move context_mod_init to EngineImpl

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 30a790f..d79c21f 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -173,6 +173,8 @@ void EngineImpl::initialize(int* argc, char** argv)
 
   surf_init(argc, argv); /* Initialize SURF structures */
 
+  instance_->context_mod_init();
+
   /* Prepare to display some more info when dying on Ctrl-C pressing */
   std::signal(SIGINT, inthandler);
 

diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp
index a7affcf..1676986 100644 (file)
--- a/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@ -112,6 +112,7 @@ public:
     context_factory_ = nullptr;
   }
 
+  void context_mod_init();
   /**
    * @brief Add a model to engine list
    *

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index b467843..30dd591 100644 (file)
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -107,5 +107,4 @@ XBT_PRIVATE ContextFactory* boost_factory();
 } // namespace kernel
 } // namespace simgrid
 
-XBT_PRIVATE void SIMIX_context_mod_init();
 #endif

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index 4d9f6ea..a2c02ac 100644 (file)
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -53,65 +53,6 @@ unsigned smx_context_guard_size;
 static int smx_parallel_contexts = 1;
 static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_DEFAULT;
 
-/**
- * This function is called by SIMIX_global_init() to initialize the context module.
- */
-void SIMIX_context_mod_init()
-{
-  auto* engine = simgrid::kernel::EngineImpl::get_instance();
-  xbt_assert(not engine->has_context_factory());
-
-#if HAVE_SMPI && (defined(__APPLE__) || defined(__NetBSD__))
-  smpi_init_options_internal(false);
-  std::string priv = simgrid::config::get_value<std::string>("smpi/privatization");
-  if (context_factory_name == "thread" && (priv == "dlopen" || priv == "yes" || priv == "default" || priv == "1")) {
-    XBT_WARN("dlopen+thread broken on Apple and BSD. Switching to raw contexts.");
-    context_factory_name = "raw";
-  }
-#endif
-
-#if HAVE_SMPI && defined(__FreeBSD__)
-  smpi_init_options_internal(false);
-  if (context_factory_name == "thread" && simgrid::config::get_value<std::string>("smpi/privatization") != "no") {
-    XBT_WARN("mmap broken on FreeBSD, but dlopen+thread broken too. Switching to dlopen+raw contexts.");
-    context_factory_name = "raw";
-  }
-#endif
-
-  /* select the context factory to use to create the contexts */
-  if (simgrid::kernel::context::factory_initializer != nullptr) { // Give Java a chance to hijack the factory mechanism
-    engine->set_context_factory(simgrid::kernel::context::factory_initializer());
-    return;
-  }
-  /* use the factory specified by --cfg=contexts/factory:value */
-  for (auto const& factory : context_factories)
-    if (context_factory_name == factory.first) {
-      engine->set_context_factory(factory.second());
-      break;
-    }
-
-  if (not engine->has_context_factory()) {
-    XBT_ERROR("Invalid context factory specified. Valid factories on this machine:");
-#if HAVE_RAW_CONTEXTS
-    XBT_ERROR("  raw: high performance context factory implemented specifically for SimGrid");
-#else
-    XBT_ERROR("  (raw contexts were disabled at compilation time on this machine -- check configure logs for details)");
-#endif
-#if HAVE_UCONTEXT_CONTEXTS
-    XBT_ERROR("  ucontext: classical system V contexts (implemented with makecontext, swapcontext and friends)");
-#else
-    XBT_ERROR("  (ucontext was disabled at compilation time on this machine -- check configure logs for details)");
-#endif
-#if HAVE_BOOST_CONTEXTS
-    XBT_ERROR("  boost: this uses the boost libraries context implementation");
-#else
-    XBT_ERROR("  (boost was disabled at compilation time on this machine -- check configure logs for details. Did you install the libboost-context-dev package?)");
-#endif
-    XBT_ERROR("  thread: slow portability layer using pthreads as provided by gcc");
-    xbt_die("Please use a valid factory.");
-  }
-}
-
 /** @brief Returns whether some parallel threads are used for the user contexts. */
 int SIMIX_context_is_parallel() {
   return smx_parallel_contexts > 1;
@@ -160,3 +101,64 @@ e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode() {
 void SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode) {
   smx_parallel_synchronization_mode = mode;
 }
+
+namespace simgrid {
+namespace kernel {
+
+void EngineImpl::context_mod_init()
+{
+  xbt_assert(not instance_->has_context_factory());
+
+#if HAVE_SMPI && (defined(__APPLE__) || defined(__NetBSD__))
+  smpi_init_options_internal(false);
+  std::string priv = config::get_value<std::string>("smpi/privatization");
+  if (context_factory_name == "thread" && (priv == "dlopen" || priv == "yes" || priv == "default" || priv == "1")) {
+    XBT_WARN("dlopen+thread broken on Apple and BSD. Switching to raw contexts.");
+    context_factory_name = "raw";
+  }
+#endif
+
+#if HAVE_SMPI && defined(__FreeBSD__)
+  smpi_init_options_internal(false);
+  if (context_factory_name == "thread" && config::get_value<std::string>("smpi/privatization") != "no") {
+    XBT_WARN("mmap broken on FreeBSD, but dlopen+thread broken too. Switching to dlopen+raw contexts.");
+    context_factory_name = "raw";
+  }
+#endif
+
+  /* select the context factory to use to create the contexts */
+  if (context::factory_initializer != nullptr) { // Give Java a chance to hijack the factory mechanism
+    instance_->set_context_factory(context::factory_initializer());
+    return;
+  }
+  /* use the factory specified by --cfg=contexts/factory:value */
+  for (auto const& factory : context_factories)
+    if (context_factory_name == factory.first) {
+      instance_->set_context_factory(factory.second());
+      break;
+    }
+
+  if (not instance_->has_context_factory()) {
+    XBT_ERROR("Invalid context factory specified. Valid factories on this machine:");
+#if HAVE_RAW_CONTEXTS
+    XBT_ERROR("  raw: high performance context factory implemented specifically for SimGrid");
+#else
+    XBT_ERROR("  (raw contexts were disabled at compilation time on this machine -- check configure logs for details)");
+#endif
+#if HAVE_UCONTEXT_CONTEXTS
+    XBT_ERROR("  ucontext: classical system V contexts (implemented with makecontext, swapcontext and friends)");
+#else
+    XBT_ERROR("  (ucontext was disabled at compilation time on this machine -- check configure logs for details)");
+#endif
+#if HAVE_BOOST_CONTEXTS
+    XBT_ERROR("  boost: this uses the boost libraries context implementation");
+#else
+    XBT_ERROR("  (boost was disabled at compilation time on this machine -- check configure logs for details. Did you "
+              "install the libboost-context-dev package?)");
+#endif
+    XBT_ERROR("  thread: slow portability layer using pthreads as provided by gcc");
+    xbt_die("Please use a valid factory.");
+  }
+}
+} // namespace kernel
+} // namespace simgrid

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 25b7577..1904af4 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -59,8 +59,6 @@ void SIMIX_set_maestro(void (*code)(void*), void* data)
 void SIMIX_global_init(int* argc, char** argv)
 {
 
-  SIMIX_context_mod_init();
-
   // Either create a new context with maestro or create
   // a context object with the current context maestro):
   simgrid::kernel::actor::create_maestro(maestro_code);