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
Fix doxygen comments.
[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
e254af4
..
ee35dfd
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
2
. The SimGrid Team.
+/* Copyright (c) 2009-201
4
. 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
@@
-25,10
+25,10
@@
typedef struct s_smx_ctx_thread {
static xbt_os_sem_t smx_ctx_thread_sem;
static smx_context_t
static xbt_os_sem_t smx_ctx_thread_sem;
static smx_context_t
-smx_ctx_thread_factory_create_context(xbt_main_func_t code,
int argc,
- char **argv,
+smx_ctx_thread_factory_create_context(xbt_main_func_t code,
+
int argc,
char **argv,
void_pfn_smxprocess_t cleanup_func,
void_pfn_smxprocess_t cleanup_func,
-
void *data
);
+
smx_process_t process
);
static void smx_ctx_thread_free(smx_context_t context);
static void smx_ctx_thread_stop(smx_context_t context);
static void smx_ctx_thread_free(smx_context_t context);
static void smx_ctx_thread_stop(smx_context_t context);
@@
-80,12
+80,12
@@
static smx_context_t
smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc,
char **argv,
void_pfn_smxprocess_t cleanup_func,
smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc,
char **argv,
void_pfn_smxprocess_t cleanup_func,
-
void *data
)
+
smx_process_t process
)
{
smx_ctx_thread_t context = (smx_ctx_thread_t)
smx_ctx_base_factory_create_context_sized(sizeof(s_smx_ctx_thread_t),
code, argc, argv,
{
smx_ctx_thread_t context = (smx_ctx_thread_t)
smx_ctx_base_factory_create_context_sized(sizeof(s_smx_ctx_thread_t),
code, argc, argv,
- cleanup_func,
data
);
+ cleanup_func,
process
);
/* If the user provided a function for the process then use it
otherwise is the context for maestro */
/* If the user provided a function for the process then use it
otherwise is the context for maestro */
@@
-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 *
@@
-151,6
+153,13
@@
static void *smx_ctx_thread_wrapper(void *param)
{
smx_ctx_thread_t context = (smx_ctx_thread_t) param;
{
smx_ctx_thread_t context = (smx_ctx_thread_t) param;
+ /* 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);
+
/* 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);