mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-19 02:24:40 +02:00
8274004: Change 'nonleaf' rank name
8273956: Add checking for rank values Reviewed-by: dholmes, pchilanomate
This commit is contained in:
Coleen Phillimore
parent
b60837a7d5
commit
6364719cd1
41 changed files with 335 additions and 347 deletions
|
|
@ -199,176 +199,175 @@ static void add_mutex(Mutex* var) {
|
|||
_mutex_array[_num_mutex++] = var;
|
||||
}
|
||||
|
||||
#define def(var, type, pri, vm_block, safepoint_check_allowed ) { \
|
||||
var = new type(Mutex::pri, #var, Mutex::safepoint_check_allowed, vm_block); \
|
||||
add_mutex(var); \
|
||||
#define def(var, type, pri, vm_block) { \
|
||||
var = new type(Mutex::pri, #var, vm_block); \
|
||||
add_mutex(var); \
|
||||
}
|
||||
|
||||
// Specify relative ranked lock
|
||||
#ifdef ASSERT
|
||||
#define defl(var, type, held_lock, vm_block, safepoint_check_allowed) { \
|
||||
var = new type(held_lock->rank()-1, #var, Mutex::safepoint_check_allowed, vm_block); \
|
||||
add_mutex(var); \
|
||||
#define defl(var, type, held_lock, vm_block) { \
|
||||
var = new type(held_lock->rank()-1, #var, vm_block); \
|
||||
add_mutex(var); \
|
||||
}
|
||||
#else
|
||||
#define defl(var, type, held_lock, vm_block, safepoint_check_allowed) { \
|
||||
var = new type(Mutex::nonleaf, #var, Mutex::safepoint_check_allowed, vm_block); \
|
||||
add_mutex(var); \
|
||||
#define defl(var, type, held_lock, vm_block) { \
|
||||
var = new type(Mutex::safepoint, #var, vm_block); \
|
||||
add_mutex(var); \
|
||||
}
|
||||
#endif
|
||||
|
||||
// Using Padded subclasses to prevent false sharing of these global monitors and mutexes.
|
||||
void mutex_init() {
|
||||
def(tty_lock , PaddedMutex , tty, true, _safepoint_check_never); // allow to lock in VM
|
||||
def(tty_lock , PaddedMutex , tty, true); // allow to lock in VM
|
||||
|
||||
def(STS_lock , PaddedMonitor, nosafepoint, true, _safepoint_check_never);
|
||||
def(STS_lock , PaddedMonitor, nosafepoint, true);
|
||||
|
||||
if (UseG1GC) {
|
||||
def(CGC_lock , PaddedMonitor, nosafepoint, true, _safepoint_check_never);
|
||||
def(CGC_lock , PaddedMonitor, nosafepoint, true);
|
||||
|
||||
def(G1DetachedRefinementStats_lock, PaddedMutex, nosafepoint-2, true, _safepoint_check_never);
|
||||
def(G1DetachedRefinementStats_lock, PaddedMutex, nosafepoint-2, true);
|
||||
|
||||
def(FreeList_lock , PaddedMutex , service-1, true, _safepoint_check_never);
|
||||
def(OldSets_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(Uncommit_lock , PaddedMutex , service-2, true, _safepoint_check_never);
|
||||
def(RootRegionScan_lock , PaddedMonitor, nosafepoint-1, true, _safepoint_check_never);
|
||||
def(FreeList_lock , PaddedMutex , service-1, true);
|
||||
def(OldSets_lock , PaddedMutex , nosafepoint, true);
|
||||
def(Uncommit_lock , PaddedMutex , service-2, true);
|
||||
def(RootRegionScan_lock , PaddedMonitor, nosafepoint-1, true);
|
||||
|
||||
def(MarkStackFreeList_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(MarkStackChunkList_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(MarkStackFreeList_lock , PaddedMutex , nosafepoint, true);
|
||||
def(MarkStackChunkList_lock , PaddedMutex , nosafepoint, true);
|
||||
|
||||
def(MonitoringSupport_lock , PaddedMutex , service-1, true, _safepoint_check_never); // used for serviceability monitoring support
|
||||
def(MonitoringSupport_lock , PaddedMutex , service-1, true); // used for serviceability monitoring support
|
||||
}
|
||||
def(StringDedup_lock , PaddedMonitor, nosafepoint, true, _safepoint_check_never);
|
||||
def(StringDedupIntern_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(ParGCRareEvent_lock , PaddedMutex , nonleaf, true, _safepoint_check_always);
|
||||
def(RawMonitor_lock , PaddedMutex , nosafepoint-1, true, _safepoint_check_never);
|
||||
def(StringDedup_lock , PaddedMonitor, nosafepoint, true);
|
||||
def(StringDedupIntern_lock , PaddedMutex , nosafepoint, true);
|
||||
def(ParGCRareEvent_lock , PaddedMutex , safepoint, true);
|
||||
def(RawMonitor_lock , PaddedMutex , nosafepoint-1, true);
|
||||
|
||||
def(Metaspace_lock , PaddedMutex , nosafepoint-3, true, _safepoint_check_never);
|
||||
def(Metaspace_lock , PaddedMutex , nosafepoint-3, true);
|
||||
|
||||
def(Patching_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never); // used for safepointing and code patching.
|
||||
def(MonitorDeflation_lock , PaddedMonitor, nosafepoint, true, _safepoint_check_never); // used for monitor deflation thread operations
|
||||
def(Service_lock , PaddedMonitor, service, true, _safepoint_check_never); // used for service thread operations
|
||||
def(Patching_lock , PaddedMutex , nosafepoint, true); // used for safepointing and code patching.
|
||||
def(MonitorDeflation_lock , PaddedMonitor, nosafepoint, true); // used for monitor deflation thread operations
|
||||
def(Service_lock , PaddedMonitor, service, true); // used for service thread operations
|
||||
|
||||
if (UseNotificationThread) {
|
||||
def(Notification_lock , PaddedMonitor, service, true, _safepoint_check_never); // used for notification thread operations
|
||||
def(Notification_lock , PaddedMonitor, service, true); // used for notification thread operations
|
||||
} else {
|
||||
Notification_lock = Service_lock;
|
||||
}
|
||||
|
||||
def(JmethodIdCreation_lock , PaddedMutex , nosafepoint-2, true, _safepoint_check_never); // used for creating jmethodIDs.
|
||||
def(JmethodIdCreation_lock , PaddedMutex , nosafepoint-2, true); // used for creating jmethodIDs.
|
||||
|
||||
def(SharedDictionary_lock , PaddedMutex , nonleaf, true, _safepoint_check_always);
|
||||
def(VMStatistic_lock , PaddedMutex , nonleaf, false, _safepoint_check_always);
|
||||
def(JNIHandleBlockFreeList_lock , PaddedMutex , nosafepoint-1, true, _safepoint_check_never); // handles are used by VM thread
|
||||
def(SignatureHandlerLibrary_lock , PaddedMutex , nonleaf, false, _safepoint_check_always);
|
||||
def(SymbolArena_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(ExceptionCache_lock , PaddedMutex , nonleaf, false, _safepoint_check_always);
|
||||
def(SharedDictionary_lock , PaddedMutex , safepoint, true);
|
||||
def(VMStatistic_lock , PaddedMutex , safepoint, false);
|
||||
def(JNIHandleBlockFreeList_lock , PaddedMutex , nosafepoint-1, true); // handles are used by VM thread
|
||||
def(SignatureHandlerLibrary_lock , PaddedMutex , safepoint, false);
|
||||
def(SymbolArena_lock , PaddedMutex , nosafepoint, true);
|
||||
def(ExceptionCache_lock , PaddedMutex , safepoint, false);
|
||||
#ifndef PRODUCT
|
||||
def(FullGCALot_lock , PaddedMutex , nonleaf, false, _safepoint_check_always); // a lock to make FullGCALot MT safe
|
||||
def(FullGCALot_lock , PaddedMutex , safepoint, false); // a lock to make FullGCALot MT safe
|
||||
#endif
|
||||
def(BeforeExit_lock , PaddedMonitor, nonleaf, true, _safepoint_check_always);
|
||||
def(BeforeExit_lock , PaddedMonitor, safepoint, true);
|
||||
|
||||
def(NonJavaThreadsList_lock , PaddedMutex, nosafepoint-1, true, _safepoint_check_never);
|
||||
def(NonJavaThreadsListSync_lock , PaddedMutex, nosafepoint, true, _safepoint_check_never);
|
||||
def(NonJavaThreadsList_lock , PaddedMutex, nosafepoint-1, true);
|
||||
def(NonJavaThreadsListSync_lock , PaddedMutex, nosafepoint, true);
|
||||
|
||||
def(RetData_lock , PaddedMutex , nonleaf, false, _safepoint_check_always);
|
||||
def(Terminator_lock , PaddedMonitor, nonleaf, true, _safepoint_check_always);
|
||||
def(InitCompleted_lock , PaddedMonitor, nosafepoint, true, _safepoint_check_never);
|
||||
def(Notify_lock , PaddedMonitor, nonleaf, true, _safepoint_check_always);
|
||||
def(JNICritical_lock , PaddedMonitor, nonleaf, true, _safepoint_check_always); // used for JNI critical regions
|
||||
def(AdapterHandlerLibrary_lock , PaddedMutex , nonleaf, true, _safepoint_check_always);
|
||||
def(RetData_lock , PaddedMutex , safepoint, false);
|
||||
def(Terminator_lock , PaddedMonitor, safepoint, true);
|
||||
def(InitCompleted_lock , PaddedMonitor, nosafepoint, true);
|
||||
def(Notify_lock , PaddedMonitor, safepoint, true);
|
||||
def(JNICritical_lock , PaddedMonitor, safepoint, true); // used for JNI critical regions
|
||||
def(AdapterHandlerLibrary_lock , PaddedMutex , safepoint, true);
|
||||
|
||||
def(Heap_lock , PaddedMonitor, nonleaf, false, _safepoint_check_always); // Doesn't safepoint check during termination.
|
||||
def(JfieldIdCreation_lock , PaddedMutex , nonleaf, true, _safepoint_check_always); // jfieldID, Used in VM_Operation
|
||||
def(Heap_lock , PaddedMonitor, safepoint, false); // Doesn't safepoint check during termination.
|
||||
def(JfieldIdCreation_lock , PaddedMutex , safepoint, true); // jfieldID, Used in VM_Operation
|
||||
|
||||
def(CompiledIC_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never); // locks VtableStubs_lock, InlineCacheBuffer_lock
|
||||
def(MethodCompileQueue_lock , PaddedMonitor, nonleaf, false, _safepoint_check_always);
|
||||
def(CompileStatistics_lock , PaddedMutex , nonleaf, false, _safepoint_check_always);
|
||||
def(DirectivesStack_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(MultiArray_lock , PaddedMutex , nonleaf, false, _safepoint_check_always);
|
||||
def(CompiledIC_lock , PaddedMutex , nosafepoint, true); // locks VtableStubs_lock, InlineCacheBuffer_lock
|
||||
def(MethodCompileQueue_lock , PaddedMonitor, safepoint, false);
|
||||
def(CompileStatistics_lock , PaddedMutex , safepoint, false);
|
||||
def(DirectivesStack_lock , PaddedMutex , nosafepoint, true);
|
||||
def(MultiArray_lock , PaddedMutex , safepoint, false);
|
||||
|
||||
def(JvmtiThreadState_lock , PaddedMutex , nonleaf, false, _safepoint_check_always); // Used by JvmtiThreadState/JvmtiEventController
|
||||
def(EscapeBarrier_lock , PaddedMonitor, nosafepoint, true, _safepoint_check_never); // Used to synchronize object reallocation/relocking triggered by JVMTI
|
||||
def(Management_lock , PaddedMutex , nonleaf, false, _safepoint_check_always); // used for JVM management
|
||||
def(JvmtiThreadState_lock , PaddedMutex , safepoint, false); // Used by JvmtiThreadState/JvmtiEventController
|
||||
def(EscapeBarrier_lock , PaddedMonitor, nosafepoint, true); // Used to synchronize object reallocation/relocking triggered by JVMTI
|
||||
def(Management_lock , PaddedMutex , safepoint, false); // used for JVM management
|
||||
|
||||
def(ConcurrentGCBreakpoints_lock , PaddedMonitor, nonleaf, true, _safepoint_check_always);
|
||||
def(MethodData_lock , PaddedMutex , nonleaf, false, _safepoint_check_always);
|
||||
def(TouchedMethodLog_lock , PaddedMutex , nonleaf, false, _safepoint_check_always);
|
||||
def(ConcurrentGCBreakpoints_lock , PaddedMonitor, safepoint, true);
|
||||
def(MethodData_lock , PaddedMutex , safepoint, false);
|
||||
def(TouchedMethodLog_lock , PaddedMutex , safepoint, false);
|
||||
|
||||
def(CompileThread_lock , PaddedMonitor, nonleaf, false, _safepoint_check_always);
|
||||
def(PeriodicTask_lock , PaddedMonitor, nonleaf, true, _safepoint_check_always);
|
||||
def(RedefineClasses_lock , PaddedMonitor, nonleaf, true, _safepoint_check_always);
|
||||
def(Verify_lock , PaddedMutex, nonleaf, true, _safepoint_check_always);
|
||||
def(CompileThread_lock , PaddedMonitor, safepoint, false);
|
||||
def(PeriodicTask_lock , PaddedMonitor, safepoint, true);
|
||||
def(RedefineClasses_lock , PaddedMonitor, safepoint, true);
|
||||
def(Verify_lock , PaddedMutex, safepoint, true);
|
||||
|
||||
if (WhiteBoxAPI) {
|
||||
def(Compilation_lock , PaddedMonitor, nosafepoint, true, _safepoint_check_never);
|
||||
def(Compilation_lock , PaddedMonitor, nosafepoint, true);
|
||||
}
|
||||
|
||||
#if INCLUDE_JFR
|
||||
def(JfrBuffer_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(JfrStacktrace_lock , PaddedMutex , stackwatermark-1, true, _safepoint_check_never);
|
||||
def(JfrThreadSampler_lock , PaddedMonitor, nosafepoint, true, _safepoint_check_never);
|
||||
def(JfrBuffer_lock , PaddedMutex , nosafepoint, true);
|
||||
def(JfrStacktrace_lock , PaddedMutex , stackwatermark-1, true);
|
||||
def(JfrThreadSampler_lock , PaddedMonitor, nosafepoint, true);
|
||||
#endif
|
||||
|
||||
#ifndef SUPPORTS_NATIVE_CX8
|
||||
def(UnsafeJlong_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(UnsafeJlong_lock , PaddedMutex , nosafepoint, true);
|
||||
#endif
|
||||
|
||||
def(CodeHeapStateAnalytics_lock , PaddedMutex , nonleaf, false, _safepoint_check_always);
|
||||
def(NMethodSweeperStats_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(ThreadsSMRDelete_lock , PaddedMonitor, nosafepoint-3, true, _safepoint_check_never); // Holds ConcurrentHashTableResize_lock
|
||||
def(ThreadIdTableCreate_lock , PaddedMutex , nonleaf, false, _safepoint_check_always);
|
||||
def(SharedDecoder_lock , PaddedMutex , tty-1, true, _safepoint_check_never);
|
||||
def(DCmdFactory_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(CodeHeapStateAnalytics_lock , PaddedMutex , safepoint, false);
|
||||
def(NMethodSweeperStats_lock , PaddedMutex , nosafepoint, true);
|
||||
def(ThreadsSMRDelete_lock , PaddedMonitor, nosafepoint-3, true); // Holds ConcurrentHashTableResize_lock
|
||||
def(ThreadIdTableCreate_lock , PaddedMutex , safepoint, false);
|
||||
def(SharedDecoder_lock , PaddedMutex , tty-1, true);
|
||||
def(DCmdFactory_lock , PaddedMutex , nosafepoint, true);
|
||||
#if INCLUDE_NMT
|
||||
def(NMTQuery_lock , PaddedMutex , nonleaf, false, _safepoint_check_always);
|
||||
def(NMTQuery_lock , PaddedMutex , safepoint, false);
|
||||
#endif
|
||||
#if INCLUDE_CDS
|
||||
#if INCLUDE_JVMTI
|
||||
def(CDSClassFileStream_lock , PaddedMutex , nonleaf, false, _safepoint_check_always);
|
||||
def(CDSClassFileStream_lock , PaddedMutex , safepoint, false);
|
||||
#endif
|
||||
def(DumpTimeTable_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(CDSLambda_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(DumpRegion_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(ClassListFile_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(LambdaFormInvokers_lock , PaddedMutex , nonleaf, false, _safepoint_check_always);
|
||||
def(DumpTimeTable_lock , PaddedMutex , nosafepoint, true);
|
||||
def(CDSLambda_lock , PaddedMutex , nosafepoint, true);
|
||||
def(DumpRegion_lock , PaddedMutex , nosafepoint, true);
|
||||
def(ClassListFile_lock , PaddedMutex , nosafepoint, true);
|
||||
def(LambdaFormInvokers_lock , PaddedMutex , safepoint, false);
|
||||
#endif // INCLUDE_CDS
|
||||
def(Bootclasspath_lock , PaddedMutex , nosafepoint, true, _safepoint_check_never);
|
||||
def(Zip_lock , PaddedMonitor, nosafepoint-1, true, _safepoint_check_never); // Holds DumpTimeTable_lock
|
||||
def(Bootclasspath_lock , PaddedMutex , nosafepoint, true);
|
||||
def(Zip_lock , PaddedMonitor, nosafepoint-1, true); // Holds DumpTimeTable_lock
|
||||
|
||||
#if INCLUDE_JVMCI
|
||||
def(JVMCI_lock , PaddedMonitor, nonleaf, true, _safepoint_check_always);
|
||||
def(JVMCI_lock , PaddedMonitor, safepoint, true);
|
||||
#endif
|
||||
|
||||
// These locks have safepoint_check_never and relative rankings.
|
||||
defl(InlineCacheBuffer_lock , PaddedMutex , CompiledIC_lock, true, _safepoint_check_never);
|
||||
defl(VtableStubs_lock , PaddedMutex , CompiledIC_lock, true, _safepoint_check_never); // Also holds DumpTimeTable_lock
|
||||
defl(CodeCache_lock , PaddedMonitor, VtableStubs_lock, true, _safepoint_check_never);
|
||||
defl(CompiledMethod_lock , PaddedMutex , CodeCache_lock, true, _safepoint_check_never);
|
||||
defl(CodeSweeper_lock , PaddedMonitor, CompiledMethod_lock, true, _safepoint_check_never);
|
||||
// These locks have relative rankings, and inherit safepoint checking attributes from that rank.
|
||||
defl(InlineCacheBuffer_lock , PaddedMutex , CompiledIC_lock, true);
|
||||
defl(VtableStubs_lock , PaddedMutex , CompiledIC_lock, true); // Also holds DumpTimeTable_lock
|
||||
defl(CodeCache_lock , PaddedMonitor, VtableStubs_lock, true);
|
||||
defl(CompiledMethod_lock , PaddedMutex , CodeCache_lock, true);
|
||||
defl(CodeSweeper_lock , PaddedMonitor, CompiledMethod_lock, true);
|
||||
|
||||
// These locks have safepoint_check_always and relative rankings.
|
||||
defl(Threads_lock , PaddedMonitor, CompileThread_lock, true, _safepoint_check_always);
|
||||
defl(Heap_lock , PaddedMonitor, MultiArray_lock, false, _safepoint_check_always);
|
||||
defl(Compile_lock , PaddedMutex , MethodCompileQueue_lock, false, _safepoint_check_always);
|
||||
defl(Threads_lock , PaddedMonitor, CompileThread_lock, true);
|
||||
defl(Heap_lock , PaddedMonitor, MultiArray_lock, false);
|
||||
defl(Compile_lock , PaddedMutex , MethodCompileQueue_lock, false);
|
||||
|
||||
defl(PerfDataMemAlloc_lock , PaddedMutex , Heap_lock, true, _safepoint_check_always);
|
||||
defl(PerfDataManager_lock , PaddedMutex , Heap_lock, true, _safepoint_check_always);
|
||||
defl(ClassLoaderDataGraph_lock , PaddedMutex , MultiArray_lock, false, _safepoint_check_always);
|
||||
defl(VMOperation_lock , PaddedMonitor, Compile_lock, true, _safepoint_check_always);
|
||||
defl(ClassInitError_lock , PaddedMonitor, Threads_lock, true, _safepoint_check_always);
|
||||
defl(PerfDataMemAlloc_lock , PaddedMutex , Heap_lock, true);
|
||||
defl(PerfDataManager_lock , PaddedMutex , Heap_lock, true);
|
||||
defl(ClassLoaderDataGraph_lock , PaddedMutex , MultiArray_lock, false);
|
||||
defl(VMOperation_lock , PaddedMonitor, Compile_lock, true);
|
||||
defl(ClassInitError_lock , PaddedMonitor, Threads_lock, true);
|
||||
|
||||
if (UseG1GC) {
|
||||
defl(G1OldGCCount_lock , PaddedMonitor, Threads_lock, true, _safepoint_check_always);
|
||||
defl(G1OldGCCount_lock , PaddedMonitor, Threads_lock, true);
|
||||
}
|
||||
defl(CompileTaskAlloc_lock , PaddedMutex , MethodCompileQueue_lock, true, _safepoint_check_always);
|
||||
defl(ExpandHeap_lock , PaddedMutex , Heap_lock, true, _safepoint_check_always);
|
||||
defl(OopMapCacheAlloc_lock , PaddedMutex , Threads_lock, true, _safepoint_check_always);
|
||||
defl(Module_lock , PaddedMutex , ClassLoaderDataGraph_lock, false, _safepoint_check_always);
|
||||
defl(SystemDictionary_lock , PaddedMonitor, Module_lock, true, _safepoint_check_always);
|
||||
defl(CompileTaskAlloc_lock , PaddedMutex , MethodCompileQueue_lock, true);
|
||||
defl(ExpandHeap_lock , PaddedMutex , Heap_lock, true);
|
||||
defl(OopMapCacheAlloc_lock , PaddedMutex , Threads_lock, true);
|
||||
defl(Module_lock , PaddedMutex , ClassLoaderDataGraph_lock, false);
|
||||
defl(SystemDictionary_lock , PaddedMonitor, Module_lock, true);
|
||||
|
||||
#if INCLUDE_JFR
|
||||
defl(JfrMsg_lock , PaddedMonitor, Module_lock, true, _safepoint_check_always);
|
||||
defl(JfrMsg_lock , PaddedMonitor, Module_lock, true);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue