yugui	2009-10-28 23:15:54 +0900 (Wed, 28 Oct 2009)

  New Revision: 25541

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

  Log:
    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]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/thread.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25540)
+++ ruby_1_9_1/ChangeLog	(revision 25541)
@@ -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 15:01:35 2009  NARUSE, Yui  <naruse@r...>
 
 	* ext/readline/readline.c (readline_readline): use rb_prep_terminal
Index: ruby_1_9_1/thread.c
===================================================================
--- ruby_1_9_1/thread.c	(revision 25540)
+++ ruby_1_9_1/thread.c	(revision 25541)
@@ -3955,6 +3955,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_thread_raise(2, argv, vm->main_thread);
     }
 }
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25540)
+++ ruby_1_9_1/version.h	(revision 25541)
@@ -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

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