From f0739b6f1e30a8328696767c8b99dad9fd249346 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Oct 2009 14:15:54 +0000 Subject: merges r24616 from trunk into ruby_1_9_1. -- * thread.c (rb_check_deadlock): decrease number of sleepers before deadlock detection because the deadlock exception makes main thread run. [ruby-dev:39142] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ thread.c | 1 + version.h | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 02a3603e6..66389f05c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Aug 22 00:03:19 2009 Yusuke Endoh + + * thread.c (rb_check_deadlock): decrease number of sleepers before + deadlock detection because the deadlock exception makes main thread + run. [ruby-dev:39142] + Fri Aug 21 15:01:35 2009 NARUSE, Yui * ext/readline/readline.c (readline_readline): use rb_prep_terminal diff --git a/thread.c b/thread.c index c51499488..78571590c 100644 --- a/thread.c +++ b/thread.c @@ -3955,6 +3955,7 @@ rb_check_deadlock(rb_vm_t *vm) printf("%d %d %p %p\n", vm->living_threads->num_entries, vm->sleeper, GET_THREAD(), vm->main_thread); st_foreach(vm->living_threads, debug_i, (st_data_t)0); #endif + vm->sleeper--; rb_thread_raise(2, argv, vm->main_thread); } } diff --git a/version.h b/version.h index c91787c78..4799d12a8 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 300 +#define RUBY_PATCHLEVEL 301 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit