Fix build and test

GoeLin · Aug 30, 2024 · b106b0e · b106b0e
1 parent 8300932
commit b106b0e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/hotspot/share/services/classLoadingService.cpp b/src/hotspot/share/services/classLoadingService.cpp
@@ -36,6 +36,7 @@
 #include "utilities/defaultStream.hpp"
 #include "logging/log.hpp"
 #include "logging/logConfiguration.hpp"
+#include "logging/logFileStreamOutput.hpp"
 
 #ifdef DTRACE_ENABLED
 
@@ -134,7 +135,7 @@ bool ClassLoadingService::get_verbose() {
     // so look for all tag sets that match class+load*
     if (ts->contains(LogTag::_class) &&
         ts->contains(LogTag::_load)) {
-      LogLevelType l = ts->level_for(LogConfiguration::StdoutLog);
+      LogLevelType l = ts->level_for(StdoutLog);
       if (l != LogLevel::Info && l != LogLevel::Debug && l != LogLevel::Trace) {
         return false;
       }

diff --git a/src/hotspot/share/services/memoryService.cpp b/src/hotspot/share/services/memoryService.cpp
@@ -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"
@@ -207,7 +208,7 @@ bool MemoryService::get_verbose() {
     // 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(LogConfiguration::StdoutLog);
+      LogLevelType l = ts->level_for(StdoutLog);
       if (l == LogLevel::Info || l == LogLevel::Debug || l == LogLevel::Trace) {
         return true;
       }

diff --git a/test/jdk/java/lang/management/ClassLoadingMXBean/TestVerboseClassLoading.java b/test/jdk/java/lang/management/ClassLoadingMXBean/TestVerboseClassLoading.java
@@ -45,12 +45,12 @@
  * @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+cause=trace TestVerboseClassLoading true
- * @run main/othervm -Xlog:class+load*=info,class+load+cause=debug TestVerboseClassLoading true
- * @run main/othervm -Xlog:class+load*=info,class+load+cause=info TestVerboseClassLoading true
- * @run main/othervm -Xlog:class+load*=info,class+load+cause=warning TestVerboseClassLoading false
- * @run main/othervm -Xlog:class+load*=info,class+load+cause=error TestVerboseClassLoading false
- * @run main/othervm -Xlog:class+load*=info,class+load+cause=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
  */