jdk-sandbox: comparison src/hotspot/share/runtime/mutexLocker.hpp

equal deleted inserted replaced

-:13588c901957
+:9cf78a70fa4f
 #include "runtime/mutex.hpp"
 // Mutexes used in the VM.
 extern Mutex*   Patching_lock;                   // a lock used to guard code patching of compiled code
-extern Mutex*   CompiledMethod_lock;             // a lock used to guard a compiled method
+extern Mutex*   CompiledMethod_lock;             // a lock used to guard a compiled method and OSR queues
 extern Monitor* SystemDictionary_lock;           // a lock on the system dictionary
 extern Mutex*   ProtectionDomainSet_lock;        // a lock on the pd_set list in the system dictionary
 extern Mutex*   SharedDictionary_lock;           // a lock on the CDS shared dictionary
 extern Mutex*   Module_lock;                     // a lock on module and package related data structures
 extern Mutex*   CompiledIC_lock;                 // a lock used to guard compiled IC patching and access
 extern Mutex*   InlineCacheBuffer_lock;          // a lock used to guard the InlineCacheBuffer
 extern Mutex*   VMStatistic_lock;                // a lock used to guard statistics count increment
-extern Mutex*   JNIGlobalAlloc_lock;             // JNI global storage allocate list lock
-extern Mutex*   JNIGlobalActive_lock;            // JNI global storage active list lock
-extern Mutex*   JNIWeakAlloc_lock;               // JNI weak storage allocate list lock
-extern Mutex*   JNIWeakActive_lock;              // JNI weak storage active list lock
-extern Mutex*   StringTableWeakAlloc_lock;       // StringTable weak storage allocate list lock
-extern Mutex*   StringTableWeakActive_lock;      // STringTable weak storage active list lock
 extern Mutex*   JNIHandleBlockFreeList_lock;     // a lock on the JNI handle block free list
-extern Mutex*   VMWeakAlloc_lock;                // VM Weak Handles storage allocate list lock
-extern Mutex*   VMWeakActive_lock;               // VM Weak Handles storage active list lock
-extern Mutex*   ResolvedMethodTableWeakAlloc_lock;  // ResolvedMethodTable weak storage allocate list
-extern Mutex*   ResolvedMethodTableWeakActive_lock; // ResolvedMethodTable weak storage active list
 extern Mutex*   JmethodIdCreation_lock;          // a lock on creating JNI method identifiers
 extern Mutex*   JfieldIdCreation_lock;           // a lock on creating JNI static field identifiers
 extern Monitor* JNICritical_lock;                // a lock used while entering and exiting JNI critical regions, allows GC to sometimes get in
 extern Mutex*   JvmtiThreadState_lock;           // a lock on modification of JVMTI thread data
 extern Monitor* Heap_lock;                       // a lock on the heap
 extern Mutex*   NonJavaThreadsListSync_lock;     // a lock for NonJavaThreads list synchronization
 extern Monitor* CGC_lock;                        // used for coordination between
 // fore- & background GC threads.
 extern Monitor* STS_lock;                        // used for joining/leaving SuspendibleThreadSet.
 extern Monitor* FullGCCount_lock;                // in support of "concurrent" full gc
-extern Monitor* SATB_Q_CBL_mon;                  // Protects SATB Q
-// completed buffer queue.
 extern Monitor* DirtyCardQ_CBL_mon;              // Protects dirty card Q
 // completed buffer queue.
 extern Mutex*   Shared_DirtyCardQ_lock;          // Lock protecting dirty card
 // queue shared by
 // non-Java threads.
 extern Monitor* InitCompleted_lock;              // a lock used to signal threads waiting on init completed
 extern Monitor* BeforeExit_lock;                 // a lock used to guard cleanups and shutdown hooks
 extern Monitor* Notify_lock;                     // a lock used to synchronize the start-up of the vm
 extern Mutex*   ProfilePrint_lock;               // a lock used to serialize the printing of profiles
 extern Mutex*   ExceptionCache_lock;             // a lock used to synchronize exception cache updates
-extern Mutex*   OsrList_lock;                    // a lock used to serialize access to OSR queues
 extern Mutex*   NMethodSweeperStats_lock;        // a lock used to serialize access to sweeper statistics
 #ifndef PRODUCT
 extern Mutex*   FullGCALot_lock;                 // a lock to make FullGCALot MT safe
 #endif // PRODUCT
 extern Mutex*   Debug3_lock;
 extern Mutex*   RawMonitor_lock;
 extern Mutex*   PerfDataMemAlloc_lock;           // a lock on the allocator for PerfData memory for performance data
 extern Mutex*   PerfDataManager_lock;            // a long on access to PerfDataManager resources
-extern Mutex*   ParkerFreeList_lock;
 extern Mutex*   OopMapCacheAlloc_lock;           // protects allocation of oop_map caches
 extern Mutex*   FreeList_lock;                   // protects the free region list during safepoints
 extern Mutex*   OldSets_lock;                    // protects the old region sets
 extern Monitor* RootRegionScan_lock;             // used to notify that the CM threads have finished scanning the IM snapshot regions
 extern Mutex*   Management_lock;                 // a lock used to serialize JVM management
 extern Monitor* Service_lock;                    // a lock used for service thread operation
+extern Monitor* Notification_lock;               // a lock used for notification thread operation
 extern Monitor* PeriodicTask_lock;               // protects the periodic task structure
 extern Monitor* RedefineClasses_lock;            // locks classes from parallel redefinition
+extern Mutex*   Verify_lock;                     // synchronize initialization of verify library
 extern Monitor* ThreadsSMRDelete_lock;           // Used by ThreadsSMRSupport to take pressure off the Threads_lock
+extern Mutex*   ThreadIdTableCreate_lock;        // Used by ThreadIdTable to lazily create the thread id table
 extern Mutex*   SharedDecoder_lock;              // serializes access to the decoder during normal (not error reporting) use
 extern Mutex*   DCmdFactory_lock;                // serialize access to DCmdFactory information
 #if INCLUDE_NMT
 extern Mutex*   NMTQuery_lock;                   // serialize NMT Dcmd queries
 #endif
 extern Mutex*   MetaspaceExpand_lock;            // protects Metaspace virtualspace and chunk expansions
 extern Mutex*   ClassLoaderDataGraph_lock;       // protects CLDG list, needed for concurrent unloading
-extern Monitor* CodeHeapStateAnalytics_lock;     // lock print functions against concurrent analyze functions.
+extern Mutex*   CodeHeapStateAnalytics_lock;     // lock print functions against concurrent analyze functions.
 // Only used locally in PrintCodeCacheLayout processing.
 #if INCLUDE_JVMCI
 extern Monitor* JVMCI_lock;                      // Monitor to control initialization of JVMCI
-extern Mutex*   JVMCIGlobalAlloc_lock;           // JVMCI global storage allocate list lock
+#endif
-extern Mutex*   JVMCIGlobalActive_lock;          // JVMCI global storage active list lock
-#endif
+extern Mutex* tty_lock;                          // lock to synchronize output.
 // A MutexLocker provides mutual exclusion with respect to a given mutex
 // for the scope which contains the locker.  The lock is an OS lock, not
 // an object lock, and the two do not interoperate.  Do not use Mutex-based
 // locks to lock on Java objects, because they will not be respected if a
 char *lock_name(Mutex *mutex);
 // for debugging: check that we're already owning this lock (or are at a safepoint)
 #ifdef ASSERT
-void assert_locked_or_safepoint(const Monitor * lock);
+void assert_locked_or_safepoint(const Mutex* lock);
-void assert_locked_or_safepoint_weak(const Monitor * lock);
+void assert_locked_or_safepoint_weak(const Mutex* lock);
-void assert_lock_strong(const Monitor * lock);
+void assert_lock_strong(const Mutex* lock);
 #else
 #define assert_locked_or_safepoint(lock)
 #define assert_locked_or_safepoint_weak(lock)
 #define assert_lock_strong(lock)
 #endif
 class MutexLocker: public StackObj {
 protected:
-Monitor* _mutex;
+Mutex* _mutex;
 private:
 public:
-MutexLocker(Monitor* mutex, Mutex::SafepointCheckFlag flag = Mutex::_safepoint_check_flag) :
+MutexLocker(Mutex* mutex, Mutex::SafepointCheckFlag flag = Mutex::_safepoint_check_flag) :
 _mutex(mutex) {
 bool no_safepoint_check = flag == Mutex::_no_safepoint_check_flag;
 if (_mutex != NULL) {
 assert(_mutex->rank() > Mutex::special || no_safepoint_check,
 "Mutexes with rank special or lower should not do safepoint checks");
 _mutex->lock();
 }
 }
 }
-MutexLocker(Monitor* mutex, Thread* thread, Mutex::SafepointCheckFlag flag = Mutex::_safepoint_check_flag) :
+MutexLocker(Mutex* mutex, Thread* thread, Mutex::SafepointCheckFlag flag = Mutex::_safepoint_check_flag) :
 _mutex(mutex) {
 bool no_safepoint_check = flag == Mutex::_no_safepoint_check_flag;
 if (_mutex != NULL) {
 assert(_mutex->rank() > Mutex::special || no_safepoint_check,
 "Mutexes with rank special or lower should not do safepoint checks");
 // wait/notify as well which are delegated to the underlying Monitor.
 // It also disallows NULL.
 class MonitorLocker: public MutexLocker {
 Mutex::SafepointCheckFlag _flag;
+Monitor* _monitor;
 public:
 MonitorLocker(Monitor* monitor, Mutex::SafepointCheckFlag flag = Mutex::_safepoint_check_flag) :
-MutexLocker(monitor, flag), _flag(flag) {
+MutexLocker(monitor, flag), _flag(flag), _monitor(monitor) {
 // Superclass constructor did locking
-assert(_mutex != NULL, "NULL monitor not allowed");
+assert(_monitor != NULL, "NULL monitor not allowed");
 }
 MonitorLocker(Monitor* monitor, Thread* thread, Mutex::SafepointCheckFlag flag = Mutex::_safepoint_check_flag) :
-MutexLocker(monitor, thread, flag), _flag(flag)  {
+MutexLocker(monitor, thread, flag), _flag(flag), _monitor(monitor)  {
 // Superclass constructor did locking
-assert(_mutex != NULL, "NULL monitor not allowed");
+assert(_monitor != NULL, "NULL monitor not allowed");
 }
 bool wait(long timeout = 0,
 bool as_suspend_equivalent = !Mutex::_as_suspend_equivalent_flag) {
 if (_flag == Mutex::_safepoint_check_flag) {
-return _mutex->wait(timeout, as_suspend_equivalent);
+return _monitor->wait(timeout, as_suspend_equivalent);
 } else {
-return _mutex->wait_without_safepoint_check(timeout);
+return _monitor->wait_without_safepoint_check(timeout);
 }
 return false;
 }
 void notify_all() {
-_mutex->notify_all();
+_monitor->notify_all();
 }
 void notify() {
-_mutex->notify();
+_monitor->notify();
 }
 };
 // A GCMutexLocker is usually initialized with a mutex that is
 // GC's.  Thus, it must acquire the mutex if GC is not in progress, but not
 // if GC is in progress (since the mutex is already held on its behalf.)
 class GCMutexLocker: public StackObj {
 private:
-Monitor* _mutex;
+Mutex* _mutex;
 bool _locked;
 public:
-GCMutexLocker(Monitor* mutex);
+GCMutexLocker(Mutex* mutex);
 ~GCMutexLocker() { if (_locked) _mutex->unlock(); }
 };
 // A MutexUnlocker temporarily exits a previously
 // entered mutex for the scope which contains the unlocker.
 class MutexUnlocker: StackObj {
 private:
-Monitor* _mutex;
+Mutex* _mutex;
 bool _no_safepoint_check;
 public:
-MutexUnlocker(Monitor* mutex, Mutex::SafepointCheckFlag flag = Mutex::_safepoint_check_flag) :
+MutexUnlocker(Mutex* mutex, Mutex::SafepointCheckFlag flag = Mutex::_safepoint_check_flag) :
 _mutex(mutex),
 _no_safepoint_check(flag) {
 _mutex->unlock();
 }

branch	datagramsocketimpl-branch
changeset 58678	9cf78a70fa4f
parent 55005	9b70ebd131b4
child 58679	9c3209ff7550