From 67b79d6c84b1611cb15a05cafc93ed8b875e2e06 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 thread.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'thread.c')

diff --git a/thread.c b/thread.c
index c51499488f..78571590cf 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);
     }
 }
-- 
cgit v1.2.3