smpi/privatization is not the concern of smx_context

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index eb1b2b7..85c6c0a 100644 (file)
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -110,16 +110,12 @@ void SIMIX_context_mod_init()
     context_factory_name = "raw";
   }
 #endif
     context_factory_name = "raw";
   }
 #endif

-#if defined(__FreeBSD__)
-  if (xbt_cfg_get_string("smpi/privatization") == "mmap") {
-    xbt_cfg_set_string("smpi/privatization", "dlopen");
-  }

 
 

+#if 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";
   }
   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 */
 #endif
 
   /* select the context factory to use to create the contexts */

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index 2dbfbce..769c009 100644 (file)
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -383,7 +383,7 @@ static void smpi_init_options(){
 
 #if defined(__FreeBSD__)
     if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) {
 
 #if defined(__FreeBSD__)
     if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) {

-      XBT_INFO("Mixing mmap privatization is broken on FreeBSD, switching to dlopen privatization instead.");
+      XBT_INFO("mmap privatization is broken on FreeBSD, switching to dlopen privatization instead.");

       smpi_privatize_global_variables = SMPI_PRIVATIZE_DLOPEN;
     }
 #endif
       smpi_privatize_global_variables = SMPI_PRIVATIZE_DLOPEN;
     }
 #endif