X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ddf6262b78ea331d365560f3c94270a97a6d7763..f11b7e2b68cf873f304062d21d49419899093aec:/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 b6d60750ce..b7f147c737 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -1,119 +1,139 @@ -/* Copyright (c) 2006-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2006-2017. 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 -#include -#include /* va_arg */ - -#include "xbt/misc.h" -#include "xbt/log.h" -#include "xbt/str.h" -#include "xbt/file.h" -#include "xbt/dict.h" -#include "src/surf/surf_private.h" -#include "src/surf/network_interface.hpp" +#include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.h" -#include "simgrid/link.h" +#include "src/kernel/routing/NetPoint.hpp" +#include "src/surf/network_interface.hpp" +#include "xbt/file.h" #include "src/surf/xml/platf_private.hpp" +#include +#include +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module"); -#undef CLEANUP + +SG_BEGIN_DECL() + int ETag_surfxml_include_state(); #include "simgrid_dtd.c" char* surf_parsed_filename = nullptr; // to locate parse error messages -std::vector parsed_link_list; /* temporary store of current list link of a route */ +std::vector parsed_link_list; /* temporary store of current list link of a route */ + /* * Helping functions */ -void surf_parse_assert(bool cond, const char *fmt, ...) { - if (!cond ) { - va_list va; - va_start(va,fmt); +void surf_parse_assert(bool cond, std::string msg) +{ + if (not cond) { int lineno = surf_parse_lineno; - char *msg = bvprintf(fmt,va); - va_end(va); cleanup(); - XBT_ERROR("Parse error at %s:%d: %s", surf_parsed_filename, lineno, msg); + XBT_ERROR("Parse error at %s:%d: %s", surf_parsed_filename, lineno, msg.c_str()); surf_exit(); xbt_die("Exiting now"); } } -void surf_parse_error(const char *fmt, ...) { - va_list va; - va_start(va,fmt); + +void surf_parse_error(std::string msg) +{ int lineno = surf_parse_lineno; - char *msg = bvprintf(fmt,va); - va_end(va); cleanup(); - XBT_ERROR("Parse error at %s:%d: %s", surf_parsed_filename, lineno, msg); + XBT_ERROR("Parse error at %s:%d: %s", surf_parsed_filename, lineno, msg.c_str()); surf_exit(); xbt_die("Exiting now"); } -void surf_parse_warn(const char *fmt, ...) { - va_list va; - va_start(va,fmt); - char *msg = bvprintf(fmt,va); - va_end(va); - XBT_WARN("%s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg); - free(msg); + +void surf_parse_assert_netpoint(std::string hostname, std::string pre, std::string post) +{ + if (sg_netpoint_by_name_or_null(hostname.c_str()) != nullptr) // found + return; + + std::string msg = pre + hostname + post + " Existing netpoints: \n"; + + std::vector list; + simgrid::s4u::Engine::getInstance()->getNetpointList(&list); + std::sort(list.begin(), list.end(), + [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) { + return a->name() < b->name(); + }); + bool first = true; + for (auto const& np : list) { + if (np->isNetZone()) + continue; + + if (not first) + msg += ","; + first = false; + msg += "'" + np->name() + "'"; + if (msg.length() > 4096) { + msg.pop_back(); // remove trailing quote + msg += "...(list truncated)......"; + break; + } + } + surf_parse_error(msg); } -double surf_parse_get_double(const char *string) { - double res; - int ret = sscanf(string, "%lg", &res); - if (ret != 1) - surf_parse_error("%s is not a double", string); - return res; +void surf_parse_warn(std::string msg) +{ + XBT_WARN("%s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg.c_str()); } -int surf_parse_get_int(const char *string) { - int res; - int ret = sscanf(string, "%d", &res); - if (ret != 1) - surf_parse_error("%s is not an integer", string); - return res; +double surf_parse_get_double(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) +{ + try { + return std::stoi(s); + } catch (std::invalid_argument& ia) { + surf_parse_error(s + " is not a double"); + return -1; + } } /* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */ -static std::vector* explodesRadical(const char* radicals) +static std::vector* explodesRadical(std::string radicals) { std::vector* exploded = new std::vector(); - char* groups; - unsigned int iter; // Make all hosts - xbt_dynar_t radical_elements = xbt_str_split(radicals, ","); - xbt_dynar_foreach (radical_elements, iter, groups) { - - xbt_dynar_t radical_ends = xbt_str_split(groups, "-"); - int start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char*)); - int end = 0; - - switch (xbt_dynar_length(radical_ends)) { + std::vector radical_elements; + boost::split(radical_elements, radicals, boost::is_any_of(",")); + for (auto const& group : radical_elements) { + std::vector radical_ends; + boost::split(radical_ends, group, boost::is_any_of("-")); + int start = surf_parse_get_int(radical_ends.front()); + int end = 0; + + switch (radical_ends.size()) { case 1: end = start; break; case 2: - end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char*)); + end = surf_parse_get_int(radical_ends.back()); break; default: - surf_parse_error("Malformed radical: %s", groups); + surf_parse_error(std::string("Malformed radical: ") + group); break; } - for (int i = start; i <= end; i++) exploded->push_back(i); - - xbt_dynar_free(&radical_ends); } - xbt_dynar_free(&radical_elements); return exploded; } @@ -124,22 +144,23 @@ struct unit_scale { }; /* 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 struct unit_scale *units, - const char *entity_kind, const char *name, const char *error_msg, const char *default_unit) +static double surf_parse_get_value_with_unit(const char* string, const struct unit_scale* units, + const char* entity_kind, std::string name, const char* error_msg, + const char* default_unit) { char* ptr; int i; errno = 0; double res = strtod(string, &ptr); if (errno == ERANGE) - surf_parse_error("value out of range: %s", string); + surf_parse_error(std::string("value out of range: ") + string); if (ptr == string) - surf_parse_error("cannot parse number: %s", 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, error_msg); + XBT_WARN("Deprecated unit-less value '%s' for %s %s. %s", string, entity_kind, name.c_str(), error_msg); ptr = (char*)default_unit; } for (i = 0; units[i].unit != nullptr && strcmp(ptr, units[i].unit) != 0; i++); @@ -147,11 +168,11 @@ static double surf_parse_get_value_with_unit(const char *string, const struct un if (units[i].unit != nullptr) res *= units[i].scale; else - surf_parse_error("unknown unit: %s", ptr); + surf_parse_error(std::string("unknown unit: ") + ptr); return res; } -double surf_parse_get_time(const char *string, const char *entity_kind, const char *name) +double surf_parse_get_time(const char* string, const char* entity_kind, std::string name) { const struct unit_scale units[] = { { "w", 7 * 24 * 60 * 60 }, @@ -169,7 +190,7 @@ double surf_parse_get_time(const char *string, const char *entity_kind, const ch "Append 's' to your time to get seconds", "s"); } -double surf_parse_get_size(const char *string, const char *entity_kind, const char *name) +double surf_parse_get_size(const char* string, const char* entity_kind, std::string name) { const struct unit_scale units[] = { { "EiB", pow(1024, 6) }, @@ -204,7 +225,7 @@ double surf_parse_get_size(const char *string, const char *entity_kind, const ch "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, const char *name) +double surf_parse_get_bandwidth(const char* string, const char* entity_kind, std::string name) { const struct unit_scale units[] = { { "EiBps", pow(1024, 6) }, @@ -237,7 +258,7 @@ double surf_parse_get_bandwidth(const char *string, const char *entity_kind, con "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, const char *name) +double surf_parse_get_speed(const char* string, const char* entity_kind, std::string name) { const struct unit_scale units[] = { { "yottaflops", 1e24 }, @@ -264,6 +285,27 @@ double surf_parse_get_speed(const char *string, const char *entity_kind, const c "Append 'f' or 'flops' to your speed to get flop per second", "f"); } +static std::vector surf_parse_get_all_speeds(char* speeds, const char* entity_kind, std::string id) +{ + + std::vector speed_per_pstate; + + if (strchr(speeds, ',') == nullptr){ + double speed = surf_parse_get_speed(speeds, entity_kind, id); + speed_per_pstate.push_back(speed); + } else { + std::vector pstate_list; + boost::split(pstate_list, speeds, boost::is_any_of(",")); + for (auto speed_str : pstate_list) { + boost::trim(speed_str); + double speed = surf_parse_get_speed(speed_str.c_str(), entity_kind, id); + speed_per_pstate.push_back(speed); + XBT_DEBUG("Speed value: %f", speed); + } + } + return speed_per_pstate; +} + /* * All the callback lists that can be overridden anywhere. * (this list should probably be reduced to the bare minimum to allow the models to work) @@ -272,76 +314,68 @@ double surf_parse_get_speed(const char *string, const char *entity_kind, const c /* 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. */ -xbt_dict_t current_property_set = nullptr; -xbt_dict_t current_model_property_set = nullptr; -xbt_dict_t as_current_property_set = nullptr; -int AS_TAG = 0; -char* as_name_tab[1024]; -void* as_dict_tab[1024]; -int as_prop_nb = 0; - - -/* dictionary of random generator data */ -xbt_dict_t random_data_list = nullptr; +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 - */ +/* Stuff relative to storage */ void STag_surfxml_storage() { - AS_TAG = 0; + ZONE_TAG = 0; XBT_DEBUG("STag_surfxml_storage"); 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_storage() { - s_sg_platf_storage_cbarg_t storage; - memset(&storage,0,sizeof(storage)); + StorageCreationArgs storage; + + storage.properties = current_property_set; + current_property_set = nullptr; storage.id = A_surfxml_storage_id; storage.type_id = A_surfxml_storage_typeId; storage.content = A_surfxml_storage_content; - storage.content_type = A_surfxml_storage_content___type; - storage.properties = current_property_set; storage.attach = A_surfxml_storage_attach; + sg_platf_new_storage(&storage); - current_property_set = nullptr; } void STag_surfxml_storage___type() { - AS_TAG = 0; + ZONE_TAG = 0; XBT_DEBUG("STag_surfxml_storage___type"); xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); xbt_assert(current_model_property_set == nullptr, "Someone forgot to reset the model property set to nullptr in its closing tag (or XML malformed)"); } void ETag_surfxml_storage___type() { - s_sg_platf_storage_type_cbarg_t storage_type; - memset(&storage_type,0,sizeof(storage_type)); - - storage_type.content = A_surfxml_storage___type_content; - storage_type.content_type = A_surfxml_storage___type_content___type; - storage_type.id = A_surfxml_storage___type_id; - storage_type.model = A_surfxml_storage___type_model; - storage_type.properties = current_property_set; + StorageTypeCreationArgs storage_type; + + storage_type.properties = current_property_set; + current_property_set = nullptr; + storage_type.model_properties = current_model_property_set; - storage_type.size = surf_parse_get_size(A_surfxml_storage___type_size, - "size of storage type", storage_type.id); + current_model_property_set = nullptr; + + storage_type.content = A_surfxml_storage___type_content; + storage_type.id = A_surfxml_storage___type_id; + storage_type.model = A_surfxml_storage___type_model; + storage_type.size = + surf_parse_get_size(A_surfxml_storage___type_size, "size of storage type", storage_type.id.c_str()); sg_platf_new_storage_type(&storage_type); - current_property_set = nullptr; - current_model_property_set = nullptr; } + void STag_surfxml_mount() { XBT_DEBUG("STag_surfxml_mount"); } + void ETag_surfxml_mount() { - s_sg_platf_mount_cbarg_t mount; - memset(&mount,0,sizeof(mount)); + MountCreationArgs mount; mount.name = A_surfxml_mount_name; mount.storageId = A_surfxml_mount_storageId; @@ -351,23 +385,24 @@ void ETag_surfxml_mount() /* * Stuff relative to the tag */ -static xbt_dynar_t surf_input_buffer_stack = nullptr; -static xbt_dynar_t surf_file_to_parse_stack = nullptr; -static xbt_dynar_t surf_parsed_filename_stack = nullptr; +static std::vector surf_input_buffer_stack; +static std::vector surf_file_to_parse_stack; +static std::vector surf_parsed_filename_stack; 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); - xbt_dynar_push(surf_parsed_filename_stack,&surf_parsed_filename); // save old file name + surf_parsed_filename_stack.push_back(surf_parsed_filename); // save old file name surf_parsed_filename = xbt_strdup(A_surfxml_include_file); - xbt_dynar_push(surf_file_to_parse_stack, &surf_file_to_parse); //save old file descriptor + 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); - xbt_dynar_push(surf_input_buffer_stack,&surf_input_buffer); + 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); @@ -387,7 +422,7 @@ void ETag_surfxml_include() { * 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 #include is encountered + * 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() @@ -395,18 +430,18 @@ int ETag_surfxml_include_state() fflush(nullptr); XBT_DEBUG("ETag_surfxml_include_state '%s'",A_surfxml_include_file); - if(xbt_dynar_is_empty(surf_input_buffer_stack)) // nope, that's a true premature EOF. Let the parser die verbosely. + 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); - xbt_dynar_pop(surf_file_to_parse_stack, &surf_file_to_parse); + surf_file_to_parse_stack.pop_back(); surf_parse_pop_buffer_state(); - xbt_dynar_pop(surf_input_buffer_stack,&surf_input_buffer); + surf_input_buffer_stack.pop_back(); // Restore the filename for error messages free(surf_parsed_filename); - xbt_dynar_pop(surf_parsed_filename_stack,&surf_parsed_filename); + surf_parsed_filename_stack.pop_back(); return 1; } @@ -435,16 +470,30 @@ 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."); - xbt_assert((version >= 4.0), "******* FILE %s IS TOO OLD (v:%.1f) *********\n " - "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" - " - 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); + xbt_assert((version >= 4.0), + "******* FILE %s IS TOO OLD (v:%.1f) *********\n " + "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" + " - 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); + 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. " + "This program is installed automatically with SimGrid, or " + "available in the tools/ directory of the source archive.", + 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); sg_platf_begin(); } @@ -453,60 +502,36 @@ void ETag_surfxml_platform(){ } void STag_surfxml_host(){ - AS_TAG = 0; + ZONE_TAG = 0; xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); } void STag_surfxml_prop() { - if(AS_TAG){ // We need a stack here to retrieve the most recently opened AS - if (!as_current_property_set){ - xbt_assert(as_prop_nb < 1024, "Number of AS property reach the limit!!!"); - as_current_property_set = xbt_dict_new_homogeneous(xbt_free_f); // Maybe, it should raise an error - as_name_tab[as_prop_nb] = xbt_strdup(A_surfxml_AS_id); - as_dict_tab[as_prop_nb] = as_current_property_set; - XBT_DEBUG("PUSH prop set %p for AS '%s'",as_dict_tab[as_prop_nb],as_name_tab[as_prop_nb]); - as_prop_nb++; - } - XBT_DEBUG("add prop %s=%s into current AS property set", A_surfxml_prop_id, A_surfxml_prop_value); - xbt_dict_set(as_current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), nullptr); - } - else{ - if (!current_property_set) - current_property_set = xbt_dict_new(); // Maybe, it should raise an error - xbt_dict_set(current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), xbt_free_f); - XBT_DEBUG("add prop %s=%s into current property set", A_surfxml_prop_id, A_surfxml_prop_value); + 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::getInstance()->getNetzoneByNameOrNull(A_surfxml_zone_id); + + netzone->setProperty(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->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); } } void ETag_surfxml_host() { s_sg_platf_host_cbarg_t host; memset(&host,0,sizeof(host)); - char* buf; - host.properties = current_property_set; + current_property_set = nullptr; host.id = A_surfxml_host_id; - buf = A_surfxml_host_speed; - XBT_DEBUG("Buffer: %s", buf); - if (strchr(buf, ',') == nullptr){ - double speed = surf_parse_get_speed(A_surfxml_host_speed,"speed of host", host.id); - host.speed_per_pstate.push_back(speed); - } - else { - xbt_dynar_t pstate_list = xbt_str_split(buf, ","); - unsigned int i; - char* speed_str; - xbt_dynar_foreach(pstate_list, i, speed_str) { - xbt_str_trim(speed_str, nullptr); - double speed = surf_parse_get_speed(speed_str,"speed of host", host.id); - host.speed_per_pstate.push_back(speed); - XBT_DEBUG("Speed value: %f", speed); - } - xbt_dynar_free(&pstate_list); - } + host.speed_per_pstate = surf_parse_get_all_speeds(A_surfxml_host_speed, "speed of host", host.id); XBT_DEBUG("pstate: %s", A_surfxml_host_pstate); host.core_amount = surf_parse_get_int(A_surfxml_host_core); @@ -516,13 +541,11 @@ void ETag_surfxml_host() { host.coord = A_surfxml_host_coordinates; sg_platf_new_host(&host); - current_property_set = nullptr; } void STag_surfxml_host___link(){ XBT_DEBUG("Create a Host_link for %s",A_surfxml_host___link_id); - s_sg_platf_host_link_cbarg_t host_link; - memset(&host_link,0,sizeof(host_link)); + HostLinkCreationArgs host_link; host_link.id = A_surfxml_host___link_id; host_link.link_up = A_surfxml_host___link_up; @@ -531,25 +554,19 @@ void STag_surfxml_host___link(){ } void STag_surfxml_router(){ - s_sg_platf_router_cbarg_t router; - memset(&router, 0, sizeof(router)); - - router.id = A_surfxml_router_id; - router.coord = A_surfxml_router_coordinates; - - sg_platf_new_router(&router); + sg_platf_new_router(A_surfxml_router_id, A_surfxml_router_coordinates); } void ETag_surfxml_cluster(){ - s_sg_platf_cluster_cbarg_t cluster; - memset(&cluster,0,sizeof(cluster)); - cluster.properties = as_current_property_set; + ClusterCreationArgs cluster; + cluster.properties = current_property_set; + current_property_set = nullptr; cluster.id = A_surfxml_cluster_id; cluster.prefix = A_surfxml_cluster_prefix; cluster.suffix = A_surfxml_cluster_suffix; cluster.radicals = explodesRadical(A_surfxml_cluster_radical); - cluster.speed = surf_parse_get_speed(A_surfxml_cluster_speed, "speed of cluster", cluster.id); + cluster.speeds = surf_parse_get_all_speeds(A_surfxml_cluster_speed, "speed of cluster", cluster.id); cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core); cluster.bw = surf_parse_get_bandwidth(A_surfxml_cluster_bw, "bw of cluster", cluster.id); cluster.lat = surf_parse_get_time(A_surfxml_cluster_lat, "lat of cluster", cluster.id); @@ -578,8 +595,7 @@ void ETag_surfxml_cluster(){ cluster.topology= SURF_CLUSTER_DRAGONFLY ; break; default: - surf_parse_error("Invalid cluster topology for cluster %s", - cluster.id); + surf_parse_error(std::string("Invalid cluster topology for cluster ") + cluster.id); break; } cluster.topo_parameters = A_surfxml_cluster_topo___parameters; @@ -596,8 +612,7 @@ void ETag_surfxml_cluster(){ cluster.sharing_policy = SURF_LINK_FATPIPE; break; default: - surf_parse_error("Invalid cluster sharing policy for cluster %s", - cluster.id); + surf_parse_error(std::string("Invalid cluster sharing policy for cluster ") + cluster.id); break; } switch (AX_surfxml_cluster_bb___sharing___policy) { @@ -608,31 +623,28 @@ void ETag_surfxml_cluster(){ cluster.bb_sharing_policy = SURF_LINK_SHARED; break; default: - surf_parse_error("Invalid bb sharing policy in cluster %s", - cluster.id); + surf_parse_error(std::string("Invalid bb sharing policy in cluster ") + cluster.id); break; } sg_platf_new_cluster(&cluster); - - current_property_set = nullptr; } void STag_surfxml_cluster(){ + ZONE_TAG = 0; parse_after_config(); xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); } void STag_surfxml_cabinet(){ parse_after_config(); - s_sg_platf_cabinet_cbarg_t cabinet; - memset(&cabinet,0,sizeof(cabinet)); + CabinetCreationArgs cabinet; cabinet.id = A_surfxml_cabinet_id; cabinet.prefix = A_surfxml_cabinet_prefix; cabinet.suffix = A_surfxml_cabinet_suffix; - cabinet.speed = surf_parse_get_speed(A_surfxml_cabinet_speed, "speed of cabinet", cabinet.id); - cabinet.bw = surf_parse_get_bandwidth(A_surfxml_cabinet_bw, "bw of cabinet", cabinet.id); - cabinet.lat = surf_parse_get_time(A_surfxml_cabinet_lat, "lat of cabinet", cabinet.id); + cabinet.speed = surf_parse_get_speed(A_surfxml_cabinet_speed, "speed of cabinet", cabinet.id.c_str()); + cabinet.bw = surf_parse_get_bandwidth(A_surfxml_cabinet_bw, "bw of cabinet", cabinet.id.c_str()); + cabinet.lat = surf_parse_get_time(A_surfxml_cabinet_lat, "lat of cabinet", cabinet.id.c_str()); cabinet.radicals = explodesRadical(A_surfxml_cabinet_radical); sg_platf_new_cabinet(&cabinet); @@ -640,34 +652,38 @@ void STag_surfxml_cabinet(){ void STag_surfxml_peer(){ parse_after_config(); - s_sg_platf_peer_cbarg_t peer; - memset(&peer,0,sizeof(peer)); - peer.id = A_surfxml_peer_id; - peer.speed = surf_parse_get_speed(A_surfxml_peer_speed, "speed of peer", peer.id); - peer.bw_in = surf_parse_get_bandwidth(A_surfxml_peer_bw___in, "bw_in of peer", peer.id); - peer.bw_out = surf_parse_get_bandwidth(A_surfxml_peer_bw___out, "bw_out of peer", peer.id); - peer.lat = surf_parse_get_time(A_surfxml_peer_lat, "lat of peer", peer.id); - peer.coord = A_surfxml_peer_coordinates; - peer.availability_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; + 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()); + 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; + + if (A_surfxml_peer_lat[0] != '\0') + XBT_WARN("The latency parameter in is now deprecated. Use the z coordinate instead of '%s'.", + A_surfxml_peer_lat); sg_platf_new_peer(&peer); } void STag_surfxml_link(){ - AS_TAG = 0; + ZONE_TAG = 0; 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_link(){ - s_sg_platf_link_cbarg_t link; - memset(&link,0,sizeof(link)); + LinkCreationArgs link; link.properties = current_property_set; - link.id = A_surfxml_link_id; - link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth, "bandwidth of link", link.id); + current_property_set = nullptr; + + 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.latency = surf_parse_get_time(A_surfxml_link_latency, "latency of link", link.id); + 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; @@ -682,105 +698,109 @@ void ETag_surfxml_link(){ link.policy = SURF_LINK_FULLDUPLEX; break; default: - surf_parse_error("Invalid sharing policy in link %s", link.id); + surf_parse_error(std::string("Invalid sharing policy in link ") + link.id); break; } sg_platf_new_link(&link); - - current_property_set = nullptr; } -void STag_surfxml_link___ctn(){ - - simgrid::surf::Link *link; - char *link_name=nullptr; +void STag_surfxml_link___ctn() +{ + simgrid::surf::LinkImpl* link = nullptr; switch (A_surfxml_link___ctn_direction) { case AU_surfxml_link___ctn_direction: case A_surfxml_link___ctn_direction_NONE: - link = Link::byName(A_surfxml_link___ctn_id); + link = simgrid::surf::LinkImpl::byName(A_surfxml_link___ctn_id); break; case A_surfxml_link___ctn_direction_UP: - link_name = bprintf("%s_UP", A_surfxml_link___ctn_id); - link = Link::byName(link_name); + link = simgrid::surf::LinkImpl::byName(std::string(A_surfxml_link___ctn_id) + "_UP"); break; case A_surfxml_link___ctn_direction_DOWN: - link_name = bprintf("%s_DOWN", A_surfxml_link___ctn_id); - link = Link::byName(link_name); + link = simgrid::surf::LinkImpl::byName(std::string(A_surfxml_link___ctn_id) + "_DOWN"); + break; + default: + surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id); break; } - xbt_free(link_name); // no-op if it's already nullptr - surf_parse_assert(link!=nullptr,"No such link: '%s'%s", A_surfxml_link___ctn_id, - A_surfxml_link___ctn_direction==A_surfxml_link___ctn_direction_UP?" (upward)": - ( A_surfxml_link___ctn_direction==A_surfxml_link___ctn_direction_DOWN?" (downward)": - "")); + const char* dirname = ""; + switch (A_surfxml_link___ctn_direction) { + case A_surfxml_link___ctn_direction_UP: + dirname = " (upward)"; + break; + case A_surfxml_link___ctn_direction_DOWN: + dirname = " (downward)"; + break; + default: + dirname = ""; + } + surf_parse_assert(link != nullptr, std::string("No such link: '") + A_surfxml_link___ctn_id + "'" + dirname); parsed_link_list.push_back(link); } void ETag_surfxml_backbone(){ - s_sg_platf_link_cbarg_t link; - memset(&link,0,sizeof(link)); + LinkCreationArgs link; link.properties = nullptr; - link.id = A_surfxml_backbone_id; - link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id); - link.latency = surf_parse_get_time(A_surfxml_backbone_latency, "latency of backbone", link.id); + link.id = std::string(A_surfxml_backbone_id); + link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id.c_str()); + link.latency = surf_parse_get_time(A_surfxml_backbone_latency, "latency of backbone", link.id.c_str()); link.policy = SURF_LINK_SHARED; sg_platf_new_link(&link); - routing_cluster_add_backbone(sg_link_by_name(A_surfxml_backbone_id)); + routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(A_surfxml_backbone_id)); } void STag_surfxml_route(){ - surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_route_src), - "Route src='%s' does name a node.", A_surfxml_route_src); - surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_route_dst), - "Route dst='%s' does name a node.", A_surfxml_route_dst); + surf_parse_assert_netpoint(A_surfxml_route_src, "Route src='", "' does name a node."); + surf_parse_assert_netpoint(A_surfxml_route_dst, "Route dst='", "' does name a node."); } void STag_surfxml_ASroute(){ - surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_src), - "ASroute src='%s' does name a node.", A_surfxml_route_src); - surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_dst), - "ASroute dst='%s' does name a node.", A_surfxml_route_dst); + surf_parse_assert_netpoint(A_surfxml_ASroute_src, "ASroute src='", "' does name a node."); + surf_parse_assert_netpoint(A_surfxml_ASroute_dst, "ASroute dst='", "' does name a node."); - surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___src), - "ASroute gw_src='%s' does name a node.", A_surfxml_ASroute_gw___src); - surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___dst), - "ASroute gw_dst='%s' does name a node.", A_surfxml_ASroute_gw___dst); + surf_parse_assert_netpoint(A_surfxml_ASroute_gw___src, "ASroute gw_src='", "' does name a node."); + surf_parse_assert_netpoint(A_surfxml_ASroute_gw___dst, "ASroute gw_dst='", "' does name a node."); +} +void STag_surfxml_zoneRoute(){ + surf_parse_assert_netpoint(A_surfxml_zoneRoute_src, "zoneRoute src='", "' does name a node."); + surf_parse_assert_netpoint(A_surfxml_zoneRoute_dst, "zoneRoute dst='", "' does name a node."); + surf_parse_assert_netpoint(A_surfxml_zoneRoute_gw___src, "zoneRoute gw_src='", "' does name a node."); + surf_parse_assert_netpoint(A_surfxml_zoneRoute_gw___dst, "zoneRoute gw_dst='", "' does name a node."); } void STag_surfxml_bypassRoute(){ - surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassRoute_src), - "bypassRoute src='%s' does name a node.", A_surfxml_bypassRoute_src); - surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassRoute_dst), - "bypassRoute dst='%s' does name a node.", A_surfxml_bypassRoute_dst); + surf_parse_assert_netpoint(A_surfxml_bypassRoute_src, "bypassRoute src='", "' does name a node."); + surf_parse_assert_netpoint(A_surfxml_bypassRoute_dst, "bypassRoute dst='", "' does name a node."); } void STag_surfxml_bypassASroute(){ - surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_src), - "bypassASroute src='%s' does name a node.", A_surfxml_bypassASroute_src); - surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_dst), - "bypassASroute dst='%s' does name a node.", A_surfxml_bypassASroute_dst); - surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src), - "bypassASroute gw_src='%s' does name a node.", A_surfxml_bypassASroute_gw___src); - surf_parse_assert(sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___dst), - "bypassASroute gw_dst='%s' does name a node.", A_surfxml_bypassASroute_gw___dst); + surf_parse_assert_netpoint(A_surfxml_bypassASroute_src, "bypassASroute src='", "' does name a node."); + surf_parse_assert_netpoint(A_surfxml_bypassASroute_dst, "bypassASroute dst='", "' does name a node."); + surf_parse_assert_netpoint(A_surfxml_bypassASroute_gw___src, "bypassASroute gw_src='", "' does name a node."); + surf_parse_assert_netpoint(A_surfxml_bypassASroute_gw___dst, "bypassASroute gw_dst='", "' does name a node."); +} +void STag_surfxml_bypassZoneRoute(){ + surf_parse_assert_netpoint(A_surfxml_bypassZoneRoute_src, "bypassZoneRoute src='", "' does name a node."); + surf_parse_assert_netpoint(A_surfxml_bypassZoneRoute_dst, "bypassZoneRoute dst='", "' does name a node."); + surf_parse_assert_netpoint(A_surfxml_bypassZoneRoute_gw___src, "bypassZoneRoute gw_src='", "' does name a node."); + surf_parse_assert_netpoint(A_surfxml_bypassZoneRoute_gw___dst, "bypassZoneRoute gw_dst='", "' does name a node."); } void ETag_surfxml_route(){ s_sg_platf_route_cbarg_t route; memset(&route,0,sizeof(route)); - route.src = sg_netcard_by_name_or_null(A_surfxml_route_src); // tested to not be nullptr in start tag - route.dst = sg_netcard_by_name_or_null(A_surfxml_route_dst); // tested to not be nullptr in start tag + 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.link_list = new std::vector(); route.symmetrical = (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES); - for (auto link: parsed_link_list) + for (auto const& link : parsed_link_list) route.link_list->push_back(link); parsed_link_list.clear(); @@ -788,28 +808,38 @@ void ETag_surfxml_route(){ delete route.link_list; } -void ETag_surfxml_ASroute(){ +void ETag_surfxml_ASroute() +{ + AX_surfxml_zoneRoute_src = AX_surfxml_ASroute_src; + AX_surfxml_zoneRoute_dst = AX_surfxml_ASroute_dst; + AX_surfxml_zoneRoute_gw___src = AX_surfxml_ASroute_gw___src; + AX_surfxml_zoneRoute_gw___dst = AX_surfxml_ASroute_gw___dst; + AX_surfxml_zoneRoute_symmetrical = (AT_surfxml_zoneRoute_symmetrical)AX_surfxml_ASroute_symmetrical; + ETag_surfxml_zoneRoute(); +} +void ETag_surfxml_zoneRoute() +{ s_sg_platf_route_cbarg_t ASroute; memset(&ASroute,0,sizeof(ASroute)); - ASroute.src = sg_netcard_by_name_or_null(A_surfxml_ASroute_src); // tested to not be nullptr in start tag - ASroute.dst = sg_netcard_by_name_or_null(A_surfxml_ASroute_dst); // tested to not be nullptr in start tag + 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_netcard_by_name_or_null(A_surfxml_ASroute_gw___src); // tested to not be nullptr in start tag - ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_ASroute_gw___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(); + ASroute.link_list = new std::vector(); - for (auto link: parsed_link_list) + for (auto const& link : parsed_link_list) ASroute.link_list->push_back(link); parsed_link_list.clear(); - switch (A_surfxml_ASroute_symmetrical) { - case AU_surfxml_ASroute_symmetrical: - case A_surfxml_ASroute_symmetrical_YES: + switch (A_surfxml_zoneRoute_symmetrical) { + case AU_surfxml_zoneRoute_symmetrical: + case A_surfxml_zoneRoute_symmetrical_YES: ASroute.symmetrical = true; break; - case A_surfxml_ASroute_symmetrical_NO: + case A_surfxml_zoneRoute_symmetrical_NO: ASroute.symmetrical = false; break; } @@ -822,42 +852,52 @@ void ETag_surfxml_bypassRoute(){ s_sg_platf_route_cbarg_t route; memset(&route,0,sizeof(route)); - route.src = sg_netcard_by_name_or_null(A_surfxml_bypassRoute_src); // tested to not be nullptr in start tag - route.dst = sg_netcard_by_name_or_null(A_surfxml_bypassRoute_dst); // tested to not be nullptr in start tag + 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(); + route.link_list = new std::vector(); - for (auto link: parsed_link_list) + for (auto const& link : parsed_link_list) route.link_list->push_back(link); parsed_link_list.clear(); sg_platf_new_bypassRoute(&route); + delete route.link_list; } -void ETag_surfxml_bypassASroute(){ +void ETag_surfxml_bypassASroute() +{ + AX_surfxml_bypassZoneRoute_src = AX_surfxml_bypassASroute_src; + AX_surfxml_bypassZoneRoute_dst = AX_surfxml_bypassASroute_dst; + AX_surfxml_bypassZoneRoute_gw___src = AX_surfxml_bypassASroute_gw___src; + AX_surfxml_bypassZoneRoute_gw___dst = AX_surfxml_bypassASroute_gw___dst; + ETag_surfxml_bypassZoneRoute(); +} +void ETag_surfxml_bypassZoneRoute() +{ s_sg_platf_route_cbarg_t ASroute; memset(&ASroute,0,sizeof(ASroute)); - ASroute.src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_src); - ASroute.dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_dst); - ASroute.link_list = new std::vector(); - for (auto link: parsed_link_list) + 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.symmetrical = false; - ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src); - ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___dst); + ASroute.gw_src = sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_gw___src); + 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(){ - s_sg_platf_trace_cbarg_t trace; - memset(&trace,0,sizeof(trace)); + TraceCreationArgs trace; trace.id = A_surfxml_trace_id; trace.file = A_surfxml_trace_file; @@ -867,10 +907,10 @@ void ETag_surfxml_trace(){ sg_platf_new_trace(&trace); } -void STag_surfxml_trace___connect(){ +void STag_surfxml_trace___connect() +{ parse_after_config(); - s_sg_platf_trace_connect_cbarg_t trace_connect; - memset(&trace_connect,0,sizeof(trace_connect)); + TraceConnectCreationArgs trace_connect; trace_connect.element = A_surfxml_trace___connect_element; trace_connect.trace = A_surfxml_trace___connect_trace; @@ -892,99 +932,130 @@ void STag_surfxml_trace___connect(){ case A_surfxml_trace___connect_kind_LINK___AVAIL: trace_connect.kind = SURF_TRACE_CONNECT_KIND_LINK_AVAIL; break; + default: + surf_parse_error("Invalid trace kind"); + break; } sg_platf_trace_connect(&trace_connect); } -void STag_surfxml_AS(){ - parse_after_config(); - AS_TAG = 1; - s_sg_platf_AS_cbarg_t AS = { A_surfxml_AS_id, (int)A_surfxml_AS_routing}; +void STag_surfxml_AS() +{ + AX_surfxml_zone_id = AX_surfxml_AS_id; + AX_surfxml_zone_routing = (AT_surfxml_zone_routing)AX_surfxml_AS_routing; + STag_surfxml_zone(); +} + +void ETag_surfxml_AS() +{ + ETag_surfxml_zone(); +} - as_current_property_set = nullptr; +void STag_surfxml_zone() +{ + parse_after_config(); + ZONE_TAG = 1; + ZoneCreationArgs zone; + zone.id = A_surfxml_zone_id; + zone.routing = static_cast(A_surfxml_zone_routing); - sg_platf_new_AS_begin(&AS); + sg_platf_new_Zone_begin(&zone); } -void ETag_surfxml_AS(){ - if(as_prop_nb){ - char *name = as_name_tab[as_prop_nb-1]; - xbt_dict_t dict = (xbt_dict_t) as_dict_tab[as_prop_nb-1]; - as_prop_nb--; - XBT_DEBUG("POP prop %p for AS '%s'",dict,name); - xbt_lib_set(as_router_lib, name, ROUTING_PROP_ASR_LEVEL, dict); - xbt_free(name); - } - sg_platf_new_AS_seal(); + +void ETag_surfxml_zone() +{ + sg_platf_new_Zone_seal(); } -void STag_surfxml_config(){ - AS_TAG = 0; - xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); +void STag_surfxml_config() +{ + ZONE_TAG = 0; + xbt_assert(current_property_set == nullptr, + "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); XBT_DEBUG("START configuration name = %s",A_surfxml_config_id); if (_sg_cfg_init_status == 2) { - surf_parse_error("All tags must be given before any platform elements (such as , , , , etc)."); + surf_parse_error("All tags must be given before any platform elements (such as , , , " + ", etc)."); } } -void ETag_surfxml_config(){ - xbt_dict_cursor_t cursor = nullptr; - char *key; - char *elem; - char *cfg; - xbt_dict_foreach(current_property_set, cursor, key, elem) { - cfg = bprintf("%s:%s",key,elem); - if(xbt_cfg_is_default_value(key)) - xbt_cfg_set_parse(cfg); - else - XBT_INFO("The custom configuration '%s' is already defined by user!",key); - free(cfg); + +void ETag_surfxml_config() +{ + for (auto const& elm : *current_property_set) { + if (xbt_cfg_is_default_value(elm.first.c_str())) { + std::string cfg = elm.first + ":" + elm.second; + xbt_cfg_set_parse(cfg.c_str()); + } else + XBT_INFO("The custom configuration '%s' is already defined by user!", elm.first.c_str()); } XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); - xbt_dict_free(¤t_property_set); + delete current_property_set; current_property_set = nullptr; } static int argc; static char **argv; -void STag_surfxml_process(){ - AS_TAG = 0; +void STag_surfxml_process() +{ + AX_surfxml_actor_function = AX_surfxml_process_function; + STag_surfxml_actor(); +} + +void STag_surfxml_actor() +{ + ZONE_TAG = 0; argc = 1; argv = xbt_new(char *, 1); - argv[0] = xbt_strdup(A_surfxml_process_function); + argv[0] = xbt_strdup(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_process(){ - s_sg_platf_process_cbarg_t process; - memset(&process,0,sizeof(process)); +void ETag_surfxml_process() +{ + AX_surfxml_actor_host = AX_surfxml_process_host; + AX_surfxml_actor_function = AX_surfxml_process_function; + AX_surfxml_actor_start___time = AX_surfxml_process_start___time; + AX_surfxml_actor_kill___time = AX_surfxml_process_kill___time; + AX_surfxml_actor_on___failure = (AT_surfxml_actor_on___failure)AX_surfxml_process_on___failure; + ETag_surfxml_actor(); +} + +void ETag_surfxml_actor() +{ + s_sg_platf_process_cbarg_t actor; + memset(&actor,0,sizeof(actor)); - process.argc = argc; - process.argv = (const char **)argv; - process.properties = current_property_set; - process.host = A_surfxml_process_host; - process.function = A_surfxml_process_function; - process.start_time = surf_parse_get_double(A_surfxml_process_start___time); - process.kill_time = surf_parse_get_double(A_surfxml_process_kill___time); + actor.properties = current_property_set; + current_property_set = nullptr; - switch (A_surfxml_process_on___failure) { - case AU_surfxml_process_on___failure: - case A_surfxml_process_on___failure_DIE: - process.on_failure = SURF_PROCESS_ON_FAILURE_DIE; + actor.argc = argc; + actor.argv = (const char **)argv; + actor.host = A_surfxml_actor_host; + actor.function = A_surfxml_actor_function; + actor.start_time = surf_parse_get_double(A_surfxml_actor_start___time); + actor.kill_time = surf_parse_get_double(A_surfxml_actor_kill___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; break; - case A_surfxml_process_on___failure_RESTART: - process.on_failure = SURF_PROCESS_ON_FAILURE_RESTART; + case A_surfxml_actor_on___failure_RESTART: + actor.on_failure = SURF_ACTOR_ON_FAILURE_RESTART; + break; + default: + surf_parse_error("Invalid on failure behavior"); break; } - sg_platf_new_process(&process); + sg_platf_new_process(&actor); for (int i = 0; i != argc; ++i) xbt_free(argv[i]); xbt_free(argv); argv = nullptr; - - current_property_set = nullptr; } void STag_surfxml_argument(){ @@ -994,10 +1065,10 @@ void STag_surfxml_argument(){ } void STag_surfxml_model___prop(){ - if (!current_model_property_set) - current_model_property_set = xbt_dict_new_homogeneous(xbt_free_f); + if (not current_model_property_set) + current_model_property_set = new std::map(); - xbt_dict_set(current_model_property_set, A_surfxml_model___prop_id, xbt_strdup(A_surfxml_model___prop_value), nullptr); + current_model_property_set->insert({A_surfxml_model___prop_id, A_surfxml_model___prop_value}); } void ETag_surfxml_prop(){/* Nothing to do */} @@ -1019,20 +1090,14 @@ void surf_parse_open(const char *file) { xbt_assert(file, "Cannot parse the nullptr file. Bypassing the parser is strongly deprecated nowadays."); - if (!surf_input_buffer_stack) - surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), nullptr); - if (!surf_file_to_parse_stack) - surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), nullptr); - - if (!surf_parsed_filename_stack) - surf_parsed_filename_stack = xbt_dynar_new(sizeof(char *), &xbt_free_ref); - surf_parsed_filename = xbt_strdup(file); - char *dir = xbt_dirname(file); - xbt_dynar_push(surf_path, &dir); + char* dir = xbt_dirname(file); + surf_path.push_back(std::string(dir)); + xbt_free(dir); surf_file_to_parse = surf_fopen(file, "r"); - xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", file); + if (surf_file_to_parse == nullptr) + xbt_die("Unable to open '%s'\n", file); 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; @@ -1040,13 +1105,8 @@ void surf_parse_open(const char *file) void surf_parse_close() { - xbt_dynar_free(&surf_input_buffer_stack); - xbt_dynar_free(&surf_file_to_parse_stack); - xbt_dynar_free(&surf_parsed_filename_stack); if (surf_parsed_filename) { - char *dir = nullptr; - xbt_dynar_pop(surf_path, &dir); - free(dir); + surf_path.pop_back(); } free(surf_parsed_filename); @@ -1059,18 +1119,10 @@ void surf_parse_close() } } -/* Call the lexer to parse the currently opened file. This pointer to function enables bypassing of the parser */ -static int _surf_parse() { +/* Call the lexer to parse the currently opened file */ +int surf_parse() +{ return surf_parse_lex(); } -int_f_void_t surf_parse = _surf_parse; - -/* Prop tag functions - * - * With XML parser - */ -xbt_dict_t get_as_router_properties(const char* name) -{ - return (xbt_dict_t)xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL); -} +SG_END_DECL()