X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bfdc9a38c22af6a9becf133be154a2fa2bc6589..ba5400c9278f4f61cf8319210a5edda78e0c5bd8:/src/simix/smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index f222f62f28..9adeeac59e 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -1,6 +1,6 @@
 /* a fast and simple context switching library                              */
 
-/* Copyright (c) 2009-2014. The SimGrid Team.
+/* Copyright (c) 2009-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -27,7 +27,9 @@
 #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>
@@ -85,6 +87,12 @@ void SIMIX_context_mod_init(void)
         /* use raw contexts */
         SIMIX_ctx_raw_factory_init(&simix_global->context_factory);
       }
+#endif
+#ifdef HAVE_BOOST_CONTEXT
+      else if (!strcmp(smx_context_factory_name, "boost")) {
+        /* use Boost.Context */
+        SIMIX_ctx_boost_factory_init(&simix_global->context_factory);
+      }
 #endif
       else {
         XBT_ERROR("Invalid context factory specified. Valid factories on this machine:");
@@ -155,8 +163,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;
@@ -190,7 +199,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 */
     }