Restore public smpi_init_options().

[simgrid.git] / src / simix / smx_context.cpp

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index 1365a6a..2d40401 100644 (file)
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -1,51 +1,52 @@
 /* a fast and simple context switching library                              */
 
-/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/internal_config.h"
 #include "src/simix/smx_private.hpp"
-#include "smpi/smpi.h"
+#include "src/smpi/include/private.hpp"
 #include "xbt/config.hpp"
 
+#include <initializer_list>
 #include <thread>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, "Context switching mechanism");
 
-static std::pair<const char*, simgrid::kernel::context::ContextFactoryInitializer> context_factories[] = {
+constexpr std::initializer_list<std::pair<const char*, simgrid::kernel::context::ContextFactoryInitializer>>
+    context_factories = {
 #if HAVE_RAW_CONTEXTS
-  { "raw", &simgrid::kernel::context::raw_factory },
+        {"raw", &simgrid::kernel::context::raw_factory},
 #endif
 #if HAVE_UCONTEXT_CONTEXTS
-  { "ucontext", &simgrid::kernel::context::sysv_factory },
+        {"ucontext", &simgrid::kernel::context::sysv_factory},
 #endif
 #if HAVE_BOOST_CONTEXTS
-  { "boost", &simgrid::kernel::context::boost_factory },
+        {"boost", &simgrid::kernel::context::boost_factory},
 #endif
-  { "thread", &simgrid::kernel::context::thread_factory },
+        {"thread", &simgrid::kernel::context::thread_factory},
 };
 
-static_assert(sizeof(context_factories) != 0, "No context factories are enabled for this build");
+static_assert(context_factories.size() > 0, "No context factories are enabled for this build");
 
 // Create the list of possible contexts:
 static inline
 std::string contexts_list()
 {
   std::string res;
-  const std::size_t n = sizeof(context_factories) / sizeof(context_factories[0]);
-  for (std::size_t i = 1; i != n; ++i) {
-    res += ", ";
-    res += context_factories[i].first;
+  std::string sep = "";
+  for (auto const& factory : context_factories) {
+    res += sep + factory.first;
+    sep = ", ";
   }
   return res;
 }
 
-static simgrid::config::Flag<std::string> context_factory_name(
-  "contexts/factory",
-  (std::string("Possible values: ")+contexts_list()).c_str(),
-  context_factories[0].first);
+static simgrid::config::Flag<std::string>
+    context_factory_name("contexts/factory", (std::string("Possible values: ") + contexts_list()).c_str(),
+                         context_factories.begin()->first);
 
 unsigned smx_context_stack_size;
 unsigned smx_context_guard_size;
@@ -57,10 +58,10 @@ static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_DEFAUL
  */
 void SIMIX_context_mod_init()
 {
-  xbt_assert(simix_global->context_factory == nullptr);
+  xbt_assert(not simix_global->has_context_factory());
 
 #if HAVE_SMPI && (defined(__APPLE__) || defined(__NetBSD__))
-  smpi_init_options();
+  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.");
@@ -69,7 +70,7 @@ void SIMIX_context_mod_init()
 #endif
 
 #if HAVE_SMPI && defined(__FreeBSD__)
-  smpi_init_options();
+  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";
@@ -78,17 +79,17 @@ void SIMIX_context_mod_init()
 
   /* 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
-    simix_global->context_factory = simgrid::kernel::context::factory_initializer();
+    simix_global->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) {
-      simix_global->context_factory = factory.second();
+      simix_global->set_context_factory(factory.second());
       break;
     }
 
-  if (simix_global->context_factory == nullptr) {
+  if (not simix_global->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");
@@ -110,15 +111,6 @@ void SIMIX_context_mod_init()
   }
 }
 
-/**
- * This function is called by SIMIX_clean() to finalize the context module.
- */
-void SIMIX_context_mod_exit()
-{
-  delete simix_global->context_factory;
-  simix_global->context_factory = nullptr;
-}
-
 /** @brief Returns whether some parallel threads are used for the user contexts. */
 int SIMIX_context_is_parallel() {
   return smx_parallel_contexts > 1;