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
[surf] Remove sg_platf_storage_type_cb
[simgrid.git]
/
src
/
simix
/
smx_context_thread.c
diff --git
a/src/simix/smx_context_thread.c
b/src/simix/smx_context_thread.c
index
ea06db0
..
a151abf
100644
(file)
--- a/
src/simix/smx_context_thread.c
+++ b/
src/simix/smx_context_thread.c
@@
-1,6
+1,6
@@
/* context_thread - implementation of context switching with native threads */
/* context_thread - implementation of context switching with native threads */
-/* 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
@@
-8,10
+8,10
@@
#include "xbt/function_types.h"
#include "smx_private.h"
#include "xbt/function_types.h"
#include "smx_private.h"
-#include "portable.h" /* loads context system definitions */
+#include "
src/
portable.h" /* loads context system definitions */
#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
-#include "xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
+#include "
src/
xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
@@
-94,6
+94,8
@@
smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc,
context->end = xbt_os_sem_init(0);
if (smx_context_stack_size_was_set)
xbt_os_thread_setstacksize(smx_context_stack_size);
context->end = xbt_os_sem_init(0);
if (smx_context_stack_size_was_set)
xbt_os_thread_setstacksize(smx_context_stack_size);
+ if (smx_context_guard_size_was_set)
+ xbt_os_thread_setguardsize(smx_context_guard_size);
/* create and start the process */
/* NOTE: The first argument to xbt_os_thread_create used to be the process *
/* create and start the process */
/* NOTE: The first argument to xbt_os_thread_create used to be the process *
@@
-150,7
+152,14
@@
static void smx_ctx_thread_stop(smx_context_t pcontext)
static void *smx_ctx_thread_wrapper(void *param)
{
smx_ctx_thread_t context = (smx_ctx_thread_t) param;
static void *smx_ctx_thread_wrapper(void *param)
{
smx_ctx_thread_t context = (smx_ctx_thread_t) param;
-
+#ifndef WIN32
+ /* Install alternate signal stack, for SIGSEGV handler. */
+ stack_t stack;
+ stack.ss_sp = sigsegv_stack;
+ stack.ss_size = sizeof sigsegv_stack;
+ stack.ss_flags = 0;
+ sigaltstack(&stack, NULL);
+#endif
/* Tell the maestro we are starting, and wait for its green light */
xbt_os_sem_release(context->end);
xbt_os_sem_acquire(context->begin);
/* Tell the maestro we are starting, and wait for its green light */
xbt_os_sem_release(context->end);
xbt_os_sem_acquire(context->begin);
@@
-179,6
+188,7
@@
static void smx_ctx_thread_runall_serial(void)
unsigned int cursor;
xbt_dynar_foreach(simix_global->process_to_run, cursor, process) {
unsigned int cursor;
xbt_dynar_foreach(simix_global->process_to_run, cursor, process) {
+ XBT_DEBUG("Handling %p",process);
xbt_os_sem_release(((smx_ctx_thread_t) process->context)->begin);
xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end);
}
xbt_os_sem_release(((smx_ctx_thread_t) process->context)->begin);
xbt_os_sem_acquire(((smx_ctx_thread_t) process->context)->end);
}