8131331: tmtools/jstack/locks/wait_interrupt and wait_notify fail due to wrong number of lock records
Summary: make new thread dump output line optional
Reviewed-by: dholmes
--- a/hotspot/src/share/vm/runtime/vframe.cpp Wed Jul 15 10:37:11 2015 -0700
+++ b/hotspot/src/share/vm/runtime/vframe.cpp Wed Jul 15 15:52:55 2015 -0700
@@ -235,12 +235,14 @@
// disable the extra printing below.
mark = NULL;
}
- } else if (frame_count != 0) {
+ } else if (frame_count != 0 && ObjectMonitor::Knob_Verbose) {
// This is not the first frame so we either own this monitor
// or we owned the monitor before and called wait(). Because
// wait() could have been called on any monitor in a lower
// numbered frame on the stack, we have to check all the
// monitors on the list for this frame.
+ // Note: Only enable this new output line in verbose mode
+ // since existing tests are not ready for it.
mark = monitor->owner()->mark();
if (mark->has_monitor() &&
( // we have marked ourself as pending on this monitor