hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Thread.java

rev 611 : Merge

*** 36,46 ****
    private static int EXTERNAL_SUSPEND;
    private static int EXT_SUSPENDED;
    private static int HAS_ASYNC_EXCEPTION;
  
    private static AddressField activeHandlesField;
-   private static AddressField highestLockField;
    private static AddressField currentPendingMonitorField;
    private static AddressField currentWaitingMonitorField;
  
    static {
      VM.registerVMInitializedObserver(new Observer() {
--- 36,45 ----
*** 58,68 ****
      EXT_SUSPENDED = db.lookupIntConstant("Thread::_ext_suspended").intValue();
      HAS_ASYNC_EXCEPTION = db.lookupIntConstant("Thread::_has_async_exception").intValue();
  
      tlabFieldOffset    = type.getField("_tlab").getOffset();
      activeHandlesField = type.getAddressField("_active_handles");
-     highestLockField   = type.getAddressField("_highest_lock");
      currentPendingMonitorField = type.getAddressField("_current_pending_monitor");
      currentWaitingMonitorField = type.getAddressField("_current_waiting_monitor");
    }
  
    public Thread(Address addr) {
--- 57,66 ----
*** 119,132 ****
    public void oopsDo(AddressVisitor oopVisitor) {
      // FIXME: Empty for now; will later traverse JNI handles and
      // pending exception
    }
  
-   public Address highestLock() {
-     return highestLockField.getValue(addr);
-   }
- 
    public ObjectMonitor getCurrentPendingMonitor() {
      Address monitorAddr = currentPendingMonitorField.getValue(addr);
      if (monitorAddr == null) {
        return null;
      }
--- 117,126 ----