summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-27 02:00:40 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-27 02:00:40 +0000
commit9ace5c122e9ad5203e98590adfc3896464b67ec1 (patch)
tree9dd83c8b1b7d57572a26148f934b5a477b930a8e
parent863e08732624822bac9fe546dc13ef2b6d23e542 (diff)
* eval.c (ruby_cleanup): set thread status to THREAD_KILLED
for preventing thr.raise. * test/ruby/test_thread.rb (test_main_thread_status_at_exit): test for the above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--eval.c3
-rw-r--r--test/ruby/test_thread.rb12
3 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ad83433bfa..d24cc23df31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov 27 10:55:09 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * eval.c (ruby_cleanup): set thread status to THREAD_KILLED
+ for preventing thr.raise.
+ * test/ruby/test_thread.rb (test_main_thread_status_at_exit):
+ test for the above.
+
Tue Nov 27 10:31:29 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread.c (rb_thread_terminate_all): suppress a warning.
diff --git a/eval.c b/eval.c
index 2cdc88acc9c..35202ce07bd 100644
--- a/eval.c
+++ b/eval.c
@@ -159,6 +159,9 @@ ruby_cleanup(volatile int ex)
rb_thread_t *th = GET_THREAD();
int nerr;
+ /* protect from thread.raise */
+ th->status = THREAD_KILLED;
+
rb_threadptr_interrupt(th);
rb_threadptr_check_signal(th);
PUSH_TAG();
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index fb2efec5523..13d1a3ff659 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -889,4 +889,16 @@ class TestThreadGroup < Test::Unit::TestCase
}.join
end
end
+
+ def test_main_thread_status_at_exit
+ assert_in_out_err([], <<-INPUT, %w(false), [])
+Thread.new(Thread.current) {|mth|
+ begin
+ sleep 0.1
+ ensure
+ p mth.alive?
+ end
+}
+ INPUT
+ end
end