1.1 --- a/src/share/vm/runtime/mutex.cpp Sun Oct 11 16:19:25 2009 -0700
1.2 +++ b/src/share/vm/runtime/mutex.cpp Thu Apr 22 13:23:15 2010 -0700
1.3 @@ -1288,8 +1288,9 @@
1.4 !(this == Safepoint_lock && contains(locks, Terminator_lock) &&
1.5 SafepointSynchronize::is_synchronizing())) {
1.6 new_owner->print_owned_locks();
1.7 - fatal4("acquiring lock %s/%d out of order with lock %s/%d -- possible deadlock",
1.8 - this->name(), this->rank(), locks->name(), locks->rank());
1.9 + fatal(err_msg("acquiring lock %s/%d out of order with lock %s/%d -- "
1.10 + "possible deadlock", this->name(), this->rank(),
1.11 + locks->name(), locks->rank()));
1.12 }
1.13
1.14 this->_next = new_owner->_owned_locks;
1.15 @@ -1342,7 +1343,8 @@
1.16 || rank() == Mutex::special, "wrong thread state for using locks");
1.17 if (StrictSafepointChecks) {
1.18 if (thread->is_VM_thread() && !allow_vm_block()) {
1.19 - fatal1("VM thread using lock %s (not allowed to block on)", name());
1.20 + fatal(err_msg("VM thread using lock %s (not allowed to block on)",
1.21 + name()));
1.22 }
1.23 debug_only(if (rank() != Mutex::special) \
1.24 thread->check_for_valid_safepoint_state(false);)
