X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ddf6262b78ea331d365560f3c94270a97a6d7763..07c12189c716ea527ddcf8f8b55983213dead2bf:/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..47cf277f5e 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/NetPoint.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" @@ -274,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; @@ -387,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() @@ -459,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); } } @@ -531,19 +523,13 @@ 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; + cluster.properties = current_property_set; cluster.id = A_surfxml_cluster_id; cluster.prefix = A_surfxml_cluster_prefix; @@ -619,6 +605,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)"); } @@ -642,14 +629,17 @@ 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.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); } @@ -901,19 +891,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(); } @@ -1065,12 +1045,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); -}