...

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

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index 23bb02e..519bd46 100644 (file)
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -5,7 +5,9 @@
 /* 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 "src/smpi/include/smpi_config.hpp"
 #include "xbt/config.hpp"
 
 #include <thread>
@@ -46,9 +48,7 @@ static simgrid::config::Flag<std::string> context_factory_name(
   context_factories[0].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";