X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a91f50abdce08089b633bb5496b3f0c92a4b7c2e..d6d03a0a88c2673c9e5c604d63912b77bc17fdd4:/src/surf/xml/surfxml_sax_cb.cpp diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index f747566778..d59eeb0523 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -1,27 +1,19 @@ - /* Copyright (c) 2006-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include -#include -#include /* va_arg */ - -#include "simgrid/link.h" -#include "simgrid/s4u/engine.hpp" +#include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.h" #include "src/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" -#include "src/surf/surf_private.h" -#include "xbt/dict.h" #include "xbt/file.h" -#include "xbt/log.h" -#include "xbt/misc.h" -#include "xbt/str.h" -#include #include "src/surf/xml/platf_private.hpp" +#include +#include +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module"); @@ -91,35 +83,30 @@ int surf_parse_get_int(const char *string) { static std::vector* explodesRadical(const char* radicals) { std::vector* exploded = new std::vector(); - char* groups; - unsigned int iter; // Make all hosts - xbt_dynar_t radical_elements = xbt_str_split(radicals, ","); - xbt_dynar_foreach (radical_elements, iter, groups) { - - xbt_dynar_t radical_ends = xbt_str_split(groups, "-"); - int start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char*)); + std::vector radical_elements; + boost::split(radical_elements, radicals, boost::is_any_of(",")); + for (auto group : radical_elements) { + std::vector radical_ends; + boost::split(radical_ends, group, boost::is_any_of("-")); + int start = surf_parse_get_int((radical_ends.front()).c_str()); int end = 0; - switch (xbt_dynar_length(radical_ends)) { + switch (radical_ends.size()) { case 1: end = start; break; case 2: - end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char*)); + end = surf_parse_get_int((radical_ends.back()).c_str()); break; default: - surf_parse_error("Malformed radical: %s", groups); + surf_parse_error("Malformed radical: %s", group.c_str()); break; } - for (int i = start; i <= end; i++) exploded->push_back(i); - - xbt_dynar_free(&radical_ends); } - xbt_dynar_free(&radical_elements); return exploded; } @@ -278,16 +265,14 @@ static std::vector surf_parse_get_all_speeds(char* speeds, const char* e double speed = surf_parse_get_speed(speeds, entity_kind, id); speed_per_pstate.push_back(speed); } else { - xbt_dynar_t pstate_list = xbt_str_split(speeds, ","); - unsigned int i; - char* speed_str; - xbt_dynar_foreach(pstate_list, i, speed_str) { - xbt_str_trim(speed_str, nullptr); - double speed = surf_parse_get_speed(speed_str,entity_kind, id); + std::vector pstate_list; + boost::split(pstate_list, speeds, boost::is_any_of(",")); + for (auto speed_str : pstate_list) { + boost::trim(speed_str); + double speed = surf_parse_get_speed(speed_str.c_str(), entity_kind, id); speed_per_pstate.push_back(speed); XBT_DEBUG("Speed value: %f", speed); } - xbt_dynar_free(&pstate_list); } return speed_per_pstate; } @@ -301,8 +286,8 @@ static std::vector surf_parse_get_all_speeds(char* speeds, const char* e /* The default current property receiver. Setup in the corresponding opening callbacks. */ xbt_dict_t current_property_set = nullptr; -xbt_dict_t current_model_property_set = nullptr; -int AS_TAG = 0; // Whether we just opened an AS tag (to see what to do with the properties) +std::map* current_model_property_set = nullptr; +int ZONE_TAG = 0; // Whether we just opened a zone tag (to see what to do with the properties) /* dictionary of random generator data */ xbt_dict_t random_data_list = nullptr; @@ -315,7 +300,7 @@ FILE *surf_file_to_parse = nullptr; */ void STag_surfxml_storage() { - AS_TAG = 0; + ZONE_TAG = 0; XBT_DEBUG("STag_surfxml_storage"); xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); } @@ -336,7 +321,7 @@ void ETag_surfxml_storage() } void STag_surfxml_storage___type() { - AS_TAG = 0; + ZONE_TAG = 0; XBT_DEBUG("STag_surfxml_storage___type"); xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); xbt_assert(current_model_property_set == nullptr, "Someone forgot to reset the model property set to nullptr in its closing tag (or XML malformed)"); @@ -426,15 +411,12 @@ int ETag_surfxml_include_state() // Yeah, we were in an Restore state and proceed. fclose(surf_file_to_parse); - surf_file_to_parse = surf_file_to_parse_stack.back(); surf_file_to_parse_stack.pop_back(); surf_parse_pop_buffer_state(); - surf_input_buffer = surf_input_buffer_stack.back(); surf_input_buffer_stack.pop_back(); // Restore the filename for error messages free(surf_parsed_filename); - surf_parsed_filename = surf_parsed_filename_stack.back(); surf_parsed_filename_stack.pop_back(); return 1; @@ -464,16 +446,30 @@ void STag_surfxml_platform() { "Use simgrid_update_xml to update your file automatically. " "This program is installed automatically with SimGrid, or " "available in the tools/ directory of the source archive."); - xbt_assert((version >= 4.0), "******* FILE %s IS TOO OLD (v:%.1f) *********\n " - "Changes introduced in SimGrid 3.13:\n" - " - 'power' attribute of hosts (and others) got renamed to 'speed'.\n" - " - In , attribute kind=\"POWER\" is now kind=\"SPEED\".\n" - " - DOCTYPE now point to the rignt URL: http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\n" - " - speed, bandwidth and latency attributes now MUST have an explicit unit (f, Bps, s by default)" - "\n\n" - "Use simgrid_update_xml to update your file automatically. " - "This program is installed automatically with SimGrid, or " - "available in the tools/ directory of the source archive.",surf_parsed_filename, version); + xbt_assert((version >= 4.0), + "******* FILE %s IS TOO OLD (v:%.1f) *********\n " + "Changes introduced in SimGrid 3.13:\n" + " - 'power' attribute of hosts (and others) got renamed to 'speed'.\n" + " - In , attribute kind=\"POWER\" is now kind=\"SPEED\".\n" + " - DOCTYPE now point to the rignt URL: http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\n" + " - speed, bandwidth and latency attributes now MUST have an explicit unit (f, Bps, s by default)" + "\n\n" + "Use simgrid_update_xml to update your file automatically. " + "This program is installed automatically with SimGrid, or " + "available in the tools/ directory of the source archive.", + surf_parsed_filename, version); + if (version < 4.1) { + XBT_INFO("You're using a v%.1f XML file (%s) while the current standard is v4.1 " + "That's fine, the new version is backward compatible. \n\n" + "Use simgrid_update_xml to update your file automatically. " + "This program is installed automatically with SimGrid, or " + "available in the tools/ directory of the source archive.", + version, surf_parsed_filename); + } + xbt_assert(version <= 4.1, "******* FILE %s COMES FROM THE FUTURE (v:%.1f) *********\n " + "The most recent formalism that this version of SimGrid understands is v4.1.\n" + "Please update your code, or use another, more adapted, file.", + surf_parsed_filename, version); sg_platf_begin(); } @@ -482,17 +478,17 @@ void ETag_surfxml_platform(){ } void STag_surfxml_host(){ - AS_TAG = 0; + ZONE_TAG = 0; xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); } void STag_surfxml_prop() { - if (AS_TAG) { // We need to retrieve the most recently opened AS - XBT_DEBUG("Set AS property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value); - simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::instance()->netzoneByNameOrNull(A_surfxml_AS_id); + if (ZONE_TAG) { // We need to retrieve the most recently opened zone + XBT_DEBUG("Set zone property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value); + simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::instance()->netzoneByNameOrNull(A_surfxml_zone_id); - netzone->setProperty(A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value)); + netzone->setProperty(A_surfxml_prop_id, A_surfxml_prop_value); } else{ if (!current_property_set) @@ -615,7 +611,7 @@ void ETag_surfxml_cluster(){ } void STag_surfxml_cluster(){ - AS_TAG = 0; + ZONE_TAG = 0; parse_after_config(); xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); } @@ -655,7 +651,7 @@ void STag_surfxml_peer(){ } void STag_surfxml_link(){ - AS_TAG = 0; + ZONE_TAG = 0; xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); } @@ -692,7 +688,7 @@ void ETag_surfxml_link(){ void STag_surfxml_link___ctn(){ - simgrid::surf::LinkImpl* link; + simgrid::surf::LinkImpl* link = nullptr; char *link_name=nullptr; switch (A_surfxml_link___ctn_direction) { case AU_surfxml_link___ctn_direction: @@ -710,10 +706,18 @@ void STag_surfxml_link___ctn(){ } xbt_free(link_name); // no-op if it's already nullptr - surf_parse_assert(link!=nullptr,"No such link: '%s'%s", A_surfxml_link___ctn_id, - A_surfxml_link___ctn_direction==A_surfxml_link___ctn_direction_UP?" (upward)": - ( A_surfxml_link___ctn_direction==A_surfxml_link___ctn_direction_DOWN?" (downward)": - "")); + const char* dirname = ""; + switch (A_surfxml_link___ctn_direction) { + case A_surfxml_link___ctn_direction_UP: + dirname = " (upward)"; + break; + case A_surfxml_link___ctn_direction_DOWN: + dirname = " (downward)"; + break; + default: + dirname = ""; + } + surf_parse_assert(link != nullptr, "No such link: '%s'%s", A_surfxml_link___ctn_id, dirname); parsed_link_list.push_back(link); } @@ -739,15 +743,26 @@ void STag_surfxml_route(){ void STag_surfxml_ASroute(){ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_src), "ASroute src='%s' does name a node.", - A_surfxml_route_src); + A_surfxml_ASroute_src); surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_dst), "ASroute dst='%s' does name a node.", - A_surfxml_route_dst); + A_surfxml_ASroute_dst); surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_gw___src), "ASroute gw_src='%s' does name a node.", A_surfxml_ASroute_gw___src); surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_gw___dst), "ASroute gw_dst='%s' does name a node.", A_surfxml_ASroute_gw___dst); } +void STag_surfxml_zoneRoute(){ + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_src), "zoneRoute src='%s' does name a node.", + A_surfxml_zoneRoute_src); + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_dst), "zoneRoute dst='%s' does name a node.", + A_surfxml_zoneRoute_dst); + + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_gw___src), "zoneRoute gw_src='%s' does name a node.", + A_surfxml_zoneRoute_gw___src); + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_gw___dst), "zoneRoute gw_dst='%s' does name a node.", + A_surfxml_zoneRoute_gw___dst); +} void STag_surfxml_bypassRoute(){ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassRoute_src), "bypassRoute src='%s' does name a node.", @@ -766,6 +781,16 @@ void STag_surfxml_bypassASroute(){ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_gw___dst), "bypassASroute gw_dst='%s' does name a node.", A_surfxml_bypassASroute_gw___dst); } +void STag_surfxml_bypassZoneRoute(){ + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_src), + "bypassASroute src='%s' does name a node.", A_surfxml_bypassZoneRoute_src); + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_dst), + "bypassASroute dst='%s' does name a node.", A_surfxml_bypassZoneRoute_dst); + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_gw___src), + "bypassASroute gw_src='%s' does name a node.", A_surfxml_bypassZoneRoute_gw___src); + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_gw___dst), + "bypassASroute gw_dst='%s' does name a node.", A_surfxml_bypassZoneRoute_gw___dst); +} void ETag_surfxml_route(){ s_sg_platf_route_cbarg_t route; @@ -786,15 +811,25 @@ void ETag_surfxml_route(){ delete route.link_list; } -void ETag_surfxml_ASroute(){ +void ETag_surfxml_ASroute() +{ + AX_surfxml_zoneRoute_src = AX_surfxml_ASroute_src; + AX_surfxml_zoneRoute_dst = AX_surfxml_ASroute_dst; + AX_surfxml_zoneRoute_gw___src = AX_surfxml_ASroute_gw___src; + AX_surfxml_zoneRoute_gw___dst = AX_surfxml_ASroute_gw___dst; + AX_surfxml_zoneRoute_symmetrical = (AT_surfxml_zoneRoute_symmetrical)AX_surfxml_ASroute_symmetrical; + ETag_surfxml_zoneRoute(); +} +void ETag_surfxml_zoneRoute() +{ s_sg_platf_route_cbarg_t ASroute; memset(&ASroute,0,sizeof(ASroute)); - ASroute.src = sg_netpoint_by_name_or_null(A_surfxml_ASroute_src); // tested to not be nullptr in start tag - ASroute.dst = sg_netpoint_by_name_or_null(A_surfxml_ASroute_dst); // tested to not be nullptr in start tag + ASroute.src = sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_src); // tested to not be nullptr in start tag + ASroute.dst = sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_dst); // tested to not be nullptr in start tag - ASroute.gw_src = sg_netpoint_by_name_or_null(A_surfxml_ASroute_gw___src); // tested to not be nullptr in start tag - ASroute.gw_dst = sg_netpoint_by_name_or_null(A_surfxml_ASroute_gw___dst); // tested to not be nullptr in start tag + ASroute.gw_src = sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_gw___src); // tested to not be nullptr in start tag + ASroute.gw_dst = sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_gw___dst); // tested to not be nullptr in start tag ASroute.link_list = new std::vector(); @@ -802,12 +837,12 @@ void ETag_surfxml_ASroute(){ ASroute.link_list->push_back(link); parsed_link_list.clear(); - switch (A_surfxml_ASroute_symmetrical) { - case AU_surfxml_ASroute_symmetrical: - case A_surfxml_ASroute_symmetrical_YES: + switch (A_surfxml_zoneRoute_symmetrical) { + case AU_surfxml_zoneRoute_symmetrical: + case A_surfxml_zoneRoute_symmetrical_YES: ASroute.symmetrical = true; break; - case A_surfxml_ASroute_symmetrical_NO: + case A_surfxml_zoneRoute_symmetrical_NO: ASroute.symmetrical = false; break; } @@ -835,12 +870,21 @@ void ETag_surfxml_bypassRoute(){ delete route.link_list; } -void ETag_surfxml_bypassASroute(){ +void ETag_surfxml_bypassASroute() +{ + AX_surfxml_bypassZoneRoute_src = AX_surfxml_bypassASroute_src; + AX_surfxml_bypassZoneRoute_dst = AX_surfxml_bypassASroute_dst; + AX_surfxml_bypassZoneRoute_gw___src = AX_surfxml_bypassASroute_gw___src; + AX_surfxml_bypassZoneRoute_gw___dst = AX_surfxml_bypassASroute_gw___dst; + ETag_surfxml_bypassZoneRoute(); +} +void ETag_surfxml_bypassZoneRoute() +{ s_sg_platf_route_cbarg_t ASroute; memset(&ASroute,0,sizeof(ASroute)); - ASroute.src = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_src); - ASroute.dst = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_dst); + ASroute.src = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_src); + ASroute.dst = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_dst); ASroute.link_list = new std::vector(); for (auto link: parsed_link_list) ASroute.link_list->push_back(link); @@ -848,8 +892,8 @@ void ETag_surfxml_bypassASroute(){ ASroute.symmetrical = false; - ASroute.gw_src = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_gw___src); - ASroute.gw_dst = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_gw___dst); + ASroute.gw_src = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_gw___src); + ASroute.gw_dst = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_gw___dst); sg_platf_new_bypassRoute(&ASroute); delete ASroute.link_list; @@ -897,22 +941,31 @@ void STag_surfxml_trace___connect(){ } void STag_surfxml_AS(){ + AX_surfxml_zone_id = AX_surfxml_AS_id; + AX_surfxml_zone_routing = (AT_surfxml_zone_routing)AX_surfxml_AS_routing; + STag_surfxml_zone(); +} +void ETag_surfxml_AS(){ + ETag_surfxml_zone(); +} +void STag_surfxml_zone(){ parse_after_config(); - AS_TAG = 1; - s_sg_platf_AS_cbarg_t AS = { A_surfxml_AS_id, (int)A_surfxml_AS_routing}; + ZONE_TAG = 1; + s_sg_platf_AS_cbarg_t AS = { A_surfxml_zone_id, (int)A_surfxml_zone_routing}; sg_platf_new_AS_begin(&AS); } -void ETag_surfxml_AS(){ +void ETag_surfxml_zone(){ sg_platf_new_AS_seal(); } void STag_surfxml_config(){ - AS_TAG = 0; + ZONE_TAG = 0; xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); XBT_DEBUG("START configuration name = %s",A_surfxml_config_id); if (_sg_cfg_init_status == 2) { - surf_parse_error("All tags must be given before any platform elements (such as , , , , etc)."); + surf_parse_error("All tags must be given before any platform elements (such as , , , " + ", etc)."); } } void ETag_surfxml_config(){ @@ -936,37 +989,53 @@ void ETag_surfxml_config(){ static int argc; static char **argv; -void STag_surfxml_process(){ - AS_TAG = 0; +void STag_surfxml_process() +{ + AX_surfxml_actor_function = AX_surfxml_process_function; + STag_surfxml_actor(); +} +void STag_surfxml_actor() +{ + ZONE_TAG = 0; argc = 1; argv = xbt_new(char *, 1); - argv[0] = xbt_strdup(A_surfxml_process_function); + argv[0] = xbt_strdup(A_surfxml_actor_function); xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); } -void ETag_surfxml_process(){ - s_sg_platf_process_cbarg_t process; - memset(&process,0,sizeof(process)); - - process.argc = argc; - process.argv = (const char **)argv; - process.properties = current_property_set; - process.host = A_surfxml_process_host; - process.function = A_surfxml_process_function; - process.start_time = surf_parse_get_double(A_surfxml_process_start___time); - process.kill_time = surf_parse_get_double(A_surfxml_process_kill___time); - - switch (A_surfxml_process_on___failure) { - case AU_surfxml_process_on___failure: - case A_surfxml_process_on___failure_DIE: - process.on_failure = SURF_PROCESS_ON_FAILURE_DIE; +void ETag_surfxml_process() +{ + AX_surfxml_actor_host = AX_surfxml_process_host; + AX_surfxml_actor_function = AX_surfxml_process_function; + AX_surfxml_actor_start___time = AX_surfxml_process_start___time; + AX_surfxml_actor_kill___time = AX_surfxml_process_kill___time; + AX_surfxml_actor_on___failure = (AT_surfxml_actor_on___failure)AX_surfxml_process_on___failure; + ETag_surfxml_actor(); +} +void ETag_surfxml_actor() +{ + s_sg_platf_process_cbarg_t actor; + memset(&actor,0,sizeof(actor)); + + actor.argc = argc; + actor.argv = (const char **)argv; + actor.properties = current_property_set; + actor.host = A_surfxml_actor_host; + actor.function = A_surfxml_actor_function; + actor.start_time = surf_parse_get_double(A_surfxml_actor_start___time); + actor.kill_time = surf_parse_get_double(A_surfxml_actor_kill___time); + + switch (A_surfxml_actor_on___failure) { + case AU_surfxml_actor_on___failure: + case A_surfxml_actor_on___failure_DIE: + actor.on_failure = SURF_ACTOR_ON_FAILURE_DIE; break; - case A_surfxml_process_on___failure_RESTART: - process.on_failure = SURF_PROCESS_ON_FAILURE_RESTART; + case A_surfxml_actor_on___failure_RESTART: + actor.on_failure = SURF_ACTOR_ON_FAILURE_RESTART; break; } - sg_platf_new_process(&process); + sg_platf_new_process(&actor); for (int i = 0; i != argc; ++i) xbt_free(argv[i]); @@ -984,9 +1053,10 @@ void STag_surfxml_argument(){ void STag_surfxml_model___prop(){ if (!current_model_property_set) - current_model_property_set = xbt_dict_new_homogeneous(xbt_free_f); + current_model_property_set = new std::map(); - xbt_dict_set(current_model_property_set, A_surfxml_model___prop_id, xbt_strdup(A_surfxml_model___prop_value), nullptr); + current_model_property_set->insert( + {std::string(A_surfxml_model___prop_id), std::string(A_surfxml_model___prop_value)}); } void ETag_surfxml_prop(){/* Nothing to do */} @@ -1009,8 +1079,9 @@ void surf_parse_open(const char *file) xbt_assert(file, "Cannot parse the nullptr file. Bypassing the parser is strongly deprecated nowadays."); surf_parsed_filename = xbt_strdup(file); - char *dir = xbt_dirname(file); - xbt_dynar_push(surf_path, &dir); + char* dir = xbt_dirname(file); + surf_path.push_back(std::string(dir)); + xbt_free(dir); surf_file_to_parse = surf_fopen(file, "r"); xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", file); @@ -1022,9 +1093,7 @@ void surf_parse_open(const char *file) void surf_parse_close() { if (surf_parsed_filename) { - char *dir = nullptr; - xbt_dynar_pop(surf_path, &dir); - free(dir); + surf_path.pop_back(); } free(surf_parsed_filename);