Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authormgronlun
Tue, 07 Jun 2016 01:58:33 +0200
changeset 39209 1f9e8543cffd
parent 39207 5c6e88667985 (current diff)
parent 39208 2fb442b1e05d (diff)
child 39212 e46a559b4503
Merge
--- a/hotspot/src/share/vm/runtime/mutexLocker.cpp	Mon Jun 06 22:34:57 2016 +0300
+++ b/hotspot/src/share/vm/runtime/mutexLocker.cpp	Tue Jun 07 01:58:33 2016 +0200
@@ -274,7 +274,7 @@
   def(JfrMsg_lock                  , Monitor, leaf,        true,  Monitor::_safepoint_check_always);
   def(JfrBuffer_lock               , Mutex,   leaf,        true,  Monitor::_safepoint_check_never);
   def(JfrThreadGroups_lock         , Mutex,   leaf,        true,  Monitor::_safepoint_check_always);
-  def(JfrStream_lock               , Mutex,   nonleaf,     true,  Monitor::_safepoint_check_never);
+  def(JfrStream_lock               , Mutex,   leaf+1,      true,  Monitor::_safepoint_check_never);      // ensure to rank lower than 'safepoint'
   def(JfrStacktrace_lock           , Mutex,   special,     true,  Monitor::_safepoint_check_sometimes);
 #endif
jdk-sandbox