src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java

rev 54415 : 8222295: more baseline cleanups from Async Monitor Deflation project

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 48,58 ****
      objectFieldOffset = f.getOffset();
      f = type.getField("_owner");
      ownerFieldOffset = f.getOffset();
      f = type.getField("FreeNext");
      FreeNextFieldOffset = f.getOffset();
!     countField  = type.getJIntField("_count");
      waitersField = type.getJIntField("_waiters");
      recursionsField = type.getCIntegerField("_recursions");
    }
  
    public ObjectMonitor(Address addr) {
--- 48,58 ----
      objectFieldOffset = f.getOffset();
      f = type.getField("_owner");
      ownerFieldOffset = f.getOffset();
      f = type.getField("FreeNext");
      FreeNextFieldOffset = f.getOffset();
!     contentionsField  = type.getJIntField("_contentions");
      waitersField = type.getJIntField("_waiters");
      recursionsField = type.getCIntegerField("_recursions");
    }
  
    public ObjectMonitor(Address addr) {
*** 85,107 ****
  
    public Address freeNext() { return addr.getAddressAt(FreeNextFieldOffset); }
    // FIXME
    //  void      set_queue(void* owner);
  
-   public int count() { return countField.getValue(addr); }
-   // FIXME
-   //  void      set_count(int count);
- 
    public long recursions() { return recursionsField.getValue(addr); }
  
    public OopHandle object() {
      return addr.getOopHandleAt(objectFieldOffset);
    }
  
-   // contentions is always equal to count
    public int contentions() {
!       return count();
    }
  
    // FIXME
    //  void*     object_addr();
    //  void      set_object(void* obj);
--- 85,102 ----
  
    public Address freeNext() { return addr.getAddressAt(FreeNextFieldOffset); }
    // FIXME
    //  void      set_queue(void* owner);
  
    public long recursions() { return recursionsField.getValue(addr); }
  
    public OopHandle object() {
      return addr.getOopHandleAt(objectFieldOffset);
    }
  
    public int contentions() {
!       return contentionsField.getValue(addr);
    }
  
    // FIXME
    //  void*     object_addr();
    //  void      set_object(void* obj);
*** 112,121 ****
    private static ObjectHeap    heap;
    private static long          headerFieldOffset;
    private static long          objectFieldOffset;
    private static long          ownerFieldOffset;
    private static long          FreeNextFieldOffset;
!   private static JIntField     countField;
    private static JIntField     waitersField;
    private static CIntegerField recursionsField;
    // FIXME: expose platform-dependent stuff
  }
--- 107,116 ----
    private static ObjectHeap    heap;
    private static long          headerFieldOffset;
    private static long          objectFieldOffset;
    private static long          ownerFieldOffset;
    private static long          FreeNextFieldOffset;
!   private static JIntField     contentionsField;
    private static JIntField     waitersField;
    private static CIntegerField recursionsField;
    // FIXME: expose platform-dependent stuff
  }