X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19e1048a7009c4144b0f361ad85fb9dff44761ea..db9ef2223acb402e44eec406541e671bfebd5ade:/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 1a0edf9536..7b0e782a68 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-2022. 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"); } } @@ -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 */ @@ -195,17 +193,19 @@ 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."); - 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."); + 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 " "That's fine, the new version is backward compatible. \n\n" @@ -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; @@ -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') @@ -444,15 +444,15 @@ void ETag_surfxml_link(){ 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) { @@ -481,19 +481,20 @@ void ETag_surfxml_link(){ void STag_surfxml_link___ctn() { - simgrid::s4u::Link* link; + 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(std::string(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(std::string(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(std::string(A_surfxml_link___ctn_id)); direction = simgrid::s4u::LinkInRoute::Direction::DOWN; break; default: @@ -512,7 +513,7 @@ void STag_surfxml_link___ctn() dirname = ""; } surf_parse_assert(link != nullptr, std::string("No such link: '") + A_surfxml_link___ctn_id + "'" + dirname); - parsed_link_list.emplace_back(simgrid::s4u::LinkInRoute(link, direction)); + parsed_link_list.emplace_back(link, direction); } void ETag_surfxml_backbone() @@ -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); } @@ -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 */ }