X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df7dd242cb1d449653076cc87a6020b2c6a8cbf5..acd052f4e734a5580577a6462a6e08c0ea3b5509:/src/surf/xml/surfxml_sax_cb.cpp diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index dfcc8c91ea..d3a116868d 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -23,22 +23,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF extern "C" { -int ETag_surfxml_include_state(); - #include "simgrid_dtd.c" -/* - * Stuff relative to the tag - */ -static std::vector surf_input_buffer_stack; -static std::vector surf_file_to_parse_stack; -static std::vector 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 parsed_link_list; /* temporary store of current list link of a route */ /* @@ -49,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, lineno, msg.c_str()); surf_exit(); xbt_die("Exiting now"); } @@ -59,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, lineno, msg.c_str()); surf_exit(); xbt_die("Exiting now"); } @@ -94,11 +81,6 @@ void surf_parse_assert_netpoint(std::string hostname, std::string pre, std::stri 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 { @@ -118,9 +100,12 @@ int surf_parse_get_int(std::string s) return -1; } } +} + +namespace { /* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */ -static std::vector* explodesRadical(std::string radicals) +std::vector* explodesRadical(std::string radicals) { std::vector* exploded = new std::vector(); @@ -151,7 +136,6 @@ static std::vector* explodesRadical(std::string radicals) return exploded; } -namespace { class unit_scale : public std::unordered_map { public: using std::unordered_map::unordered_map; @@ -189,11 +173,10 @@ unit_scale::unit_scale(std::initializer_listsecond; } +} + +extern "C" { double surf_parse_get_time(const char* string, const char* entity_kind, std::string name) { - static const unit_scale units{{"w", 7 * 24 * 60 * 60}, - {"d", 24 * 60 * 60}, - {"h", 60 * 60}, - {"m", 60}, - {"s", 1.0}, - {"ms", 1e-3}, - {"us", 1e-6}, - {"ns", 1e-9}, - {"ps", 1e-12}}; + static const unit_scale units{std::make_pair("w", 7 * 24 * 60 * 60), + std::make_pair("d", 24 * 60 * 60), + std::make_pair("h", 60 * 60), + std::make_pair("m", 60), + std::make_pair("s", 1.0), + std::make_pair("ms", 1e-3), + std::make_pair("us", 1e-6), + std::make_pair("ns", 1e-9), + std::make_pair("ps", 1e-12)}; return surf_parse_get_value_with_unit(string, units, entity_kind, name, "Append 's' to your time to get seconds", "s"); } double surf_parse_get_size(const char* string, const char* entity_kind, std::string name) { - static const unit_scale units{ - {"b", 0.125, 2, true}, {"b", 0.125, 10, true}, {"B", 1.0, 2, true}, {"B", 1.0, 10, true}}; + 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)}; return surf_parse_get_value_with_unit(string, units, entity_kind, name, "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) { - static const unit_scale units{ - {"bps", 0.125, 2, true}, {"bps", 0.125, 10, true}, {"Bps", 1.0, 2, true}, {"Bps", 1.0, 10, true}}; + 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)}; return surf_parse_get_value_with_unit(string, units, entity_kind, name, "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) { - static const unit_scale units{{"f", 1.0, 10, true}, {"flops", 1.0, 10, false}}; + 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"); } @@ -286,7 +272,6 @@ std::map* current_property_set = nullptr; std::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) -YY_BUFFER_STATE surf_input_buffer; FILE *surf_file_to_parse = nullptr; /* Stuff relative to storage */ @@ -352,61 +337,15 @@ void ETag_surfxml_mount() void STag_surfxml_include() { - XBT_ERROR(" 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); + xbt_die(" tag was removed in SimGrid v3.18. Please stop using it now."); } -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 */ -} - -/** @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 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 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); @@ -440,19 +379,19 @@ void STag_surfxml_platform() { "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 ride 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(); } @@ -483,7 +422,6 @@ void STag_surfxml_prop() void ETag_surfxml_host() { s_sg_platf_host_cbarg_t host; - memset(&host,0,sizeof(host)); host.properties = current_property_set; current_property_set = nullptr; @@ -542,16 +480,16 @@ void ETag_surfxml_cluster(){ switch(AX_surfxml_cluster_topology){ case A_surfxml_cluster_topology_FLAT: - cluster.topology= SURF_CLUSTER_FLAT ; + cluster.topology = ClusterTopology::FLAT; break; case A_surfxml_cluster_topology_TORUS: - cluster.topology= SURF_CLUSTER_TORUS ; + cluster.topology = ClusterTopology::TORUS; break; case A_surfxml_cluster_topology_FAT___TREE: - cluster.topology = SURF_CLUSTER_FAT_TREE; + cluster.topology = ClusterTopology::FAT_TREE; break; case A_surfxml_cluster_topology_DRAGONFLY: - cluster.topology= SURF_CLUSTER_DRAGONFLY ; + cluster.topology = ClusterTopology::DRAGONFLY; break; default: surf_parse_error(std::string("Invalid cluster topology for cluster ") + cluster.id); @@ -565,7 +503,11 @@ void ETag_surfxml_cluster(){ 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; @@ -654,8 +596,12 @@ void ETag_surfxml_link(){ 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; @@ -749,22 +695,17 @@ void STag_surfxml_bypassZoneRoute(){ } void ETag_surfxml_route(){ - s_sg_platf_route_cbarg_t route; - memset(&route,0,sizeof(route)); + 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(); 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() @@ -778,8 +719,7 @@ void ETag_surfxml_ASroute() } void ETag_surfxml_zoneRoute() { - s_sg_platf_route_cbarg_t ASroute; - memset(&ASroute,0,sizeof(ASroute)); + 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 @@ -787,11 +727,7 @@ void ETag_surfxml_zoneRoute() 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(); - - 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: @@ -806,26 +742,20 @@ void ETag_surfxml_zoneRoute() } 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)); + 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(); - 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() @@ -838,15 +768,11 @@ void ETag_surfxml_bypassASroute() } void ETag_surfxml_bypassZoneRoute() { - s_sg_platf_route_cbarg_t ASroute; - memset(&ASroute,0,sizeof(ASroute)); + 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(); - 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; @@ -854,7 +780,6 @@ void ETag_surfxml_bypassZoneRoute() 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(){ @@ -879,19 +804,19 @@ void STag_surfxml_trace___connect() 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 = TraceConnectKind::SPEED; break; case A_surfxml_trace___connect_kind_BANDWIDTH: - trace_connect.kind = SURF_TRACE_CONNECT_KIND_BANDWIDTH; + trace_connect.kind = TraceConnectKind::BANDWIDTH; break; case A_surfxml_trace___connect_kind_HOST___AVAIL: - trace_connect.kind = SURF_TRACE_CONNECT_KIND_HOST_AVAIL; + trace_connect.kind = TraceConnectKind::HOST_AVAIL; break; case A_surfxml_trace___connect_kind_LATENCY: - trace_connect.kind = SURF_TRACE_CONNECT_KIND_LATENCY; + trace_connect.kind = TraceConnectKind::LATENCY; break; case A_surfxml_trace___connect_kind_LINK___AVAIL: - trace_connect.kind = SURF_TRACE_CONNECT_KIND_LINK_AVAIL; + trace_connect.kind = TraceConnectKind::LINK_AVAIL; break; default: surf_parse_error("Invalid trace kind"); @@ -955,8 +880,7 @@ void ETag_surfxml_config() current_property_set = nullptr; } -static int argc; -static char **argv; +static std::vector arguments; void STag_surfxml_process() { @@ -967,9 +891,7 @@ 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)"); } @@ -985,14 +907,12 @@ void ETag_surfxml_process() void ETag_surfxml_actor() { - s_sg_platf_process_cbarg_t actor; - memset(&actor,0,sizeof(actor)); + 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); @@ -1001,28 +921,21 @@ void ETag_surfxml_actor() 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 = ActorOnFailure::DIE; break; case A_surfxml_actor_on___failure_RESTART: - actor.on_failure = SURF_ACTOR_ON_FAILURE_RESTART; + actor.on_failure = 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(){ @@ -1047,11 +960,13 @@ void ETag_surfxml_argument(){/* Nothing to do */} 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); @@ -1065,11 +980,7 @@ void surf_parse_open(const char *file) 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);