-/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2019. 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 <unordered_map>
#include <vector>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module");
-
#include "simgrid_dtd.c"
+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<simgrid::kernel::resource::LinkImpl*>
parsed_link_list; /* temporary store of current list link of a route */
/*
* Helping functions
*/
-void surf_parse_assert(bool cond, std::string msg)
+void surf_parse_assert(bool cond, const std::string& msg)
{
if (not cond) {
int lineno = surf_parse_lineno;
}
}
-void surf_parse_error(std::string msg)
+void surf_parse_error(const std::string& msg)
{
int lineno = surf_parse_lineno;
cleanup();
xbt_die("Exiting now");
}
-void surf_parse_assert_netpoint(std::string hostname, std::string pre, std::string post)
+void surf_parse_assert_netpoint(const std::string& hostname, const std::string& pre, const std::string& post)
{
- if (sg_netpoint_by_name_or_null(hostname.c_str()) != nullptr) // found
+ if (simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(hostname) != nullptr) // found
return;
std::string msg = pre + hostname + post + " Existing netpoints: \n";
surf_parse_error(msg);
}
-double surf_parse_get_double(std::string s)
+double surf_parse_get_double(const std::string& s)
{
try {
return std::stod(s);
} catch (std::invalid_argument& ia) {
surf_parse_error(s + " is not a double");
- return -1;
}
}
-int surf_parse_get_int(std::string s)
+int surf_parse_get_int(const std::string& s)
{
try {
return std::stoi(s);
} catch (std::invalid_argument& ia) {
surf_parse_error(s + " is not a double");
- return -1;
}
}
namespace {
/* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */
-std::vector<int>* explodesRadical(std::string radicals)
+std::vector<int>* explodesRadical(const std::string& radicals)
{
std::vector<int>* exploded = new std::vector<int>();
break;
default:
surf_parse_error(std::string("Malformed radical: ") + group);
- break;
}
for (int i = start; i <= end; i++)
exploded->push_back(i);
/* Note: field `unit' for the last element of parameter `units' should be nullptr. */
double surf_parse_get_value_with_unit(const char* string, const unit_scale& units, const char* entity_kind,
- std::string name, const char* error_msg, const char* default_unit)
+ const std::string& name, const char* error_msg, const char* default_unit)
{
char* ptr;
errno = 0;
if (ptr == string)
surf_parse_error(std::string("cannot parse number:") + string);
if (ptr[0] == '\0') {
- if (res == 0)
- return res; // Ok, 0 can be unit-less
-
- XBT_WARN("Deprecated unit-less value '%s' for %s %s. %s", string, entity_kind, name.c_str(), error_msg);
ptr = (char*)default_unit;
}
auto u = units.find(ptr);
}
}
-double surf_parse_get_time(const char* string, const char* entity_kind, std::string name)
+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),
"Append 's' to your time to get seconds", "s");
}
-double surf_parse_get_size(const char* string, const char* entity_kind, std::string name)
+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)};
"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, std::string name)
+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)};
"Append 'Bps' to get bytes per second (or 'bps' for bits but 1Bps = 8bps)", "Bps");
}
-double surf_parse_get_speed(const char* string, const char* entity_kind, std::string name)
+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<double> surf_parse_get_all_speeds(char* speeds, const char* entity_kind, std::string id)
+static std::vector<double> surf_parse_get_all_speeds(char* speeds, const char* entity_kind, const std::string& id)
{
std::vector<double> speed_per_pstate;
XBT_DEBUG("pstate: %s", A_surfxml_host_pstate);
host.core_amount = surf_parse_get_int(A_surfxml_host_core);
- host.speed_trace = A_surfxml_host_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_availability___file) : nullptr;
- host.state_trace = A_surfxml_host_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_state___file) : nullptr;
+
+ host.speed_trace = nullptr;
+ 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);
+ }
+ if (A_surfxml_host_speed___file[0] != '\0')
+ host.speed_trace = simgrid::kernel::profile::Profile::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)
+ : nullptr;
host.pstate = surf_parse_get_int(A_surfxml_host_pstate);
host.coord = A_surfxml_host_coordinates;
break;
default:
surf_parse_error(std::string("Invalid cluster topology for cluster ") + cluster.id);
- break;
}
cluster.topo_parameters = A_surfxml_cluster_topo___parameters;
cluster.router_id = A_surfxml_cluster_router___id;
break;
default:
surf_parse_error(std::string("Invalid cluster sharing policy for cluster ") + cluster.id);
- break;
}
switch (AX_surfxml_cluster_bb___sharing___policy) {
case A_surfxml_cluster_bb___sharing___policy_FATPIPE:
break;
default:
surf_parse_error(std::string("Invalid bb sharing policy in cluster ") + cluster.id);
- break;
}
sg_platf_new_cluster(&cluster);
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.coord = A_surfxml_peer_coordinates;
- peer.speed_trace = A_surfxml_peer_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_availability___file) : nullptr;
- peer.state_trace = A_surfxml_peer_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_state___file) : nullptr;
+ 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);
+ }
+ if (A_surfxml_peer_speed___file[0] != '\0')
+ peer.speed_trace = simgrid::kernel::profile::Profile::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)
+ : nullptr;
if (A_surfxml_peer_lat[0] != '\0')
- XBT_WARN("The latency
parameter in <peer> is now deprecated. Use the z coordinate instead of '%s'.",
+ XBT_WARN("The latency
attribute in <peer> is now deprecated. Use the z coordinate instead of '%s'.",
A_surfxml_peer_lat);
sg_platf_new_peer(&peer);
link.id = std::string(A_surfxml_link_id);
link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth, "bandwidth of link", link.id.c_str());
- link.bandwidth_trace = A_surfxml_link_bandwidth___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file) : nullptr;
+ link.bandwidth_trace = A_surfxml_link_bandwidth___file[0]
+ ? simgrid::kernel::profile::Profile::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_trace = A_surfxml_link_latency___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_latency___file) : nullptr;
- link.state_trace = A_surfxml_link_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_state___file):nullptr;
+ link.latency_trace = A_surfxml_link_latency___file[0]
+ ? simgrid::kernel::profile::Profile::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)
+ : nullptr;
switch (A_surfxml_link_sharing___policy) {
case A_surfxml_link_sharing___policy_SHARED:
break;
default:
surf_parse_error(std::string("Invalid sharing policy in link ") + link.id);
- break;
}
sg_platf_new_link(&link);
break;
default:
surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id);
- break;
}
const char* dirname = "";
}
void ETag_surfxml_trace(){
- simgrid::kernel::routing::TraceCreationArgs trace;
+ simgrid::kernel::routing::ProfileCreationArgs trace;
trace.id = A_surfxml_trace_id;
trace.file = A_surfxml_trace_file;
break;
default:
surf_parse_error("Invalid trace kind");
- break;
}
sg_platf_trace_connect(&trace_connect);
}
break;
default:
surf_parse_error("Invalid on failure behavior");
- break;
}
sg_platf_new_actor(&actor);
/* Open and Close parse file */
YY_BUFFER_STATE surf_input_buffer;
-void surf_parse_open(std::string file)
+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);
surf_file_to_parse = surf_fopen(file, "r");
- if (surf_file_to_parse == nullptr)
- xbt_die("Unable to open '%s'\n", file.c_str());
+ if (surf_file_to_parse == nullptr) {
+ std::string cwd = simgrid::xbt::Path().get_name();
+ xbt_die("Unable to open '%s' from '%s'\n", file.c_str(), cwd.c_str());
+ }
surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
surf_parse__switch_to_buffer(surf_input_buffer);
surf_parse_lineno = 1;
