X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f45abd9a448a9196144cb2aa845cb966b741d562..e0b9996b2ae3c2311d0288c0946a9c6c5c912a7e:/src/simix/smx_context.cpp

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index 3a6a2245df..58516d8ba7 100644
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -1,56 +1,56 @@
 /* a fast and simple context switching library                              */
 
-/* Copyright (c) 2009-2018. 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 "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;
-int smx_context_stack_size_was_set = 0;
 unsigned smx_context_guard_size;
-int smx_context_guard_size_was_set = 0;
 static int smx_parallel_contexts = 1;
-static int smx_parallel_threshold = 2;
 static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_DEFAULT;
 
 /**
@@ -60,10 +60,8 @@ void SIMIX_context_mod_init()
 {
   xbt_assert(simix_global->context_factory == nullptr);
 
-  smx_context_stack_size_was_set = not simgrid::config::is_default("contexts/stack-size");
-  smx_context_guard_size_was_set = not simgrid::config::is_default("contexts/guard-size");
-
 #if HAVE_SMPI && (defined(__APPLE__) || defined(__NetBSD__))
+  smpi_init_options();
   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.");
@@ -72,6 +70,7 @@ void SIMIX_context_mod_init()
 #endif
 
 #if HAVE_SMPI && defined(__FreeBSD__)
+  smpi_init_options();
   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";
@@ -152,32 +151,6 @@ void SIMIX_context_set_nthreads(int nb_threads) {
   smx_parallel_contexts = nb_threads;
 }
 
-/**
- * @brief Returns the threshold above which user processes are run in parallel.
- *
- * If the number of threads is set to 1, there is no parallelism and this
- * threshold has no effect.
- *
- * @return when the number of user processes ready to run is above
- * this threshold, they are run in parallel
- */
-int SIMIX_context_get_parallel_threshold() {
-  return smx_parallel_threshold;
-}
-
-/**
- * @brief Sets the threshold above which user processes are run in parallel.
- *
- * If the number of threads is set to 1, there is no parallelism and this
- * threshold has no effect.
- *
- * @param threshold when the number of user processes ready to run is above
- * this threshold, they are run in parallel
- */
-void SIMIX_context_set_parallel_threshold(int threshold) {
-  smx_parallel_threshold = threshold;
-}
-
 /**
  * @brief Returns the synchronization mode used when processes are run in
  * parallel.