commit 8e4aac52962d54cb4be2078b9cd95685e067133a
author Elliott Hughes <enh@google.com> Mon Sep 26 17:03:36 2011 -0700
committer Elliott Hughes <enh@google.com> Mon Sep 26 17:03:36 2011 -0700
tree bb85a52e0326bef05acf9abe5e3d3b396c1d3795
parent 03f034949fa7b44aa49e6603d8d5e7a55bf07795

Add the "- waiting on"/"- waiting to lock" lines to the SIGQUIT output.

Change-Id: I0a8ab2e9e54c390e0d499ef464d82c2f2c628cbe

src/thread.h

diff --git a/src/thread.h b/src/thread.h
index a9cc78f..01cc1cc 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -151,8 +151,6 @@
     kMaxPriority = 10,
   };
   enum State {
-    kUnknown = -1,
-
     // These match up with JDWP values.
     kTerminated   = 0,        // TERMINATED
     kRunnable     = 1,        // RUNNABLE or running now
@@ -257,6 +255,7 @@
   }
 
   static Thread* FromManagedThread(JNIEnv* env, jobject thread);
+  static uint32_t LockOwnerFromThreadLock(Object* thread_lock);
 
   void Dump(std::ostream& os) const;
 
@@ -577,15 +576,28 @@
   // Our managed peer (an instance of java.lang.Thread).
   Object* peer_;
 
+  // The top_of_managed_stack_ and top_of_managed_stack_pc_ fields are accessed from
+  // compiled code, so we keep them early in the structure to (a) avoid having to keep
+  // fixing the assembler offsets and (b) improve the chances that these will still be aligned.
+
+  // Top of the managed stack, written out prior to the state transition from
+  // kRunnable to kNative. Uses include to give the starting point for scanning
+  // a managed stack when a thread is in native code.
+  Frame top_of_managed_stack_;
+  // PC corresponding to the call out of the top_of_managed_stack_ frame
+  uintptr_t top_of_managed_stack_pc_;
+
   // Guards the 'interrupted_' and 'wait_monitor_' members.
   mutable Mutex* wait_mutex_;
   ConditionVariable* wait_cond_;
   // Pointer to the monitor lock we're currently waiting on (or NULL), guarded by wait_mutex_.
   Monitor* wait_monitor_;
   // Thread "interrupted" status; stays raised until queried or thrown, guarded by wait_mutex_.
-  bool interrupted_;
+  uint32_t interrupted_;
   // The next thread in the wait set this thread is part of.
   Thread* wait_next_;
+  // If we're blocked in MonitorEnter, this is the object we're trying to lock.
+  Object* monitor_enter_object_;
 
   friend class Monitor;
 
@@ -604,14 +616,6 @@
   // The "lowest addressable byte" of the stack
   byte* stack_base_;
 
-  // Top of the managed stack, written out prior to the state transition from
-  // kRunnable to kNative. Uses include to give the starting point for scanning
-  // a managed stack when a thread is in native code.
-  Frame top_of_managed_stack_;
-
-  // PC corresponding to the call out of the top_of_managed_stack_ frame
-  uintptr_t top_of_managed_stack_pc_;
-
   // A linked list (of stack allocated records) recording transitions from
   // native to managed code.
   NativeToManagedRecord* native_to_managed_record_;