/* 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. */
#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"
-#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
#ifdef _WIN32
xbt_os_thread_key_create(&smx_current_context_key);
#endif
-#if defined(__APPLE__) || defined(__NetBSD__)
- if (context_factory_name == std::string("thread") &&
- strcmp(xbt_cfg_get_string("smpi/privatization"), "dlopen") == 0) {
+#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 (context_factory_name == std::string("thread") && strcmp(xbt_cfg_get_string("smpi/privatization"), "no") != 0) {
+
+#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";
}