* thread.c, vm_core.h, vm.c, thread_pthread.c, thread_win32.c: add

  deadlock detection.  [ruby-dev:35044]

* bootstraptest/test_thread.rb: add tests for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 0 deletions

diff --git a/vm_core.h b/vm_core.h
index 03644dc29b..b001491f00 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -302,6 +302,7 @@ struct rb_vm_struct
     int running;
     int thread_abort_on_exception;
     unsigned long trace_flag;
+    volatile int sleeper;
 
     /* object management */
     VALUE mark_object_ary;
@@ -360,6 +361,7 @@ enum rb_thread_status {
     THREAD_TO_KILL,
     THREAD_RUNNABLE,
     THREAD_STOPPED,
+    THREAD_STOPPED_FOREVER,
     THREAD_KILLED,
 };
 
@@ -429,6 +431,8 @@ struct rb_thread_struct
     int interrupt_flag;
     rb_thread_lock_t interrupt_lock;
     struct rb_unblock_callback unblock;
+    VALUE locking_mutex;
+    VALUE keeping_mutexes;
 
     struct rb_vm_tag *tag;
     struct rb_vm_trap_tag *trap_tag;