-/* 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. */
/* 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.");
+ /* 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. \n"
+
+ "Last, do not forget to also update your values for "
+ "the calls to MSG_task_create (if any).");
+ 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 >= 4.0),
- std::string("******* THIS FILE IS TOO OLD (v:") + std::to_string(version) +
+ version >= 400L,
+ std::string("******* 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"
"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 "
+ 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, std::string("******* 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();
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()));
}
if (A_surfxml_host_availability___file[0] != '\0') {
XBT_WARN("The availability_file attribute in <host> 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;
peer.speed_trace = nullptr;
if (A_surfxml_peer_availability___file[0] != '\0') {
XBT_WARN("The availability_file attribute in <peer> 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')
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) {
auto current_property_set = property_sets.back();
std::vector<std::string> 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) {