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
[MSVC] correct support for thread-local storage
[simgrid.git]
/
src
/
simix
/
smx_context.c
diff --git
a/src/simix/smx_context.c
b/src/simix/smx_context.c
index
f222f62
..
e447ed3
100644
(file)
--- a/
src/simix/smx_context.c
+++ b/
src/simix/smx_context.c
@@
-1,6
+1,6
@@
/* a fast and simple context switching library */
/* a fast and simple context switching library */
-/* Copyright (c) 2009-201
4
. The SimGrid Team.
+/* Copyright (c) 2009-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-18,6
+18,7
@@
#ifdef _WIN32
#include <windows.h>
#ifdef _WIN32
#include <windows.h>
+#include <malloc.h>
#else
#include <sys/mman.h>
#endif
#else
#include <sys/mman.h>
#endif
@@
-27,8
+28,6
@@
#define _aligned_free __mingw_aligned_free
#endif //MINGW
#define _aligned_free __mingw_aligned_free
#endif //MINGW
-
-
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
#endif
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
#endif
@@
-43,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
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
#else
static xbt_os_thread_key_t smx_current_context_key = 0;
#endif
@@
-85,6
+84,12
@@
void SIMIX_context_mod_init(void)
/* use raw contexts */
SIMIX_ctx_raw_factory_init(&simix_global->context_factory);
}
/* 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:");
#endif
else {
XBT_ERROR("Invalid context factory specified. Valid factories on this machine:");
@@
-155,8
+160,9
@@
void *SIMIX_context_stack_new(void)
#ifndef _XBT_WIN32
if (mprotect(stack, smx_context_guard_size, PROT_NONE) == -1) {
#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;
}
#endif
stack = (char *)stack + smx_context_guard_size;
@@
-190,7
+196,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,
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 */
}
XBT_WARN("Failed to remove page protection: %s", strerror(errno));
/* try to pursue anyway */
}