X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2dacf5b5e81474fb89d8234b907f6f61b623983e..571ed94e23c9aefbd5f81f1a800eb5f1dddd8ae9:/src/s4u/s4u_engine.cpp

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index dc22416387..ce3cc47f76 100644
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -12,32 +12,44 @@
 XBT_LOG_NEW_CATEGORY(s4u,"Log channels of the S4U (Simgrid for you) interface");
 using namespace simgrid;
 
-double s4u::Engine::getClock() {
-	return SIMIX_get_clock();
-}
+s4u::Engine *s4u::Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
+
 
 s4u::Engine::Engine(int *argc, char **argv) {
-	SIMIX_global_init(argc, argv);
+  xbt_assert(s4u::Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine");
+  s4u::Engine::instance_ = this;
+
+  SIMIX_global_init(argc, argv);
+}
+
+s4u::Engine *s4u::Engine::instance() {
+  if (s4u::Engine::instance_ == nullptr)
+    new Engine(0,nullptr);
+  return s4u::Engine::instance_;
+}
+
+double s4u::Engine::getClock() {
+  return SIMIX_get_clock();
 }
 
 void s4u::Engine::loadPlatform(const char *platf) {
-	SIMIX_create_environment(platf);
+  SIMIX_create_environment(platf);
 }
 
-void s4u::Engine::register_function(const char*name, int (*code)(int,char**)) {
-	SIMIX_function_register(name,code);
+void s4u::Engine::registerFunction(const char*name, int (*code)(int,char**)) {
+  SIMIX_function_register(name,code);
 }
-void s4u::Engine::register_default(int (*code)(int,char**)) {
-	SIMIX_function_register_default(code);
+void s4u::Engine::registerDefault(int (*code)(int,char**)) {
+  SIMIX_function_register_default(code);
 }
 void s4u::Engine::loadDeployment(const char *deploy) {
-	SIMIX_launch_application(deploy);
+  SIMIX_launch_application(deploy);
 }
 
 void s4u::Engine::run() {
-	if (MC_is_active()) {
-		MC_run();
-	} else {
-		SIMIX_run();
-	}
+  if (MC_is_active()) {
+    MC_run();
+  } else {
+    SIMIX_run();
+  }
 }