A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
also change the namespace of kernel/resource/{Action,Model}
[simgrid.git]
/
src
/
simix
/
smx_context.cpp
diff --git
a/src/simix/smx_context.cpp
b/src/simix/smx_context.cpp
index
6b0c54b
..
eb1b2b7
100644
(file)
--- a/
src/simix/smx_context.cpp
+++ b/
src/simix/smx_context.cpp
@@
-21,7
+21,6
@@
#include "smx_private.hpp"
#include "src/internal_config.h"
#include "xbt/log.h"
#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
#include "xbt/xbt_os_thread.h"
#ifdef _WIN32
@@
-105,17
+104,22
@@
void SIMIX_context_mod_init()
#endif
#if defined(__APPLE__) || defined(__NetBSD__)
#endif
#if defined(__APPLE__) || defined(__NetBSD__)
- if (context_factory_name == std::string("thread") &&
-
strcmp(xbt_cfg_get_string("smpi/privatization"), "dlopen") == 0
) {
+ 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__)
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 (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_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 */