summaryrefslogtreecommitdiff
path: root/signal.c
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-30 01:58:21 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-30 01:58:21 +0000
commit64270d3df28624de151b5d555e02b42b48c5b301 (patch)
tree5aa0456de592c701e2d63f08fcec96a7a2e73d09 /signal.c
parent32cfc7cefdc004895f76abf82ae62b53d200e424 (diff)
merge revision(s) 32749:
* vm.c (th_init): preallocate alternative stack. NoMemoryError is better than rb_bug, of course. Patch by Eric Wong. [ruby-core:38572][ruby-core:38594]. * signal.c (rb_register_sigaltstack): ditto. * vm_core.h: moved ALT_STACK_SIZE definition from signal.c. * vm.c (thread_free): use xfree() instead of free(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'signal.c')
-rw-r--r--signal.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/signal.c b/signal.c
index 7bad8c1d8a..3b91616a7c 100644
--- a/signal.c
+++ b/signal.c
@@ -423,29 +423,22 @@ typedef RETSIGTYPE ruby_sigaction_t(int);
#ifdef POSIX_SIGNAL
#ifdef USE_SIGALTSTACK
-#ifdef SIGSTKSZ
-#define ALT_STACK_SIZE (SIGSTKSZ*2)
-#else
-#define ALT_STACK_SIZE (4*1024)
-#endif
/* alternate stack for SIGSEGV */
void
rb_register_sigaltstack(rb_thread_t *th)
{
stack_t newSS, oldSS;
- if (th->altstack) return;
+ if (!th->altstack)
+ rb_bug("rb_register_sigaltstack: th->altstack not initialized\n");
- newSS.ss_sp = th->altstack = malloc(ALT_STACK_SIZE);
- if (newSS.ss_sp == NULL)
- /* should handle error */
- rb_bug("rb_register_sigaltstack. malloc error\n");
+ newSS.ss_sp = th->altstack;
newSS.ss_size = ALT_STACK_SIZE;
newSS.ss_flags = 0;
sigaltstack(&newSS, &oldSS); /* ignore error. */
}
-#endif
+#endif /* USE_SIGALTSTACK */
static sighandler_t
ruby_signal(int signum, sighandler_t handler)