X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19b3962253112b19308537bc2400de141c119d99..79853b8925152a5b89d3f8f44d64ffaf284a0196:/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 f33d9108dd..ac88aa5092 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -31,7 +31,7 @@ std::vector parsed_link_list; /* temporary store of cu * Helping functions */ void surf_parse_assert(bool cond, const char *fmt, ...) { - if (!cond ) { + if (not cond) { va_list va; va_start(va,fmt); int lineno = surf_parse_lineno; @@ -287,7 +287,7 @@ static std::vector surf_parse_get_all_speeds(char* speeds, const char* e /* The default current property receiver. Setup in the corresponding opening callbacks. */ xbt_dict_t current_property_set = nullptr; std::map* current_model_property_set = nullptr; -int AS_TAG = 0; // Whether we just opened an AS tag (to see what to do with the properties) +int ZONE_TAG = 0; // Whether we just opened a zone tag (to see what to do with the properties) /* dictionary of random generator data */ xbt_dict_t random_data_list = nullptr; @@ -300,7 +300,7 @@ FILE *surf_file_to_parse = nullptr; */ 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)"); } @@ -315,13 +315,13 @@ void ETag_surfxml_storage() 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.attach = A_surfxml_storage_attach; sg_platf_new_storage(&storage); } 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)"); @@ -338,7 +338,6 @@ void ETag_surfxml_storage___type() current_model_property_set = nullptr; 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.size = surf_parse_get_size(A_surfxml_storage___type_size, @@ -446,16 +445,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(); } @@ -464,20 +477,20 @@ 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 to retrieve the most recently opened AS - XBT_DEBUG("Set AS property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value); - simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::instance()->netzoneByNameOrNull(A_surfxml_AS_id); + 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::instance()->netzoneByNameOrNull(A_surfxml_zone_id); netzone->setProperty(A_surfxml_prop_id, A_surfxml_prop_value); } else{ - if (!current_property_set) + if (not current_property_set) current_property_set = xbt_dict_new_homogeneous(&xbt_free_f); // Maybe, it should raise an error xbt_dict_set(current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), nullptr); XBT_DEBUG("add prop %s=%s into current property set %p", A_surfxml_prop_id, A_surfxml_prop_value, @@ -597,7 +610,7 @@ void ETag_surfxml_cluster(){ } void STag_surfxml_cluster(){ - AS_TAG = 0; + 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)"); } @@ -637,7 +650,7 @@ void STag_surfxml_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)"); } @@ -689,6 +702,9 @@ void STag_surfxml_link___ctn(){ link_name = bprintf("%s_DOWN", A_surfxml_link___ctn_id); link = simgrid::surf::LinkImpl::byName(link_name); break; + default: + surf_parse_error("Invalid direction for link %s", link_name); + break; } xbt_free(link_name); // no-op if it's already nullptr @@ -729,15 +745,26 @@ void STag_surfxml_route(){ void STag_surfxml_ASroute(){ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_src), "ASroute src='%s' does name a node.", - A_surfxml_route_src); + A_surfxml_ASroute_src); surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_ASroute_dst), "ASroute dst='%s' does name a node.", - A_surfxml_route_dst); + A_surfxml_ASroute_dst); surf_parse_assert(sg_netpoint_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_netpoint_by_name_or_null(A_surfxml_ASroute_gw___dst), "ASroute gw_dst='%s' does name a node.", A_surfxml_ASroute_gw___dst); } +void STag_surfxml_zoneRoute(){ + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_src), "zoneRoute src='%s' does name a node.", + A_surfxml_zoneRoute_src); + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_dst), "zoneRoute dst='%s' does name a node.", + A_surfxml_zoneRoute_dst); + + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_gw___src), "zoneRoute gw_src='%s' does name a node.", + A_surfxml_zoneRoute_gw___src); + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_zoneRoute_gw___dst), "zoneRoute gw_dst='%s' does name a node.", + A_surfxml_zoneRoute_gw___dst); +} void STag_surfxml_bypassRoute(){ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassRoute_src), "bypassRoute src='%s' does name a node.", @@ -756,6 +783,16 @@ void STag_surfxml_bypassASroute(){ surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_gw___dst), "bypassASroute gw_dst='%s' does name a node.", A_surfxml_bypassASroute_gw___dst); } +void STag_surfxml_bypassZoneRoute(){ + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_src), + "bypassASroute src='%s' does name a node.", A_surfxml_bypassZoneRoute_src); + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_dst), + "bypassASroute dst='%s' does name a node.", A_surfxml_bypassZoneRoute_dst); + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_gw___src), + "bypassASroute gw_src='%s' does name a node.", A_surfxml_bypassZoneRoute_gw___src); + surf_parse_assert(sg_netpoint_by_name_or_null(A_surfxml_bypassZoneRoute_gw___dst), + "bypassASroute gw_dst='%s' does name a node.", A_surfxml_bypassZoneRoute_gw___dst); +} void ETag_surfxml_route(){ s_sg_platf_route_cbarg_t route; @@ -776,15 +813,25 @@ 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_netpoint_by_name_or_null(A_surfxml_ASroute_src); // tested to not be nullptr in start tag - ASroute.dst = sg_netpoint_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_netpoint_by_name_or_null(A_surfxml_ASroute_gw___src); // tested to not be nullptr in start tag - ASroute.gw_dst = sg_netpoint_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(); @@ -792,12 +839,12 @@ void ETag_surfxml_ASroute(){ 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; } @@ -825,12 +872,21 @@ void ETag_surfxml_bypassRoute(){ 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_netpoint_by_name_or_null(A_surfxml_bypassASroute_src); - ASroute.dst = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_dst); + 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 link: parsed_link_list) ASroute.link_list->push_back(link); @@ -838,8 +894,8 @@ void ETag_surfxml_bypassASroute(){ ASroute.symmetrical = false; - ASroute.gw_src = sg_netpoint_by_name_or_null(A_surfxml_bypassASroute_gw___src); - ASroute.gw_dst = sg_netpoint_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; @@ -857,7 +913,8 @@ 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)); @@ -882,38 +939,59 @@ 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(){ +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(); +} + +void STag_surfxml_zone() +{ parse_after_config(); - AS_TAG = 1; - s_sg_platf_AS_cbarg_t AS = { A_surfxml_AS_id, (int)A_surfxml_AS_routing}; + ZONE_TAG = 1; + s_sg_platf_AS_cbarg_t AS = {A_surfxml_zone_id, (int)A_surfxml_zone_routing}; sg_platf_new_AS_begin(&AS); } -void ETag_surfxml_AS(){ + +void ETag_surfxml_zone() +{ sg_platf_new_AS_seal(); } -void STag_surfxml_config(){ - AS_TAG = 0; +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(){ + +void ETag_surfxml_config() +{ xbt_dict_cursor_t cursor = nullptr; char *key; char *elem; xbt_dict_foreach(current_property_set, cursor, key, elem) { if (xbt_cfg_is_default_value(key)) { - char* cfg = bprintf("%s:%s", key, elem); - xbt_cfg_set_parse(cfg); - free(cfg); + std::string cfg = std::string(key) + ":" + elem; + xbt_cfg_set_parse(cfg.c_str()); } else XBT_INFO("The custom configuration '%s' is already defined by user!",key); } @@ -926,37 +1004,56 @@ void ETag_surfxml_config(){ 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)); - - 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); - - 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; +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)); + + actor.argc = argc; + actor.argv = (const char **)argv; + actor.properties = current_property_set; + 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]); @@ -973,7 +1070,7 @@ void STag_surfxml_argument(){ } void STag_surfxml_model___prop(){ - if (!current_model_property_set) + if (not current_model_property_set) current_model_property_set = new std::map(); current_model_property_set->insert( @@ -1005,7 +1102,7 @@ void surf_parse_open(const char *file) xbt_free(dir); surf_file_to_parse = surf_fopen(file, "r"); - xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", file); + xbt_assert(surf_file_to_parse != nullptr, "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; @@ -1032,6 +1129,6 @@ static int _surf_parse() { return surf_parse_lex(); } -int_f_void_t surf_parse = _surf_parse; +int_f_void_t surf_parse = &_surf_parse; SG_END_DECL()