X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/564a883b3d816d2c5d227f5311d248ef799b5190..69b64311b67fddc105da16faded6fecec9db45d3:/include/simgrid/s4u/engine.hpp

diff --git a/include/simgrid/s4u/engine.hpp b/include/simgrid/s4u/engine.hpp
index 68d3de29af..413f7ef92e 100644
--- a/include/simgrid/s4u/engine.hpp
+++ b/include/simgrid/s4u/engine.hpp
@@ -6,21 +6,37 @@
 #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);
 
+  /** Finalize the default engine and all its dependencies */
+  static void shutdown();
+
   /** @brief Load a platform file describing the environment
    *
    * The environment is either a XML file following the simgrid.dtd formalism, or a lua file.
@@ -49,15 +65,55 @@ public:
   
   /** @brief Retrieve the engine singleton */
   static s4u::Engine *instance();
+
+  /** @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* netpointByNameOrNull(const char* name);
+  void netpointList(std::vector<simgrid::kernel::routing::NetPoint*> * list);
+  void netpointRegister(simgrid::kernel::routing::NetPoint * card);
+  void netpointUnregister(simgrid::kernel::routing::NetPoint * card);
+
+  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_;
-
-public:
-  /** @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);
 };
+
+/** Callback fired when the platform is created (ie, the xml file parsed),
+ * right before the actual simulation starts. */
+extern XBT_PRIVATE xbt::signal<void()> onPlatformCreated;
+
+/** Callback fired when the main simulation loop ends, just before MSG_run (or similar) ends */
+extern XBT_PRIVATE xbt::signal<void()> onSimulationEnd;
+
+/** Callback fired when the time jumps into the future */
+extern XBT_PRIVATE xbt::signal<void(double)> onTimeAdvance;
 }} // namespace simgrid::s4u
 
 #endif /* SIMGRID_S4U_ENGINE_HPP */