src/share/vm/runtime/mutexLocker.cpp

*** 51,60 ****
--- 51,64 ----
  Mutex*   JfieldIdCreation_lock        = NULL;
  Monitor* JNICritical_lock             = NULL;
  Mutex*   JvmtiThreadState_lock        = NULL;
  Monitor* JvmtiPendingEvent_lock       = NULL;
  Monitor* Heap_lock                    = NULL;
+ Monitor* ShenandoahHeap_lock          = NULL;
+ Monitor* ShenandoahFullGC_lock        = NULL;
+ Monitor* ShenandoahJNICritical_lock   = NULL;
+ Monitor* ShenandoahMemProtect_lock    = NULL;
  Mutex*   ExpandHeap_lock              = NULL;
  Mutex*   AdapterHandlerLibrary_lock   = NULL;
  Mutex*   SignatureHandlerLibrary_lock = NULL;
  Mutex*   VtableStubs_lock             = NULL;
  Mutex*   SymbolTable_lock             = NULL;
*** 201,210 ****
--- 205,223 ----
      def(MMUTracker_lock            , Mutex  , leaf     ,   true,  Monitor::_safepoint_check_never);
  
      def(StringDedupQueue_lock      , Monitor, leaf,        true,  Monitor::_safepoint_check_never);
      def(StringDedupTable_lock      , Mutex  , leaf,        true,  Monitor::_safepoint_check_never);
    }
+   if (UseShenandoahGC) {
+     def(SATB_Q_FL_lock             , Mutex  , special,     true,  Monitor::_safepoint_check_never);
+     def(SATB_Q_CBL_mon             , Monitor, nonleaf,     true,  Monitor::_safepoint_check_never);
+     def(Shared_SATB_Q_lock         , Mutex,   nonleaf,     true,  Monitor::_safepoint_check_never);
+     def(ShenandoahFullGC_lock      , Monitor, leaf,        true,  Monitor::_safepoint_check_always);
+     def(ShenandoahJNICritical_lock , Monitor, nonleaf+1,   false, Monitor::_safepoint_check_never);
+     def(ShenandoahMemProtect_lock  , Monitor, native,      false, Monitor::_safepoint_check_never);
+     def(ShenandoahHeap_lock        , Monitor, special,     false, Monitor::_safepoint_check_never);
+   }
    def(ParGCRareEvent_lock          , Mutex  , leaf     ,   true,  Monitor::_safepoint_check_sometimes);
    def(DerivedPointerTableGC_lock   , Mutex,   leaf,        true,  Monitor::_safepoint_check_never);
    def(CodeCache_lock               , Mutex  , special,     true,  Monitor::_safepoint_check_never);
    def(Interrupt_lock               , Monitor, special,     true,  Monitor::_safepoint_check_never);      // used for interrupt processing
    def(RawMonitor_lock              , Mutex,   special,     true,  Monitor::_safepoint_check_never);