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
Fix non-smpi builds on Mac OSX
[simgrid.git]
/
src
/
simix
/
smx_context.cpp
diff --git
a/src/simix/smx_context.cpp
b/src/simix/smx_context.cpp
index
5906e9d
..
40c6f00
100644
(file)
--- a/
src/simix/smx_context.cpp
+++ b/
src/simix/smx_context.cpp
@@
-16,15
+16,12
@@
#include <xbt/range.hpp>
#include <xbt/sysdep.h>
#include <xbt/range.hpp>
#include <xbt/sysdep.h>
+#include "simgrid/modelchecker.h"
+#include "simgrid/sg_config.h"
+#include "smx_private.hpp"
#include "src/internal_config.h"
#include "xbt/log.h"
#include "src/internal_config.h"
#include "xbt/log.h"
-#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
#include "xbt/xbt_os_thread.h"
-#include "smx_private.h"
-#include "simgrid/sg_config.h"
-#include "src/internal_config.h"
-#include "simgrid/modelchecker.h"
-
#ifdef _WIN32
#include <windows.h>
#ifdef _WIN32
#include <windows.h>
@@
-79,9
+76,9
@@
static simgrid::config::Flag<std::string> context_factory_name(
(std::string("Possible values: ")+contexts_list()).c_str(),
context_factories[0].first);
(std::string("Possible values: ")+contexts_list()).c_str(),
context_factories[0].first);
-
int
smx_context_stack_size;
+
unsigned
smx_context_stack_size;
int smx_context_stack_size_was_set = 0;
int smx_context_stack_size_was_set = 0;
-
int
smx_context_guard_size;
+
unsigned
smx_context_guard_size;
int smx_context_guard_size_was_set = 0;
#if HAVE_THREAD_LOCAL_STORAGE
static XBT_THREAD_LOCAL smx_context_t smx_current_context_parallel;
int smx_context_guard_size_was_set = 0;
#if HAVE_THREAD_LOCAL_STORAGE
static XBT_THREAD_LOCAL smx_context_t smx_current_context_parallel;
@@
-106,15
+103,16
@@
void SIMIX_context_mod_init()
xbt_os_thread_key_create(&smx_current_context_key);
#endif
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
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";
}
XBT_WARN("mmap broken on FreeBSD, but dlopen+thread broken too. Switching to dlopen+raw contexts.");
context_factory_name = "raw";
}