< prev index next >

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

Print this page
rev 60025 : 8246476: remove AsyncDeflateIdleMonitors option and the safepoint based deflation mechanism

@@ -65,11 +65,11 @@
   return Atomic::load(&_owner) == DEFLATER_MARKER;
 }
 
 // Returns true if 'this' is being async deflated and false otherwise.
 inline bool ObjectMonitor::is_being_async_deflated() {
-  return AsyncDeflateIdleMonitors && contentions() < 0;
+  return contentions() < 0;
 }
 
 inline void ObjectMonitor::clear() {
   assert(Atomic::load(&_header).value() != 0, "must be non-zero");
   assert(_owner == NULL, "must be NULL: owner=" INTPTR_FORMAT, p2i(_owner));

@@ -78,21 +78,19 @@
 
   clear_common();
 }
 
 inline void ObjectMonitor::clear_common() {
-  if (AsyncDeflateIdleMonitors) {
     // Async deflation protocol uses the header, owner and contentions
     // fields. While the ObjectMonitor being deflated is on the global
     // free list, we leave those three fields alone; contentions < 0
     // will force any racing threads to retry. The header field is used
     // by install_displaced_markword_in_object() to restore the object's
     // header so we cannot check its value here.
     guarantee(_owner == NULL || _owner == DEFLATER_MARKER,
               "must be NULL or DEFLATER_MARKER: owner=" INTPTR_FORMAT,
               p2i(_owner));
-  }
   assert(contentions() <= 0, "must not be positive: contentions=%d", contentions());
   assert(_waiters == 0, "must be 0: waiters=%d", _waiters);
   assert(_recursions == 0, "must be 0: recursions=" INTX_FORMAT, _recursions);
   assert(_object != NULL, "must be non-NULL");
 

@@ -122,24 +120,28 @@
   Atomic::add(&_contentions, value);
 }
 
 // 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);
-  ADIM_guarantee(prev == old_value, "unexpected prev owner=" INTPTR_FORMAT
+#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));
 }
 
 // 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);
-  ADIM_guarantee(prev == old_value, "unexpected prev owner=" INTPTR_FORMAT
+#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),

@@ -148,11 +150,11 @@
 
 // Simply set _owner field to new_value; current value must match old_value1 or old_value2.
 // (Simple means no memory sync needed.)
 inline void ObjectMonitor::set_owner_from(void* old_value1, void* old_value2, void* new_value) {
   void* prev = Atomic::load(&_owner);
-  ADIM_guarantee(prev == old_value1 || prev == old_value2,
+  assert(prev == old_value1 || prev == old_value2,
                  "unexpected prev owner=" INTPTR_FORMAT ", expected1="
                  INTPTR_FORMAT " or expected2=" INTPTR_FORMAT, p2i(prev),
                  p2i(old_value1), p2i(old_value2));
   _owner = new_value;
   log_trace(monitorinflation, owner)("set_owner_from(old1=" INTPTR_FORMAT

@@ -163,12 +165,14 @@
                                      p2i(new_value));
 }
 
 // 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);
-  ADIM_guarantee(prev == basic_lock_p, "unexpected prev owner=" INTPTR_FORMAT
+#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="
< prev index next >