From f150ed1532e727c409cc018a98e1362a8c71242c Mon Sep 17 00:00:00 2001
From: kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 26 Nov 2012 08:05:49 +0000
Subject: * vm_core.h (rb_thread_struct): added 'in_trap' member for marking  
 running trap handler. * signal.c (signal_exec): turn on in_trap when running
 trap. * thread.c (Init_Thread, thread_create_core): initialize in_trap   when
 creating new threads. * thread.c (thread_join_m): raise ThreadError when
 running trap   handler.Bug [#6416][ruby-core:44956] *
 test/ruby/test_thread.rb (test_thread_join_in_trap): new test   for the
 above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 vm_core.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'vm_core.h')

diff --git a/vm_core.h b/vm_core.h
index fffaa5e986..333e845607 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -584,6 +584,9 @@ typedef struct rb_thread_struct {
     void *altstack;
 #endif
     unsigned long running_time_us;
+
+    /* 1 if running trap handler */
+    int in_trap;
 } rb_thread_t;
 
 /* iseq.c */
-- 
cgit v1.2.3