X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc05a6b37aefdf463cac0fe88a8c8cb1d7d72eda..627857967e297ea0191d97addc4519efbf2d5dc2:/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 83073b4f0f..355cba0bd4 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -1,111 +1,103 @@ -/* Copyright (c) 2006-2017. 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.h" -#include "src/kernel/routing/NetPoint.hpp" +#include "simgrid/sg_config.hpp" +#include "src/kernel/resource/profile/FutureEvtSet.hpp" +#include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/network_interface.hpp" +#include "src/surf/surf_interface.hpp" +#include "src/surf/xml/platf_private.hpp" +#include "surf/surf.hpp" #include "xbt/file.hpp" -#include "src/surf/xml/platf_private.hpp" #include #include #include -#include #include #include #include #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module"); - -extern "C" { - #include "simgrid_dtd.c" -static const char* surf_parsed_filename; // Currently parsed file (for the error messages) -std::vector parsed_link_list; /* temporary store of current list link of a route */ +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::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 */ /* * Helping functions */ -void surf_parse_assert(bool cond, std::string msg) -{ - if (not cond) { - int lineno = surf_parse_lineno; - cleanup(); - XBT_ERROR("Parse error at %s:%d: %s", surf_parsed_filename, lineno, msg.c_str()); - surf_exit(); - xbt_die("Exiting now"); - } +void surf_parse_assert(bool cond, const std::string& msg) +{ + if (not cond) + surf_parse_error(msg); } -void surf_parse_error(std::string 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, 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(std::string hostname, std::string pre, std::string post) +void surf_parse_assert_netpoint(const std::string& hostname, const std::string& pre, const std::string& post) { - if (sg_netpoint_by_name_or_null(hostname.c_str()) != nullptr) // found + if (simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(hostname) != nullptr) // found return; std::string msg = pre + hostname + post + " Existing netpoints: \n"; - std::vector list; - simgrid::s4u::Engine::getInstance()->getNetpointList(&list); - std::sort(list.begin(), list.end(), [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) { - return a->getName() < b->getName(); - }); + std::vector netpoints = + simgrid::s4u::Engine::get_instance()->get_all_netpoints(); + std::sort(netpoints.begin(), netpoints.end(), + [](const simgrid::kernel::routing::NetPoint* a, const simgrid::kernel::routing::NetPoint* b) { + return a->get_name() < b->get_name(); + }); bool first = true; - for (auto const& np : list) { - if (np->isNetZone()) + for (auto const& np : netpoints) { + if (np->is_netzone()) continue; if (not first) msg += ","; first = false; - msg += "'" + np->getName() + "'"; + msg += "'" + np->get_name() + "'"; if (msg.length() > 4096) { msg.pop_back(); // remove trailing quote msg += "...(list truncated)......"; break; } } - surf_parse_error(msg); + surf_parse_error(std::move(msg)); } -double surf_parse_get_double(std::string s) +double surf_parse_get_double(const std::string& s) { try { return std::stod(s); - } catch (std::invalid_argument& ia) { + } catch (const std::invalid_argument&) { surf_parse_error(s + " is not a double"); - return -1; } } -int surf_parse_get_int(std::string s) +int surf_parse_get_int(const std::string& s) { try { return std::stoi(s); - } catch (std::invalid_argument& ia) { + } catch (const std::invalid_argument&) { surf_parse_error(s + " is not a double"); - return -1; } } -} namespace { /* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */ -std::vector* explodesRadical(std::string radicals) +std::vector* explodesRadical(const std::string& radicals) { std::vector* exploded = new std::vector(); @@ -127,7 +119,6 @@ std::vector* explodesRadical(std::string radicals) break; default: surf_parse_error(std::string("Malformed radical: ") + group); - break; } for (int i = start; i <= end; i++) exploded->push_back(i); @@ -174,23 +165,23 @@ unit_scale::unit_scale(std::initializer_list 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, std::string id) +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){ @@ -267,27 +272,26 @@ static std::vector surf_parse_get_all_speeds(char* speeds, const char* e /* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */ +std::vector*> property_sets; + /* The default current property receiver. Setup in the corresponding opening callbacks. */ -std::map* current_property_set = nullptr; -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) +std::unordered_map* current_model_property_set = nullptr; FILE *surf_file_to_parse = nullptr; /* Stuff relative to storage */ void STag_surfxml_storage() { - 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)"); + property_sets.push_back(new std::unordered_map()); } void ETag_surfxml_storage() { - StorageCreationArgs storage; + simgrid::kernel::routing::StorageCreationArgs storage; - storage.properties = current_property_set; - current_property_set = nullptr; + storage.properties = property_sets.back(); + property_sets.pop_back(); storage.id = A_surfxml_storage_id; storage.type_id = A_surfxml_storage_typeId; @@ -298,17 +302,16 @@ void ETag_surfxml_storage() } void STag_surfxml_storage___type() { - 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)"); + property_sets.push_back(new std::unordered_map()); xbt_assert(current_model_property_set == nullptr, "Someone forgot to reset the model property set to nullptr in its closing tag (or XML malformed)"); } void ETag_surfxml_storage___type() { - StorageTypeCreationArgs storage_type; + simgrid::kernel::routing::StorageTypeCreationArgs storage_type; - storage_type.properties = current_property_set; - current_property_set = nullptr; + storage_type.properties = property_sets.back(); + property_sets.pop_back(); storage_type.model_properties = current_model_property_set; current_model_property_set = nullptr; @@ -328,7 +331,7 @@ void STag_surfxml_mount() void ETag_surfxml_mount() { - MountCreationArgs mount; + simgrid::kernel::routing::MountCreationArgs mount; mount.name = A_surfxml_mount_name; mount.storageId = A_surfxml_mount_storageId; @@ -347,9 +350,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" @@ -363,68 +366,55 @@ 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" - " - DOCTYPE now point to the rignt URL: http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\n" + " - DOCTYPE now point to the rignt URL.\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); + "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" - "Use simgrid_update_xml to update your file automatically to get ride of this warning. " + "Use simgrid_update_xml to update your file automatically to get rid of this warning. " "This program is installed automatically with SimGrid, or " "available in the tools/ directory of the source archive.", - version, surf_parsed_filename); + version, surf_parsed_filename.c_str()); } - 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(); + 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."); } void ETag_surfxml_platform(){ - sg_platf_end(); + simgrid::s4u::Engine::on_platform_created(); } void STag_surfxml_host(){ - 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)"); + property_sets.push_back(new std::unordered_map()); } void STag_surfxml_prop() { - 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::getInstance()->getNetzoneByNameOrNull(A_surfxml_zone_id); - - netzone->setProperty(A_surfxml_prop_id, A_surfxml_prop_value); - } else { - if (not current_property_set) - current_property_set = new std::map; // Maybe, it should raise an error - current_property_set->insert({A_surfxml_prop_id, A_surfxml_prop_value}); - XBT_DEBUG("add prop %s=%s into current property set %p", A_surfxml_prop_id, A_surfxml_prop_value, - current_property_set); - } + property_sets.back()->insert({A_surfxml_prop_id, A_surfxml_prop_value}); + XBT_DEBUG("add prop %s=%s into current property set %p", A_surfxml_prop_id, A_surfxml_prop_value, + property_sets.back()); } void ETag_surfxml_host() { - s_sg_platf_host_cbarg_t host; + simgrid::kernel::routing::HostCreationArgs host; - host.properties = current_property_set; - current_property_set = nullptr; + host.properties = property_sets.back(); + property_sets.pop_back(); host.id = A_surfxml_host_id; @@ -432,17 +422,43 @@ void ETag_surfxml_host() { XBT_DEBUG("pstate: %s", A_surfxml_host_pstate); host.core_amount = surf_parse_get_int(A_surfxml_host_core); - host.speed_trace = A_surfxml_host_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_availability___file) : nullptr; - host.state_trace = A_surfxml_host_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_state___file) : nullptr; + + host.speed_trace = nullptr; + if (A_surfxml_host_availability___file[0] != '\0') { + XBT_WARN("The availability_file attribute in is now deprecated. Please, use 'speed_file' instead."); + host.speed_trace = simgrid::kernel::profile::Profile::from_file(A_surfxml_host_availability___file); + } + if (A_surfxml_host_speed___file[0] != '\0') + host.speed_trace = simgrid::kernel::profile::Profile::from_file(A_surfxml_host_speed___file); + host.state_trace = A_surfxml_host_state___file[0] + ? simgrid::kernel::profile::Profile::from_file(A_surfxml_host_state___file) + : nullptr; host.pstate = surf_parse_get_int(A_surfxml_host_pstate); host.coord = A_surfxml_host_coordinates; + host.disks.swap(parsed_disk_list); sg_platf_new_host(&host); } +void STag_surfxml_disk() { + property_sets.push_back(new std::unordered_map()); +} + +void ETag_surfxml_disk() { + simgrid::kernel::routing::DiskCreationArgs disk; + disk.properties = property_sets.back(); + 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); + + parsed_disk_list.push_back(sg_platf_new_disk(&disk)); +} + void STag_surfxml_host___link(){ XBT_DEBUG("Create a Host_link for %s",A_surfxml_host___link_id); - HostLinkCreationArgs host_link; + simgrid::kernel::routing::HostLinkCreationArgs host_link; host_link.id = A_surfxml_host___link_id; host_link.link_up = A_surfxml_host___link_up; @@ -455,9 +471,9 @@ void STag_surfxml_router(){ } void ETag_surfxml_cluster(){ - ClusterCreationArgs cluster; - cluster.properties = current_property_set; - current_property_set = nullptr; + simgrid::kernel::routing::ClusterCreationArgs cluster; + cluster.properties = property_sets.back(); + property_sets.pop_back(); cluster.id = A_surfxml_cluster_id; cluster.prefix = A_surfxml_cluster_prefix; @@ -480,66 +496,60 @@ void ETag_surfxml_cluster(){ switch(AX_surfxml_cluster_topology){ case A_surfxml_cluster_topology_FLAT: - cluster.topology = ClusterTopology::FLAT; + cluster.topology = simgrid::kernel::routing::ClusterTopology::FLAT; break; case A_surfxml_cluster_topology_TORUS: - cluster.topology = ClusterTopology::TORUS; + cluster.topology = simgrid::kernel::routing::ClusterTopology::TORUS; break; case A_surfxml_cluster_topology_FAT___TREE: - cluster.topology = ClusterTopology::FAT_TREE; + cluster.topology = simgrid::kernel::routing::ClusterTopology::FAT_TREE; break; case A_surfxml_cluster_topology_DRAGONFLY: - cluster.topology = ClusterTopology::DRAGONFLY; + cluster.topology = simgrid::kernel::routing::ClusterTopology::DRAGONFLY; break; default: surf_parse_error(std::string("Invalid cluster topology for cluster ") + cluster.id); - break; } cluster.topo_parameters = A_surfxml_cluster_topo___parameters; cluster.router_id = A_surfxml_cluster_router___id; switch (AX_surfxml_cluster_sharing___policy) { case A_surfxml_cluster_sharing___policy_SHARED: - cluster.sharing_policy = SURF_LINK_SHARED; + cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::SHARED; break; case A_surfxml_cluster_sharing___policy_FULLDUPLEX: XBT_WARN("FULLDUPLEX is now deprecated. Please update your platform file to use SPLITDUPLEX instead."); - cluster.sharing_policy = SURF_LINK_SPLITDUPLEX; + cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; break; case A_surfxml_cluster_sharing___policy_SPLITDUPLEX: - cluster.sharing_policy = SURF_LINK_SPLITDUPLEX; + cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; break; case A_surfxml_cluster_sharing___policy_FATPIPE: - cluster.sharing_policy = SURF_LINK_FATPIPE; + cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; break; default: surf_parse_error(std::string("Invalid cluster sharing policy for cluster ") + cluster.id); - break; } switch (AX_surfxml_cluster_bb___sharing___policy) { case A_surfxml_cluster_bb___sharing___policy_FATPIPE: - cluster.bb_sharing_policy = SURF_LINK_FATPIPE; + cluster.bb_sharing_policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; break; case A_surfxml_cluster_bb___sharing___policy_SHARED: - cluster.bb_sharing_policy = SURF_LINK_SHARED; + cluster.bb_sharing_policy = simgrid::s4u::Link::SharingPolicy::SHARED; break; default: surf_parse_error(std::string("Invalid bb sharing policy in cluster ") + cluster.id); - break; } sg_platf_new_cluster(&cluster); } void STag_surfxml_cluster(){ - 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)"); + property_sets.push_back(new std::unordered_map()); } void STag_surfxml_cabinet(){ - parse_after_config(); - CabinetCreationArgs cabinet; + simgrid::kernel::routing::CabinetCreationArgs cabinet; cabinet.id = A_surfxml_cabinet_id; cabinet.prefix = A_surfxml_cabinet_prefix; cabinet.suffix = A_surfxml_cabinet_suffix; @@ -552,59 +562,73 @@ void STag_surfxml_cabinet(){ } void STag_surfxml_peer(){ - parse_after_config(); - PeerCreationArgs 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.coord = A_surfxml_peer_coordinates; - peer.speed_trace = A_surfxml_peer_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_availability___file) : nullptr; - peer.state_trace = A_surfxml_peer_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_state___file) : nullptr; + peer.speed_trace = nullptr; + if (A_surfxml_peer_availability___file[0] != '\0') { + XBT_WARN("The availability_file attribute in is now deprecated. Please, use 'speed_file' instead."); + peer.speed_trace = simgrid::kernel::profile::Profile::from_file(A_surfxml_peer_availability___file); + } + if (A_surfxml_peer_speed___file[0] != '\0') + peer.speed_trace = simgrid::kernel::profile::Profile::from_file(A_surfxml_peer_speed___file); + peer.state_trace = A_surfxml_peer_state___file[0] + ? simgrid::kernel::profile::Profile::from_file(A_surfxml_peer_state___file) + : nullptr; if (A_surfxml_peer_lat[0] != '\0') - XBT_WARN("The latency parameter in is now deprecated. Use the z coordinate instead of '%s'.", + XBT_WARN("The latency attribute in is now deprecated. Use the z coordinate instead of '%s'.", A_surfxml_peer_lat); sg_platf_new_peer(&peer); } void STag_surfxml_link(){ - 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)"); + property_sets.push_back(new std::unordered_map()); } void ETag_surfxml_link(){ - LinkCreationArgs link; + simgrid::kernel::routing::LinkCreationArgs link; - link.properties = current_property_set; - current_property_set = nullptr; + link.properties = property_sets.back(); + property_sets.pop_back(); link.id = std::string(A_surfxml_link_id); - link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth, "bandwidth of link", link.id.c_str()); - link.bandwidth_trace = A_surfxml_link_bandwidth___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file) : nullptr; + link.bandwidths = surf_parse_get_bandwidths(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_trace = A_surfxml_link_latency___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_latency___file) : nullptr; - link.state_trace = A_surfxml_link_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_state___file):nullptr; + link.latency_trace = A_surfxml_link_latency___file[0] + ? simgrid::kernel::profile::Profile::from_file(A_surfxml_link_latency___file) + : nullptr; + link.state_trace = A_surfxml_link_state___file[0] + ? simgrid::kernel::profile::Profile::from_file(A_surfxml_link_state___file) + : nullptr; switch (A_surfxml_link_sharing___policy) { case A_surfxml_link_sharing___policy_SHARED: - link.policy = SURF_LINK_SHARED; + link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; break; case A_surfxml_link_sharing___policy_FATPIPE: - link.policy = SURF_LINK_FATPIPE; - break; + link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; + break; case A_surfxml_link_sharing___policy_FULLDUPLEX: XBT_WARN("FULLDUPLEX is now deprecated. Please update your platform file to use SPLITDUPLEX instead."); - link.policy = SURF_LINK_SPLITDUPLEX; + link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; break; - case A_surfxml_cluster_sharing___policy_SPLITDUPLEX: - link.policy = SURF_LINK_SPLITDUPLEX; + case A_surfxml_link_sharing___policy_SPLITDUPLEX: + link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; + break; + case A_surfxml_link_sharing___policy_WIFI: + link.policy = simgrid::s4u::Link::SharingPolicy::WIFI; break; default: surf_parse_error(std::string("Invalid sharing policy in link ") + link.id); - break; } sg_platf_new_link(&link); @@ -612,21 +636,20 @@ void ETag_surfxml_link(){ void STag_surfxml_link___ctn() { - simgrid::surf::LinkImpl* link = nullptr; + simgrid::kernel::resource::LinkImpl* link = nullptr; switch (A_surfxml_link___ctn_direction) { case AU_surfxml_link___ctn_direction: case A_surfxml_link___ctn_direction_NONE: - link = simgrid::surf::LinkImpl::byName(A_surfxml_link___ctn_id); + link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id))->get_impl(); break; case A_surfxml_link___ctn_direction_UP: - link = simgrid::surf::LinkImpl::byName(std::string(A_surfxml_link___ctn_id) + "_UP"); + link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id) + "_UP")->get_impl(); break; case A_surfxml_link___ctn_direction_DOWN: - link = simgrid::surf::LinkImpl::byName(std::string(A_surfxml_link___ctn_id) + "_DOWN"); + link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id) + "_DOWN")->get_impl(); break; default: surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id); - break; } const char* dirname = ""; @@ -645,16 +668,17 @@ void STag_surfxml_link___ctn() } void ETag_surfxml_backbone(){ - LinkCreationArgs link; + simgrid::kernel::routing::LinkCreationArgs link; link.properties = nullptr; link.id = std::string(A_surfxml_backbone_id); - link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id.c_str()); + 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.policy = SURF_LINK_SHARED; + link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; sg_platf_new_link(&link); - routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(A_surfxml_backbone_id)); + routing_cluster_add_backbone(simgrid::s4u::Link::by_name(std::string(A_surfxml_backbone_id))->get_impl()); } void STag_surfxml_route(){ @@ -695,7 +719,7 @@ void STag_surfxml_bypassZoneRoute(){ } void ETag_surfxml_route(){ - RouteCreationArgs route; + simgrid::kernel::routing::RouteCreationArgs route; route.src = sg_netpoint_by_name_or_null(A_surfxml_route_src); // tested to not be nullptr in start tag route.dst = sg_netpoint_by_name_or_null(A_surfxml_route_dst); // tested to not be nullptr in start tag @@ -719,7 +743,7 @@ void ETag_surfxml_ASroute() } void ETag_surfxml_zoneRoute() { - RouteCreationArgs ASroute; + simgrid::kernel::routing::RouteCreationArgs ASroute; 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 @@ -745,7 +769,7 @@ void ETag_surfxml_zoneRoute() } void ETag_surfxml_bypassRoute(){ - RouteCreationArgs route; + simgrid::kernel::routing::RouteCreationArgs route; route.src = sg_netpoint_by_name_or_null(A_surfxml_bypassRoute_src); // tested to not be nullptr in start tag route.dst = sg_netpoint_by_name_or_null(A_surfxml_bypassRoute_dst); // tested to not be nullptr in start tag @@ -768,7 +792,7 @@ void ETag_surfxml_bypassASroute() } void ETag_surfxml_bypassZoneRoute() { - RouteCreationArgs ASroute; + simgrid::kernel::routing::RouteCreationArgs ASroute; ASroute.src = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_src); ASroute.dst = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_dst); @@ -783,7 +807,7 @@ void ETag_surfxml_bypassZoneRoute() } void ETag_surfxml_trace(){ - TraceCreationArgs trace; + simgrid::kernel::routing::ProfileCreationArgs trace; trace.id = A_surfxml_trace_id; trace.file = A_surfxml_trace_file; @@ -795,8 +819,7 @@ void ETag_surfxml_trace(){ void STag_surfxml_trace___connect() { - parse_after_config(); - TraceConnectCreationArgs trace_connect; + simgrid::kernel::routing::TraceConnectCreationArgs trace_connect; trace_connect.element = A_surfxml_trace___connect_element; trace_connect.trace = A_surfxml_trace___connect_trace; @@ -804,23 +827,22 @@ void STag_surfxml_trace___connect() switch (A_surfxml_trace___connect_kind) { case AU_surfxml_trace___connect_kind: case A_surfxml_trace___connect_kind_SPEED: - trace_connect.kind = TraceConnectKind::SPEED; + trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::SPEED; break; case A_surfxml_trace___connect_kind_BANDWIDTH: - trace_connect.kind = TraceConnectKind::BANDWIDTH; + trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::BANDWIDTH; break; case A_surfxml_trace___connect_kind_HOST___AVAIL: - trace_connect.kind = TraceConnectKind::HOST_AVAIL; + trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::HOST_AVAIL; break; case A_surfxml_trace___connect_kind_LATENCY: - trace_connect.kind = TraceConnectKind::LATENCY; + trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::LATENCY; break; case A_surfxml_trace___connect_kind_LINK___AVAIL: - trace_connect.kind = TraceConnectKind::LINK_AVAIL; + trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::LINK_AVAIL; break; default: surf_parse_error("Invalid trace kind"); - break; } sg_platf_trace_connect(&trace_connect); } @@ -839,25 +861,25 @@ void ETag_surfxml_AS() void STag_surfxml_zone() { - parse_after_config(); - ZONE_TAG = 1; - ZoneCreationArgs 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); - sg_platf_new_Zone_begin(&zone); } void ETag_surfxml_zone() { + sg_platf_new_Zone_set_properties(property_sets.back()); + delete property_sets.back(); + property_sets.pop_back(); + sg_platf_new_Zone_seal(); } void STag_surfxml_config() { - 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)"); + property_sets.push_back(new std::unordered_map()); 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 , , , " @@ -867,17 +889,26 @@ void STag_surfxml_config() void ETag_surfxml_config() { - for (auto const& elm : *current_property_set) { - if (xbt_cfg_is_default_value(elm.first.c_str())) { - std::string cfg = elm.first + ":" + elm.second; - xbt_cfg_set_parse(cfg.c_str()); + // Sort config elements before applying. + // That's a little waste of time, but not doing so would break the tests + auto current_property_set = property_sets.back(); + + std::vector keys; + for (auto const& kv : *current_property_set) { + keys.push_back(kv.first); + } + std::sort(keys.begin(), keys.end()); + 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)); } else - XBT_INFO("The custom configuration '%s' is already defined by user!", elm.first.c_str()); + XBT_INFO("The custom configuration '%s' is already defined by user!", key.c_str()); } XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); delete current_property_set; - current_property_set = nullptr; + property_sets.pop_back(); } static std::vector arguments; @@ -890,9 +921,8 @@ void STag_surfxml_process() void STag_surfxml_actor() { - ZONE_TAG = 0; + property_sets.push_back(new std::unordered_map()); arguments.assign(1, 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() @@ -907,10 +937,10 @@ void ETag_surfxml_process() void ETag_surfxml_actor() { - ActorCreationArgs actor; + simgrid::kernel::routing::ActorCreationArgs actor; - actor.properties = current_property_set; - current_property_set = nullptr; + actor.properties = property_sets.back(); + property_sets.pop_back(); actor.args.swap(arguments); actor.host = A_surfxml_actor_host; @@ -921,14 +951,13 @@ 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 = ActorOnFailure::DIE; + actor.restart_on_failure = false; break; case A_surfxml_actor_on___failure_RESTART: - actor.on_failure = ActorOnFailure::RESTART; + actor.restart_on_failure = true; break; default: surf_parse_error("Invalid on failure behavior"); - break; } sg_platf_new_actor(&actor); @@ -940,7 +969,7 @@ void STag_surfxml_argument(){ void STag_surfxml_model___prop(){ if (not current_model_property_set) - current_model_property_set = new std::map(); + current_model_property_set = new std::unordered_map(); current_model_property_set->insert({A_surfxml_model___prop_id, A_surfxml_model___prop_value}); } @@ -949,7 +978,9 @@ void ETag_surfxml_prop(){/* Nothing to do */} void STag_surfxml_random(){/* Nothing to do */} void ETag_surfxml_random(){/* Nothing to do */} void ETag_surfxml_trace___connect(){/* Nothing to do */} -void STag_surfxml_trace(){parse_after_config();} +void STag_surfxml_trace() +{ /* Nothing to do */ +} void ETag_surfxml_router(){/*Nothing to do*/} void ETag_surfxml_host___link(){/* Nothing to do */} void ETag_surfxml_cabinet(){/* Nothing to do */} @@ -962,17 +993,16 @@ void ETag_surfxml_model___prop(){/* Nothing to do */} /* Open and Close parse file */ YY_BUFFER_STATE surf_input_buffer; -void surf_parse_open(const char *file) +void surf_parse_open(const std::string& file) { - xbt_assert(file, "Cannot parse the nullptr file. Bypassing the parser is strongly deprecated nowadays."); - surf_parsed_filename = file; - std::string dir = simgrid::xbt::Path(file).getDirname(); + std::string dir = simgrid::xbt::Path(file).get_dir_name(); surf_path.push_back(dir); surf_file_to_parse = surf_fopen(file, "r"); if (surf_file_to_parse == nullptr) - xbt_die("Unable to open '%s'\n", file); + 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; @@ -990,8 +1020,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"); }