[前][次][番号順一覧][スレッド一覧]

ruby-changes:12881

From: mame <ko1@a...>
Date: Sat, 22 Aug 2009 00:17:24 +0900 (JST)
Subject: [ruby-changes:12881] Ruby:r24616 (trunk): * thread.c (rb_check_deadlock): decrease number of sleepers before

mame	2009-08-22 00:14:29 +0900 (Sat, 22 Aug 2009)

  New Revision: 24616

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24616

  Log:
    * thread.c (rb_check_deadlock): decrease number of sleepers before
      deadlock detection because the deadlock exception makes main thread
      run.  [ruby-dev:39142]

  Modified files:
    trunk/ChangeLog
    trunk/thread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24615)
+++ ChangeLog	(revision 24616)
@@ -1,3 +1,9 @@
+Sat Aug 22 00:03:19 2009  Yusuke Endoh  <mame@t...>
+
+	* 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 22:34:58 2009  Tanaka Akira  <akr@f...>
 
 	* enumerator.c (get_next_values): extracted from
Index: thread.c
===================================================================
--- thread.c	(revision 24615)
+++ thread.c	(revision 24616)
@@ -4049,6 +4049,7 @@
 	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_threadptr_raise(vm->main_thread, 2, argv);
     }
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]