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

rev 60098 : 8246476: remove AsyncDeflateIdleMonitors option and the safepoint based deflation mechanism
Reviewed-by: dholmes, pchilanomate, coleenp
rev 60099 : coleenp CR

*** 122,134 ****
  
  // Clear _owner field; current value must match old_value.
  inline void ObjectMonitor::release_clear_owner(void* old_value) {
  #ifdef ASSERT
    void* prev = Atomic::load(&_owner);
- #endif
    assert(prev == old_value, "unexpected prev owner=" INTPTR_FORMAT
           ", expected=" INTPTR_FORMAT, p2i(prev), p2i(old_value));
    Atomic::release_store(&_owner, (void*)NULL);
    log_trace(monitorinflation, owner)("release_clear_owner(): mid="
                                       INTPTR_FORMAT ", old_value=" INTPTR_FORMAT,
                                       p2i(this), p2i(old_value));
  }
--- 122,134 ----
  
  // Clear _owner field; current value must match old_value.
  inline void ObjectMonitor::release_clear_owner(void* old_value) {
  #ifdef ASSERT
    void* prev = Atomic::load(&_owner);
    assert(prev == old_value, "unexpected prev owner=" INTPTR_FORMAT
           ", expected=" INTPTR_FORMAT, p2i(prev), p2i(old_value));
+ #endif
    Atomic::release_store(&_owner, (void*)NULL);
    log_trace(monitorinflation, owner)("release_clear_owner(): mid="
                                       INTPTR_FORMAT ", old_value=" INTPTR_FORMAT,
                                       p2i(this), p2i(old_value));
  }
*** 136,148 ****
  // Simply set _owner field to new_value; current value must match old_value.
  // (Simple means no memory sync needed.)
  inline void ObjectMonitor::set_owner_from(void* old_value, void* new_value) {
  #ifdef ASSERT
    void* prev = Atomic::load(&_owner);
- #endif
    assert(prev == old_value, "unexpected prev owner=" INTPTR_FORMAT
           ", expected=" INTPTR_FORMAT, p2i(prev), p2i(old_value));
    Atomic::store(&_owner, new_value);
    log_trace(monitorinflation, owner)("set_owner_from(): mid="
                                       INTPTR_FORMAT ", old_value=" INTPTR_FORMAT
                                       ", new_value=" INTPTR_FORMAT, p2i(this),
                                       p2i(old_value), p2i(new_value));
--- 136,148 ----
  // Simply set _owner field to new_value; current value must match old_value.
  // (Simple means no memory sync needed.)
  inline void ObjectMonitor::set_owner_from(void* old_value, void* new_value) {
  #ifdef ASSERT
    void* prev = Atomic::load(&_owner);
    assert(prev == old_value, "unexpected prev owner=" INTPTR_FORMAT
           ", expected=" INTPTR_FORMAT, p2i(prev), p2i(old_value));
+ #endif
    Atomic::store(&_owner, new_value);
    log_trace(monitorinflation, owner)("set_owner_from(): mid="
                                       INTPTR_FORMAT ", old_value=" INTPTR_FORMAT
                                       ", new_value=" INTPTR_FORMAT, p2i(this),
                                       p2i(old_value), p2i(new_value));
*** 167,179 ****
  
  // Simply set _owner field to self; current value must match basic_lock_p.
  inline void ObjectMonitor::set_owner_from_BasicLock(void* basic_lock_p, Thread* self) {
  #ifdef ASSERT
    void* prev = Atomic::load(&_owner);
- #endif
    assert(prev == basic_lock_p, "unexpected prev owner=" INTPTR_FORMAT
           ", expected=" INTPTR_FORMAT, p2i(prev), p2i(basic_lock_p));
    // Non-null owner field to non-null owner field is safe without
    // cmpxchg() as long as all readers can tolerate either flavor.
    Atomic::store(&_owner, self);
    log_trace(monitorinflation, owner)("set_owner_from_BasicLock(): mid="
                                       INTPTR_FORMAT ", basic_lock_p="
--- 167,179 ----
  
  // Simply set _owner field to self; current value must match basic_lock_p.
  inline void ObjectMonitor::set_owner_from_BasicLock(void* basic_lock_p, Thread* self) {
  #ifdef ASSERT
    void* prev = Atomic::load(&_owner);
    assert(prev == basic_lock_p, "unexpected prev owner=" INTPTR_FORMAT
           ", expected=" INTPTR_FORMAT, p2i(prev), p2i(basic_lock_p));
+ #endif
    // Non-null owner field to non-null owner field is safe without
    // cmpxchg() as long as all readers can tolerate either flavor.
    Atomic::store(&_owner, self);
    log_trace(monitorinflation, owner)("set_owner_from_BasicLock(): mid="
                                       INTPTR_FORMAT ", basic_lock_p="