X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/087d11a0d22c93b0d9289684ceca2a8ed1db7e89..1cce0801abcad7c884f9e72ceda87e36d6635104:/include/simgrid/s4u/engine.hpp

diff --git a/include/simgrid/s4u/engine.hpp b/include/simgrid/s4u/engine.hpp
index 7c2f9aff3c..e7b184c175 100644
--- a/include/simgrid/s4u/engine.hpp
+++ b/include/simgrid/s4u/engine.hpp
@@ -6,44 +6,85 @@
 #ifndef SIMGRID_S4U_ENGINE_HPP
 #define SIMGRID_S4U_ENGINE_HPP
 
+#include <xbt/base.h>
+#include <xbt/functional.hpp>
+
+#include <simgrid/simix.hpp>
+
+#include <simgrid/s4u/forward.hpp>
+
 namespace simgrid {
 namespace s4u {
 /** @brief Simulation engine
  *
  * This class is an interface to the simulation engine.
  */
-class Engine {
+XBT_PUBLIC_CLASS Engine {
 public:
-	/** Constructor, taking the command line parameters of your main function */
-	Engine(int *argc, char **argv);
-
-	/** @brief Load a platform file describing the environment
-	 *
-	 * The environment is either a XML file following the simgrid.dtd formalism, or a lua file.
-	 * Some examples can be found in the directory examples/platforms.
-	 */
-	void loadPlatform(const char *platf);
-
-	/** Registers the main function of a process that will be launched from the deployment file */
-	void register_function(const char*name, int (*code)(int,char**));
-
-	/** Registers a function as the default main function of processes
-	 *
-	 * It will be used as fallback when the function requested from the deployment file was not registered.
-	 * It is used for trace-based simulations (see examples/msg/actions).
-	 */
-	void register_default(int (*code)(int,char**));
-
-	/** @brief Load a deployment file and launch the processes that it contains */
-	void loadDeployment(const char *deploy);
-
-	/** @brief Run the simulation */
-	void run();
-
-	/** @brief Retrieve the simulation time */
-	static double getClock();
-	
+  /** 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.
+   * Some examples can be found in the directory examples/platforms.
+   */
+  void loadPlatform(const char *platf);
+
+  /** Registers the main function of an actor that will be launched from the deployment file */
+  void registerFunction(const char*name, int (*code)(int,char**));
+
+  /** Registers a function as the default main function of actors
+   *
+   * It will be used as fallback when the function requested from the deployment file was not registered.
+   * It is used for trace-based simulations (see examples/msg/actions).
+   */
+  void registerDefault(int (*code)(int,char**));
+
+  /** @brief Load a deployment file and launch the actors that it contains */
+  void loadDeployment(const char *deploy);
+
+  /** @brief Run the simulation */
+  void run();
+
+  /** @brief Retrieve the simulation time */
+  static double getClock();
+  
+  /** @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);
+
+  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));
+      });
+    });
+  }
+
+private:
+  static s4u::Engine *instance_;
 };
-}} // namespace simgrid::sgo
+}} // namespace simgrid::s4u
 
 #endif /* SIMGRID_S4U_ENGINE_HPP */