* 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

1 files changed, 3 insertions, 0 deletions

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 */