[SIMIX] Updated error messages for contexts

[simgrid.git] / src / simix / smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 5bcfdf9..a801c04 100644 (file)
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -6,18 +6,19 @@
 /* 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 "portable.h"
+#include "src/portable.h"
 #include "xbt/log.h"
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
 #include "smx_private.h"
 #include "simgrid/sg_config.h"
-#include "internal_config.h"
+#include "src/internal_config.h"
 #include "simgrid/modelchecker.h"
 
 
 #ifdef _WIN32
 #include <windows.h>
+#include <malloc.h>
 #else
 #include <sys/mman.h>
 #endif
@@ -27,10 +28,6 @@
 #define _aligned_free  __mingw_aligned_free 
 #endif //MINGW
 
-#if defined(_XBT_WIN32)
-#include <malloc.h>
-#endif
-
 #ifdef HAVE_VALGRIND_VALGRIND_H
 # include <valgrind/valgrind.h>
 #endif
@@ -45,7 +42,7 @@ int smx_context_stack_size_was_set = 0;
 int smx_context_guard_size;
 int smx_context_guard_size_was_set = 0;
 #ifdef HAVE_THREAD_LOCAL_STORAGE
-static __thread smx_context_t smx_current_context_parallel;
+static XBT_THREAD_LOCAL smx_context_t smx_current_context_parallel;
 #else
 static xbt_os_thread_key_t smx_current_context_key = 0;
 #endif
@@ -99,12 +96,17 @@ void SIMIX_context_mod_init(void)
 #ifdef HAVE_RAWCTX
         XBT_ERROR("  raw: high performance context factory implemented specifically for SimGrid");
 #else
-        XBT_ERROR("  (raw contexts are disabled at compilation time on this machine -- check configure logs for details)");
+        XBT_ERROR("  (raw contexts were disabled at compilation time on this machine -- check configure logs for details)");
 #endif
 #ifdef CONTEXT_UCONTEXT
         XBT_ERROR("  ucontext: classical system V contexts (implemented with makecontext, swapcontext and friends)");
 #else
-        XBT_ERROR("  (ucontext is disabled at compilation time on this machine -- check configure logs for details)");
+        XBT_ERROR("  (ucontext was disabled at compilation time on this machine -- check configure logs for details)");
+#endif
+#ifdef HAVE_BOOST_CONTEXT
+        XBT_ERROR("  boost: this uses the boost libraries context implementation");
+#else
+        XBT_ERROR("  (boost was disabled at compilation time on this machine -- check configure logs for details. Did you install the libboost-context-dev package?)");
 #endif
         XBT_ERROR("  thread: slow portability layer using system threads (pthreads on UNIX, CreateThread() on windows)");
         xbt_die("Please use a valid factory.");
@@ -163,8 +165,9 @@ void *SIMIX_context_stack_new(void)
 
 #ifndef _XBT_WIN32
     if (mprotect(stack, smx_context_guard_size, PROT_NONE) == -1) {
-      XBT_WARN("Failed to protect stack: %s", strerror(errno));
-      /* That's not fatal, pursue anyway. */
+      xbt_die("Failed to protect stack: %s", strerror(errno));
+      /* This is fatal. We are going to fail at some point when
+         we tryi reusing this. */
     }
 #endif
     stack = (char *)stack + smx_context_guard_size;
@@ -198,7 +201,7 @@ void SIMIX_context_stack_delete(void *stack)
   if (smx_context_guard_size > 0 && !MC_is_active()) {
     stack = (char *)stack - smx_context_guard_size;
     if (mprotect(stack, smx_context_guard_size,
-                 PROT_READ | PROT_WRITE | PROT_EXEC) == -1) {
+                 PROT_READ | PROT_WRITE) == -1) {
       XBT_WARN("Failed to remove page protection: %s", strerror(errno));
       /* try to pursue anyway */
     }