X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/900387d3c17ad331e7ce770590d07aca4be07c1d..571ed94e23c9aefbd5f81f1a800eb5f1dddd8ae9:/include/simgrid/s4u/engine.hpp?ds=sidebyside

diff --git a/include/simgrid/s4u/engine.hpp b/include/simgrid/s4u/engine.hpp
index da1d33ae3e..2c9fa3cd13 100644
--- a/include/simgrid/s4u/engine.hpp
+++ b/include/simgrid/s4u/engine.hpp
@@ -18,35 +18,39 @@ namespace s4u {
  */
 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 an actor 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 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 register_default(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();
-	
+  /** 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 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();
+private:
+  static s4u::Engine *instance_;
 };
 }} // namespace simgrid::sgo