From ab2390702e68b8ccd676bd5f019c6bd2666240ba Mon Sep 17 00:00:00 2001 From: tstuefe Date: Thu, 1 May 2025 06:52:25 +0200 Subject: [PATCH 1/2] start --- src/hotspot/share/runtime/globals.hpp | 5 +- src/hotspot/share/runtime/java.cpp | 7 +++ .../ErrorHandling/PrintVMInfoAtExitTest.java | 60 +++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp index 29f0948276ada..cdb68bf92251c 100644 --- a/src/hotspot/share/runtime/globals.hpp +++ b/src/hotspot/share/runtime/globals.hpp @@ -702,10 +702,13 @@ const int ObjectAlignmentInBytes = 8; develop(bool, PrintClassLoaderDataGraphAtExit, false, \ "Print the class loader data graph at exit") \ \ + product(bool, PrintVMInfoAtExit, false, DIAGNOSTIC, \ + "Executes the the VM.info diagnostic command at exit") \ + \ product(bool, AllowParallelDefineClass, false, \ "Allow parallel defineClass requests for class loaders " \ "registering as parallel capable") \ - \ + \ product(bool, DisablePrimordialThreadGuardPages, false, EXPERIMENTAL, \ "Disable the use of stack guard pages if the JVM is loaded " \ "on the primordial process thread") \ diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp index b3ad15ae3ff68..1079212a843e5 100644 --- a/src/hotspot/share/runtime/java.cpp +++ b/src/hotspot/share/runtime/java.cpp @@ -332,6 +332,13 @@ void print_statistics() { print_bytecode_count(); + if (PrintVMInfoAtExit) { + // Use an intermediate stream to prevent deadlocking on tty_lock + stringStream ss; + VMError::print_vm_info(&ss); + tty->print_raw(ss.base()); + } + if (PrintSystemDictionaryAtExit) { ResourceMark rm; MutexLocker mcld(ClassLoaderDataGraph_lock); diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java new file mode 100644 index 0000000000000..2b9393e3d358c --- /dev/null +++ b/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2025, Red Hat Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* + * @test + * @summary Test PrintVMInfoAtExit + * @library /test/lib + * @modules java.base/jdk.internal.misc + * @requires vm.flagless + * @requires vm.bits == "64" + * @run driver PrintVMInfoAtExitTest + */ + +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; + +public class PrintVMInfoAtExitTest { + + public static void main(String[] args) throws Exception { + ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder( + "-Xmx64M", "-Xms64M", + "-XX:-CreateCoredumpOnCrash", + "-XX:+UnlockDiagnosticVMOptions", + "-XX:+PrintVMInfoAtExit", + "-XX:NativeMemoryTracking=summary", + "-XX:CompressedClassSpaceSize=256m", + "-version"); + + OutputAnalyzer output_detail = new OutputAnalyzer(pb.start()); + output_detail.shouldContain("# JRE version:"); + output_detail.shouldContain("-- S U M M A R Y --"); + output_detail.shouldContain("Command Line: -Xmx64M -Xms64M -XX:-CreateCoredumpOnCrash -XX:+UnlockDiagnosticVMOptions -XX:+PrintVMInfoAtExit -XX:NativeMemoryTracking=summary -XX:CompressedClassSpaceSize=256m"); + output_detail.shouldContain("Native Memory Tracking:"); + output_detail.shouldContain("Java Heap (reserved=65536KB, committed=65536KB)"); + } +} + + From 88aacea1996c64a695e7ac40efe824326816df2e Mon Sep 17 00:00:00 2001 From: tstuefe Date: Thu, 1 May 2025 11:04:59 +0200 Subject: [PATCH 2/2] fix whitespace --- src/hotspot/share/runtime/globals.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp index cdb68bf92251c..2ff682d9fd7ef 100644 --- a/src/hotspot/share/runtime/globals.hpp +++ b/src/hotspot/share/runtime/globals.hpp @@ -708,7 +708,7 @@ const int ObjectAlignmentInBytes = 8; product(bool, AllowParallelDefineClass, false, \ "Allow parallel defineClass requests for class loaders " \ "registering as parallel capable") \ - \ + \ product(bool, DisablePrimordialThreadGuardPages, false, EXPERIMENTAL, \ "Disable the use of stack guard pages if the JVM is loaded " \ "on the primordial process thread") \