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
[mc] Remove the --cfg=model-check:1 flag
[simgrid.git]
/
src
/
simix
/
smx_context.c
diff --git
a/src/simix/smx_context.c
b/src/simix/smx_context.c
index
0bfad29
..
9adeeac
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
@@
-14,7
+14,22
@@
#include "simgrid/sg_config.h"
#include "internal_config.h"
#include "simgrid/modelchecker.h"
#include "simgrid/sg_config.h"
#include "internal_config.h"
#include "simgrid/modelchecker.h"
+
+
+#ifdef _WIN32
+#include <windows.h>
+#else
#include <sys/mman.h>
#include <sys/mman.h>
+#endif
+
+#ifdef __MINGW32__
+#define _aligned_malloc __mingw_aligned_malloc
+#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>
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
@@
-72,6
+87,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:");
@@
-111,7
+132,21
@@
void *SIMIX_context_stack_new(void)
{
void *stack;
{
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 && !MC_is_active()) {
if (smx_context_guard_size > 0 && !MC_is_active()) {
+
+#if defined(_XBT_WIN32) || (PTH_STACKGROWTH != -1)
+ static int warned_once = 0;
+ if (!warned_once) {
+ XBT_WARN("Stack overflow protection is known to be broken on your system. Either you're on Windows or PTH_STACKGROWTH != -1 (current value is %d).",
+ PTH_STACKGROWTH);
+ warned_once = 1;
+ }
+#endif
+
size_t size = smx_context_stack_size + smx_context_guard_size;
#ifdef HAVE_MC
/* Cannot use posix_memalign when HAVE_MC. Align stack by hand, and save the
size_t size = smx_context_stack_size + smx_context_guard_size;
#ifdef HAVE_MC
/* Cannot use posix_memalign when HAVE_MC. Align stack by hand, and save the
@@
-119,14
+154,20
@@
void *SIMIX_context_stack_new(void)
char *alloc = xbt_malloc0(size + xbt_pagesize);
stack = alloc - ((uintptr_t)alloc & (xbt_pagesize - 1)) + xbt_pagesize;
*((void **)stack - 1) = alloc;
char *alloc = xbt_malloc0(size + xbt_pagesize);
stack = alloc - ((uintptr_t)alloc & (xbt_pagesize - 1)) + xbt_pagesize;
*((void **)stack - 1) = alloc;
-#el
se
+#el
if !defined(_XBT_WIN32)
if (posix_memalign(&stack, xbt_pagesize, size) != 0)
xbt_die("Failed to allocate stack.");
if (posix_memalign(&stack, xbt_pagesize, size) != 0)
xbt_die("Failed to allocate stack.");
+#else
+ stack = _aligned_malloc(size, xbt_pagesize);
#endif
#endif
+
+#ifndef _XBT_WIN32
if (mprotect(stack, smx_context_guard_size, PROT_NONE) == -1) {
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;
} else {
stack = xbt_malloc0(smx_context_stack_size);
stack = (char *)stack + smx_context_guard_size;
} else {
stack = xbt_malloc0(smx_context_stack_size);
@@
-154,10
+195,11
@@
void SIMIX_context_stack_delete(void *stack)
VALGRIND_STACK_DEREGISTER(valgrind_stack_id);
#endif
VALGRIND_STACK_DEREGISTER(valgrind_stack_id);
#endif
+#ifndef WIN32
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 */
}
@@
-166,6
+208,8
@@
void SIMIX_context_stack_delete(void *stack)
stack = *((void **)stack - 1);
#endif
}
stack = *((void **)stack - 1);
#endif
}
+#endif
+
xbt_free(stack);
}
xbt_free(stack);
}