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

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index e6b6c4e839..40c6f00b3c 100644
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -103,17 +103,18 @@ void SIMIX_context_mod_init()
   xbt_os_thread_key_create(&smx_current_context_key);
 #endif
 
-#if defined(__APPLE__) || defined(__NetBSD__)
-  if (context_factory_name == "thread" && xbt_cfg_get_string("smpi/privatization") == "dlopen") {
+#if HAVE_SMPI && (defined(__APPLE__) || defined(__NetBSD__))
+  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 (xbt_cfg_get_string("smpi/privatization") == "mmap") {
+
+#if HAVE_SMPI && defined(__FreeBSD__)
+  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";
-    xbt_cfg_set_string("smpi/privatization", "dlopen");
   }
 #endif