X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/149c63f36e15b8500b1e826bda5138318ff7ba2b..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 3cf6edf3f1..7b0e782a68 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -1,21 +1,22 @@ -/* Copyright (c) 2006-2020. 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 #include #include #include @@ -27,13 +28,10 @@ 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 - */ +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 */ + +/* Helping functions */ void surf_parse_assert(bool cond, const std::string& msg) { if (not cond) @@ -50,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(); @@ -73,7 +71,7 @@ void surf_parse_assert_netpoint(const std::string& hostname, const std::string& break; } } - surf_parse_error(std::move(msg)); + surf_parse_error(msg); } double surf_parse_get_double(const std::string& s) @@ -90,17 +88,13 @@ 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"); } } -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 void explodesRadical(const std::string& radicals, std::vector* exploded) { - std::vector* exploded = new std::vector(); - // Make all hosts std::vector radical_elements; boost::split(radical_elements, radicals, boost::is_any_of(",")); @@ -123,147 +117,8 @@ std::vector* explodesRadical(const std::string& radicals) for (int i = start; i <= end; i++) exploded->push_back(i); } - - 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. @@ -272,70 +127,37 @@ 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::unordered_map* current_model_property_set = nullptr; +std::vector> property_sets; FILE *surf_file_to_parse = nullptr; /* Stuff relative to storage */ void STag_surfxml_storage() { - XBT_DEBUG("STag_surfxml_storage"); - property_sets.push_back(new std::unordered_map()); + xbt_die(" tag was removed in SimGrid v3.27. Please stop using it now."); } void ETag_surfxml_storage() { - simgrid::kernel::routing::StorageCreationArgs storage; - - storage.properties = property_sets.back(); - property_sets.pop_back(); - - storage.id = A_surfxml_storage_id; - storage.type_id = A_surfxml_storage_typeId; - storage.content = A_surfxml_storage_content; - storage.attach = A_surfxml_storage_attach; - - sg_platf_new_storage(&storage); + /* Won't happen since is now removed since v3.27. */ } void STag_surfxml_storage___type() { - XBT_DEBUG("STag_surfxml_storage___type"); - 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)"); + xbt_die(" tag was removed in SimGrid v3.27. Please stop using it now."); } void ETag_surfxml_storage___type() { - simgrid::kernel::routing::StorageTypeCreationArgs storage_type; - - storage_type.properties = property_sets.back(); - property_sets.pop_back(); - - storage_type.model_properties = current_model_property_set; - current_model_property_set = nullptr; - - storage_type.content = A_surfxml_storage___type_content; - 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()); - sg_platf_new_storage_type(&storage_type); + /* Won't happen since is now removed since v3.27. */ } void STag_surfxml_mount() { - XBT_DEBUG("STag_surfxml_mount"); + xbt_die(" tag was removed in SimGrid v3.27. Please stop using it now."); } void ETag_surfxml_mount() { - simgrid::kernel::routing::MountCreationArgs mount; - - mount.name = A_surfxml_mount_name; - mount.storageId = A_surfxml_mount_storageId; - sg_platf_new_mount(&mount); + /* Won't happen since is now removed since v3.27. */ } void STag_surfxml_include() @@ -350,7 +172,7 @@ 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); surf_parse_assert((version >= 1.0), "******* BIG FAT WARNING *********\n " "You're using an ancient XML file.\n" @@ -371,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" @@ -399,49 +223,49 @@ void ETag_surfxml_platform(){ simgrid::s4u::Engine::on_platform_created(); } -void STag_surfxml_host(){ - property_sets.push_back(new std::unordered_map()); -} - 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()); + &(property_sets.back())); } -void ETag_surfxml_host() { +void STag_surfxml_host() +{ simgrid::kernel::routing::HostCreationArgs host; - - host.properties = property_sets.back(); - property_sets.pop_back(); - + property_sets.emplace_back(); 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); - 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); + 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.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); + sg_platf_new_host_begin(&host); +} + +void ETag_surfxml_host() +{ + sg_platf_new_host_set_properties(property_sets.back()); + property_sets.pop_back(); + + sg_platf_new_host_seal(surf_parse_get_int(A_surfxml_host_pstate)); } void STag_surfxml_disk() { - property_sets.push_back(new std::unordered_map()); + property_sets.emplace_back(); } void ETag_surfxml_disk() { @@ -450,10 +274,12 @@ 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)); + sg_platf_new_disk(&disk); } void STag_surfxml_host___link(){ @@ -478,21 +304,32 @@ void ETag_surfxml_cluster(){ cluster.id = A_surfxml_cluster_id; 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); + explodesRadical(A_surfxml_cluster_radical, &cluster.radicals); + + 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: @@ -541,11 +378,11 @@ void ETag_surfxml_cluster(){ surf_parse_error(std::string("Invalid bb sharing policy in cluster ") + cluster.id); } - sg_platf_new_cluster(&cluster); + sg_platf_new_tag_cluster(&cluster); } void STag_surfxml_cluster(){ - property_sets.push_back(new std::unordered_map()); + property_sets.emplace_back(); } void STag_surfxml_cabinet(){ @@ -553,10 +390,13 @@ 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.radicals = explodesRadical(A_surfxml_cabinet_radical); + cabinet.speed = xbt_parse_get_speed(surf_parsed_filename, surf_parse_lineno, A_surfxml_cabinet_speed, + "speed of cabinet " + cabinet.id); + cabinet.bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_cabinet_bw, + "bw of cabinet " + cabinet.id); + cabinet.lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_surfxml_cabinet_lat, + "lat of cabinet " + cabinet.id); + explodesRadical(A_surfxml_cabinet_radical, &cabinet.radicals); sg_platf_new_cabinet(&cabinet); } @@ -565,19 +405,22 @@ 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); + peer.bw_in = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_peer_bw___in, + "bw_in of peer " + peer.id); + peer.bw_out = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_surfxml_peer_bw___out, + "bw_out of peer " + peer.id); peer.coord = A_surfxml_peer_coordinates; 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') @@ -588,7 +431,7 @@ void STag_surfxml_peer(){ } void STag_surfxml_link(){ - property_sets.push_back(new std::unordered_map()); + property_sets.emplace_back(); } void ETag_surfxml_link(){ @@ -598,16 +441,18 @@ 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); 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 = 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); 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) { @@ -636,23 +481,27 @@ void ETag_surfxml_link(){ void STag_surfxml_link___ctn() { - simgrid::kernel::resource::LinkImpl* link = nullptr; + 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))->get_impl(); + link = engine->link_by_name(std::string(A_surfxml_link___ctn_id)); break; case A_surfxml_link___ctn_direction_UP: - link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id) + "_UP")->get_impl(); + 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::Link::by_name(std::string(A_surfxml_link___ctn_id) + "_DOWN")->get_impl(); + link = engine->split_duplex_link_by_name(std::string(A_surfxml_link___ctn_id)); + direction = simgrid::s4u::LinkInRoute::Direction::DOWN; break; default: surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id); } - const char* dirname = ""; + const char* dirname; switch (A_surfxml_link___ctn_direction) { case A_surfxml_link___ctn_direction_UP: dirname = " (upward)"; @@ -664,21 +513,21 @@ 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.push_back(link); + parsed_link_list.emplace_back(link, direction); } -void ETag_surfxml_backbone(){ - simgrid::kernel::routing::LinkCreationArgs link; +void ETag_surfxml_backbone() +{ + auto link = std::make_unique(); - 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.policy = simgrid::s4u::Link::SharingPolicy::SHARED; + link->id = std::string(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, + "latency of backbone " + link->id); + link->policy = simgrid::s4u::Link::SharingPolicy::SHARED; - sg_platf_new_link(&link); - routing_cluster_add_backbone(simgrid::s4u::Link::by_name(std::string(A_surfxml_backbone_id))->get_impl()); + routing_cluster_add_backbone(std::move(link)); } void STag_surfxml_route(){ @@ -723,9 +572,9 @@ void ETag_surfxml_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 - 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); @@ -753,17 +602,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); } @@ -773,13 +614,11 @@ void ETag_surfxml_bypassRoute(){ 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 - route.gw_src = nullptr; - route.gw_dst = nullptr; route.symmetrical = false; route.link_list.swap(parsed_link_list); - sg_platf_new_bypassRoute(&route); + sg_platf_new_bypass_route(&route); } void ETag_surfxml_bypassASroute() @@ -803,7 +642,7 @@ void ETag_surfxml_bypassZoneRoute() 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); + sg_platf_new_bypass_route(&ASroute); } void ETag_surfxml_trace(){ @@ -822,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); } @@ -850,7 +689,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(); } @@ -861,25 +700,23 @@ void ETag_surfxml_AS() void STag_surfxml_zone() { - property_sets.push_back(new std::unordered_map()); + property_sets.emplace_back(); 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); + zone.routing = 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(); + sg_platf_new_zone_set_properties(property_sets.back()); property_sets.pop_back(); - - sg_platf_new_Zone_seal(); + sg_platf_new_zone_seal(); } void STag_surfxml_config() { - property_sets.push_back(new std::unordered_map()); + property_sets.emplace_back(); 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 , , , " @@ -894,20 +731,19 @@ void ETag_surfxml_config() auto current_property_set = property_sets.back(); std::vector keys; - for (auto const& kv : *current_property_set) { + for (auto const& kv : current_property_set) { keys.push_back(kv.first); } std::sort(keys.begin(), keys.end()); - for (std::string key : keys) { + for (const 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)); + std::string cfg = key + ":" + current_property_set.at(key); + simgrid::config::set_parse(cfg); } else 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; property_sets.pop_back(); } @@ -921,7 +757,7 @@ void STag_surfxml_process() void STag_surfxml_actor() { - property_sets.push_back(new std::unordered_map()); + property_sets.emplace_back(); arguments.assign(1, A_surfxml_actor_function); } @@ -964,20 +800,19 @@ 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(){ - if (not current_model_property_set) - current_model_property_set = new std::unordered_map(); - - 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 */ } @@ -1001,7 +836,7 @@ void surf_parse_open(const std::string& file) surf_file_to_parse = surf_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(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);