Merge branch 'master' of https://framagit.org/simgrid/simgrid

[simgrid.git] / src / surf / sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index db9026a2e5c0c7544e326f34b840303fe5a567a8..9f2a19868532d3cdfcc25bf6ca5753e140abe95c 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -29,7 +29,7 @@
 #include <algorithm>
 #include <string>
 
 #include <algorithm>
 #include <string>
 

-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(platf_parse);

 
 namespace simgrid::kernel::routing {
 xbt::signal<void(ClusterCreationArgs const&)> on_cluster_creation;
 
 namespace simgrid::kernel::routing {
 xbt::signal<void(ClusterCreationArgs const&)> on_cluster_creation;


@@ -42,14 +42,8 @@ static simgrid::kernel::routing::ClusterZoneCreationArgs
 static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr;
 static simgrid::s4u::Host* current_host = nullptr;
 
 static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr;
 static simgrid::s4u::Host* current_host = nullptr;
 

-/** Module management function: creates all internal data structures */
-void sg_platf_init()
-{
-  // Do nothing: just for symmetry of user code
-}
-

 /** Module management function: frees all internal data structures */
 /** Module management function: frees all internal data structures */

-void sg_platf_exit()
+void sg_platf_parser_finalize()

 {
   simgrid::kernel::routing::on_cluster_creation.disconnect_slots();
 
 {
   simgrid::kernel::routing::on_cluster_creation.disconnect_slots();