8334305: Remove all code for nsk.share.Log verbose mode

Reviewed-by: mli, cjplummer, lmesnik
This commit is contained in:
Ramkumar Sunderbabu 2024-10-02 10:48:21 +00:00
parent d6820d1324
commit 855c8a7def
13 changed files with 30 additions and 130 deletions
test/hotspot/jtreg/vmTestbase
jit/escape/LockElision/MatMul
nsk
jdi/LaunchingConnector/launchnosuspend
jvmti/IterateThroughHeap/filter_tagged
monitoring
MemoryPoolMBean
isCollectionUsageThresholdExceeded
isUsageThresholdExceeded
stress/lowmem
share
vm/compiler/coverage/parentheses

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -85,7 +85,7 @@ public class MatMul {
} }
public int run() { public int run() {
log = new Log(System.out, verbose); log = new Log(System.out);
log.display("Parallel matrix multiplication test"); log.display("Parallel matrix multiplication test");
Matrix a = Matrix.randomMatrix(dim); Matrix a = Matrix.randomMatrix(dim);

@ -73,7 +73,6 @@ public class launchnosuspend001 {
argHandler = new ArgumentHandler(args); argHandler = new ArgumentHandler(args);
log = new Log(this.out, argHandler); log = new Log(this.out, argHandler);
//log.enableVerbose(true);
} }
private PrintStream out; private PrintStream out;

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -49,7 +49,6 @@ public class HeapFilter extends DebugeeClass {
log = new Log(out, argHandler); log = new Log(out, argHandler);
testObjects = new Object[]{new TaggedClass(), testObjects = new Object[]{new TaggedClass(),
new UntaggedClass()}; new UntaggedClass()};
log.enableVerbose(true);
log.display("Verifying reachable objects."); log.display("Verifying reachable objects.");
status = checkStatus(status); status = checkStatus(status);
testObjects = null; testObjects = null;

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -40,7 +40,6 @@ public class isexceeded001 {
public static int run(String[] argv, PrintStream out) { public static int run(String[] argv, PrintStream out) {
ArgumentHandler argHandler = new ArgumentHandler(argv); ArgumentHandler argHandler = new ArgumentHandler(argv);
Log log = new Log(out, argHandler); Log log = new Log(out, argHandler);
log.enableVerbose(true);
monitor = Monitor.getMemoryMonitor(log, argHandler); monitor = Monitor.getMemoryMonitor(log, argHandler);
List pools = monitor.getMemoryPoolMBeans(); List pools = monitor.getMemoryPoolMBeans();

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -47,7 +47,6 @@ public class isexceeded001 {
public static int run(String[] argv, PrintStream out) { public static int run(String[] argv, PrintStream out) {
ArgumentHandler argHandler = new ArgumentHandler(argv); ArgumentHandler argHandler = new ArgumentHandler(argv);
Log log = new Log(out, argHandler); Log log = new Log(out, argHandler);
log.enableVerbose(true); // show log output
MemoryMonitor monitor = Monitor.getMemoryMonitor(log, argHandler); MemoryMonitor monitor = Monitor.getMemoryMonitor(log, argHandler);
List pools = monitor.getMemoryPoolMBeans(); List pools = monitor.getMemoryPoolMBeans();

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -58,7 +58,7 @@ public class lowmem001 extends ThreadedGCTest {
@Override @Override
public void run() { public void run() {
Log log = new Log(System.out, true); Log log = new Log(System.out);
// System.err is duplicated into buffer // System.err is duplicated into buffer
// it should be empty // it should be empty
MyStream stream = new MyStream(System.err); MyStream stream = new MyStream(System.err);

@ -29,22 +29,15 @@ import java.io.IOException;
import java.io.PrintStream; import java.io.PrintStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringReader; import java.io.StringReader;
import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.HashSet; import java.util.HashSet;
import java.util.Vector; import java.util.Vector;
import nsk.share.test.LazyFormatString;
/** /**
* This class helps to print test-execution trace messages * This class helps to print test-execution trace messages.
* and filter them when execution mode is not verbose.
* <p>
* Verbose mode if defined by providing <i>-verbose</i> command line
* option, handled by <code>ArgumentParser</code>. Use <code>verbose()</code>
* method to determine which mode is used.
* <p> * <p>
* <code>Log</code> provides with two main methods to print messages: * <code>Log</code> provides with two main methods to print messages:
* <ul> * <ul>
@ -60,7 +53,6 @@ import nsk.share.test.LazyFormatString;
* To provide printing messages from different sources into one log * To provide printing messages from different sources into one log
* with distinct prefixes use internal <code>Log.Logger</code> class. * with distinct prefixes use internal <code>Log.Logger</code> class.
* *
* @see #verbose()
* @see #complain(String) * @see #complain(String)
* @see #display(String) * @see #display(String)
* @see ArgumentParser * @see ArgumentParser
@ -72,18 +64,6 @@ public class Log {
*/ */
private PrintStream out = null; private PrintStream out = null;
/**
* Is log-mode verbose?
* Always enabled.
*/
private final boolean verbose = true;
/**
* Should log messages prefixed with timestamps?
* Always enabled.
*/
private final boolean timestamp = true;
/** /**
* Names for trace levels * Names for trace levels
*/ */
@ -188,41 +168,14 @@ public class Log {
/** /**
* Incarnate new Log for the given <code>stream</code>; and * Incarnate new Log for the given <code>stream</code>; and
* either for verbose or for non-verbose mode accordingly to
* the given <code>verbose</code> key.
*/
public Log(PrintStream stream, boolean verbose) {
this(stream);
}
/**
* Incarnate new Log for the given <code>stream</code>; and
* either for verbose or for non-verbose mode accordingly to
* the given <code>argsHandler</code>. * the given <code>argsHandler</code>.
*/ */
public Log(PrintStream stream, ArgumentParser argsParser) { public Log(PrintStream stream, ArgumentParser argsParser) {
this(stream, argsParser.verbose());
traceLevel = argsParser.getTraceLevel(); traceLevel = argsParser.getTraceLevel();
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
/**
* Return <i>true</i> if log mode is verbose.
*/
public boolean verbose() {
return verbose;
}
/**
* Enable or disable verbose mode for printing messages.
*/
public void enableVerbose(boolean enable) {
if (!enable) {
throw new RuntimeException("The non-verbose logging is not supported.");
}
}
public int getTraceLevel() { public int getTraceLevel() {
return traceLevel; return traceLevel;
} }
@ -266,9 +219,6 @@ public class Log {
@Deprecated @Deprecated
public synchronized void println(String message) { public synchronized void println(String message) {
doPrint(message); doPrint(message);
if (!verbose()) {
keepLog(composeLine(message));
}
} }
/** /**
@ -282,9 +232,6 @@ public class Log {
*/ */
@Deprecated @Deprecated
public synchronized void comment(String message) { public synchronized void comment(String message) {
if (!verbose()) {
doPrint(message);
}
} }
/** /**
@ -314,17 +261,10 @@ public class Log {
} }
/** /**
* Print <code>message</code> to the assigned output stream, * Print <code>message</code> to the assigned output stream.
* if log mode is verbose. The <code>message</code> will be lost,
* if execution mode is non-verbose, and there is no error messages
* printed.
*/ */
public synchronized void display(Object message) { public synchronized void display(Object message) {
if (verbose()) { doPrint(message.toString());
doPrint(message.toString());
} else {
keepLog(composeLine(message.toString()));
}
} }
/** /**
@ -333,15 +273,6 @@ public class Log {
* into <code>errorsBuffer</code>. * into <code>errorsBuffer</code>.
*/ */
public synchronized void complain(Object message) { public synchronized void complain(Object message) {
if (!verbose()) {
PrintStream stream = findOutStream();
stream.println("#> ");
stream.println("#> WARNING: switching log to verbose mode,");
stream.println("#> because error is complained");
stream.println("#> ");
stream.flush();
enableVerbose(true);
}
String msgStr = message.toString(); String msgStr = message.toString();
printError(msgStr); printError(msgStr);
@ -406,10 +337,7 @@ public class Log {
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
/** /**
* Redirect log to the given <code>stream</code>, and switch * Redirect log to the given <code>stream</code>.
* log mode to verbose.
* Prints errors summary to current stream, cancel current stream
* and switches to new stream. Turns on verbose mode for new stream.
* *
* @deprecated This method is obsolete. * @deprecated This method is obsolete.
*/ */
@ -430,20 +358,6 @@ public class Log {
logBuffer.clear(); logBuffer.clear();
} }
/**
* Print all messages from log buffer which were hidden because
* of non-verbose mode,
*/
private synchronized void flushLogBuffer() {
if (!logBuffer.isEmpty()) {
PrintStream stream = findOutStream();
for (int i = 0; i < logBuffer.size(); i++) {
stream.println(logBuffer.elementAt(i));
}
stream.flush();
}
}
/** /**
* Return <code>out</code> stream if defined or <code>Sytem.err<code> otherwise; * Return <code>out</code> stream if defined or <code>Sytem.err<code> otherwise;
* print a warning message when <code>System.err</code> is used first time. * print a warning message when <code>System.err</code> is used first time.
@ -468,18 +382,15 @@ public class Log {
* Compose line to print possible prefixing it with timestamp. * Compose line to print possible prefixing it with timestamp.
*/ */
private String composeLine(String message) { private String composeLine(String message) {
if (timestamp) { long time = System.currentTimeMillis();
long time = System.currentTimeMillis(); long ms = time % 1000;
long ms = time % 1000; time /= 1000;
time /= 1000; long secs = time % 60;
long secs = time % 60; time /= 60;
time /= 60; long mins = time % 60;
long mins = time % 60; time /= 60;
time /= 60; long hours = time % 24;
long hours = time % 24; return "[" + hours + ":" + mins + ":" + secs + "." + ms + "] " + message;
return "[" + hours + ":" + mins + ":" + secs + "." + ms + "] " + message;
}
return message;
} }
/** /**
@ -513,13 +424,6 @@ public class Log {
} }
} }
/**
* Keep the given log <code>message</code> into <code>logBuffer</code>.
*/
private synchronized void keepLog(String message) {
logBuffer.addElement(message);
}
/** /**
* This class can be used as a base for each class that use <code>Log</code> * This class can be used as a base for each class that use <code>Log</code>
* for print messages and errors. * for print messages and errors.

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -68,7 +68,7 @@ public class AODTestRunner {
protected AODRunnerArgParser argParser; protected AODRunnerArgParser argParser;
protected AODTestRunner(String[] args) { protected AODTestRunner(String[] args) {
log = new Log(System.out, true); log = new Log(System.out);
argParser = createArgParser(args); argParser = createArgParser(args);
} }

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -157,7 +157,7 @@ abstract public class AbstractJarAgent {
if (name == null) if (name == null)
throw new TestBug("Agent name wasn't specified"); throw new TestBug("Agent name wasn't specified");
log = new Log(System.out, true); log = new Log(System.out);
} }
/* /*

@ -39,7 +39,7 @@ it sends signal that it is ready for test and waits for signal permitting finish
*/ */
public class DummyTargetApplication { public class DummyTargetApplication {
protected Log log = new Log(System.out, true); protected Log log = new Log(System.out);
protected AODTargetArgParser argParser; protected AODTargetArgParser argParser;

@ -213,7 +213,7 @@ public class TargetApplicationWaitingAgents {
if (targetApplicationInitialized) if (targetApplicationInitialized)
throw new TestBug("TargetApplication already initialized"); throw new TestBug("TargetApplication already initialized");
log = new Log(System.out, true); log = new Log(System.out);
argParser = createArgParser(args); argParser = createArgParser(args);

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -87,7 +87,7 @@ public class JVMTITest {
AgentsAttacher attacher = new AgentsAttacher(Utils.findCurrentVMIdUsingJPS(jdkPath), AgentsAttacher attacher = new AgentsAttacher(Utils.findCurrentVMIdUsingJPS(jdkPath),
agents, agents,
new Log(System.out, true)); new Log(System.out));
attacher.attachAgents(); attacher.attachAgents();
} }
} }

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -69,7 +69,7 @@ public class Parentheses {
public void run() throws IOException, ReflectiveOperationException { public void run() throws IOException, ReflectiveOperationException {
log = new Log(System.out, verbose); log = new Log(System.out);
InstructionSequence instructionSequence = null; InstructionSequence instructionSequence = null;
for (int i = 0; i < iterations * stressOptions.getIterationsFactor(); i++) { for (int i = 0; i < iterations * stressOptions.getIterationsFactor(); i++) {