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
jenkins: try to disable CMAKE_DISABLE_SOURCE_CHANGES=ON on CMake 3.11
[simgrid.git]
/
src
/
simix
/
smx_context.cpp
diff --git
a/src/simix/smx_context.cpp
b/src/simix/smx_context.cpp
index
933ef54
..
55bb5e8
100644
(file)
--- a/
src/simix/smx_context.cpp
+++ b/
src/simix/smx_context.cpp
@@
-97,6
+97,9
@@
void SIMIX_context_mod_init()
{
xbt_assert(simix_global->context_factory == nullptr);
+ smx_context_stack_size_was_set = not simgrid::config::is_default("contexts/stack-size");
+ smx_context_guard_size_was_set = not simgrid::config::is_default("contexts/guard-size");
+
#if HAVE_THREAD_CONTEXTS && not HAVE_THREAD_LOCAL_STORAGE
/* the __thread storage class is not available on this platform:
* use getspecific/setspecific instead to store the current context in each thread */
@@
-104,7
+107,7
@@
void SIMIX_context_mod_init()
#endif
#if HAVE_SMPI && (defined(__APPLE__) || defined(__NetBSD__))
- std::string priv =
xbt_cfg_get_string
("smpi/privatization");
+ std::string priv =
simgrid::config::get_value<std::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";
@@
-112,7
+115,7
@@
void SIMIX_context_mod_init()
#endif
#if HAVE_SMPI && defined(__FreeBSD__)
- if (context_factory_name == "thread" &&
xbt_cfg_get_string("smpi/privatization") != "no")
{
+ if (context_factory_name == "thread" &&
simgrid::config::get_value<std::string>("smpi/privatization") != "no")
{
XBT_WARN("mmap broken on FreeBSD, but dlopen+thread broken too. Switching to dlopen+raw contexts.");
context_factory_name = "raw";
}
@@
-165,18
+168,14
@@
void *SIMIX_context_stack_new()
{
void *stack;
- /* FIXME: current code for stack overflow protection assumes that stacks are
- * growing downward (PTH_STACKGROWTH == -1). Protected pages need to be put
- * after the stack when PTH_STACKGROWTH == 1. */
-
if (smx_context_guard_size > 0 && not MC_is_active()) {
#if !defined(PTH_STACKGROWTH) || (PTH_STACKGROWTH != -1)
- static int warned_once = 0;
- if (not warned_once) {
-
XBT_WARN("Stack overflow protection is known to be broken on your system. Either stack grows upwards, or it was not even tested properly.
");
- warned_once = 1;
- }
+ xbt_die("Stack overflow protection is known to be broken on your system: you stacks grow upwards (or detection is "
+ "broken). "
+
"Please disable stack guards with --cfg=contexts:guard-size:0
");
+ /* Current code for stack overflow protection assumes that stacks are growing downward (PTH_STACKGROWTH == -1).
+ * Protected pages need to be put after the stack when PTH_STACKGROWTH == 1. */
#endif
size_t size = smx_context_stack_size + smx_context_guard_size;