summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-30 01:57:06 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-30 01:57:06 +0000
commit18bc6c31a1a0831ae6dda645a13b2df13d761fe8 (patch)
treea0849e5d3ad49cf0d5759c42e0f152d543a4ef43 /vm.c
parent1054b79609f3f468470ae022cea5445e58ed831b (diff)
* 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/trunk@32749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/vm.c b/vm.c
index d945fba0d7..3c1e8b4113 100644
--- a/vm.c
+++ b/vm.c
@@ -1754,7 +1754,7 @@ thread_free(void *ptr)
else {
#ifdef USE_SIGALTSTACK
if (th->altstack) {
- free(th->altstack);
+ xfree(th->altstack);
}
#endif
ruby_xfree(ptr);
@@ -1826,6 +1826,9 @@ th_init(rb_thread_t *th, VALUE self)
th->self = self;
/* allocate thread stack */
+#ifdef USE_SIGALTSTACK
+ th->altstack = xmalloc(ALT_STACK_SIZE);
+#endif
th->stack_size = RUBY_VM_THREAD_STACK_SIZE;
th->stack = thread_recycle_stack(th->stack_size);