From 897f433b33a46d56cc6972b1c6b4405ecaa4dea9 Mon Sep 17 00:00:00 2001
From: Goetz Lindenmaier <goetz@openjdk.org>
Date: Tue, 3 Sep 2024 12:41:27 +0000
Subject: [PATCH] 8338139: {ClassLoading,Memory}MXBean::isVerbose methods are
inconsistent with their setVerbose methods
Reviewed-by: mdoerr
Backport-of: 459757e3777d61d7510518e88f76f66c08918161
---
.../share/services/classLoadingService.cpp | 19 ++++-
.../share/services/classLoadingService.hpp | 4 +-
src/hotspot/share/services/memoryService.cpp | 18 +++-
src/hotspot/share/services/memoryService.hpp | 4 +-
.../TestVerboseClassLoading.java | 84 +++++++++++++++++++
.../MemoryMXBean/TestVerboseMemory.java | 79 +++++++++++++++++
6 files changed, 202 insertions(+), 6 deletions(-)
create mode 100644 test/jdk/java/lang/management/ClassLoadingMXBean/TestVerboseClassLoading.java
create mode 100644 test/jdk/java/lang/management/MemoryMXBean/TestVerboseMemory.java
diff --git a/src/hotspot/share/services/classLoadingService.cpp b/src/hotspot/share/services/classLoadingService.cpp
index 9da4496971c..524851dd6e1 100644
--- a/src/hotspot/share/services/classLoadingService.cpp
+++ b/src/hotspot/share/services/classLoadingService.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, 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
@@ -36,6 +36,7 @@
#include "utilities/defaultStream.hpp"
#include "logging/log.hpp"
#include "logging/logConfiguration.hpp"
+#include "logging/logFileStreamOutput.hpp"
#ifdef DTRACE_ENABLED
@@ -186,6 +187,22 @@ bool ClassLoadingService::set_verbose(bool verbose) {
return verbose;
}
+bool ClassLoadingService::get_verbose() {
+ for (LogTagSet* ts = LogTagSet::first(); ts != nullptr; ts = ts->next()) {
+ // set_verbose looks for a non-exact match for class+load,
+ // so look for all tag sets that match class+load*
+ if (ts->contains(LogTag::_class) &&
+ ts->contains(LogTag::_load)) {
+ LogLevelType l = ts->level_for(&StdoutLog);
+ if (l != LogLevel::Info && l != LogLevel::Debug && l != LogLevel::Trace) {
+ return false;
+ }
+ }
+ }
+
+ return true;
+}
+
// Caller to this function must own Management_lock
void ClassLoadingService::reset_trace_class_unloading() {
assert(Management_lock->owned_by_self(), "Must own the Management_lock");
diff --git a/src/hotspot/share/services/classLoadingService.hpp b/src/hotspot/share/services/classLoadingService.hpp
index db422cbf11f..a2137ccd6ab 100644
--- a/src/hotspot/share/services/classLoadingService.hpp
+++ b/src/hotspot/share/services/classLoadingService.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019, 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
@@ -55,8 +55,8 @@ private:
public:
static void init();
- static bool get_verbose() { return log_is_enabled(Info, class, load); }
static bool set_verbose(bool verbose);
+ static bool get_verbose() NOT_MANAGEMENT_RETURN_(false);
static void reset_trace_class_unloading() NOT_MANAGEMENT_RETURN;
static jlong loaded_class_count() {
diff --git a/src/hotspot/share/services/memoryService.cpp b/src/hotspot/share/services/memoryService.cpp
index b9edf887b83..b3d57ea25de 100644
--- a/src/hotspot/share/services/memoryService.cpp
+++ b/src/hotspot/share/services/memoryService.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, 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
@@ -26,6 +26,7 @@
#include "classfile/vmSymbols.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "logging/logConfiguration.hpp"
+#include "logging/logFileStreamOutput.hpp"
#include "memory/heap.hpp"
#include "memory/memRegion.hpp"
#include "memory/resourceArea.hpp"
@@ -201,6 +202,21 @@ bool MemoryService::set_verbose(bool verbose) {
return verbose;
}
+bool MemoryService::get_verbose() {
+ for (LogTagSet* ts = LogTagSet::first(); ts != nullptr; ts = ts->next()) {
+ // set_verbose only sets gc and not gc*, so check for an exact match
+ const bool is_gc_exact_match = ts->contains(LogTag::_gc) && ts->ntags() == 1;
+ if (is_gc_exact_match) {
+ LogLevelType l = ts->level_for(&StdoutLog);
+ if (l == LogLevel::Info || l == LogLevel::Debug || l == LogLevel::Trace) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
Handle MemoryService::create_MemoryUsage_obj(MemoryUsage usage, TRAPS) {
InstanceKlass* ik = Management::java_lang_management_MemoryUsage_klass(CHECK_NH);
diff --git a/src/hotspot/share/services/memoryService.hpp b/src/hotspot/share/services/memoryService.hpp
index a00e49dd0a7..78214548e91 100644
--- a/src/hotspot/share/services/memoryService.hpp
+++ b/src/hotspot/share/services/memoryService.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019, 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
@@ -106,8 +106,8 @@ public:
GCCause::Cause cause,
bool allMemoryPoolsAffected, const char* notificationMessage = nullptr);
- static bool get_verbose() { return log_is_enabled(Info, gc); }
static bool set_verbose(bool verbose);
+ static bool get_verbose();
// Create an instance of java/lang/management/MemoryUsage
static Handle create_MemoryUsage_obj(MemoryUsage usage, TRAPS);
diff --git a/test/jdk/java/lang/management/ClassLoadingMXBean/TestVerboseClassLoading.java b/test/jdk/java/lang/management/ClassLoadingMXBean/TestVerboseClassLoading.java
new file mode 100644
index 00000000000..c951578fac5
--- /dev/null
+++ b/test/jdk/java/lang/management/ClassLoadingMXBean/TestVerboseClassLoading.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 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
+ * 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
+ * @bug 8338139
+ * @summary Basic unit test of ClassLoadingMXBean.set/isVerbose() when
+ * related unified logging is enabled.
+ *
+ * @run main/othervm -Xlog:class+load=trace:file=vm.log TestVerboseClassLoading false
+ * @run main/othervm -Xlog:class+load=debug:file=vm.log TestVerboseClassLoading false
+ * @run main/othervm -Xlog:class+load=info:file=vm.log TestVerboseClassLoading false
+ *
+ * @run main/othervm -Xlog:class+load=trace TestVerboseClassLoading false
+ * @run main/othervm -Xlog:class+load=debug TestVerboseClassLoading false
+ * @run main/othervm -Xlog:class+load=info TestVerboseClassLoading false
+ * @run main/othervm -Xlog:class+load=warning TestVerboseClassLoading false
+ * @run main/othervm -Xlog:class+load=error TestVerboseClassLoading false
+ * @run main/othervm -Xlog:class+load=off TestVerboseClassLoading false
+ *
+ * @run main/othervm -Xlog:class+load*=trace TestVerboseClassLoading true
+ * @run main/othervm -Xlog:class+load*=debug TestVerboseClassLoading true
+ * @run main/othervm -Xlog:class+load*=info TestVerboseClassLoading true
+ * @run main/othervm -Xlog:class+load*=warning TestVerboseClassLoading false
+ * @run main/othervm -Xlog:class+load*=error TestVerboseClassLoading false
+ * @run main/othervm -Xlog:class+load*=off TestVerboseClassLoading false
+ *
+ * @run main/othervm -Xlog:class+load*=info,class+load=trace TestVerboseClassLoading true
+ * @run main/othervm -Xlog:class+load*=info,class+load=debug TestVerboseClassLoading true
+ * @run main/othervm -Xlog:class+load*=info,class+load=info TestVerboseClassLoading true
+ * @run main/othervm -Xlog:class+load*=info,class+load=warning TestVerboseClassLoading false
+ * @run main/othervm -Xlog:class+load*=info,class+load=error TestVerboseClassLoading false
+ * @run main/othervm -Xlog:class+load*=info,class+load=off TestVerboseClassLoading false
+ *
+ * @run main/othervm -Xlog:all=trace:file=vm.log TestVerboseClassLoading false
+ */
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.ClassLoadingMXBean;
+
+public class TestVerboseClassLoading {
+
+ public static void main(String[] args) throws Exception {
+ ClassLoadingMXBean mxBean = ManagementFactory.getClassLoadingMXBean();
+ boolean expected = Boolean.parseBoolean(args[0]);
+ boolean initial = mxBean.isVerbose();
+ if (expected != initial) {
+ throw new Error("Initial verbosity setting was unexpectedly " + initial);
+ }
+ mxBean.setVerbose(false);
+ if (mxBean.isVerbose()) {
+ throw new Error("Verbosity was still enabled");
+ }
+ mxBean.setVerbose(true);
+ if (!mxBean.isVerbose()) {
+ throw new Error("Verbosity was still disabled");
+ }
+ // Turn off again as a double-check and also to avoid excessive logging
+ mxBean.setVerbose(false);
+ if (mxBean.isVerbose()) {
+ throw new Error("Verbosity was still enabled");
+ }
+ }
+}
diff --git a/test/jdk/java/lang/management/MemoryMXBean/TestVerboseMemory.java b/test/jdk/java/lang/management/MemoryMXBean/TestVerboseMemory.java
new file mode 100644
index 00000000000..7d34c45036b
--- /dev/null
+++ b/test/jdk/java/lang/management/MemoryMXBean/TestVerboseMemory.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 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
+ * 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
+ * @bug 8338139
+ * @summary Basic unit test of TestVerboseMemory.set/isVerbose() when
+ * related unified logging is enabled.
+ *
+ * @run main/othervm -Xlog:gc=trace:file=vm.log TestVerboseMemory false
+ * @run main/othervm -Xlog:gc=debug:file=vm.log TestVerboseMemory false
+ * @run main/othervm -Xlog:gc=info:file=vm.log TestVerboseMemory false
+ *
+ * @run main/othervm -Xlog:gc=off TestVerboseMemory false
+ * @run main/othervm -Xlog:gc=error TestVerboseMemory false
+ * @run main/othervm -Xlog:gc=warning TestVerboseMemory false
+ *
+ * @run main/othervm -Xlog:gc=info TestVerboseMemory true
+ * @run main/othervm -Xlog:gc=trace TestVerboseMemory true
+ * @run main/othervm -Xlog:gc=debug TestVerboseMemory true
+ *
+ * @run main/othervm -Xlog:gc*=info TestVerboseMemory true
+ * @run main/othervm -Xlog:gc*=debug TestVerboseMemory true
+ * @run main/othervm -Xlog:gc*=trace TestVerboseMemory true
+ *
+ * @run main/othervm -Xlog:gc=info,gc+init=off TestVerboseMemory true
+ * @run main/othervm -Xlog:gc=off,gc+init=info TestVerboseMemory false
+ * @run main/othervm -Xlog:gc,gc+init TestVerboseMemory true
+ *
+ * @run main/othervm -Xlog:all=trace:file=vm.log TestVerboseMemory false
+ */
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+
+public class TestVerboseMemory {
+
+ public static void main(String[] args) throws Exception {
+ MemoryMXBean mxBean = ManagementFactory.getMemoryMXBean();
+ boolean expected = Boolean.parseBoolean(args[0]);
+ boolean initial = mxBean.isVerbose();
+ if (expected != initial) {
+ throw new Error("Initial verbosity setting was unexpectedly " + initial);
+ }
+ mxBean.setVerbose(false);
+ if (mxBean.isVerbose()) {
+ throw new Error("Verbosity was still enabled");
+ }
+ mxBean.setVerbose(true);
+ if (!mxBean.isVerbose()) {
+ throw new Error("Verbosity was still disabled");
+ }
+ // Turn off again as a double-check and also to avoid excessive logging
+ mxBean.setVerbose(false);
+ if (mxBean.isVerbose()) {
+ throw new Error("Verbosity was still enabled");
+ }
+ }
+}
--
GitLab