diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index b870ed0b54e..017c33a0857 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -937,6 +937,7 @@
+
diff --git a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
index 3704bec1555..5f15d0a018a 100644
--- a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
+++ b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
@@ -588,6 +588,7 @@ TRACE_REQUEST_FUNC(CompilerConfiguration) {
EventCompilerConfiguration event;
event.set_threadCount(CICompilerCount);
event.set_tieredCompilation(TieredCompilation);
+ event.set_dynamicCompilerThreadCount(UseDynamicNumberOfCompilerThreads);
event.commit();
}
diff --git a/test/jdk/jdk/jfr/event/compiler/TestCompilerConfig.java b/test/jdk/jdk/jfr/event/compiler/TestCompilerConfig.java
index ffd3ef99174..0e4834ccfa1 100644
--- a/test/jdk/jdk/jfr/event/compiler/TestCompilerConfig.java
+++ b/test/jdk/jdk/jfr/event/compiler/TestCompilerConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, 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
@@ -52,6 +52,7 @@ public class TestCompilerConfig {
System.out.println("Event:" + event);
Events.assertField(event, "threadCount").atLeast(0);
Events.assertField(event, "tieredCompilation");
+ Events.assertField(event, "dynamicCompilerThreadCount");
}
}
}
diff --git a/test/jdk/jdk/jfr/event/metadata/TestEventMetadata.java b/test/jdk/jdk/jfr/event/metadata/TestEventMetadata.java
index 9f45bd8630f..afdb84952f4 100644
--- a/test/jdk/jdk/jfr/event/metadata/TestEventMetadata.java
+++ b/test/jdk/jdk/jfr/event/metadata/TestEventMetadata.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, 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
@@ -98,7 +98,7 @@ public class TestEventMetadata {
Set eventNames= new HashSet<>();
for (EventType eventType : eventTypes) {
verifyEventType(eventType);
- verifyValueDesscriptors(eventType.getFields(), types);
+ verifyValueDescriptors(eventType.getFields(), types);
System.out.println();
String eventName = eventType.getName();
if (eventNames.contains(eventName)) {
@@ -116,11 +116,11 @@ public class TestEventMetadata {
}
}
- private static void verifyValueDesscriptors(List fields, Set visitedTypes) {
+ private static void verifyValueDescriptors(List fields, Set visitedTypes) {
for (ValueDescriptor v : fields) {
if (!visitedTypes.contains(v.getTypeName())) {
visitedTypes.add(v.getTypeName());
- verifyValueDesscriptors(v.getFields(), visitedTypes);
+ verifyValueDescriptors(v.getFields(), visitedTypes);
}
verifyValueDescriptor(v);
}