Rename NetCards to NetPoints

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

diff --git a/include/simgrid/s4u/engine.hpp b/include/simgrid/s4u/engine.hpp
index 07863e1..3caf268 100644 (file)
--- a/include/simgrid/s4u/engine.hpp
+++ b/include/simgrid/s4u/engine.hpp
@@ -6,6 +6,10 @@
 #ifndef SIMGRID_S4U_ENGINE_HPP
 #define SIMGRID_S4U_ENGINE_HPP
 
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <xbt/base.h>
 #include <xbt/functional.hpp>
 
@@ -14,12 +18,18 @@
 #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);
@@ -56,15 +66,22 @@ 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::NetPoint* netcardByNameOrNull(const char* name);
+  void netcardList(std::vector<simgrid::kernel::routing::NetPoint*> * list);
+  void netcardRegister(simgrid::kernel::routing::NetPoint * card);
+  void netcardUnregister(simgrid::kernel::routing::NetPoint * card);
 
   template<class F>
   void registerFunction(const char* name)
   {
-    simgrid::simix::registerFunction(name, [](simgrid::xbt::args args){
+    simgrid::simix::registerFunction(name, [](std::vector<std::string> args){
       return simgrid::simix::ActorCode([args] {
         F code(std::move(args));
         code();
@@ -75,13 +92,15 @@ public:
   template<class F>
   void registerFunction(const char* name, F code)
   {
-    simgrid::simix::registerFunction(name, [code](simgrid::xbt::args args){
+    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_;
 };