X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/159ec4477f94c16e7da9894ff1cf87925f532b70..c28b7e03130c89fae7bad65806977cdbccb79c53:/src/xbt/graph.c diff --git a/src/xbt/graph.c b/src/xbt/graph.c index 184da8f8f9..a0f5d9e6ad 100644 --- a/src/xbt/graph.c +++ b/src/xbt/graph.c @@ -20,7 +20,7 @@ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(graph, xbt, "Graph"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_graph, xbt, "Graph"); @@ -86,12 +86,12 @@ xbt_edge_t xbt_graph_get_edge(xbt_graph_t g, xbt_node_t src, xbt_node_t dst) int cursor; xbt_dynar_foreach(src->out, cursor, edge) { - INFO3("%p = %p--%p",edge,edge->src,edge->dst); + DEBUG3("%p = %p--%p",edge,edge->src,edge->dst); if((edge->src==src) && (edge->dst==dst)) return edge; } if(!g->directed) { xbt_dynar_foreach(src->out, cursor, edge) { - INFO3("%p = %p--%p",edge,edge->src,edge->dst); + DEBUG3("%p = %p--%p",edge,edge->src,edge->dst); if((edge->dst==src) && (edge->src==dst)) return edge; } } @@ -173,12 +173,12 @@ void xbt_graph_free_node(xbt_graph_t g, xbt_node_t n, nbr = xbt_dynar_length(g->edges); cursor = 0; for (i = 0; i < nbr; i++) { - xbt_dynar_cursor_get(g->edges, &cursor, &edge); + xbt_dynar_get_cpy(g->edges, cursor, &edge); if ((edge->dst == n) || (edge->src == n)) { xbt_graph_free_edge(g, edge, edge_free_function); } else - xbt_dynar_cursor_step(g->edges, &cursor); + cursor ++; } if ((node_free_function) && (n->data))