-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2018. 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/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/sg_config.h"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/sg_config.hpp"
#include "src/surf/network_interface.hpp"
#include "xbt/file.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module");
-extern "C" {
-
-int ETag_surfxml_include_state();
-
#include "simgrid_dtd.c"
-/*
- * Stuff relative to the <include> tag
- */
-static std::vector<YY_BUFFER_STATE> surf_input_buffer_stack;
-static std::vector<FILE*> surf_file_to_parse_stack;
-static std::vector<std::string> surf_parsed_filename_stack;
-
-static inline const char* surf_parsed_filename() // to locate parse error messages
-{
- return surf_parsed_filename_stack.empty() ? nullptr : surf_parsed_filename_stack.back().c_str();
-}
-
+static const char* surf_parsed_filename; // Currently parsed file (for the error messages)
std::vector<simgrid::surf::LinkImpl*> parsed_link_list; /* temporary store of current list link of a route */
/*
if (not cond) {
int lineno = surf_parse_lineno;
cleanup();
- XBT_ERROR("Parse error at %s:%d: %s", surf_parsed_filename(), lineno, msg.c_str());
+ XBT_ERROR("Parse error at %s:%d: %s", surf_parsed_filename, lineno, msg.c_str());
surf_exit();
xbt_die("Exiting now");
}
{
int lineno = surf_parse_lineno;
cleanup();
- XBT_ERROR("Parse error at %s:%d: %s", surf_parsed_filename(), lineno, msg.c_str());
+ XBT_ERROR("Parse error at %s:%d: %s", surf_parsed_filename, lineno, msg.c_str());
surf_exit();
xbt_die("Exiting now");
}
surf_parse_error(msg);
}
-void surf_parse_warn(std::string msg)
-{
- XBT_WARN("%s:%d: %s", surf_parsed_filename(), surf_parse_lineno, msg.c_str());
-}
-
double surf_parse_get_double(std::string s)
{
try {
}
}
+namespace {
+
/* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */
-static std::vector<int>* explodesRadical(std::string radicals)
+std::vector<int>* explodesRadical(std::string radicals)
{
std::vector<int>* exploded = new std::vector<int>();
return exploded;
}
-namespace {
class unit_scale : public std::unordered_map<std::string, double> {
public:
using std::unordered_map<std::string, double>::unordered_map;
}
}
}
-}
/* Note: field `unit' for the last element of parameter `units' should be nullptr. */
-static 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)
+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)
{
char* ptr;
errno = 0;
surf_parse_error(std::string("unknown unit: ") + ptr);
return res * u->second;
}
+}
double surf_parse_get_time(const char* string, const char* entity_kind, std::string name)
{
std::map<std::string, std::string>* current_model_property_set = nullptr;
int ZONE_TAG = 0; // Whether we just opened a zone tag (to see what to do with the properties)
-YY_BUFFER_STATE surf_input_buffer;
FILE *surf_file_to_parse = nullptr;
/* Stuff relative to storage */
void ETag_surfxml_storage()
{
- StorageCreationArgs storage;
+ simgrid::kernel::routing::StorageCreationArgs storage;
storage.properties = current_property_set;
current_property_set = nullptr;
}
void ETag_surfxml_storage___type()
{
- StorageTypeCreationArgs storage_type;
+ simgrid::kernel::routing::StorageTypeCreationArgs storage_type;
storage_type.properties = current_property_set;
current_property_set = nullptr;
void ETag_surfxml_mount()
{
- MountCreationArgs mount;
+ simgrid::kernel::routing::MountCreationArgs mount;
mount.name = A_surfxml_mount_name;
mount.storageId = A_surfxml_mount_storageId;
void STag_surfxml_include()
{
- XBT_ERROR("<include> tag is deprecated, and will be removed in SimGrid v3.18. Please stop using it now (or tell us why you need it).");
- parse_after_config();
- XBT_DEBUG("STag_surfxml_include '%s'",A_surfxml_include_file);
- surf_parsed_filename_stack.emplace_back(A_surfxml_include_file); // save file name
-
- surf_file_to_parse_stack.push_back(surf_file_to_parse); // save old file descriptor
-
- surf_file_to_parse = surf_fopen(A_surfxml_include_file, "r"); // read new file descriptor
- xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", A_surfxml_include_file);
-
- surf_input_buffer_stack.push_back(surf_input_buffer);
- surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
- surf_parse_push_buffer_state(surf_input_buffer);
-
- fflush(nullptr);
-}
-
-void ETag_surfxml_include() {
-/* Nothing to do when done with reading the include tag.
- * Instead, the handling should be deferred until the EOF of current buffer -- see below */
+ xbt_die("<include> tag was removed in SimGrid v3.18. Please stop using it now.");
}
-/** @brief When reaching EOF, check whether we are in an include tag, and behave accordingly if yes
- *
- * This function is called automatically by sedding the parser in tools/cmake/MaintainerMode.cmake
- * Every FAIL on "Premature EOF" is preceded by a call to this function, which role is to restore the
- * previous buffer if we reached the EOF /of an include file/. Its return code is used to avoid the
- * error message in that case.
- *
- * Yeah, that's terribly hackish, but it works. A better solution should be dealed with in flexml
- * directly: a command line flag could instruct it to do the correct thing when the include directive is encountered
- * on a line. One day maybe, if the maya allow it.
- */
-int ETag_surfxml_include_state()
+void ETag_surfxml_include()
{
- fflush(nullptr);
- XBT_DEBUG("ETag_surfxml_include_state '%s'",A_surfxml_include_file);
-
- if (surf_input_buffer_stack.empty()) // nope, that's a true premature EOF. Let the parser die verbosely.
- return 0;
-
- // Yeah, we were in an <include> Restore state and proceed.
- fclose(surf_file_to_parse);
- surf_file_to_parse_stack.pop_back();
- surf_parse_pop_buffer_state();
- surf_input_buffer_stack.pop_back();
-
- // Restore the filename for error messages
- surf_parsed_filename_stack.pop_back();
-
- return 1;
+ /* Won't happen since <include> is now removed since v3.18. */
}
/* Stag and Etag parse functions */
-
void STag_surfxml_platform() {
XBT_ATTRIB_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version);
"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_parsed_filename(), version);
+ surf_parsed_filename, version);
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"
- "Use simgrid_update_xml to update your file automatically. "
+ "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());
+ version, surf_parsed_filename);
}
xbt_assert(version <= 4.1, "******* FILE %s COMES FROM THE FUTURE (v:%.1f) *********\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_parsed_filename(), version);
+ surf_parsed_filename, version);
sg_platf_begin();
}
}
void ETag_surfxml_host() {
- s_sg_platf_host_cbarg_t host;
- memset(&host,0,sizeof(host));
+ simgrid::kernel::routing::HostCreationArgs host;
host.properties = current_property_set;
current_property_set = nullptr;
void STag_surfxml_host___link(){
XBT_DEBUG("Create a Host_link for %s",A_surfxml_host___link_id);
- HostLinkCreationArgs host_link;
+ simgrid::kernel::routing::HostLinkCreationArgs host_link;
host_link.id = A_surfxml_host___link_id;
host_link.link_up = A_surfxml_host___link_up;
}
void ETag_surfxml_cluster(){
- ClusterCreationArgs cluster;
+ simgrid::kernel::routing::ClusterCreationArgs cluster;
cluster.properties = current_property_set;
current_property_set = nullptr;
switch(AX_surfxml_cluster_topology){
case A_surfxml_cluster_topology_FLAT:
- cluster.topology= SURF_CLUSTER_FLAT ;
+ cluster.topology = simgrid::kernel::routing::ClusterTopology::FLAT;
break;
case A_surfxml_cluster_topology_TORUS:
- cluster.topology= SURF_CLUSTER_TORUS ;
+ cluster.topology = simgrid::kernel::routing::ClusterTopology::TORUS;
break;
case A_surfxml_cluster_topology_FAT___TREE:
- cluster.topology = SURF_CLUSTER_FAT_TREE;
+ cluster.topology = simgrid::kernel::routing::ClusterTopology::FAT_TREE;
break;
case A_surfxml_cluster_topology_DRAGONFLY:
- cluster.topology= SURF_CLUSTER_DRAGONFLY ;
+ cluster.topology = simgrid::kernel::routing::ClusterTopology::DRAGONFLY;
break;
default:
surf_parse_error(std::string("Invalid cluster topology for cluster ") + cluster.id);
cluster.sharing_policy = SURF_LINK_SHARED;
break;
case A_surfxml_cluster_sharing___policy_FULLDUPLEX:
- cluster.sharing_policy = SURF_LINK_FULLDUPLEX;
+ XBT_WARN("FULLDUPLEX is now deprecated. Please update your platform file to use SPLITDUPLEX instead.");
+ cluster.sharing_policy = SURF_LINK_SPLITDUPLEX;
+ break;
+ case A_surfxml_cluster_sharing___policy_SPLITDUPLEX:
+ cluster.sharing_policy = SURF_LINK_SPLITDUPLEX;
break;
case A_surfxml_cluster_sharing___policy_FATPIPE:
cluster.sharing_policy = SURF_LINK_FATPIPE;
void STag_surfxml_cabinet(){
parse_after_config();
- CabinetCreationArgs cabinet;
+ simgrid::kernel::routing::CabinetCreationArgs cabinet;
cabinet.id = A_surfxml_cabinet_id;
cabinet.prefix = A_surfxml_cabinet_prefix;
cabinet.suffix = A_surfxml_cabinet_suffix;
void STag_surfxml_peer(){
parse_after_config();
- PeerCreationArgs 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());
}
void ETag_surfxml_link(){
- LinkCreationArgs link;
+ simgrid::kernel::routing::LinkCreationArgs link;
link.properties = current_property_set;
current_property_set = nullptr;
link.policy = SURF_LINK_FATPIPE;
break;
case A_surfxml_link_sharing___policy_FULLDUPLEX:
- link.policy = SURF_LINK_FULLDUPLEX;
- break;
+ XBT_WARN("FULLDUPLEX is now deprecated. Please update your platform file to use SPLITDUPLEX instead.");
+ link.policy = SURF_LINK_SPLITDUPLEX;
+ break;
+ case A_surfxml_link_sharing___policy_SPLITDUPLEX:
+ link.policy = SURF_LINK_SPLITDUPLEX;
+ break;
default:
surf_parse_error(std::string("Invalid sharing policy in link ") + link.id);
break;
}
void ETag_surfxml_backbone(){
- LinkCreationArgs link;
+ simgrid::kernel::routing::LinkCreationArgs link;
link.properties = nullptr;
link.id = std::string(A_surfxml_backbone_id);
}
void ETag_surfxml_route(){
- s_sg_platf_route_cbarg_t route;
- memset(&route,0,sizeof(route));
+ simgrid::kernel::routing::RouteCreationArgs 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.link_list = new std::vector<simgrid::surf::LinkImpl*>();
route.symmetrical = (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES);
- for (auto const& link : parsed_link_list)
- route.link_list->push_back(link);
- parsed_link_list.clear();
+ route.link_list.swap(parsed_link_list);
sg_platf_new_route(&route);
- delete route.link_list;
}
void ETag_surfxml_ASroute()
}
void ETag_surfxml_zoneRoute()
{
- s_sg_platf_route_cbarg_t ASroute;
- memset(&ASroute,0,sizeof(ASroute));
+ simgrid::kernel::routing::RouteCreationArgs ASroute;
ASroute.src = sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_src); // tested to not be nullptr in start tag
ASroute.dst = sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_dst); // tested to not be nullptr in start tag
ASroute.gw_src = sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_gw___src); // tested to not be nullptr in start tag
ASroute.gw_dst = sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_gw___dst); // tested to not be nullptr in start tag
- ASroute.link_list = new std::vector<simgrid::surf::LinkImpl*>();
-
- for (auto const& link : parsed_link_list)
- ASroute.link_list->push_back(link);
- parsed_link_list.clear();
+ ASroute.link_list.swap(parsed_link_list);
switch (A_surfxml_zoneRoute_symmetrical) {
case AU_surfxml_zoneRoute_symmetrical:
}
sg_platf_new_route(&ASroute);
- delete ASroute.link_list;
}
void ETag_surfxml_bypassRoute(){
- s_sg_platf_route_cbarg_t route;
- memset(&route,0,sizeof(route));
+ simgrid::kernel::routing::RouteCreationArgs route;
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 = new std::vector<simgrid::surf::LinkImpl*>();
- for (auto const& link : parsed_link_list)
- route.link_list->push_back(link);
- parsed_link_list.clear();
+ route.link_list.swap(parsed_link_list);
sg_platf_new_bypassRoute(&route);
- delete route.link_list;
}
void ETag_surfxml_bypassASroute()
}
void ETag_surfxml_bypassZoneRoute()
{
- s_sg_platf_route_cbarg_t ASroute;
- memset(&ASroute,0,sizeof(ASroute));
+ simgrid::kernel::routing::RouteCreationArgs ASroute;
ASroute.src = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_src);
ASroute.dst = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_dst);
- ASroute.link_list = new std::vector<simgrid::surf::LinkImpl*>();
- for (auto const& link : parsed_link_list)
- ASroute.link_list->push_back(link);
- parsed_link_list.clear();
+ ASroute.link_list.swap(parsed_link_list);
ASroute.symmetrical = false;
ASroute.gw_dst = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_gw___dst);
sg_platf_new_bypassRoute(&ASroute);
- delete ASroute.link_list;
}
void ETag_surfxml_trace(){
- TraceCreationArgs trace;
+ simgrid::kernel::routing::TraceCreationArgs trace;
trace.id = A_surfxml_trace_id;
trace.file = A_surfxml_trace_file;
void STag_surfxml_trace___connect()
{
parse_after_config();
- TraceConnectCreationArgs trace_connect;
+ simgrid::kernel::routing::TraceConnectCreationArgs trace_connect;
trace_connect.element = A_surfxml_trace___connect_element;
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 = SURF_TRACE_CONNECT_KIND_SPEED;
+ trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::SPEED;
break;
case A_surfxml_trace___connect_kind_BANDWIDTH:
- trace_connect.kind = SURF_TRACE_CONNECT_KIND_BANDWIDTH;
+ trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::BANDWIDTH;
break;
case A_surfxml_trace___connect_kind_HOST___AVAIL:
- trace_connect.kind = SURF_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 = SURF_TRACE_CONNECT_KIND_LATENCY;
+ trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::LATENCY;
break;
case A_surfxml_trace___connect_kind_LINK___AVAIL:
- trace_connect.kind = SURF_TRACE_CONNECT_KIND_LINK_AVAIL;
+ trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::LINK_AVAIL;
break;
default:
surf_parse_error("Invalid trace kind");
{
parse_after_config();
ZONE_TAG = 1;
- ZoneCreationArgs zone;
+ simgrid::kernel::routing::ZoneCreationArgs zone;
zone.id = A_surfxml_zone_id;
zone.routing = static_cast<int>(A_surfxml_zone_routing);
current_property_set = nullptr;
}
-static int argc;
-static char **argv;
+static std::vector<std::string> arguments;
void STag_surfxml_process()
{
void STag_surfxml_actor()
{
ZONE_TAG = 0;
- argc = 1;
- argv = xbt_new(char *, 1);
- argv[0] = xbt_strdup(A_surfxml_actor_function);
+ arguments.assign(1, A_surfxml_actor_function);
xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
}
void ETag_surfxml_actor()
{
- s_sg_platf_process_cbarg_t actor;
- memset(&actor,0,sizeof(actor));
+ simgrid::kernel::routing::ActorCreationArgs actor;
actor.properties = current_property_set;
current_property_set = nullptr;
- actor.argc = argc;
- actor.argv = (const char **)argv;
+ actor.args.swap(arguments);
actor.host = A_surfxml_actor_host;
actor.function = A_surfxml_actor_function;
actor.start_time = surf_parse_get_double(A_surfxml_actor_start___time);
switch (A_surfxml_actor_on___failure) {
case AU_surfxml_actor_on___failure:
case A_surfxml_actor_on___failure_DIE:
- actor.on_failure = SURF_ACTOR_ON_FAILURE_DIE;
+ actor.on_failure = simgrid::kernel::routing::ActorOnFailure::DIE;
break;
case A_surfxml_actor_on___failure_RESTART:
- actor.on_failure = SURF_ACTOR_ON_FAILURE_RESTART;
+ actor.on_failure = simgrid::kernel::routing::ActorOnFailure::RESTART;
break;
default:
surf_parse_error("Invalid on failure behavior");
break;
}
- sg_platf_new_process(&actor);
-
- for (int i = 0; i != argc; ++i)
- xbt_free(argv[i]);
- xbt_free(argv);
- argv = nullptr;
+ sg_platf_new_actor(&actor);
}
void STag_surfxml_argument(){
- argc++;
- argv = (char**)xbt_realloc(argv, (argc) * sizeof(char **));
- argv[(argc) - 1] = xbt_strdup(A_surfxml_argument_value);
+ arguments.push_back(A_surfxml_argument_value);
}
void STag_surfxml_model___prop(){
void ETag_surfxml_model___prop(){/* Nothing to do */}
/* Open and Close parse file */
+YY_BUFFER_STATE surf_input_buffer;
+
void surf_parse_open(const char *file)
{
xbt_assert(file, "Cannot parse the nullptr file. Bypassing the parser is strongly deprecated nowadays.");
- surf_parsed_filename_stack.emplace_back(file);
+ surf_parsed_filename = file;
std::string dir = simgrid::xbt::Path(file).getDirname();
surf_path.push_back(dir);
void surf_parse_close()
{
- if (surf_parsed_filename()) {
- surf_path.pop_back();
- }
-
- surf_parsed_filename_stack.pop_back();
+ surf_path.pop_back(); // 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);
{
return surf_parse_lex();
}
-}
