A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
name the threads, plus debugs (ways too much for now)
[simgrid.git]
/
src
/
xbt
/
graph.c
diff --git
a/src/xbt/graph.c
b/src/xbt/graph.c
index
184da8f
..
a0f5d9e
100644
(file)
--- 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) {
int cursor;
xbt_dynar_foreach(src->out, cursor, edge) {
-
INFO
3("%p = %p--%p",edge,edge->src,edge->dst);
+
DEBUG
3("%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) {
if((edge->src==src) && (edge->dst==dst)) return edge;
}
if(!g->directed) {
xbt_dynar_foreach(src->out, cursor, edge) {
-
INFO
3("%p = %p--%p",edge,edge->src,edge->dst);
+
DEBUG
3("%p = %p--%p",edge,edge->src,edge->dst);
if((edge->dst==src) && (edge->src==dst)) return edge;
}
}
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++) {
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
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))
}
if ((node_free_function) && (n->data))