-/* Copyright (c) 2006-2022. 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_dtd.c"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(platf_parse, ker_platform, "Logging specific to the parsing of platform files");
std::string surf_parsed_filename; // Currently parsed file (for the error messages)
-std::vector<simgrid::s4u::LinkInRoute> parsed_link_list; /* temporary store of current link list of a route */
+static std::vector<simgrid::s4u::LinkInRoute> parsed_link_list; /* temporary store of current link list of a route */
/* Helping functions */
void surf_parse_assert(bool cond, const std::string& msg)
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);
/* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */
-std::vector<std::unordered_map<std::string, std::string>> property_sets;
+static std::vector<std::unordered_map<std::string, std::string>> property_sets;
-FILE *surf_file_to_parse = nullptr;
+static FILE* surf_file_to_parse = nullptr;
/* Stuff relative to storage */
void STag_surfxml_storage()
"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).");
+ "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. "
"available in the tools/ directory of the source archive.");
surf_parse_assert(
version >= 400L,
- std::string("******* THIS FILE IS TOO OLD (v:") + version_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"
"available in the tools/ directory of the source archive.",
version_string.c_str(), surf_parsed_filename.c_str());
}
- surf_parse_assert(version <= 410L, std::string("******* THIS FILE COMES FROM THE FUTURE (v:") + version_string +
+ 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.");
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;
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:
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);
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,
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]
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);
switch (A_surfxml_link___ctn_direction) {
case AU_surfxml_link___ctn_direction:
case A_surfxml_link___ctn_direction_NONE:
- link = engine->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 = engine->split_duplex_link_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 = engine->split_duplex_link_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:
{
auto link = std::make_unique<simgrid::kernel::routing::LinkCreationArgs>();
- 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,
void ETag_surfxml_model___prop(){/* Nothing to do */}
/* Open and Close parse file */
-YY_BUFFER_STATE surf_input_buffer;
+static YY_BUFFER_STATE surf_input_buffer;
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);
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);
