Merge with master

[simgrid.git] / src / surf / instr_routing.c

diff --git a/src/instr/instr_routing.c b/src/surf/instr_routing.c
similarity index 99%
rename from src/instr/instr_routing.c
rename to src/surf/instr_routing.c
index 36ef196..c5fc212 100644 (file)
--- a/src/instr/instr_routing.c
+++ b/src/surf/instr_routing.c
@@ -515,7 +515,7 @@ static xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_
   const char *sn = instr_node_name (s);
   const char *dn = instr_node_name (d);
   int len = strlen(sn)+strlen(dn)+1;
-  char *name = (char*)malloc(len * sizeof(char));
+  char *name = (char*)xbt_malloc(len * sizeof(char));
 
 
   snprintf (name, len, "%s%s", sn, dn);