#include <math.h>
#include <stdarg.h> /* 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"
/* 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;
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);
}
}
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;
}
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)");
}
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);
}
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();
}
}
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);
-}