X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d501d6a7990a1531087645e1a40b1b00c1185988..0d08efd41a22b0813a99a3c206152d2edcbf3f00:/src/surf/xml/surfxml_sax_cb.cpp?ds=sidebyside diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index c1e5a771b3..0448bd70eb 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -6,7 +6,6 @@ #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.hpp" -#include "src/instr/instr_private.hpp" #include "src/surf/network_interface.hpp" #include "src/surf/surf_interface.hpp" #include "src/surf/xml/platf_private.hpp" @@ -25,7 +24,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF #include "simgrid_dtd.c" -static const char* surf_parsed_filename; // Currently parsed file (for the error messages) +static std::string surf_parsed_filename; // Currently parsed file (for the error messages) std::vector parsed_link_list; /* temporary store of current list link of a route */ @@ -37,7 +36,7 @@ void surf_parse_assert(bool cond, std::string msg) 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.c_str(), lineno, msg.c_str()); surf_exit(); xbt_die("Exiting now"); } @@ -47,7 +46,7 @@ void surf_parse_error(std::string msg) { 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.c_str(), lineno, msg.c_str()); surf_exit(); xbt_die("Exiting now"); } @@ -267,8 +266,8 @@ 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 */ /* The default current property receiver. Setup in the corresponding opening callbacks. */ -std::map* current_property_set = nullptr; -std::map* current_model_property_set = nullptr; +std::unordered_map* current_property_set = nullptr; +std::unordered_map* current_model_property_set = nullptr; int ZONE_TAG = 0; // Whether we just opened a zone tag (to see what to do with the properties) FILE *surf_file_to_parse = nullptr; @@ -372,27 +371,26 @@ void STag_surfxml_platform() { "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: http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\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_parsed_filename, version); + surf_parsed_filename.c_str(), 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 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.c_str()); } - 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); - - simgrid::s4u::on_platform_creation(); + 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.c_str(), version); } void ETag_surfxml_platform(){ simgrid::s4u::on_platform_created(); @@ -407,12 +405,12 @@ void STag_surfxml_prop() { if (ZONE_TAG) { // We need to retrieve the most recently opened zone XBT_DEBUG("Set zone property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value); - simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::get_instance()->getNetzoneByNameOrNull(A_surfxml_zone_id); + simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::get_instance()->netzone_by_name_or_null(A_surfxml_zone_id); - netzone->setProperty(A_surfxml_prop_id, A_surfxml_prop_value); + netzone->set_property(std::string(A_surfxml_prop_id), A_surfxml_prop_value); } else { if (not current_property_set) - current_property_set = new std::map; // Maybe, it should raise an error + current_property_set = new std::unordered_map; // Maybe, it should raise an error current_property_set->insert({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, current_property_set); @@ -612,13 +610,13 @@ void STag_surfxml_link___ctn() switch (A_surfxml_link___ctn_direction) { case AU_surfxml_link___ctn_direction: case A_surfxml_link___ctn_direction_NONE: - link = simgrid::kernel::resource::LinkImpl::byName(A_surfxml_link___ctn_id); + link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id))->get_impl(); break; case A_surfxml_link___ctn_direction_UP: - link = simgrid::kernel::resource::LinkImpl::byName(std::string(A_surfxml_link___ctn_id) + "_UP"); + link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id) + "_UP")->get_impl(); break; case A_surfxml_link___ctn_direction_DOWN: - link = simgrid::kernel::resource::LinkImpl::byName(std::string(A_surfxml_link___ctn_id) + "_DOWN"); + link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id) + "_DOWN")->get_impl(); break; default: surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id); @@ -650,7 +648,7 @@ void ETag_surfxml_backbone(){ link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; sg_platf_new_link(&link); - routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl::byName(A_surfxml_backbone_id)); + routing_cluster_add_backbone(simgrid::s4u::Link::by_name(std::string(A_surfxml_backbone_id))->get_impl()); } void STag_surfxml_route(){ @@ -779,7 +777,7 @@ void ETag_surfxml_bypassZoneRoute() } 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; @@ -861,16 +859,22 @@ void STag_surfxml_config() void ETag_surfxml_config() { - for (auto const& elm : *current_property_set) { - if (simgrid::config::is_default(elm.first.c_str())) { - std::string cfg = elm.first + ":" + elm.second; + // Sort config elements before applying. + // That's a little waste of time, but not doing so would break the tests + std::vector keys; + for (auto const& kv : *current_property_set) { + keys.push_back(kv.first); + } + std::sort(keys.begin(), keys.end()); + for (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)); } else - XBT_INFO("The custom configuration '%s' is already defined by user!", elm.first.c_str()); + XBT_INFO("The custom configuration '%s' is already defined by user!", key.c_str()); } XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); - simgrid::s4u::on_config_in_platform_done(); delete current_property_set; current_property_set = nullptr; } @@ -935,7 +939,7 @@ void STag_surfxml_argument(){ void STag_surfxml_model___prop(){ if (not current_model_property_set) - current_model_property_set = new std::map(); + current_model_property_set = new std::unordered_map(); current_model_property_set->insert({A_surfxml_model___prop_id, A_surfxml_model___prop_value}); } @@ -959,17 +963,16 @@ 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) +void surf_parse_open(std::string file) { - xbt_assert(file, "Cannot parse the nullptr file. Bypassing the parser is strongly deprecated nowadays."); - surf_parsed_filename = file; - std::string dir = simgrid::xbt::Path(file).getDirname(); + std::string dir = simgrid::xbt::Path(file).get_dir_name(); surf_path.push_back(dir); + std::string cwd = simgrid::xbt::Path().get_dir_name(); surf_file_to_parse = surf_fopen(file, "r"); if (surf_file_to_parse == nullptr) - xbt_die("Unable to open '%s'\n", file); + 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;