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

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index 67cb04a7f5..eb1b2b76ad 100644
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -21,7 +21,6 @@
 #include "smx_private.hpp"
 #include "src/internal_config.h"
 #include "xbt/log.h"
-#include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
 
 #ifdef _WIN32
@@ -105,16 +104,22 @@ void SIMIX_context_mod_init()
 #endif
 
 #if defined(__APPLE__) || defined(__NetBSD__)
-  if (context_factory_name == std::string("thread") && xbt_cfg_get_string("smpi/privatization") == "dlopen") {
+  std::string priv = xbt_cfg_get_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 defined(__FreeBSD__)
-  if (context_factory_name == std::string("thread") && xbt_cfg_get_string("smpi/privatization") != "no") {
+  if (xbt_cfg_get_string("smpi/privatization") == "mmap") {
+    xbt_cfg_set_string("smpi/privatization", "dlopen");
+  }
+
+  if (context_factory_name == "thread" && xbt_cfg_get_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 */