/* 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
#ifdef _WIN32
#include <windows.h>
+#include <malloc.h>
#else
#include <sys/mman.h>
#endif
#define _aligned_free __mingw_aligned_free
#endif //MINGW
-
-
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
#endif
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
/* 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:");
#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;
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 */
}