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] Move stacks_areas code in mcer_ignore
[simgrid.git]
/
src
/
simix
/
smx_context.c
diff --git
a/src/simix/smx_context.c
b/src/simix/smx_context.c
index
833ca84
..
f222f62
100644
(file)
--- a/
src/simix/smx_context.c
+++ b/
src/simix/smx_context.c
@@
-14,7
+14,20
@@
#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
+
+
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
@@
-111,7
+124,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,11
+146,19
@@
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;
+#elif !defined(_XBT_WIN32)
+ if (posix_memalign(&stack, xbt_pagesize, size) != 0)
+ xbt_die("Failed to allocate stack.");
#else
#else
- posix_memalign(&stack, xbt_pagesize, size);
+ stack = _aligned_malloc(size, xbt_pagesize);
+#endif
+
+#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. */
+ }
#endif
#endif
- if (!stack || mprotect(stack, smx_context_guard_size, PROT_NONE) == -1)
- xbt_die("Failed to allocate stack: %s", strerror(errno));
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);
@@
-151,17
+186,21
@@
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 | PROT_EXEC) == -1)
{
XBT_WARN("Failed to remove page protection: %s", strerror(errno));
XBT_WARN("Failed to remove page protection: %s", strerror(errno));
- /* try to pursue anyway */
+ /* try to pursue anyway */
+ }
#ifdef HAVE_MC
/* Retrieve the saved pointer. See SIMIX_context_stack_new above. */
stack = *((void **)stack - 1);
#endif
}
#ifdef HAVE_MC
/* Retrieve the saved pointer. See SIMIX_context_stack_new above. */
stack = *((void **)stack - 1);
#endif
}
+#endif
+
xbt_free(stack);
}
xbt_free(stack);
}