Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/mutex.cpp @ 11173:6b0fd0964b87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 31 Jul 2013 11:00:54 +0200
parents 5e3b6f79d280
children de6a9e811145
comparison
equal deleted inserted replaced
10912:4ea54634f03e 11173:6b0fd0964b87
1368 name())); 1368 name()));
1369 } 1369 }
1370 debug_only(if (rank() != Mutex::special) \ 1370 debug_only(if (rank() != Mutex::special) \
1371 thread->check_for_valid_safepoint_state(false);) 1371 thread->check_for_valid_safepoint_state(false);)
1372 } 1372 }
1373 if (thread->is_Watcher_thread()) {
1374 assert(!WatcherThread::watcher_thread()->has_crash_protection(),
1375 "locking not allowed when crash protection is set");
1376 }
1373 } 1377 }
1374 1378
1375 void Monitor::check_block_state(Thread *thread) { 1379 void Monitor::check_block_state(Thread *thread) {
1376 if (!_allow_vm_block && thread->is_VM_thread()) { 1380 if (!_allow_vm_block && thread->is_VM_thread()) {
1377 warning("VM thread blocked on lock"); 1381 warning("VM thread blocked on lock");