src/hotspot/share/runtime/objectMonitor.hpp

rev 59271 : 8153224.v2.10.patch merged with 8153224.v2.11.patch.
rev 59272 : CR1 changes from dcubed, dholmes, eosterlund and rehn.

@@ -286,10 +286,11 @@
   ObjectMonitor* try_set_next_om(ObjectMonitor* old_value, ObjectMonitor* new_value);
 
   jint      waiters() const;
 
   jint      contentions() const;
+  void      add_to_contentions(jint value);
   intx      recursions() const                                         { return _recursions; }
 
   // JVM/TI GetObjectMonitorUsage() needs this:
   ObjectWaiter* first_waiter()                                         { return _WaitSet; }
   ObjectWaiter* next_waiter(ObjectWaiter* o)                           { return o->_next; }

@@ -337,11 +338,11 @@
 
   // Returns true if the specified thread owns the ObjectMonitor. Otherwise
   // returns false and throws IllegalMonitorStateException (IMSE).
   bool      check_owner(Thread* THREAD);
   void      clear();
-  void      clear_using_JT();
+  void      clear_common();
 
   bool      enter(TRAPS);
   void      exit(bool not_suspended, TRAPS);
   void      wait(jlong millis, bool interruptable, TRAPS);
   void      notify(TRAPS);