X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89feb425bdeb4351ac0e27a38d9a9b3463fff433..254b8e7fba5ec179bda920bfb0d8fa55d2a710b8:/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 62947af7a7..567a2b2377 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -1,20 +1,21 @@ -/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2023. 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 +#include +#include +#include +#include + #include "simgrid/sg_config.hpp" +#include "src/kernel/resource/LinkImpl.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.hpp" #include "src/surf/xml/platf_private.hpp" -#include "surf/surf.hpp" -#include "xbt/file.hpp" -#include "xbt/parse_units.hpp" #include #include @@ -47,7 +48,7 @@ void surf_parse_assert_netpoint(const std::string& hostname, const std::string& 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::string msg = pre + hostname + post + " Existing netpoints:\n"; std::vector netpoints = simgrid::s4u::Engine::get_instance()->get_all_netpoints(); @@ -87,7 +88,7 @@ int surf_parse_get_int(const std::string& s) try { return std::stoi(s); } catch (const std::invalid_argument&) { - surf_parse_error(s + " is not a double"); + surf_parse_error(s + " is not an int"); } } @@ -111,7 +112,7 @@ static void explodesRadical(const std::string& radicals, std::vector* explo end = surf_parse_get_int(radical_ends.back()); break; default: - surf_parse_error(std::string("Malformed radical: ") + group); + surf_parse_error("Malformed radical: " + group); } for (int i = start; i <= end; i++) exploded->push_back(i); @@ -128,9 +129,6 @@ static void explodesRadical(const std::string& radicals, std::vector* explo std::vector> property_sets; -/* The default current property receiver. Setup in the corresponding opening callbacks. */ -std::unordered_map current_model_property_set; - FILE *surf_file_to_parse = nullptr; /* Stuff relative to storage */ @@ -174,50 +172,52 @@ void ETag_surfxml_include() /* Stag and Etag parse functions */ void STag_surfxml_platform() { - double version = surf_parse_get_double(A_surfxml_platform_version); - - 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" - - "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.\n" - - "Please check also out the SURF section of the ChangeLog for " - "the 3.1 version for more information. \n" - - "Last, do not forget to also update your values for " - "the calls to MSG_task_create (if any)."); - 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."); - 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.\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."); - if (version < 4.1) { - XBT_INFO("You're using a v%.1f XML file (%s) while the current standard is v4.1 " + /* Use fixed point arithmetic to avoid rounding errors ("4.1" for example cannot be represented exactly as a floating + * point number) */ + const long int version = lround(100.0 * surf_parse_get_double(A_surfxml_platform_version)); + const std::string version_string = std::to_string(version / 100) + "." + std::to_string(version % 100); + + surf_parse_assert(version >= 100L, "******* 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" + + "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.\n" + + "Please check also out the SURF section of the ChangeLog for " + "the 3.1 version for more information."); + surf_parse_assert(version >= 300L, "******* 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."); + surf_parse_assert( + version >= 400L, + "******* THIS FILE IS TOO OLD (v:" + version_string + + ") *********\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.\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."); + if (version < 410L) { + XBT_INFO("You're using a v%s 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 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.c_str()); + version_string.c_str(), surf_parsed_filename.c_str()); } - 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_parse_assert(version <= 410L, "******* THIS FILE COMES FROM THE FUTURE (v:" + version_string + + ") *********\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(){ simgrid::s4u::Engine::on_platform_created(); @@ -225,7 +225,7 @@ void ETag_surfxml_platform(){ void STag_surfxml_prop() { - property_sets.back().insert({A_surfxml_prop_id, A_surfxml_prop_value}); + property_sets.back().try_emplace(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())); } @@ -244,12 +244,12 @@ void STag_surfxml_host() 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); + host.speed_trace = simgrid::kernel::profile::ProfileBuilder::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.speed_trace = simgrid::kernel::profile::ProfileBuilder::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) + ? simgrid::kernel::profile::ProfileBuilder::from_file(A_surfxml_host_state___file) : nullptr; host.coord = A_surfxml_host_coordinates; @@ -345,7 +345,7 @@ void ETag_surfxml_cluster(){ cluster.topology = simgrid::kernel::routing::ClusterTopology::DRAGONFLY; break; default: - surf_parse_error(std::string("Invalid cluster topology for cluster ") + cluster.id); + surf_parse_error("Invalid cluster topology for cluster " + cluster.id); } cluster.topo_parameters = A_surfxml_cluster_topo___parameters; cluster.router_id = A_surfxml_cluster_router___id; @@ -365,7 +365,7 @@ void ETag_surfxml_cluster(){ cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; break; default: - surf_parse_error(std::string("Invalid cluster sharing policy for cluster ") + cluster.id); + surf_parse_error("Invalid cluster sharing policy for cluster " + cluster.id); } switch (AX_surfxml_cluster_bb___sharing___policy) { case A_surfxml_cluster_bb___sharing___policy_FATPIPE: @@ -375,7 +375,7 @@ void ETag_surfxml_cluster(){ cluster.bb_sharing_policy = simgrid::s4u::Link::SharingPolicy::SHARED; break; default: - surf_parse_error(std::string("Invalid bb sharing policy in cluster ") + cluster.id); + surf_parse_error("Invalid bb sharing policy in cluster " + cluster.id); } sg_platf_new_tag_cluster(&cluster); @@ -404,7 +404,7 @@ void STag_surfxml_cabinet(){ void STag_surfxml_peer(){ simgrid::kernel::routing::PeerCreationArgs peer; - peer.id = std::string(A_surfxml_peer_id); + peer.id = A_surfxml_peer_id; peer.speed = xbt_parse_get_speed(surf_parsed_filename, surf_parse_lineno, A_surfxml_peer_speed, "speed of peer " + peer.id); peer.bw_in = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_peer_bw___in, @@ -415,12 +415,12 @@ void STag_surfxml_peer(){ 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); + peer.speed_trace = simgrid::kernel::profile::ProfileBuilder::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.speed_trace = simgrid::kernel::profile::ProfileBuilder::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) + ? simgrid::kernel::profile::ProfileBuilder::from_file(A_surfxml_peer_state___file) : nullptr; if (A_surfxml_peer_lat[0] != '\0') @@ -440,19 +440,19 @@ void ETag_surfxml_link(){ link.properties = property_sets.back(); property_sets.pop_back(); - link.id = std::string(A_surfxml_link_id); + link.id = A_surfxml_link_id; link.bandwidths = xbt_parse_get_bandwidths(surf_parsed_filename, surf_parse_lineno, A_surfxml_link_bandwidth, "bandwidth of link " + link.id); link.bandwidth_trace = A_surfxml_link_bandwidth___file[0] - ? simgrid::kernel::profile::Profile::from_file(A_surfxml_link_bandwidth___file) + ? simgrid::kernel::profile::ProfileBuilder::from_file(A_surfxml_link_bandwidth___file) : nullptr; link.latency = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_link_latency, "latency of link " + link.id); link.latency_trace = A_surfxml_link_latency___file[0] - ? simgrid::kernel::profile::Profile::from_file(A_surfxml_link_latency___file) + ? simgrid::kernel::profile::ProfileBuilder::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) + ? simgrid::kernel::profile::ProfileBuilder::from_file(A_surfxml_link_state___file) : nullptr; switch (A_surfxml_link_sharing___policy) { @@ -473,7 +473,7 @@ void ETag_surfxml_link(){ link.policy = simgrid::s4u::Link::SharingPolicy::WIFI; break; default: - surf_parse_error(std::string("Invalid sharing policy in link ") + link.id); + surf_parse_error("Invalid sharing policy in link " + link.id); } sg_platf_new_link(&link); @@ -481,19 +481,20 @@ void ETag_surfxml_link(){ void STag_surfxml_link___ctn() { + const auto engine = simgrid::s4u::Engine::get_instance(); const simgrid::s4u::Link* link; simgrid::s4u::LinkInRoute::Direction direction = simgrid::s4u::LinkInRoute::Direction::NONE; switch (A_surfxml_link___ctn_direction) { case AU_surfxml_link___ctn_direction: case A_surfxml_link___ctn_direction_NONE: - link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id)); + link = engine->link_by_name(A_surfxml_link___ctn_id); break; case A_surfxml_link___ctn_direction_UP: - link = simgrid::s4u::SplitDuplexLink::by_name(std::string(A_surfxml_link___ctn_id)); + link = engine->split_duplex_link_by_name(A_surfxml_link___ctn_id); direction = simgrid::s4u::LinkInRoute::Direction::UP; break; case A_surfxml_link___ctn_direction_DOWN: - link = simgrid::s4u::SplitDuplexLink::by_name(std::string(A_surfxml_link___ctn_id)); + link = engine->split_duplex_link_by_name(A_surfxml_link___ctn_id); direction = simgrid::s4u::LinkInRoute::Direction::DOWN; break; default: @@ -519,7 +520,7 @@ void ETag_surfxml_backbone() { auto link = std::make_unique(); - link->id = std::string(A_surfxml_backbone_id); + link->id = A_surfxml_backbone_id; link->bandwidths.push_back(xbt_parse_get_bandwidth( surf_parsed_filename, surf_parse_lineno, A_surfxml_backbone_bandwidth, "bandwidth of backbone " + link->id)); link->latency = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_backbone_latency, @@ -660,27 +661,27 @@ void STag_surfxml_trace___connect() simgrid::kernel::routing::TraceConnectCreationArgs trace_connect; trace_connect.element = A_surfxml_trace___connect_element; - trace_connect.trace = A_surfxml_trace___connect_trace; + trace_connect.trace = A_surfxml_trace___connect_trace; switch (A_surfxml_trace___connect_kind) { - case AU_surfxml_trace___connect_kind: - case A_surfxml_trace___connect_kind_SPEED: - trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::SPEED; - break; - case A_surfxml_trace___connect_kind_BANDWIDTH: - trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::BANDWIDTH; - break; - case A_surfxml_trace___connect_kind_HOST___AVAIL: - trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::HOST_AVAIL; - break; - case A_surfxml_trace___connect_kind_LATENCY: - trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::LATENCY; - break; - case A_surfxml_trace___connect_kind_LINK___AVAIL: - trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::LINK_AVAIL; - break; - default: - surf_parse_error("Invalid trace kind"); + case AU_surfxml_trace___connect_kind: + case A_surfxml_trace___connect_kind_SPEED: + trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::SPEED; + break; + case A_surfxml_trace___connect_kind_BANDWIDTH: + trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::BANDWIDTH; + break; + case A_surfxml_trace___connect_kind_HOST___AVAIL: + trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::HOST_AVAIL; + break; + case A_surfxml_trace___connect_kind_LATENCY: + trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::LATENCY; + break; + case A_surfxml_trace___connect_kind_LINK___AVAIL: + trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::LINK_AVAIL; + break; + default: + surf_parse_error("Invalid trace kind"); } sg_platf_trace_connect(&trace_connect); } @@ -730,8 +731,8 @@ void ETag_surfxml_config() auto current_property_set = property_sets.back(); std::vector keys; - for (auto const& kv : current_property_set) { - keys.push_back(kv.first); + for (auto const& [key, _] : current_property_set) { + keys.push_back(key); } std::sort(keys.begin(), keys.end()); for (const std::string& key : keys) { @@ -803,13 +804,15 @@ void STag_surfxml_argument(){ } void STag_surfxml_model___prop(){ - current_model_property_set.insert({A_surfxml_model___prop_id, A_surfxml_model___prop_value}); + XBT_INFO("Deprecated tag ignored"); } 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 ETag_surfxml_trace___connect() +{ /* Nothing to do */ +} void STag_surfxml_trace() { /* Nothing to do */ } @@ -829,11 +832,11 @@ void surf_parse_open(const std::string& file) { surf_parsed_filename = file; std::string dir = simgrid::xbt::Path(file).get_dir_name(); - surf_path.push_back(dir); + simgrid::xbt::path_push(dir); - surf_file_to_parse = surf_fopen(file, "r"); + surf_file_to_parse = simgrid::xbt::path_fopen(file, "r"); if (surf_file_to_parse == nullptr) - throw std::invalid_argument(std::string("Unable to open '") + file + "' from '" + simgrid::xbt::Path().get_name() + + throw std::invalid_argument("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); @@ -842,7 +845,7 @@ void surf_parse_open(const std::string& file) void surf_parse_close() { - surf_path.pop_back(); // remove the dirname of the opened file, that was added in surf_parse_open() + simgrid::xbt::path_pop(); // remove the dirname of the opened file, that was added in surf_parse_open() if (surf_file_to_parse) { surf_parse__delete_buffer(surf_input_buffer);