Install signal handler for SIGSEGV.

[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 d703ead..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 */
 
-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -12,7 +12,6 @@
 #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 "simix/context.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
@@ -26,10 +25,10 @@ typedef struct s_smx_ctx_thread {
 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 *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);
@@ -81,24 +80,30 @@ 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,
-                                      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,
-                                                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 (code) {
     context->begin = xbt_os_sem_init(0);
     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 *
     * name, but now the name is stored at SIMIX level, so we pass a null  */
     context->thread =
       xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, context, context);
 
+
     /* wait the starting of the newly created process */
     xbt_os_sem_acquire(context->end);
 
@@ -113,7 +118,7 @@ static void smx_ctx_thread_free(smx_context_t pcontext)
 {
   smx_ctx_thread_t context = (smx_ctx_thread_t) pcontext;
 
-  /* check if this is the context of maestro (it doesn't has a real thread) */
+  /* check if this is the context of maestro (it doesn't have a real thread) */
   if (context->thread) {
     /* wait about the thread terminason */
     xbt_os_thread_join(context->thread, NULL);
@@ -148,6 +153,13 @@ static void *smx_ctx_thread_wrapper(void *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);