Backport 855c8a7def21025bc2fc47594f7285a55924c213

Author: GoeLin

test/hotspot/jtreg/vmTestbase/jit/escape/LockElision/MatMul/MatMul.java

@@ -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.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,7 +85,7 @@ public static void main(String[] args) {
     }
 
     public int run() {
-        log = new Log(System.out, verbose);
+        log = new Log(System.out);
         log.display("Parallel matrix multiplication test");
 
         Matrix a = Matrix.randomMatrix(dim);

test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001.java

@@ -71,7 +71,6 @@ private launchnosuspend001 (String args[], PrintStream out) {
 
         argHandler = new ArgumentHandler(args);
         log = new Log(this.out, argHandler);
-        //log.enableVerbose(true);
     }
 
     private PrintStream out;

test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter_tagged/HeapFilter.java

@@ -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.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,6 @@ public int runTest(String args[], PrintStream out) {
         log = new Log(out, argHandler);
         testObjects = new Object[]{new TaggedClass(),
                                    new UntaggedClass()};
-        log.enableVerbose(true);
         log.display("Verifying reachable objects.");
         status = checkStatus(status);
         testObjects = null;

test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryPoolMBean/isCollectionUsageThresholdExceeded/isexceeded001.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2018, 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.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,6 @@ public static void main(String[] argv) {
     public static int run(String[] argv, PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         Log log = new Log(out, argHandler);
-        log.enableVerbose(true);
 
         monitor = Monitor.getMemoryMonitor(log, argHandler);
         List pools = monitor.getMemoryPoolMBeans();

test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001.java

@@ -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.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@ public static void main(String[] argv) {
     public static int run(String[] argv, PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         Log log = new Log(out, argHandler);
-        log.enableVerbose(true); // show log output
 
         MemoryMonitor monitor = Monitor.getMemoryMonitor(log, argHandler);
         List pools = monitor.getMemoryPoolMBeans();

test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem001.java

@@ -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.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,7 @@ public static void main(String[] args) {
 
     @Override
     public void run() {
-        Log log = new Log(System.out, true);
+        Log log = new Log(System.out);
         // System.err is duplicated into buffer
         // it should be empty
         MyStream stream = new MyStream(System.err);

test/hotspot/jtreg/vmTestbase/nsk/share/Log.java

@@ -36,15 +36,9 @@
 import java.util.HashSet;
 import java.util.Vector;
 
-import nsk.share.test.LazyFormatString;
 
 /**
- * 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.
+ * This class helps to print test-execution trace messages.
  * <p>
  * <code>Log</code> provides with two main methods to print messages:
  * <ul>
@@ -63,7 +57,6 @@
  * To provide printing messages from different sources into one log
  * with distinct prefixes use internal <code>Log.Logger</code> class.
  *
- * @see #verbose()
  * @see #complain(String)
  * @see #display(String)
  * @see ArgumentParser
@@ -78,18 +71,6 @@ public class Log extends FinalizableObject {
     @Deprecated
     protected 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
      */
@@ -207,32 +188,14 @@ public Log(PrintStream stream) {
 
     /**
      * 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>.
      */
     public Log(PrintStream stream, ArgumentParser argsParser) {
-        this(stream, argsParser.verbose());
         traceLevel = argsParser.getTraceLevel();
     }
 
     /////////////////////////////////////////////////////////////////
 
-    /**
-     * Return <i>true</i> if log mode is verbose.
-     */
-    public boolean verbose() {
-        return verbose;
-    }
-
     /**
      * Return <i>true</i> if printing errors summary at exit is enabled.
      */
@@ -313,9 +276,6 @@ public static String printExceptionToString(Object prefix, Throwable exception)
     @Deprecated
     public synchronized void println(String message) {
         doPrint(message);
-        if (!verbose() && isVerboseOnErrorEnabled()) {
-            keepLog(composeLine(message));
-        }
     }
 
     /**
@@ -329,9 +289,6 @@ public synchronized void println(String message) {
      */
     @Deprecated
     public synchronized void comment(String message) {
-        if (!verbose()) {
-            doPrint(message);
-        }
     }
 
     /**
@@ -361,19 +318,10 @@ public void trace(int level, Object message, Throwable exception) {
     }
 
     /**
-     * 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.
+     * Print <code>message</code> to the assigned output stream.
      */
     public synchronized void display(Object message) {
-        if (verbose()) {
-            doPrint(message.toString());
-        } else if (isVerboseOnErrorEnabled()) {
-            keepLog(composeLine(message.toString()));
-        } else {
-            // ignore
-        }
+        doPrint(message.toString());
     }
 
     /**
@@ -382,15 +330,6 @@ public synchronized void display(Object message) {
      * into <code>errorsBuffer</code>.
      */
     public synchronized void complain(Object message) {
-        if (!verbose() && isVerboseOnErrorEnabled()) {
-            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();
         printError(msgStr);
         if (isErrorsSummaryEnabled()) {
@@ -458,10 +397,7 @@ private void logExceptionForFailureAnalysis(String msg) {
     /////////////////////////////////////////////////////////////////
 
     /**
-     * Redirect log to the given <code>stream</code>, and switch
-     * 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.
+     * Redirect log to the given <code>stream</code>.
      *
      * @deprecated  This method is obsolete.
      */
@@ -480,20 +416,6 @@ public synchronized void clearLogBuffer() {
         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;
      * print a warning message when <code>System.err</code> is used first time.
@@ -518,18 +440,15 @@ private synchronized PrintStream findOutStream() {
      * Compose line to print possible prefixing it with timestamp.
      */
     private String composeLine(String message) {
-        if (timestamp) {
-            long time = System.currentTimeMillis();
-            long ms = time % 1000;
-            time /= 1000;
-            long secs = time % 60;
-            time /= 60;
-            long mins = time % 60;
-            time /= 60;
-            long hours = time % 24;
-            return "[" + hours + ":" + mins + ":" + secs + "." + ms + "] " + message;
-        }
-        return message;
+        long time = System.currentTimeMillis();
+        long ms = time % 1000;
+        time /= 1000;
+        long secs = time % 60;
+        time /= 60;
+        long mins = time % 60;
+        time /= 60;
+        long hours = time % 24;
+        return "[" + hours + ":" + mins + ":" + secs + "." + ms + "] " + message;
     }
 
     /**
@@ -563,13 +482,6 @@ private synchronized void printError(String message) {
         }
     }
 
-    /**
-     * Keep the given log <code>message</code> into <code>logBuffer</code>.
-     */
-    private synchronized void keepLog(String message) {
-        logBuffer.addElement(message);
-    }
-
     /**
      * Keep the given error <code>message</code> into <code>errorsBuffer</code>.
      */
@@ -603,7 +515,7 @@ private synchronized void printErrorsSummary() {
      * Print errors summary if mode is verbose, flush and cancel output stream.
      */
     protected void finalize() {
-        if (verbose() && isErrorsSummaryEnabled()) {
+        if (isErrorsSummaryEnabled()) {
             printErrorsSummary();
         }
         if (out != null)

test/hotspot/jtreg/vmTestbase/nsk/share/aod/AODTestRunner.java

@@ -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.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ public class AODTestRunner {
     protected AODRunnerArgParser argParser;
 
     protected AODTestRunner(String[] args) {
-        log = new Log(System.out, true);
+        log = new Log(System.out);
 
         argParser = createArgParser(args);
     }

test/hotspot/jtreg/vmTestbase/nsk/share/aod/AbstractJarAgent.java

@@ -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.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -157,7 +157,7 @@ private void defaultInit(String[] args) {
         if (name == null)
             throw new TestBug("Agent name wasn't specified");
 
-        log = new Log(System.out, true);
+        log = new Log(System.out);
     }
 
     /*

test/hotspot/jtreg/vmTestbase/nsk/share/aod/DummyTargetApplication.java

@@ -39,7 +39,7 @@
  */
 public class DummyTargetApplication {
 
-    protected Log log = new Log(System.out, true);
+    protected Log log = new Log(System.out);
 
     protected AODTargetArgParser argParser;