mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
02bc20ac81
commit
7320d83753
2 changed files with 6 additions and 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
|
||||
|
|
2
thread.c
2
thread.c
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue