comparison src/share/vm/runtime/mutexLocker.cpp @ 10408:836a62f43af9

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents 291ffc492eb6 f2110083203d
children cefad50507d8
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
1 /* 1 /*
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
44 Mutex* InlineCacheBuffer_lock = NULL; 44 Mutex* InlineCacheBuffer_lock = NULL;
45 Mutex* VMStatistic_lock = NULL; 45 Mutex* VMStatistic_lock = NULL;
46 Mutex* JNIGlobalHandle_lock = NULL; 46 Mutex* JNIGlobalHandle_lock = NULL;
47 Mutex* JNIHandleBlockFreeList_lock = NULL; 47 Mutex* JNIHandleBlockFreeList_lock = NULL;
48 Mutex* JNICachedItableIndex_lock = NULL; 48 Mutex* JNICachedItableIndex_lock = NULL;
49 Mutex* MemberNameTable_lock = NULL;
49 Mutex* JmethodIdCreation_lock = NULL; 50 Mutex* JmethodIdCreation_lock = NULL;
50 Mutex* JfieldIdCreation_lock = NULL; 51 Mutex* JfieldIdCreation_lock = NULL;
51 Monitor* JNICritical_lock = NULL; 52 Monitor* JNICritical_lock = NULL;
52 Mutex* JvmtiThreadState_lock = NULL; 53 Mutex* JvmtiThreadState_lock = NULL;
53 Monitor* JvmtiPendingEvent_lock = NULL; 54 Monitor* JvmtiPendingEvent_lock = NULL;
254 // used in CMS GC for locking PLL lock 255 // used in CMS GC for locking PLL lock
255 } 256 }
256 def(Heap_lock , Monitor, nonleaf+1, false); 257 def(Heap_lock , Monitor, nonleaf+1, false);
257 def(JfieldIdCreation_lock , Mutex , nonleaf+1, true ); // jfieldID, Used in VM_Operation 258 def(JfieldIdCreation_lock , Mutex , nonleaf+1, true ); // jfieldID, Used in VM_Operation
258 def(JNICachedItableIndex_lock , Mutex , nonleaf+1, false); // Used to cache an itable index during JNI invoke 259 def(JNICachedItableIndex_lock , Mutex , nonleaf+1, false); // Used to cache an itable index during JNI invoke
260 def(MemberNameTable_lock , Mutex , nonleaf+1, false); // Used to protect MemberNameTable
259 261
260 def(CompiledIC_lock , Mutex , nonleaf+2, false); // locks VtableStubs_lock, InlineCacheBuffer_lock 262 def(CompiledIC_lock , Mutex , nonleaf+2, false); // locks VtableStubs_lock, InlineCacheBuffer_lock
261 def(CompileTaskAlloc_lock , Mutex , nonleaf+2, true ); 263 def(CompileTaskAlloc_lock , Mutex , nonleaf+2, true );
262 def(CompileStatistics_lock , Mutex , nonleaf+2, false); 264 def(CompileStatistics_lock , Mutex , nonleaf+2, false);
263 def(MultiArray_lock , Mutex , nonleaf+2, false); // locks SymbolTable_lock 265 def(MultiArray_lock , Mutex , nonleaf+2, false); // locks SymbolTable_lock
270 def(MethodData_lock , Mutex , nonleaf+3, false); 272 def(MethodData_lock , Mutex , nonleaf+3, false);
271 273
272 def(MethodCompileQueue_lock , Monitor, nonleaf+4, true ); 274 def(MethodCompileQueue_lock , Monitor, nonleaf+4, true );
273 def(Debug2_lock , Mutex , nonleaf+4, true ); 275 def(Debug2_lock , Mutex , nonleaf+4, true );
274 def(Debug3_lock , Mutex , nonleaf+4, true ); 276 def(Debug3_lock , Mutex , nonleaf+4, true );
275 def(ProfileVM_lock , Monitor, nonleaf+4, false); // used for profiling of the VMThread 277 def(ProfileVM_lock , Monitor, special, false); // used for profiling of the VMThread
276 def(CompileThread_lock , Monitor, nonleaf+5, false ); 278 def(CompileThread_lock , Monitor, nonleaf+5, false );
277 279
278 def(JfrQuery_lock , Monitor, nonleaf, true); // JFR locks, keep these in consecutive order 280 def(JfrMsg_lock , Monitor, leaf, true);
279 def(JfrMsg_lock , Monitor, nonleaf+2, true); 281 def(JfrBuffer_lock , Mutex, nonleaf+1, true);
280 def(JfrBuffer_lock , Mutex, nonleaf+3, true); 282 def(JfrStream_lock , Mutex, nonleaf+2, true);
281 def(JfrStream_lock , Mutex, nonleaf+4, true);
282 def(PeriodicTask_lock , Monitor, nonleaf+5, true); 283 def(PeriodicTask_lock , Monitor, nonleaf+5, true);
283 #ifdef GRAAL 284 #ifdef GRAAL
284 def(GraalDeoptLeafGraphIds_lock , Mutex, special, true); 285 def(GraalDeoptLeafGraphIds_lock , Mutex, special, true);
285 #endif // GRAAL 286 #endif // GRAAL
286 } 287 }