comparison src/share/vm/prims/jvmtiRawMonitor.cpp @ 20804:7848fc12602b

Merge with jdk8u40-b25
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 07 Apr 2015 14:58:49 +0200
parents ce8f6bb717c9
children
comparison
equal deleted inserted replaced
20184:84105dcdb05b 20804:7848fc12602b
23 */ 23 */
24 24
25 #include "precompiled.hpp" 25 #include "precompiled.hpp"
26 #include "prims/jvmtiRawMonitor.hpp" 26 #include "prims/jvmtiRawMonitor.hpp"
27 #include "runtime/interfaceSupport.hpp" 27 #include "runtime/interfaceSupport.hpp"
28 #include "runtime/thread.hpp" 28 #include "runtime/orderAccess.inline.hpp"
29 #include "runtime/thread.inline.hpp"
29 30
30 GrowableArray<JvmtiRawMonitor*> *JvmtiPendingMonitors::_monitors = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<JvmtiRawMonitor*>(1,true); 31 GrowableArray<JvmtiRawMonitor*> *JvmtiPendingMonitors::_monitors = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<JvmtiRawMonitor*>(1,true);
31 32
32 void JvmtiPendingMonitors::transition_raw_monitors() { 33 void JvmtiPendingMonitors::transition_raw_monitors() {
33 assert((Threads::number_of_threads()==1), 34 assert((Threads::number_of_threads()==1),