X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a8c67f54839fb3e142523870e695d02cf5b1e05..c7fd10cc97f74d7f5ab7fa2a52be7df19fd4eaa1:/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 cf6f7afde2..62c38ee072 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -1,8 +1,9 @@ -/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2020. 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 "simgrid/Exception.hpp" #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.hpp" @@ -13,8 +14,8 @@ #include "src/surf/xml/platf_private.hpp" #include "surf/surf.hpp" #include "xbt/file.hpp" +#include "xbt/parse_units.hpp" -#include #include #include #include @@ -26,7 +27,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module"); -static std::string surf_parsed_filename; // Currently parsed file (for the error messages) +std::string surf_parsed_filename; // Currently parsed file (for the error messages) std::vector parsed_link_list; /* temporary store of current link list of a route */ std::vector parsed_disk_list; /* temporary store of current disk list of a host */ @@ -35,22 +36,13 @@ std::vector parsed_disk_list; /* temporary */ void surf_parse_assert(bool cond, const std::string& msg) { - if (not cond) { - int lineno = surf_parse_lineno; - cleanup(); - XBT_ERROR("Parse error at %s:%d: %s", surf_parsed_filename.c_str(), lineno, msg.c_str()); - surf_exit(); - xbt_die("Exiting now"); - } + if (not cond) + surf_parse_error(msg); } void surf_parse_error(const std::string& msg) { - int lineno = surf_parse_lineno; - cleanup(); - XBT_ERROR("Parse error at %s:%d: %s", surf_parsed_filename.c_str(), lineno, msg.c_str()); - surf_exit(); - xbt_die("Exiting now"); + throw simgrid::ParseError(surf_parsed_filename, surf_parse_lineno, msg); } void surf_parse_assert_netpoint(const std::string& hostname, const std::string& pre, const std::string& post) @@ -63,7 +55,7 @@ void surf_parse_assert_netpoint(const std::string& hostname, const std::string& std::vector netpoints = simgrid::s4u::Engine::get_instance()->get_all_netpoints(); std::sort(netpoints.begin(), netpoints.end(), - [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) { + [](const simgrid::kernel::routing::NetPoint* a, const simgrid::kernel::routing::NetPoint* b) { return a->get_name() < b->get_name(); }); bool first = true; @@ -102,12 +94,10 @@ int surf_parse_get_int(const std::string& s) } } -namespace { - /* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */ -std::vector* explodesRadical(const std::string& radicals) +static std::vector* explodesRadical(const std::string& radicals) { - std::vector* exploded = new std::vector(); + auto* exploded = new std::vector(); // Make all hosts std::vector radical_elements; @@ -135,144 +125,6 @@ std::vector* explodesRadical(const std::string& radicals) return exploded; } -class unit_scale : public std::unordered_map { -public: - using std::unordered_map::unordered_map; - // tuples are : - explicit unit_scale(std::initializer_list> generators); -}; - -unit_scale::unit_scale(std::initializer_list> generators) -{ - for (const auto& gen : generators) { - const std::string& unit = std::get<0>(gen); - double value = std::get<1>(gen); - const int base = std::get<2>(gen); - const bool abbrev = std::get<3>(gen); - double mult; - std::vector prefixes; - switch (base) { - case 2: - mult = 1024.0; - prefixes = abbrev ? std::vector{"Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi", "Yi"} - : std::vector{"kibi", "mebi", "gibi", "tebi", "pebi", "exbi", "zebi", "yobi"}; - break; - case 10: - mult = 1000.0; - prefixes = abbrev ? std::vector{"k", "M", "G", "T", "P", "E", "Z", "Y"} - : std::vector{"kilo", "mega", "giga", "tera", "peta", "exa", "zeta", "yotta"}; - break; - default: - THROW_IMPOSSIBLE; - } - emplace(unit, value); - for (const auto& prefix : prefixes) { - value *= mult; - emplace(prefix + unit, value); - } - } -} - -/* Note: no warning is issued for unit-less values when `name' is empty. */ -double surf_parse_get_value_with_unit(const char* string, const unit_scale& units, const char* entity_kind, - const std::string& name, const char* error_msg, const char* default_unit) -{ - char* endptr; - errno = 0; - double res = strtod(string, &endptr); - const char* ptr = endptr; // for const-correctness - if (errno == ERANGE) - surf_parse_error(std::string("value out of range: ") + string); - if (ptr == string) - surf_parse_error(std::string("cannot parse number:") + string); - if (ptr[0] == '\0') { - // Ok, 0 can be unit-less - if (res != 0 && not name.empty()) - XBT_WARN("Deprecated unit-less value '%s' for %s %s. %s", string, entity_kind, name.c_str(), error_msg); - ptr = default_unit; - } - auto u = units.find(ptr); - if (u == units.end()) - surf_parse_error(std::string("unknown unit: ") + ptr); - return res * u->second; -} -} - -double surf_parse_get_time(const char* string, const char* entity_kind, const std::string& name) -{ - static const unit_scale units{std::make_pair("w", 7 * 24 * 60 * 60), - std::make_pair("d", 24 * 60 * 60), - std::make_pair("h", 60 * 60), - std::make_pair("m", 60), - std::make_pair("s", 1.0), - std::make_pair("ms", 1e-3), - std::make_pair("us", 1e-6), - std::make_pair("ns", 1e-9), - std::make_pair("ps", 1e-12)}; - return surf_parse_get_value_with_unit(string, units, entity_kind, name, - "Append 's' to your time to get seconds", "s"); -} - -double surf_parse_get_size(const char* string, const char* entity_kind, const std::string& name) -{ - static const unit_scale units{std::make_tuple("b", 0.125, 2, true), std::make_tuple("b", 0.125, 10, true), - std::make_tuple("B", 1.0, 2, true), std::make_tuple("B", 1.0, 10, true)}; - return surf_parse_get_value_with_unit(string, units, entity_kind, name, - "Append 'B' to get bytes (or 'b' for bits but 1B = 8b).", "B"); -} - -double surf_parse_get_bandwidth(const char* string, const char* entity_kind, const std::string& name) -{ - static const unit_scale units{std::make_tuple("bps", 0.125, 2, true), std::make_tuple("bps", 0.125, 10, true), - std::make_tuple("Bps", 1.0, 2, true), std::make_tuple("Bps", 1.0, 10, true)}; - return surf_parse_get_value_with_unit(string, units, entity_kind, name, - "Append 'Bps' to get bytes per second (or 'bps' for bits but 1Bps = 8bps)", "Bps"); -} - -std::vector surf_parse_get_bandwidths(const char* string, const char* entity_kind, const std::string& name) -{ - static const unit_scale units{std::make_tuple("bps", 0.125, 2, true), std::make_tuple("bps", 0.125, 10, true), - std::make_tuple("Bps", 1.0, 2, true), std::make_tuple("Bps", 1.0, 10, true)}; - - std::vector bandwidths; - std::vector tokens; - boost::split(tokens, string, boost::is_any_of(";")); - for (auto token : tokens) { - bandwidths.push_back(surf_parse_get_value_with_unit( - token.c_str(), units, entity_kind, name, - "Append 'Bps' to get bytes per second (or 'bps' for bits but 1Bps = 8bps)", "Bps")); - } - - return bandwidths; -} - -double surf_parse_get_speed(const char* string, const char* entity_kind, const std::string& name) -{ - static const unit_scale units{std::make_tuple("f", 1.0, 10, true), std::make_tuple("flops", 1.0, 10, false)}; - return surf_parse_get_value_with_unit(string, units, entity_kind, name, - "Append 'f' or 'flops' to your speed to get flop per second", "f"); -} - -static std::vector surf_parse_get_all_speeds(char* speeds, const char* entity_kind, const std::string& id) -{ - - std::vector speed_per_pstate; - - if (strchr(speeds, ',') == nullptr){ - double speed = surf_parse_get_speed(speeds, entity_kind, id); - speed_per_pstate.push_back(speed); - } else { - 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); - } - } - return speed_per_pstate; -} /* * All the callback lists that can be overridden anywhere. @@ -302,6 +154,8 @@ void ETag_surfxml_storage() storage.properties = property_sets.back(); property_sets.pop_back(); + storage.filename = surf_parsed_filename; + storage.lineno = surf_parse_lineno; storage.id = A_surfxml_storage_id; storage.type_id = A_surfxml_storage_typeId; storage.content = A_surfxml_storage_content; @@ -329,7 +183,8 @@ void ETag_surfxml_storage___type() storage_type.id = A_surfxml_storage___type_id; storage_type.model = A_surfxml_storage___type_model; storage_type.size = - surf_parse_get_size(A_surfxml_storage___type_size, "size of storage type", storage_type.id.c_str()); + static_cast(surf_parse_get_size(surf_parsed_filename, surf_parse_lineno, A_surfxml_storage___type_size, + "size of storage type", storage_type.id.c_str())); sg_platf_new_storage_type(&storage_type); } @@ -359,9 +214,9 @@ void ETag_surfxml_include() /* Stag and Etag parse functions */ void STag_surfxml_platform() { - XBT_ATTRIB_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version); + double version = surf_parse_get_double(A_surfxml_platform_version); - xbt_assert((version >= 1.0), "******* BIG FAT WARNING *********\n " + surf_parse_assert((version >= 1.0), "******* BIG FAT WARNING *********\n " "You're using an ancient XML file.\n" "Since SimGrid 3.1, units are Bytes, Flops, and seconds " "instead of MBytes, MFlops and seconds.\n" @@ -375,13 +230,13 @@ void STag_surfxml_platform() { "Last, do not forget to also update your values for " "the calls to MSG_task_create (if any)."); - xbt_assert((version >= 3.0), "******* BIG FAT WARNING *********\n " + surf_parse_assert((version >= 3.0), "******* BIG FAT WARNING *********\n " "You're using an old XML file.\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."); - xbt_assert((version >= 4.0), - "******* FILE %s IS TOO OLD (v:%.1f) *********\n " + surf_parse_assert((version >= 4.0), + std::string("******* THIS FILE IS TOO OLD (v:")+std::to_string(version)+") *********\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" @@ -390,8 +245,7 @@ void STag_surfxml_platform() { "\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.c_str(), version); + "available in the tools/ directory of the source archive."); 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" @@ -400,11 +254,10 @@ void STag_surfxml_platform() { "available in the tools/ directory of the source archive.", version, surf_parsed_filename.c_str()); } - xbt_assert(version <= 4.1, - "******* FILE %s COMES FROM THE FUTURE (v:%.1f) *********\n " + surf_parse_assert(version <= 4.1, + std::string("******* THIS FILE COMES FROM THE FUTURE (v:")+std::to_string(version)+") *********\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.c_str(), version); + "Please update your code, or use another, more adapted, file."); } void ETag_surfxml_platform(){ simgrid::s4u::Engine::on_platform_created(); @@ -429,7 +282,8 @@ void ETag_surfxml_host() { host.id = A_surfxml_host_id; - host.speed_per_pstate = surf_parse_get_all_speeds(A_surfxml_host_speed, "speed of host", host.id); + host.speed_per_pstate = + xbt_parse_get_all_speeds(surf_parsed_filename, surf_parse_lineno, A_surfxml_host_speed, "speed of host", host.id); XBT_DEBUG("pstate: %s", A_surfxml_host_pstate); host.core_amount = surf_parse_get_int(A_surfxml_host_core); @@ -461,8 +315,10 @@ void ETag_surfxml_disk() { property_sets.pop_back(); disk.id = A_surfxml_disk_id; - disk.read_bw = surf_parse_get_bandwidth(A_surfxml_disk_read___bw, "read_bw of disk ", disk.id); - disk.write_bw = surf_parse_get_bandwidth(A_surfxml_disk_write___bw, "write_bw of disk ", disk.id); + disk.read_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_disk_read___bw, + "read_bw of disk ", disk.id); + disk.write_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_disk_write___bw, + "write_bw of disk ", disk.id); parsed_disk_list.push_back(sg_platf_new_disk(&disk)); } @@ -490,20 +346,29 @@ void ETag_surfxml_cluster(){ cluster.prefix = A_surfxml_cluster_prefix; cluster.suffix = A_surfxml_cluster_suffix; cluster.radicals = explodesRadical(A_surfxml_cluster_radical); - cluster.speeds = surf_parse_get_all_speeds(A_surfxml_cluster_speed, "speed of cluster", cluster.id); + cluster.speeds = xbt_parse_get_all_speeds(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_speed, + "speed of cluster", cluster.id); cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core); - cluster.bw = surf_parse_get_bandwidth(A_surfxml_cluster_bw, "bw of cluster", cluster.id); - cluster.lat = surf_parse_get_time(A_surfxml_cluster_lat, "lat of cluster", cluster.id); + cluster.bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_bw, "bw of cluster", + cluster.id); + cluster.lat = + xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_lat, "lat of cluster", cluster.id); if(strcmp(A_surfxml_cluster_bb___bw,"")) - cluster.bb_bw = surf_parse_get_bandwidth(A_surfxml_cluster_bb___bw, "bb_bw of cluster", cluster.id); + cluster.bb_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_bb___bw, + "bb_bw of cluster", cluster.id); if(strcmp(A_surfxml_cluster_bb___lat,"")) - cluster.bb_lat = surf_parse_get_time(A_surfxml_cluster_bb___lat, "bb_lat of cluster", cluster.id); + cluster.bb_lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_bb___lat, + "bb_lat of cluster", cluster.id); if(strcmp(A_surfxml_cluster_limiter___link,"")) - cluster.limiter_link = surf_parse_get_bandwidth(A_surfxml_cluster_limiter___link, "limiter_link of cluster", cluster.id); + cluster.limiter_link = + xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_limiter___link, + "limiter_link of cluster", cluster.id); if(strcmp(A_surfxml_cluster_loopback___bw,"")) - cluster.loopback_bw = surf_parse_get_bandwidth(A_surfxml_cluster_loopback___bw, "loopback_bw of cluster", cluster.id); + cluster.loopback_bw = xbt_parse_get_bandwidth( + surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_loopback___bw, "loopback_bw of cluster", cluster.id); if(strcmp(A_surfxml_cluster_loopback___lat,"")) - cluster.loopback_lat = surf_parse_get_time(A_surfxml_cluster_loopback___lat, "loopback_lat of cluster", cluster.id); + cluster.loopback_lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_cluster_loopback___lat, + "loopback_lat of cluster", cluster.id); switch(AX_surfxml_cluster_topology){ case A_surfxml_cluster_topology_FLAT: @@ -564,9 +429,12 @@ void STag_surfxml_cabinet(){ cabinet.id = A_surfxml_cabinet_id; cabinet.prefix = A_surfxml_cabinet_prefix; cabinet.suffix = A_surfxml_cabinet_suffix; - cabinet.speed = surf_parse_get_speed(A_surfxml_cabinet_speed, "speed of cabinet", cabinet.id.c_str()); - cabinet.bw = surf_parse_get_bandwidth(A_surfxml_cabinet_bw, "bw of cabinet", cabinet.id.c_str()); - cabinet.lat = surf_parse_get_time(A_surfxml_cabinet_lat, "lat of cabinet", cabinet.id.c_str()); + cabinet.speed = xbt_parse_get_speed(surf_parsed_filename, surf_parse_lineno, A_surfxml_cabinet_speed, + "speed of cabinet", cabinet.id.c_str()); + cabinet.bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cabinet_bw, "bw of cabinet", + cabinet.id.c_str()); + cabinet.lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_cabinet_lat, "lat of cabinet", + cabinet.id.c_str()); cabinet.radicals = explodesRadical(A_surfxml_cabinet_radical); sg_platf_new_cabinet(&cabinet); @@ -576,9 +444,12 @@ void STag_surfxml_peer(){ simgrid::kernel::routing::PeerCreationArgs peer; peer.id = std::string(A_surfxml_peer_id); - peer.speed = surf_parse_get_speed(A_surfxml_peer_speed, "speed of peer", peer.id.c_str()); - peer.bw_in = surf_parse_get_bandwidth(A_surfxml_peer_bw___in, "bw_in of peer", peer.id.c_str()); - peer.bw_out = surf_parse_get_bandwidth(A_surfxml_peer_bw___out, "bw_out of peer", peer.id.c_str()); + peer.speed = xbt_parse_get_speed(surf_parsed_filename, surf_parse_lineno, A_surfxml_peer_speed, "speed of peer", + peer.id.c_str()); + peer.bw_in = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_peer_bw___in, "bw_in of peer", + peer.id.c_str()); + peer.bw_out = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_peer_bw___out, + "bw_out of peer", peer.id.c_str()); peer.coord = A_surfxml_peer_coordinates; peer.speed_trace = nullptr; if (A_surfxml_peer_availability___file[0] != '\0') { @@ -609,11 +480,13 @@ void ETag_surfxml_link(){ property_sets.pop_back(); link.id = std::string(A_surfxml_link_id); - link.bandwidths = surf_parse_get_bandwidths(A_surfxml_link_bandwidth, "bandwidth of link", link.id.c_str()); + link.bandwidths = xbt_parse_get_bandwidths(surf_parsed_filename, surf_parse_lineno, A_surfxml_link_bandwidth, + "bandwidth of link", link.id.c_str()); link.bandwidth_trace = A_surfxml_link_bandwidth___file[0] ? simgrid::kernel::profile::Profile::from_file(A_surfxml_link_bandwidth___file) : nullptr; - link.latency = surf_parse_get_time(A_surfxml_link_latency, "latency of link", link.id.c_str()); + link.latency = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_link_latency, "latency of link", + link.id.c_str()); link.latency_trace = A_surfxml_link_latency___file[0] ? simgrid::kernel::profile::Profile::from_file(A_surfxml_link_latency___file) : nullptr; @@ -683,9 +556,10 @@ void ETag_surfxml_backbone(){ link.properties = nullptr; link.id = std::string(A_surfxml_backbone_id); - link.bandwidths.push_back( - surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id.c_str())); - link.latency = surf_parse_get_time(A_surfxml_backbone_latency, "latency of backbone", link.id.c_str()); + link.bandwidths.push_back(xbt_parse_get_bandwidth( + surf_parsed_filename, surf_parse_lineno, A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id.c_str())); + link.latency = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_backbone_latency, + "latency of backbone", link.id.c_str()); link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; sg_platf_new_link(&link); @@ -736,7 +610,9 @@ void ETag_surfxml_route(){ route.dst = sg_netpoint_by_name_or_null(A_surfxml_route_dst); // tested to not be nullptr in start tag route.gw_src = nullptr; route.gw_dst = nullptr; - route.symmetrical = (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES); + route.symmetrical = (A_surfxml_route_symmetrical == AU_surfxml_route_symmetrical || + A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES || + A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_yes); route.link_list.swap(parsed_link_list); @@ -764,17 +640,9 @@ void ETag_surfxml_zoneRoute() ASroute.link_list.swap(parsed_link_list); - switch (A_surfxml_zoneRoute_symmetrical) { - case AU_surfxml_zoneRoute_symmetrical: - case A_surfxml_zoneRoute_symmetrical_YES: - ASroute.symmetrical = true; - break; - case A_surfxml_zoneRoute_symmetrical_NO: - ASroute.symmetrical = false; - break; - default: - THROW_IMPOSSIBLE; - } + ASroute.symmetrical = (A_surfxml_zoneRoute_symmetrical == AU_surfxml_zoneRoute_symmetrical || + A_surfxml_zoneRoute_symmetrical == A_surfxml_zoneRoute_symmetrical_YES || + A_surfxml_zoneRoute_symmetrical == A_surfxml_zoneRoute_symmetrical_yes); sg_platf_new_route(&ASroute); } @@ -861,7 +729,7 @@ 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; + AX_surfxml_zone_routing = AX_surfxml_AS_routing; STag_surfxml_zone(); } @@ -875,7 +743,7 @@ void STag_surfxml_zone() property_sets.push_back(new std::unordered_map()); simgrid::kernel::routing::ZoneCreationArgs zone; zone.id = A_surfxml_zone_id; - zone.routing = static_cast(A_surfxml_zone_routing); + zone.routing = A_surfxml_zone_routing; sg_platf_new_Zone_begin(&zone); } @@ -912,7 +780,7 @@ void ETag_surfxml_config() for (std::string key : keys) { if (simgrid::config::is_default(key.c_str())) { std::string cfg = key + ":" + current_property_set->at(key); - simgrid::config::set_parse(std::move(cfg)); + simgrid::config::set_parse(cfg); } else XBT_INFO("The custom configuration '%s' is already defined by user!", key.c_str()); } @@ -962,10 +830,10 @@ void ETag_surfxml_actor() switch (A_surfxml_actor_on___failure) { case AU_surfxml_actor_on___failure: case A_surfxml_actor_on___failure_DIE: - actor.on_failure = simgrid::kernel::routing::ActorOnFailure::DIE; + actor.restart_on_failure = false; break; case A_surfxml_actor_on___failure_RESTART: - actor.on_failure = simgrid::kernel::routing::ActorOnFailure::RESTART; + actor.restart_on_failure = true; break; default: surf_parse_error("Invalid on failure behavior"); @@ -975,7 +843,7 @@ void ETag_surfxml_actor() } void STag_surfxml_argument(){ - arguments.push_back(A_surfxml_argument_value); + arguments.emplace_back(A_surfxml_argument_value); } void STag_surfxml_model___prop(){ @@ -1011,10 +879,9 @@ void surf_parse_open(const std::string& file) surf_path.push_back(dir); surf_file_to_parse = surf_fopen(file, "r"); - if (surf_file_to_parse == nullptr) { - std::string cwd = simgrid::xbt::Path().get_name(); - xbt_die("Unable to open '%s' from '%s'\n", file.c_str(), cwd.c_str()); - } + if (surf_file_to_parse == nullptr) + throw std::invalid_argument(std::string("Unable to open '") + file + "' from '" + simgrid::xbt::Path().get_name() + + "'. Does this file exist?"); surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE); surf_parse__switch_to_buffer(surf_input_buffer); surf_parse_lineno = 1; @@ -1032,7 +899,8 @@ void surf_parse_close() } /* Call the lexer to parse the currently opened file */ -int surf_parse() +void surf_parse() { - return surf_parse_lex(); + bool err = surf_parse_lex(); + surf_parse_assert(not err, "Flex returned an error code"); }