From f150ed1532e727c409cc018a98e1362a8c71242c Mon Sep 17 00:00:00 2001 From: kosaki 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 --- ChangeLog | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 6bb69adea1..35a8f72918 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Mon Nov 26 17:00:12 2012 KOSAKI Motohiro + + * 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. + Mon Nov 26 16:36:13 2012 NARUSE, Yui * io.c (argf_each_codepoint): add missing ARGF#codepoints [Bug #7438] -- cgit v1.2.3