X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c9b8ae2a235057d3eac28aa41a2ff89ba7b331d..d3e1bd3437bd7573295b4cf05b79f66851b216b7:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 0f6c426f7c..451428390b 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -315,7 +315,6 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) new_as->model_desc = model; new_as->hierarchy = SURF_ROUTING_NULL; new_as->name = xbt_strdup(AS_id); - new_as->routing_sons = xbt_dict_new(); if (current_routing == NULL && global_routing->root == NULL) { @@ -928,12 +927,7 @@ static void routing_parse_cluster(void) sg_platf_new_link(&link); - surf_parsing_link_up_down_t info = - xbt_new0(s_surf_parsing_link_up_down_t, 1); - info->link_up = - xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL); - info->link_down = info->link_up; - surf_routing_cluster_add_link(struct_cluster->id, info); + surf_routing_cluster_add_backbone(current_routing, xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL)); free(link_backbone); } @@ -1222,11 +1216,10 @@ static void finalize_rec(AS_t as) { char *key; AS_t elem; - xbt_dict_foreach(as->routing_sons, cursor, key, elem) - finalize_rec(elem); + xbt_dict_foreach(as->routing_sons, cursor, key, elem) { + finalize_rec(elem); + } - xbt_dict_free(&as->routing_sons); - xbt_free(as->name); as->finalize(as); }