EngineImpl::shutdown doesn't have to be static

[simgrid.git] / src / kernel / EngineImpl.hpp

diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp
index 1676986..63d2c44 100644 (file)
--- a/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@ -78,14 +78,14 @@ class EngineImpl {
   friend s4u::Engine;
 
 public:
-  explicit EngineImpl(int* argc, char** argv);
+  EngineImpl() = default;
 
   /* Currently, only one instance is allowed to exist. This is why you can't copy or move it */
 #ifndef DOXYGEN
   EngineImpl(const EngineImpl&) = delete;
   EngineImpl& operator=(const EngineImpl&) = delete;
   virtual ~EngineImpl();
-  static void shutdown();
+  void shutdown();
 #endif
 
   void initialize(int* argc, char** argv);
@@ -125,6 +125,7 @@ public:
   /** @brief Get list of all models managed by this engine */
   const std::vector<resource::Model*>& get_all_models() const { return models_; }
 
+  static bool has_instance() { return s4u::Engine::has_instance(); }
   static EngineImpl* get_instance() { return s4u::Engine::get_instance()->pimpl; }
   static EngineImpl* get_instance(int* argc, char** argv) { return s4u::Engine::get_instance(argc, argv)->pimpl; }
 
@@ -136,6 +137,9 @@ public:
     else
       return res->second;
   }
+
+  routing::NetZoneImpl* get_netzone_root() const { return netzone_root_; }
+
   void add_daemon(actor::ActorImpl* d) { daemons_.insert(d); }
   void remove_daemon(actor::ActorImpl* d);
   void add_actor_to_run_list(actor::ActorImpl* actor);