X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6fca326002116d4ae3f2c30cfcbc230dbd54d15f..da9e3460f9f8e4eb2ad4c523a19a8ddb79807e60:/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 f575f71bbc..8292cf740d 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -8,15 +8,17 @@ #include #include /* va_arg */ -#include "xbt/misc.h" +#include "simgrid/link.h" +#include "simgrid/s4u/engine.hpp" +#include "simgrid/sg_config.h" +#include "src/kernel/routing/NetCard.hpp" +#include "src/surf/network_interface.hpp" +#include "src/surf/surf_private.h" +#include "xbt/dict.h" +#include "xbt/file.h" #include "xbt/log.h" +#include "xbt/misc.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/sg_config.h" -#include "simgrid/link.h" #include "src/surf/xml/platf_private.hpp" @@ -28,7 +30,7 @@ int ETag_surfxml_include_state(); 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 */ @@ -81,6 +83,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; @@ -237,12 +276,7 @@ double surf_parse_get_speed(const char *string, const char *entity_kind, const c /* 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; - +int AS_TAG = 0; // Whether we just opened an AS tag (to see what to do with the properties) /* dictionary of random generator data */ xbt_dict_t random_data_list = nullptr; @@ -350,7 +384,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() @@ -422,23 +456,18 @@ void STag_surfxml_host(){ 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); + 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); + + netzone->setProperty(A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value)); } 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); + 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, + current_property_set); } } @@ -506,12 +535,12 @@ void STag_surfxml_router(){ void ETag_surfxml_cluster(){ s_sg_platf_cluster_cbarg_t cluster; memset(&cluster,0,sizeof(cluster)); - cluster.properties = as_current_property_set; + cluster.properties = current_property_set; 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); @@ -582,6 +611,7 @@ void ETag_surfxml_cluster(){ } void STag_surfxml_cluster(){ + AS_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)"); } @@ -596,7 +626,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); } @@ -605,14 +635,14 @@ 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; + 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.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; sg_platf_new_peer(&peer); } @@ -656,23 +686,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 doesn't work because of model rulebased - // Rule-based routing doesnt' exist anymore, does it? - parsed_link_list.push_back(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(){ @@ -737,11 +773,8 @@ void ETag_surfxml_route(){ route.link_list = new std::vector(); route.symmetrical = (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES); - for (auto link_name: parsed_link_list) { - simgrid::surf::Link *link = Link::byName(link_name); + for (auto link: parsed_link_list) route.link_list->push_back(link); - xbt_free(link_name); - } parsed_link_list.clear(); sg_platf_new_route(&route); @@ -760,11 +793,8 @@ void ETag_surfxml_ASroute(){ ASroute.link_list = new std::vector(); - for (auto link_name: parsed_link_list) { - simgrid::surf::Link *link = Link::byName(link_name); + for (auto link: parsed_link_list) ASroute.link_list->push_back(link); - xbt_free(link_name); - } parsed_link_list.clear(); switch (A_surfxml_ASroute_symmetrical) { @@ -792,11 +822,8 @@ void ETag_surfxml_bypassRoute(){ route.symmetrical = false; route.link_list = new std::vector(); - for (auto link_name: parsed_link_list) { - simgrid::surf::Link *link = Link::byName(link_name); + for (auto link: parsed_link_list) route.link_list->push_back(link); - xbt_free(link_name); - } parsed_link_list.clear(); sg_platf_new_bypassRoute(&route); @@ -809,11 +836,8 @@ 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(); - for (auto link_name: parsed_link_list) { - simgrid::surf::Link *link = Link::byName(link_name); + for (auto link: parsed_link_list) ASroute.link_list->push_back(link); - xbt_free(link_name); - } parsed_link_list.clear(); ASroute.symmetrical = false; @@ -870,19 +894,9 @@ void STag_surfxml_AS(){ AS_TAG = 1; s_sg_platf_AS_cbarg_t AS = { A_surfxml_AS_id, (int)A_surfxml_AS_routing}; - as_current_property_set = nullptr; - sg_platf_new_AS_begin(&AS); } 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(); } @@ -1034,12 +1048,3 @@ static int _surf_parse() { } 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); -}