new function: Engine::netcardList()

[simgrid.git] / include / simgrid / s4u / engine.hpp

diff --git a/include/simgrid/s4u/engine.hpp b/include/simgrid/s4u/engine.hpp
index 046eea7..62b4164 100644 (file)
--- a/include/simgrid/s4u/engine.hpp
+++ b/include/simgrid/s4u/engine.hpp
@@ -6,17 +6,30 @@
 #ifndef SIMGRID_S4U_ENGINE_HPP
 #define SIMGRID_S4U_ENGINE_HPP
 
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <xbt/base.h>
+#include <xbt/functional.hpp>
+
+#include <simgrid/simix.hpp>
 
 #include <simgrid/s4u/forward.hpp>
 
 namespace simgrid {
+namespace kernel {
+class EngineImpl;
+}
 namespace s4u {
 /** @brief Simulation engine
  *
  * This class is an interface to the simulation engine.
  */
 XBT_PUBLIC_CLASS Engine {
+private:
+  ~Engine();
+
 public:
   /** Constructor, taking the command line parameters of your main function */
   Engine(int *argc, char **argv);
@@ -53,13 +66,41 @@ public:
   /** @brief Retrieve the engine singleton */
   static s4u::Engine *instance();
 
-  /** @brief Retrieve the root AS, containing all others */
-  simgrid::s4u::As *rootAs();
-  /** @brief Retrieve the AS of the given name (or nullptr if not found) */
-  simgrid::s4u::As *asByNameOrNull(const char *name);
+  /** @brief Retrieve the root netzone, containing all others */
+  simgrid::s4u::NetZone* netRoot();
+
+  /** @brief Retrieve the netzone of the given name (or nullptr if not found) */
+  simgrid::s4u::NetZone* netzoneByNameOrNull(const char* name);
+
+  /** @brief Retrieve the netcard of the given name (or nullptr if not found) */
+  simgrid::kernel::routing::NetCard* netcardByNameOrNull(const char* name);
+  void netcardList(std::vector<simgrid::kernel::routing::NetCard*> * list);
+
+  template<class F>
+  void registerFunction(const char* name)
+  {
+    simgrid::simix::registerFunction(name, [](std::vector<std::string> args){
+      return simgrid::simix::ActorCode([args] {
+        F code(std::move(args));
+        code();
+      });
+    });
+  }
+
+  template<class F>
+  void registerFunction(const char* name, F code)
+  {
+    simgrid::simix::registerFunction(name, [code](std::vector<std::string> args){
+      return simgrid::simix::ActorCode([code,args] {
+        code(std::move(args));
+      });
+    });
+  }
+
+  simgrid::kernel::EngineImpl* pimpl;
 
 private:
-  static s4u::Engine *instance_ = nullptr;
+  static s4u::Engine *instance_;
 };
 }} // namespace simgrid::s4u