X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d469f50b8c4288a559b6e1c561b1c0e6efbec864..49f13b7915f6632e0a99d1b916b700049094a59d:/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 e426c40063..dc6f7a8ca8 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -28,7 +28,7 @@ int ETag_surfxml_include_state(); char* surf_parsed_filename = nullptr; // to locate parse error messages -xbt_dynar_t parsed_link_list = nullptr; /* 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 */ @@ -88,14 +88,12 @@ 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) + const char *entity_kind, const char *name, const char *error_msg, const char *default_unit) { char* ptr; - double res; int i; errno = 0; - res = strtod(string, &ptr); + double res = strtod(string, &ptr); if (errno == ERANGE) surf_parse_error("value out of range: %s", string); if (ptr == string) @@ -107,8 +105,8 @@ static double surf_parse_get_value_with_unit(const char *string, const struct un XBT_WARN("Deprecated unit-less value '%s' for %s %s. %s",string, entity_kind, name, error_msg); ptr = (char*)default_unit; } - for (i = 0; units[i].unit != nullptr && strcmp(ptr, units[i].unit) != 0; i++) { - } + for (i = 0; units[i].unit != nullptr && strcmp(ptr, units[i].unit) != 0; i++); + if (units[i].unit != nullptr) res *= units[i].scale; else @@ -672,9 +670,9 @@ void STag_surfxml_link___ctn(){ break; } - // FIXME we should push the surf link object but it don't - // work because of model rulebased - xbt_dynar_push(parsed_link_list, &link_id); + // FIXME we should push the surf link object but it doesn't work because of model rulebased + // Rule-based routing doesnt' exist anymore, does it? + parsed_link_list.push_back(link_id); } void ETag_surfxml_backbone(){ @@ -696,7 +694,6 @@ void STag_surfxml_route(){ "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); - parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } void STag_surfxml_ASroute(){ @@ -709,8 +706,6 @@ void STag_surfxml_ASroute(){ "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); - - parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } void STag_surfxml_bypassRoute(){ @@ -718,8 +713,6 @@ void STag_surfxml_bypassRoute(){ "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); - - parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } void STag_surfxml_bypassASroute(){ @@ -731,15 +724,12 @@ void STag_surfxml_bypassASroute(){ "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); - - parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } 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.gw_src = nullptr; @@ -747,16 +737,14 @@ void ETag_surfxml_route(){ route.link_list = new std::vector(); route.symmetrical = (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES); - unsigned int cpt; - char *link_name; - xbt_dynar_foreach(parsed_link_list, cpt, link_name) { + for (auto link_name: parsed_link_list) { simgrid::surf::Link *link = Link::byName(link_name); route.link_list->push_back(link); } + parsed_link_list.clear(); sg_platf_new_route(&route); delete route.link_list; - xbt_dynar_free(&parsed_link_list); } void ETag_surfxml_ASroute(){ @@ -771,13 +759,11 @@ void ETag_surfxml_ASroute(){ ASroute.link_list = new std::vector(); - unsigned int cpt; - char *link_name; - xbt_dynar_foreach(parsed_link_list, cpt, link_name) { + for (auto link_name: parsed_link_list) { simgrid::surf::Link *link = Link::byName(link_name); ASroute.link_list->push_back(link); } - xbt_dynar_free(&parsed_link_list); + parsed_link_list.clear(); switch (A_surfxml_ASroute_symmetrical) { case AU_surfxml_ASroute_symmetrical: @@ -804,13 +790,11 @@ void ETag_surfxml_bypassRoute(){ route.symmetrical = false; route.link_list = new std::vector(); - unsigned int cpt; - char *link_name; - xbt_dynar_foreach(parsed_link_list, cpt, link_name) { + for (auto link_name: parsed_link_list) { simgrid::surf::Link *link = Link::byName(link_name); route.link_list->push_back(link); } - xbt_dynar_free(&parsed_link_list); + parsed_link_list.clear(); sg_platf_new_bypassRoute(&route); } @@ -822,13 +806,12 @@ void ETag_surfxml_bypassASroute(){ 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(); - unsigned int cpt; - char *link_name; - xbt_dynar_foreach(parsed_link_list, cpt, link_name) { + for (auto link_name: parsed_link_list) { simgrid::surf::Link *link = Link::byName(link_name); ASroute.link_list->push_back(link); } - xbt_dynar_free(&parsed_link_list); + parsed_link_list.clear(); + ASroute.symmetrical = false; ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src); @@ -982,23 +965,21 @@ void STag_surfxml_model___prop(){ xbt_dict_set(current_model_property_set, A_surfxml_model___prop_id, xbt_strdup(A_surfxml_model___prop_value), nullptr); } -/* nothing to do in those functions */ -void ETag_surfxml_prop(){} -void STag_surfxml_random(){} -void ETag_surfxml_random(){} -void ETag_surfxml_trace___connect(){} +void ETag_surfxml_prop(){/* Nothing to do */} +void STag_surfxml_random(){/* Nothing to do */} +void ETag_surfxml_random(){/* Nothing to do */} +void ETag_surfxml_trace___connect(){/* Nothing to do */} void STag_surfxml_trace(){parse_after_config();} -void ETag_surfxml_router(){} -void ETag_surfxml_host___link(){} -void ETag_surfxml_cabinet(){} -void ETag_surfxml_peer(){} -void STag_surfxml_backbone(){} -void ETag_surfxml_link___ctn(){} -void ETag_surfxml_argument(){} -void ETag_surfxml_model___prop(){} +void ETag_surfxml_router(){/*Nothing to do*/} +void ETag_surfxml_host___link(){/* Nothing to do */} +void ETag_surfxml_cabinet(){/* Nothing to do */} +void ETag_surfxml_peer(){/* Nothing to do */} +void STag_surfxml_backbone(){/* Nothing to do */} +void ETag_surfxml_link___ctn(){/* Nothing to do */} +void ETag_surfxml_argument(){/* Nothing to do */} +void ETag_surfxml_model___prop(){/* Nothing to do */} /* Open and Close parse file */ - void surf_parse_open(const char *file) { xbt_assert(file, "Cannot parse the nullptr file. Bypassing the parser is strongly deprecated nowadays."); @@ -1044,20 +1025,17 @@ 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() { return surf_parse_lex(); } -int_f_void_t surf_parse = _surf_parse; - -/* Prop tag functions */ +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); } -