Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
138 | 138 |
139 Monitor* JfrQuery_lock = NULL; | 139 Monitor* JfrQuery_lock = NULL; |
140 Monitor* JfrMsg_lock = NULL; | 140 Monitor* JfrMsg_lock = NULL; |
141 Mutex* JfrBuffer_lock = NULL; | 141 Mutex* JfrBuffer_lock = NULL; |
142 Mutex* JfrStream_lock = NULL; | 142 Mutex* JfrStream_lock = NULL; |
143 Monitor* PeriodicTask_lock = NULL; | |
143 | 144 |
144 #ifdef GRAAL | 145 #ifdef GRAAL |
145 Mutex* GraalDeoptLeafGraphIds_lock = NULL; | 146 Mutex* GraalDeoptLeafGraphIds_lock = NULL; |
146 #endif // GRAAL | 147 #endif // GRAAL |
147 | 148 |
227 def(InlineCacheBuffer_lock , Mutex , leaf, true ); | 228 def(InlineCacheBuffer_lock , Mutex , leaf, true ); |
228 def(VMStatistic_lock , Mutex , leaf, false); | 229 def(VMStatistic_lock , Mutex , leaf, false); |
229 def(ExpandHeap_lock , Mutex , leaf, true ); // Used during compilation by VM thread | 230 def(ExpandHeap_lock , Mutex , leaf, true ); // Used during compilation by VM thread |
230 def(JNIHandleBlockFreeList_lock , Mutex , leaf, true ); // handles are used by VM thread | 231 def(JNIHandleBlockFreeList_lock , Mutex , leaf, true ); // handles are used by VM thread |
231 def(SignatureHandlerLibrary_lock , Mutex , leaf, false); | 232 def(SignatureHandlerLibrary_lock , Mutex , leaf, false); |
232 def(SymbolTable_lock , Mutex , leaf, true ); | 233 def(SymbolTable_lock , Mutex , leaf+2, true ); |
233 def(StringTable_lock , Mutex , leaf, true ); | 234 def(StringTable_lock , Mutex , leaf, true ); |
234 def(ProfilePrint_lock , Mutex , leaf, false); // serial profile printing | 235 def(ProfilePrint_lock , Mutex , leaf, false); // serial profile printing |
235 def(ExceptionCache_lock , Mutex , leaf, false); // serial profile printing | 236 def(ExceptionCache_lock , Mutex , leaf, false); // serial profile printing |
236 def(OsrList_lock , Mutex , leaf, true ); | 237 def(OsrList_lock , Mutex , leaf, true ); |
237 def(Debug1_lock , Mutex , leaf, true ); | 238 def(Debug1_lock , Mutex , leaf, true ); |
287 | 288 |
288 def(JfrQuery_lock , Monitor, nonleaf, true); // JFR locks, keep these in consecutive order | 289 def(JfrQuery_lock , Monitor, nonleaf, true); // JFR locks, keep these in consecutive order |
289 def(JfrMsg_lock , Monitor, nonleaf+2, true); | 290 def(JfrMsg_lock , Monitor, nonleaf+2, true); |
290 def(JfrBuffer_lock , Mutex, nonleaf+3, true); | 291 def(JfrBuffer_lock , Mutex, nonleaf+3, true); |
291 def(JfrStream_lock , Mutex, nonleaf+4, true); | 292 def(JfrStream_lock , Mutex, nonleaf+4, true); |
292 | 293 def(PeriodicTask_lock , Monitor, nonleaf+5, true); |
293 #ifdef GRAAL | 294 #ifdef GRAAL |
294 def(GraalDeoptLeafGraphIds_lock , Mutex, special, true); | 295 def(GraalDeoptLeafGraphIds_lock , Mutex, special, true); |
295 #endif // GRAAL | 296 #endif // GRAAL |
296 } | 297 } |
297 | 298 |