From cd98d104c2725979df7e8ba9a69b858070ae20af Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 12 Mar 2018 02:27:15 +0100 Subject: [PATCH 1/1] smpi/privatization is not the concern of smx_context --- src/simix/smx_context.cpp | 6 +----- src/smpi/internals/smpi_global.cpp | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp index eb1b2b76ad..85c6c0af15 100644 --- 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 -#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"; } - #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 2dbfbce721..769c00900d 100644 --- 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) { - 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 -- 2.20.1