src/hotspot/share/runtime/objectMonitor.inline.hpp

@@ -27,13 +27,17 @@
  
  #include "runtime/objectMonitor.hpp"
  
  #include "logging/log.hpp"
  #include "oops/access.inline.hpp"
+ #include "oops/markWord.hpp"
  #include "runtime/atomic.hpp"
+ #include "runtime/globals.hpp"
  #include "runtime/lockStack.inline.hpp"
  #include "runtime/synchronizer.hpp"
+ #include "utilities/checkedCast.hpp"
+ #include "utilities/globalDefinitions.hpp"
  
  inline bool ObjectMonitor::is_entered(JavaThread* current) const {
    if (LockingMode == LM_LIGHTWEIGHT) {
      if (is_owner_anonymous()) {
        return current->lock_stack().contains(object());

@@ -47,20 +51,42 @@
      }
    }
    return false;
  }
  
- inline markWord ObjectMonitor::header() const {
-   return Atomic::load(&_header);
+ inline uintptr_t ObjectMonitor::metadata() const {
+   return Atomic::load(&_metadata);
+ }
+ 
+ inline void ObjectMonitor::set_metadata(uintptr_t value) {
+   Atomic::store(&_metadata, value);
  }
  
- inline volatile markWord* ObjectMonitor::header_addr() {
-   return &_header;
+ inline volatile uintptr_t* ObjectMonitor::metadata_addr() {
+   STATIC_ASSERT(std::is_standard_layout<ObjectMonitor>::value);
+   STATIC_ASSERT(offsetof(ObjectMonitor, _metadata) == 0);
+   return &_metadata;
+ }
+ 
+ inline markWord ObjectMonitor::header() const {
+   assert(!UseObjectMonitorTable, "Lightweight locking with OM table does not use header");
+   return markWord(metadata());
  }
  
  inline void ObjectMonitor::set_header(markWord hdr) {
-   Atomic::store(&_header, hdr);
+   assert(!UseObjectMonitorTable, "Lightweight locking with OM table does not use header");
+   set_metadata(hdr.value());
+ }
+ 
+ inline intptr_t ObjectMonitor::hash() const {
+   assert(UseObjectMonitorTable, "Only used by lightweight locking with OM table");
+   return metadata();
+ }
+ 
+ inline void ObjectMonitor::set_hash(intptr_t hash) {
+   assert(UseObjectMonitorTable, "Only used by lightweight locking with OM table");
+   set_metadata(hash);
  }
  
  inline int ObjectMonitor::waiters() const {
    return _waiters;
  }

@@ -178,6 +204,37 @@
  // Simply set _next_om field to new_value.
  inline void ObjectMonitor::set_next_om(ObjectMonitor* new_value) {
    Atomic::store(&_next_om, new_value);
  }
  
+ inline ObjectMonitorContentionMark::ObjectMonitorContentionMark(ObjectMonitor* monitor)
+   : _monitor(monitor) {
+   _monitor->add_to_contentions(1);
+ }
+ 
+ inline ObjectMonitorContentionMark::~ObjectMonitorContentionMark() {
+   _monitor->add_to_contentions(-1);
+ }
+ 
+ inline oop ObjectMonitor::object_peek() const {
+   if (_object.is_null()) {
+     return nullptr;
+   }
+   return _object.peek();
+ }
+ 
+ inline bool ObjectMonitor::object_is_dead() const {
+   return object_peek() == nullptr;
+ }
+ 
+ inline bool ObjectMonitor::object_is_cleared() const {
+   return _object.is_null();
+ }
+ 
+ inline bool ObjectMonitor::object_refers_to(oop obj) const {
+   if (_object.is_null()) {
+     return false;
+   }
+   return _object.peek() == obj;
+ }
+ 
  #endif // SHARE_RUNTIME_OBJECTMONITOR_INLINE_HPP