diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-23 15:27:00 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-23 15:27:00 +0000 |
commit | 7320d83753d90ff7fcc78567589f1eb52a7de9a0 (patch) | |
tree | d28f2d4e23da2c791a9b4362ac28b761d2726579 | |
parent | 02bc20ac81a19d821270e91ce97e7a65b82f6cee (diff) | |
download | ruby-7320d83753d90ff7fcc78567589f1eb52a7de9a0.tar.gz |
* thread.c (rb_check_deadlock): refine an error message of deadlock
detection. [ruby-core:44336] [Bug #6288]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | thread.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Apr 24 00:25:39 2012 Yusuke Endoh <mame@tsg.ne.jp> + + * 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@tsg.ne.jp> * parse.y (primary): remove wrong "fixpos" that caused incorrect @@ -4731,7 +4731,7 @@ rb_check_deadlock(rb_vm_t *vm) 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); |