snake_case and cleanup some more methods of s4u::Engine

[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 db18b63..339cf0a 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -58,13 +58,14 @@ void surf_parse_assert_netpoint(std::string hostname, std::string pre, std::stri
 
   std::string msg = pre + hostname + post + " Existing netpoints: \n";
 
-  std::vector<simgrid::kernel::routing::NetPoint*> list;
-  simgrid::s4u::Engine::getInstance()->getNetpointList(&list);
-  std::sort(list.begin(), list.end(), [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) {
-    return a->get_name() < b->get_name();
-  });
+  std::vector<simgrid::kernel::routing::NetPoint*> netpoints =
+      simgrid::s4u::Engine::get_instance()->get_all_netpoints();
+  std::sort(netpoints.begin(), netpoints.end(),
+            [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) {
+              return a->get_name() < b->get_name();
+            });
   bool first = true;
-  for (auto const& np : list) {
+  for (auto const& np : netpoints) {
     if (np->is_netzone())
       continue;
 
@@ -405,7 +406,7 @@ void STag_surfxml_prop()
 {
   if (ZONE_TAG) { // We need to retrieve the most recently opened zone
     XBT_DEBUG("Set zone property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value);
-    simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::getInstance()->getNetzoneByNameOrNull(A_surfxml_zone_id);
+    simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::get_instance()->getNetzoneByNameOrNull(A_surfxml_zone_id);
 
     netzone->setProperty(A_surfxml_prop_id, A_surfxml_prop_value);
   } else {
@@ -497,17 +498,17 @@ void ETag_surfxml_cluster(){
 
   switch (AX_surfxml_cluster_sharing___policy) {
   case A_surfxml_cluster_sharing___policy_SHARED:
-    cluster.sharing_policy = SURF_LINK_SHARED;
+    cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::SHARED;
     break;
   case A_surfxml_cluster_sharing___policy_FULLDUPLEX:
     XBT_WARN("FULLDUPLEX is now deprecated. Please update your platform file to use SPLITDUPLEX instead.");
-    cluster.sharing_policy = SURF_LINK_SPLITDUPLEX;
+    cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
     break;
   case A_surfxml_cluster_sharing___policy_SPLITDUPLEX:
-    cluster.sharing_policy = SURF_LINK_SPLITDUPLEX;
+    cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
     break;
   case A_surfxml_cluster_sharing___policy_FATPIPE:
-    cluster.sharing_policy = SURF_LINK_FATPIPE;
+    cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
     break;
   default:
     surf_parse_error(std::string("Invalid cluster sharing policy for cluster ") + cluster.id);
@@ -515,10 +516,10 @@ void ETag_surfxml_cluster(){
   }
   switch (AX_surfxml_cluster_bb___sharing___policy) {
   case A_surfxml_cluster_bb___sharing___policy_FATPIPE:
-    cluster.bb_sharing_policy = SURF_LINK_FATPIPE;
+    cluster.bb_sharing_policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
     break;
   case A_surfxml_cluster_bb___sharing___policy_SHARED:
-    cluster.bb_sharing_policy = SURF_LINK_SHARED;
+    cluster.bb_sharing_policy = simgrid::s4u::Link::SharingPolicy::SHARED;
     break;
   default:
     surf_parse_error(std::string("Invalid bb sharing policy in cluster ") + cluster.id);
@@ -587,17 +588,17 @@ void ETag_surfxml_link(){
 
   switch (A_surfxml_link_sharing___policy) {
   case A_surfxml_link_sharing___policy_SHARED:
-    link.policy = SURF_LINK_SHARED;
+    link.policy = simgrid::s4u::Link::SharingPolicy::SHARED;
     break;
   case A_surfxml_link_sharing___policy_FATPIPE:
-     link.policy = SURF_LINK_FATPIPE;
-     break;
+    link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
+    break;
   case A_surfxml_link_sharing___policy_FULLDUPLEX:
     XBT_WARN("FULLDUPLEX is now deprecated. Please update your platform file to use SPLITDUPLEX instead.");
-    link.policy = SURF_LINK_SPLITDUPLEX;
+    link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
     break;
   case A_surfxml_link_sharing___policy_SPLITDUPLEX:
-    link.policy = SURF_LINK_SPLITDUPLEX;
+    link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
     break;
   default:
     surf_parse_error(std::string("Invalid sharing policy in link ") + link.id);
@@ -648,7 +649,7 @@ void ETag_surfxml_backbone(){
   link.id = std::string(A_surfxml_backbone_id);
   link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id.c_str());
   link.latency = surf_parse_get_time(A_surfxml_backbone_latency, "latency of backbone", link.id.c_str());
-  link.policy = SURF_LINK_SHARED;
+  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));
@@ -865,9 +866,9 @@ void STag_surfxml_config()
 void ETag_surfxml_config()
 {
   for (auto const& elm : *current_property_set) {
-    if (xbt_cfg_is_default_value(elm.first.c_str())) {
+    if (simgrid::config::is_default(elm.first.c_str())) {
       std::string cfg = elm.first + ":" + elm.second;
-      xbt_cfg_set_parse(cfg.c_str());
+      simgrid::config::set_parse(std::move(cfg));
     } else
       XBT_INFO("The custom configuration '%s' is already defined by user!", elm.first.c_str());
   }