X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1fc042e8bc9c51f9267fa1936deaebe59ae01ee7..61ab0b23d55ea10365ba11d22b8c11b39cbf16e9:/src/simix/smx_context.cpp

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index 6b0c54b944..55bb5e8970 100644
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -1,6 +1,6 @@
 /* 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. */
@@ -17,11 +17,10 @@
 #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
@@ -98,21 +97,25 @@ 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 */
   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 = 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";
   }
 #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" && 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;