diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 14:15:54 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 14:15:54 +0000 |
commit | 67b79d6c84b1611cb15a05cafc93ed8b875e2e06 (patch) | |
tree | cb06db0570933f410b0ca69130e9f9fdfe6858e3 | |
parent | e966115c7d0b1a8725a3eb91ed1beaf1e93f2da2 (diff) |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | thread.c | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat Aug 22 00:03:19 2009 Yusuke Endoh <mame@tsg.ne.jp> + + * 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 <naruse@ruby-lang.org> * ext/readline/readline.c (readline_readline): use rb_prep_terminal @@ -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); } } @@ -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 |