X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f55ebe8f51eaa911242266638068e2c91e958db9..40dffe1f6c370e36f3e20ad82539e69b25cdcecd:/src/surf/surf_routing_none.c diff --git a/src/surf/surf_routing_none.c b/src/surf/surf_routing_none.c index e4e187caef..d4a598df46 100644 --- a/src/surf/surf_routing_none.c +++ b/src/surf/surf_routing_none.c @@ -24,13 +24,15 @@ static route_t none_get_bypass_route(AS_t rc, } static int none_parse_PU(AS_t rc, network_element_t elm) { - xbt_dynar_push(rc->index_network_elm, (void *)elm); + XBT_DEBUG("Load process unit \"%s\"", elm->name); + xbt_dynar_push_as(rc->index_network_elm,network_element_t,elm); /* don't care about PUs */ return -1; } static int none_parse_AS(AS_t rc, network_element_t elm) { - xbt_dynar_push(rc->index_network_elm, (void *)elm); + XBT_DEBUG("Load Autonomous system \"%s\"", elm->name); + xbt_dynar_push_as(rc->index_network_elm,network_element_t,elm); /* even don't care about sub-ASes -- I'm as nihilist as an old punk*/ return -1; } @@ -50,15 +52,15 @@ AS_t model_none_create_sized(size_t childsize) { new_component->get_onelink_routes = none_get_onelink_routes; new_component->get_bypass_route = none_get_bypass_route; new_component->finalize = model_none_finalize; - new_component->routing_sons = xbt_dict_new_homogeneous(NULL); new_component->index_network_elm = xbt_dynar_new(sizeof(char*),NULL); + return new_component; } void model_none_finalize(AS_t as) { xbt_dict_free(&as->routing_sons); - xbt_free(as->name); + xbt_dynar_free(&as->index_network_elm); xbt_free(as); }