From: Augustin Degomme <augustin.degomme@unibas.ch>
Date: Fri, 22 Dec 2017 04:22:31 +0000 (+0100)
Subject: put back the fix for broken dlopen+thread on freebsd
X-Git-Tag: v3.18~8
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4a9216f3de0f34def576bfb38ee5ffc2f6729254

put back the fix for broken dlopen+thread on freebsd
---

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index e6b6c4e839..547a37e7e4 100644
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -111,10 +111,14 @@ void SIMIX_context_mod_init()
 #endif
 #if defined(__FreeBSD__)
   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";
-    xbt_cfg_set_string("smpi/privatization", "dlopen");
   }
+}
 #endif
 
   /* select the context factory to use to create the contexts */