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 ea98c47..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 {
@@ -867,7 +868,7 @@ 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;
-      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());
   }