try to make Engine::on_config_in_platform_done() useless my better placing 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 91c0d5a..be0c93d 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;
 
@@ -389,11 +390,9 @@ void STag_surfxml_platform() {
                              "The most recent formalism that this version of SimGrid understands is v4.1.\n"
                              "Please update your code, or use another, more adapted, file.",
              surf_parsed_filename, version);
-
-  sg_platf_begin();
 }
 void ETag_surfxml_platform(){
-  sg_platf_end();
+  simgrid::s4u::on_platform_created();
 }
 
 void STag_surfxml_host(){
@@ -405,7 +404,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 {
@@ -530,12 +529,10 @@ void ETag_surfxml_cluster(){
 
 void STag_surfxml_cluster(){
   ZONE_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)");
 }
 
 void STag_surfxml_cabinet(){
-  parse_after_config();
   simgrid::kernel::routing::CabinetCreationArgs cabinet;
   cabinet.id      = A_surfxml_cabinet_id;
   cabinet.prefix  = A_surfxml_cabinet_prefix;
@@ -549,7 +546,6 @@ void STag_surfxml_cabinet(){
 }
 
 void STag_surfxml_peer(){
-  parse_after_config();
   simgrid::kernel::routing::PeerCreationArgs peer;
 
   peer.id          = std::string(A_surfxml_peer_id);
@@ -792,7 +788,6 @@ void ETag_surfxml_trace(){
 
 void STag_surfxml_trace___connect()
 {
-  parse_after_config();
   simgrid::kernel::routing::TraceConnectCreationArgs trace_connect;
 
   trace_connect.element = A_surfxml_trace___connect_element;
@@ -836,7 +831,6 @@ void ETag_surfxml_AS()
 
 void STag_surfxml_zone()
 {
-  parse_after_config();
   ZONE_TAG                 = 1;
   simgrid::kernel::routing::ZoneCreationArgs zone;
   zone.id      = A_surfxml_zone_id;
@@ -946,7 +940,9 @@ void ETag_surfxml_prop(){/* Nothing to do */}
 void STag_surfxml_random(){/* Nothing to do */}
 void ETag_surfxml_random(){/* Nothing to do */}
 void ETag_surfxml_trace___connect(){/* Nothing to do */}
-void STag_surfxml_trace(){parse_after_config();}
+void STag_surfxml_trace()
+{ /* Nothing to do */
+}
 void ETag_surfxml_router(){/*Nothing to do*/}
 void ETag_surfxml_host___link(){/* Nothing to do */}
 void ETag_surfxml_cabinet(){/* Nothing to do */}