use unordered_maps to store properties

[simgrid.git] / 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 7719224..ebc12b7 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -266,8 +266,8 @@ static std::vector<double> surf_parse_get_all_speeds(char* speeds, const char* e
 /* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */
 
 /* The default current property receiver. Setup in the corresponding opening callbacks. */
-std::map<std::string, std::string>* current_property_set       = nullptr;
-std::map<std::string, std::string>* current_model_property_set = nullptr;
+std::unordered_map<std::string, std::string>* current_property_set       = nullptr;
+std::unordered_map<std::string, std::string>* current_model_property_set = nullptr;
 int ZONE_TAG                            = 0; // Whether we just opened a zone tag (to see what to do with the properties)
 
 FILE *surf_file_to_parse = nullptr;
@@ -406,10 +406,10 @@ void STag_surfxml_prop()
     XBT_DEBUG("Set zone property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value);
     simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::get_instance()->netzone_by_name_or_null(A_surfxml_zone_id);
 
-    netzone->setProperty(A_surfxml_prop_id, A_surfxml_prop_value);
+    netzone->set_property(A_surfxml_prop_id, A_surfxml_prop_value);
   } else {
     if (not current_property_set)
-      current_property_set = new std::map<std::string, std::string>; // Maybe, it should raise an error
+      current_property_set = new std::unordered_map<std::string, std::string>; // Maybe, it should raise an error
     current_property_set->insert({A_surfxml_prop_id, A_surfxml_prop_value});
     XBT_DEBUG("add prop %s=%s into current property set %p", A_surfxml_prop_id, A_surfxml_prop_value,
               current_property_set);
@@ -609,13 +609,13 @@ void STag_surfxml_link___ctn()
   switch (A_surfxml_link___ctn_direction) {
   case AU_surfxml_link___ctn_direction:
   case A_surfxml_link___ctn_direction_NONE:
-    link = simgrid::kernel::resource::LinkImpl::byName(A_surfxml_link___ctn_id);
+    link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id))->get_impl();
     break;
   case A_surfxml_link___ctn_direction_UP:
-    link = simgrid::kernel::resource::LinkImpl::byName(std::string(A_surfxml_link___ctn_id) + "_UP");
+    link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id) + "_UP")->get_impl();
     break;
   case A_surfxml_link___ctn_direction_DOWN:
-    link = simgrid::kernel::resource::LinkImpl::byName(std::string(A_surfxml_link___ctn_id) + "_DOWN");
+    link = simgrid::s4u::Link::by_name(std::string(A_surfxml_link___ctn_id) + "_DOWN")->get_impl();
     break;
   default:
     surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id);
@@ -647,7 +647,7 @@ void ETag_surfxml_backbone(){
   link.policy     = simgrid::s4u::Link::SharingPolicy::SHARED;
 
   sg_platf_new_link(&link);
-  routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl::byName(A_surfxml_backbone_id));
+  routing_cluster_add_backbone(simgrid::s4u::Link::by_name(std::string(A_surfxml_backbone_id))->get_impl());
 }
 
 void STag_surfxml_route(){
@@ -858,12 +858,19 @@ void STag_surfxml_config()
 
 void ETag_surfxml_config()
 {
-  for (auto const& elm : *current_property_set) {
-    if (simgrid::config::is_default(elm.first.c_str())) {
-      std::string cfg = elm.first + ":" + elm.second;
+  // Sort config elements before applying.
+  // That's a little waste of time, but not doing so would break the tests
+  std::vector<std::string> keys;
+  for (auto const& kv : *current_property_set) {
+    keys.push_back(kv.first);
+  }
+  std::sort(keys.begin(), keys.end());
+  for (std::string key : keys) {
+    if (simgrid::config::is_default(key.c_str())) {
+      std::string cfg = key + ":" + current_property_set->at(key);
       simgrid::config::set_parse(std::move(cfg));
     } else
-      XBT_INFO("The custom configuration '%s' is already defined by user!", elm.first.c_str());
+      XBT_INFO("The custom configuration '%s' is already defined by user!", key.c_str());
   }
   XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
 
@@ -931,7 +938,7 @@ void STag_surfxml_argument(){
 
 void STag_surfxml_model___prop(){
   if (not current_model_property_set)
-    current_model_property_set = new std::map<std::string, std::string>();
+    current_model_property_set = new std::unordered_map<std::string, std::string>();
 
   current_model_property_set->insert({A_surfxml_model___prop_id, A_surfxml_model___prop_value});
 }