src/share/vm/runtime/objectMonitor.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 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) 1998, 2015, 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.
*** 249,276 ****
  
  
  // -----------------------------------------------------------------------------
  // Enter support
  
- bool ObjectMonitor::try_enter(Thread* THREAD) {
-   if (THREAD != _owner) {
-     if (THREAD->is_lock_owned ((address)_owner)) {
-       assert(_recursions == 0, "internal state error");
-       _owner = THREAD;
-       _recursions = 1;
-       return true;
-     }
-     if (Atomic::cmpxchg_ptr (THREAD, &_owner, NULL) != NULL) {
-       return false;
-     }
-     return true;
-   } else {
-     _recursions++;
-     return true;
-   }
- }
- 
  void NOINLINE ObjectMonitor::enter(TRAPS) {
    // The following code is ordered to check the most common cases first
    // and to reduce RTS->RTO cache line upgrades on SPARC and IA32 processors.
    Thread * const Self = THREAD;
  
--- 249,258 ----
*** 2270,2280 ****
    JavaThread *jt = (JavaThread *)this->_thread;
    JavaThreadBlockedOnMonitorEnterState::wait_reenter_end(jt, _active);
  }
  
  inline void ObjectMonitor::AddWaiter(ObjectWaiter* node) {
!   assert(node != NULL, "should not dequeue NULL node");
    assert(node->_prev == NULL, "node already in list");
    assert(node->_next == NULL, "node already in list");
    // put node at end of queue (circular doubly linked list)
    if (_WaitSet == NULL) {
      _WaitSet = node;
--- 2252,2262 ----
    JavaThread *jt = (JavaThread *)this->_thread;
    JavaThreadBlockedOnMonitorEnterState::wait_reenter_end(jt, _active);
  }
  
  inline void ObjectMonitor::AddWaiter(ObjectWaiter* node) {
!   assert(node != NULL, "should not add NULL node");
    assert(node->_prev == NULL, "node already in list");
    assert(node->_next == NULL, "node already in list");
    // put node at end of queue (circular doubly linked list)
    if (_WaitSet == NULL) {
      _WaitSet = node;