X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c883f29dd011df0640842b12436d6f5129efd6e..ecc321240ca692a825b2223dba57172ed04d74b7:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index ef195630ab..2186a8602a 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -228,8 +228,6 @@ void STag_surfxml_platform(void) "is available in the contrib/platform_generation directory " "of the simgrid repository."); - if (set_list == NULL) set_list = xbt_dict_new(); - surfxml_call_cb_functions(STag_surfxml_platform_cb_list); } @@ -518,7 +516,8 @@ static void init_data(void) route_multi_table = xbt_dict_new(); route_multi_elements = xbt_dynar_new(sizeof(char*), NULL); traces_set_list = xbt_dict_new(); - + if (set_list == NULL) set_list = xbt_dict_new(); + trace_connect_list_host_avail = xbt_dict_new(); trace_connect_list_power = xbt_dict_new(); trace_connect_list_link_avail = xbt_dict_new(); @@ -553,6 +552,16 @@ static void free_data(void) xbt_dict_free(&route_table); route_link_list = NULL; + xbt_dict_foreach(set_list, cursor, key, data) { + xbt_dynar_t set = (xbt_dynar_t)data; + char *name; + unsigned int cpt = 0; + + xbt_dynar_foreach (set, cpt, name) free(name); + xbt_dynar_free(&set); + } + xbt_dict_free(&set_list); + xbt_dict_free(&trace_connect_list_host_avail); xbt_dict_free(&trace_connect_list_power); xbt_dict_free(&trace_connect_list_link_avail);