mame	2012-04-24 00:27:00 +0900 (Tue, 24 Apr 2012)

  New Revision: 35449

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

  Log:
    * thread.c (rb_check_deadlock): refine an error message of deadlock
      detection.  [ruby-core:44336] [Bug #6288]

  Modified files:
    trunk/ChangeLog
    trunk/thread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35448)
+++ ChangeLog	(revision 35449)
@@ -1,3 +1,8 @@
+Tue Apr 24 00:25:39 2012  Yusuke Endoh  <mame@t...>
+
+	* thread.c (rb_check_deadlock): refine an error message of deadlock
+	  detection.  [ruby-core:44336] [Bug #6288]
+
 Tue Apr 24 00:14:42 2012  Yusuke Endoh  <mame@t...>
 
 	* parse.y (primary): remove wrong "fixpos" that caused incorrect
Index: thread.c
===================================================================
--- thread.c	(revision 35448)
+++ thread.c	(revision 35449)
@@ -4731,7 +4731,7 @@
     if (!found) {
 	VALUE argv[2];
 	argv[0] = rb_eFatal;
-	argv[1] = rb_str_new2("deadlock detected");
+	argv[1] = rb_str_new2("No live threads left. Deadlock?");
 #ifdef DEBUG_DEADLOCK_CHECK
 	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);

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