#include "smx_private.hpp"
#include "src/internal_config.h"
#include "xbt/log.h"
-#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
#ifdef _WIN32
#endif
#if defined(__APPLE__) || defined(__NetBSD__)
- if (context_factory_name == std::string("thread") && xbt_cfg_get_string("smpi/privatization") == "dlopen") {
+ 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 (context_factory_name == std::string("thread") && xbt_cfg_get_string("smpi/privatization") != "no") {
+ 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";
}
+
#endif
/* select the context factory to use to create the contexts */