X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17ec0354e5b48f8b724d87b20828daa80bfe0bad..ddf6262b78ea331d365560f3c94270a97a6d7763:/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 e81955b2c4..b6d60750ce 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 */ @@ -81,6 +81,43 @@ int surf_parse_get_int(const char *string) { return res; } +/* 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) +{ + 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)) { + case 1: + end = start; + break; + case 2: + end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char*)); + break; + default: + surf_parse_error("Malformed radical: %s", groups); + break; + } + + for (int i = start; i <= end; i++) + exploded->push_back(i); + + xbt_dynar_free(&radical_ends); + } + xbt_dynar_free(&radical_elements); + + return exploded; +} + struct unit_scale { const char *unit; double scale; @@ -88,14 +125,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 +142,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 @@ -456,10 +491,9 @@ void ETag_surfxml_host() { buf = A_surfxml_host_speed; XBT_DEBUG("Buffer: %s", buf); - host.speed_per_pstate = new std::vector(); 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); + host.speed_per_pstate.push_back(speed); } else { xbt_dynar_t pstate_list = xbt_str_split(buf, ","); @@ -468,7 +502,7 @@ void ETag_surfxml_host() { 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); + host.speed_per_pstate.push_back(speed); XBT_DEBUG("Speed value: %f", speed); } xbt_dynar_free(&pstate_list); @@ -482,7 +516,6 @@ void ETag_surfxml_host() { host.coord = A_surfxml_host_coordinates; sg_platf_new_host(&host); - delete host.speed_per_pstate; current_property_set = nullptr; } @@ -515,7 +548,7 @@ void ETag_surfxml_cluster(){ cluster.id = A_surfxml_cluster_id; cluster.prefix = A_surfxml_cluster_prefix; cluster.suffix = A_surfxml_cluster_suffix; - cluster.radical = A_surfxml_cluster_radical; + cluster.radicals = explodesRadical(A_surfxml_cluster_radical); cluster.speed = surf_parse_get_speed(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); @@ -600,7 +633,7 @@ void STag_surfxml_cabinet(){ 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.radical = A_surfxml_cabinet_radical; + cabinet.radicals = explodesRadical(A_surfxml_cabinet_radical); sg_platf_new_cabinet(&cabinet); } @@ -660,23 +693,29 @@ void ETag_surfxml_link(){ void STag_surfxml_link___ctn(){ - char *link_id; + simgrid::surf::Link *link; + char *link_name=nullptr; switch (A_surfxml_link___ctn_direction) { case AU_surfxml_link___ctn_direction: case A_surfxml_link___ctn_direction_NONE: - link_id = xbt_strdup(A_surfxml_link___ctn_id); + link = Link::byName(A_surfxml_link___ctn_id); break; case A_surfxml_link___ctn_direction_UP: - link_id = bprintf("%s_UP", A_surfxml_link___ctn_id); + link_name = bprintf("%s_UP", A_surfxml_link___ctn_id); + link = Link::byName(link_name); break; case A_surfxml_link___ctn_direction_DOWN: - link_id = bprintf("%s_DOWN", A_surfxml_link___ctn_id); + link_name = bprintf("%s_DOWN", A_surfxml_link___ctn_id); + link = Link::byName(link_name); break; } + xbt_free(link_name); // no-op if it's already nullptr - // 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); + 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)": + "")); + parsed_link_list.push_back(link); } void ETag_surfxml_backbone(){ @@ -698,7 +737,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(){ @@ -711,8 +749,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(){ @@ -720,8 +756,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(){ @@ -733,15 +767,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; @@ -749,16 +780,12 @@ 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) { - simgrid::surf::Link *link = Link::byName(link_name); + for (auto link: parsed_link_list) 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(){ @@ -773,13 +800,9 @@ 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) { - simgrid::surf::Link *link = Link::byName(link_name); + for (auto link: parsed_link_list) 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: @@ -806,13 +829,9 @@ 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) { - simgrid::surf::Link *link = Link::byName(link_name); + for (auto link: parsed_link_list) route.link_list->push_back(link); - } - xbt_dynar_free(&parsed_link_list); + parsed_link_list.clear(); sg_platf_new_bypassRoute(&route); } @@ -824,13 +843,10 @@ 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) { - simgrid::surf::Link *link = Link::byName(link_name); + for (auto link: parsed_link_list) 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); @@ -984,23 +1000,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."); @@ -1046,20 +1060,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); } -