Mercurial > hg > truffle
diff src/share/vm/runtime/mutexLocker.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 12 Nov 2012 23:14:12 +0100 |
| parents | 51111665eda6 c284cf4781f0 |
| children | 5d0bb7d52783 |
line wrap: on
line diff
--- a/src/share/vm/runtime/mutexLocker.cpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/runtime/mutexLocker.cpp Mon Nov 12 23:14:12 2012 +0100 @@ -140,6 +140,7 @@ Monitor* JfrMsg_lock = NULL; Mutex* JfrBuffer_lock = NULL; Mutex* JfrStream_lock = NULL; +Monitor* PeriodicTask_lock = NULL; #ifdef GRAAL Mutex* GraalDeoptLeafGraphIds_lock = NULL; @@ -229,7 +230,7 @@ def(ExpandHeap_lock , Mutex , leaf, true ); // Used during compilation by VM thread def(JNIHandleBlockFreeList_lock , Mutex , leaf, true ); // handles are used by VM thread def(SignatureHandlerLibrary_lock , Mutex , leaf, false); - def(SymbolTable_lock , Mutex , leaf, true ); + def(SymbolTable_lock , Mutex , leaf+2, true ); def(StringTable_lock , Mutex , leaf, true ); def(ProfilePrint_lock , Mutex , leaf, false); // serial profile printing def(ExceptionCache_lock , Mutex , leaf, false); // serial profile printing @@ -289,7 +290,7 @@ def(JfrMsg_lock , Monitor, nonleaf+2, true); def(JfrBuffer_lock , Mutex, nonleaf+3, true); def(JfrStream_lock , Mutex, nonleaf+4, true); - + def(PeriodicTask_lock , Monitor, nonleaf+5, true); #ifdef GRAAL def(GraalDeoptLeafGraphIds_lock , Mutex, special, true); #endif // GRAAL