X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49e85177c669d793e84242983a1b1f430e47184e..7cad4f0d54aafeabb7ee95007fc370514c4923a9:/src/surf/instr_routing.c diff --git a/src/surf/instr_routing.c b/src/surf/instr_routing.c index 50c5769720..7dd95b1471 100644 --- a/src/surf/instr_routing.c +++ b/src/surf/instr_routing.c @@ -156,7 +156,7 @@ static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t } xbt_dict_free (&nodes); xbt_dict_free (&edges); - xbt_graph_free_graph(graph,xbt_free, xbt_free, NULL); + xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, NULL); } } @@ -245,7 +245,7 @@ static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link) if (TRACE_uncategorized()){ type_t bandwidth_used = PJ_type_get_or_null ("bandwidth_used", new->type); if (bandwidth_used == NULL){ - bandwidth_used = PJ_type_variable_new ("bandwidth_used", "0.5 0.5 0.5", new->type); + PJ_type_variable_new ("bandwidth_used", "0.5 0.5 0.5", new->type); } } } @@ -271,7 +271,7 @@ static void instr_routing_parse_start_host (sg_platf_host_cbarg_t host) if (TRACE_uncategorized()){ type_t power_used = PJ_type_get_or_null ("power_used", new->type); if (power_used == NULL){ - power_used = PJ_type_variable_new ("power_used", "0.5 0.5 0.5", new->type); + PJ_type_variable_new ("power_used", "0.5 0.5 0.5", new->type); } } @@ -326,7 +326,7 @@ static void instr_routing_parse_end_platform () { xbt_dynar_free(¤tContainer); currentContainer = NULL; - xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free); + xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free_f); XBT_DEBUG ("Starting graph extraction."); recursiveGraphExtraction (surf_platf_get_root(routing_platf), PJ_container_get_root(), filter); XBT_DEBUG ("Graph extraction finished.");