* signal.c (register_sigaltstack): stores alt stack for debug

purpose.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20375 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-11-27 07:32:56 +00:00
parent 550f10ca5b
commit ab9fd5dbf7
2 changed files with 19 additions and 14 deletions

View File

@ -1,3 +1,12 @@
Thu Nov 27 16:32:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* signal.c (register_sigaltstack): stores alt stack for debug
purpose.
Thu Nov 27 16:12:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* signal.c (ruby_sigaction_t): added.
Thu Nov 27 15:59:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Nov 27 15:59:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (ruby_stack_check): no check if using sigaltstack. * gc.c (ruby_stack_check): no check if using sigaltstack.

View File

@ -429,25 +429,25 @@ typedef RETSIGTYPE ruby_sigaction_t(int);
#endif #endif
/* alternate stack for SIGSEGV */ /* alternate stack for SIGSEGV */
static void static void
register_sigaltstack() register_sigaltstack(void)
{ {
static int is_altstack_defined = 0; static void *altstack = 0;
stack_t newSS, oldSS; stack_t newSS, oldSS;
if (is_altstack_defined) if (altstack) return;
return;
newSS.ss_sp = malloc(ALT_STACK_SIZE); newSS.ss_sp = altstack = malloc(ALT_STACK_SIZE);
if (newSS.ss_sp == NULL) if (newSS.ss_sp == NULL)
/* should handle error */ /* should handle error */
rb_bug("register_sigaltstack. malloc error\n"); rb_bug("register_sigaltstack. malloc error\n");
newSS.ss_size = ALT_STACK_SIZE; newSS.ss_size = ALT_STACK_SIZE;
newSS.ss_flags = 0; newSS.ss_flags = 0;
if (sigaltstack(&newSS, &oldSS) < 0) if (sigaltstack(&newSS, &oldSS) < 0)
rb_bug("register_sigaltstack. error\n"); rb_bug("register_sigaltstack. error\n");
is_altstack_defined = 1;
} }
#else
#define register_sigaltstack() ((void)0)
#endif #endif
static sighandler_t static sighandler_t
@ -474,7 +474,7 @@ ruby_signal(int signum, sighandler_t handler)
#endif #endif
#if defined(SA_ONSTACK) && defined(USE_SIGALTSTACK) #if defined(SA_ONSTACK) && defined(USE_SIGALTSTACK)
if (signum == SIGSEGV) if (signum == SIGSEGV)
sigact.sa_flags |= SA_ONSTACK; sigact.sa_flags |= SA_ONSTACK;
#endif #endif
if (sigaction(signum, &sigact, &old) < 0) if (sigaction(signum, &sigact, &old) < 0)
rb_bug("sigaction error.\n"); rb_bug("sigaction error.\n");
@ -716,9 +716,7 @@ default_handler(int sig)
#ifdef SIGSEGV #ifdef SIGSEGV
case SIGSEGV: case SIGSEGV:
func = (sighandler_t)sigsegv; func = (sighandler_t)sigsegv;
#ifdef USE_SIGALTSTACK
register_sigaltstack(); register_sigaltstack();
#endif
break; break;
#endif #endif
#ifdef SIGPIPE #ifdef SIGPIPE
@ -1126,9 +1124,7 @@ Init_signal(void)
install_sighandler(SIGBUS, sigbus); install_sighandler(SIGBUS, sigbus);
#endif #endif
#ifdef SIGSEGV #ifdef SIGSEGV
#ifdef USE_SIGALTSTACK
register_sigaltstack(); register_sigaltstack();
#endif
install_sighandler(SIGSEGV, (sighandler_t)sigsegv); install_sighandler(SIGSEGV, (sighandler_t)sigsegv);
#endif #endif
} }