X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0b2f12b8902eb03ecb7c9b71996252a005cc969f..3cbf54871089cc3dc50b6832652b5765e1601039:/src/simix/smx_context.cpp

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index 2e1f4cb75f..933ef547b7 100644
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -1,6 +1,6 @@
 /* a fast and simple context switching library                              */
 
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2018. 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. */
@@ -17,7 +17,7 @@
 #include <xbt/sysdep.h>
 
 #include "simgrid/modelchecker.h"
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.hpp"
 #include "smx_private.hpp"
 #include "src/internal_config.h"
 #include "xbt/log.h"
@@ -103,22 +103,19 @@ 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") {
-    xbt_cfg_set_string("smpi/privatization", "dlopen");
-  }
 
+#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";
   }
-
 #endif
 
   /* select the context factory to use to create the contexts */