diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index 96fbf375bca..a2a332c04e7 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -2457,21 +2457,6 @@ void SystemDictionary::dump(outputStream *st, bool verbose) {
}
}
-TableStatistics SystemDictionary::placeholders_statistics() {
- MutexLocker ml(SystemDictionary_lock);
- return placeholders()->statistics_calculate();
-}
-
-TableStatistics SystemDictionary::loader_constraints_statistics() {
- MutexLocker ml(SystemDictionary_lock);
- return constraints()->statistics_calculate();
-}
-
-TableStatistics SystemDictionary::protection_domain_cache_statistics() {
- MutexLocker ml(SystemDictionary_lock);
- return pd_cache_table()->statistics_calculate();
-}
-
// Utility for dumping dictionaries.
SystemDictionaryDCmd::SystemDictionaryDCmd(outputStream* output, bool heap) :
DCmdWithParser(output, heap),
diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
index a075e4de38b..53728ba48b0 100644
--- a/src/hotspot/share/classfile/systemDictionary.hpp
+++ b/src/hotspot/share/classfile/systemDictionary.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -79,7 +79,6 @@ class ProtectionDomainCacheEntry;
class GCTimer;
class EventClassLoad;
class Symbol;
-class TableStatistics;
class SystemDictionary : AllStatic {
friend class BootstrapInfo;
@@ -411,11 +410,6 @@ class SystemDictionary : AllStatic {
bool defining, TRAPS);
static void update_dictionary(unsigned int hash,
InstanceKlass* k, Handle loader);
-
-public:
- static TableStatistics placeholders_statistics();
- static TableStatistics loader_constraints_statistics();
- static TableStatistics protection_domain_cache_statistics();
};
#endif // SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 1b4ba9da167..a2d779ba5de 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -811,42 +811,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
index 905f1e53ac0..5a2329a5ef8 100644
--- a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
+++ b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
@@ -547,21 +547,6 @@ TRACE_REQUEST_FUNC(StringTableStatistics) {
emit_table_statistics(statistics);
}
-TRACE_REQUEST_FUNC(PlaceholderTableStatistics) {
- TableStatistics statistics = SystemDictionary::placeholders_statistics();
- emit_table_statistics(statistics);
-}
-
-TRACE_REQUEST_FUNC(LoaderConstraintsTableStatistics) {
- TableStatistics statistics = SystemDictionary::loader_constraints_statistics();
- emit_table_statistics(statistics);
-}
-
-TRACE_REQUEST_FUNC(ProtectionDomainCacheTableStatistics) {
- TableStatistics statistics = SystemDictionary::protection_domain_cache_statistics();
- emit_table_statistics(statistics);
-}
-
TRACE_REQUEST_FUNC(CompilerStatistics) {
EventCompilerStatistics event;
event.set_compileCount(CompileBroker::get_total_compile_count());
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index 6faba56991c..3827c4cb3b8 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -37,21 +37,6 @@
10 s
-
- true
- 10 s
-
-
-
- true
- 10 s
-
-
-
- true
- 10 s
-
-
true
true
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index f70633bfe74..931d894556e 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -37,21 +37,6 @@
10 s
-
- true
- 10 s
-
-
-
- true
- 10 s
-
-
-
- true
- 10 s
-
-
true
true
diff --git a/test/jdk/jdk/jfr/event/runtime/TestTableStatisticsEvent.java b/test/jdk/jdk/jfr/event/runtime/TestTableStatisticsEvent.java
index 4cadc4dfc75..1f5884c4b46 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestTableStatisticsEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestTableStatisticsEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -48,18 +48,12 @@ public static void main(String[] args) throws Throwable {
try (Recording recording = new Recording()) {
recording.enable(EventNames.SymbolTableStatistics);
recording.enable(EventNames.StringTableStatistics);
- recording.enable(EventNames.PlaceholderTableStatistics);
- recording.enable(EventNames.LoaderConstraintsTableStatistics);
- recording.enable(EventNames.ProtectionDomainCacheTableStatistics);
recording.start();
recording.stop();
List events = Events.fromRecording(recording);
verifyTable(events, EventNames.SymbolTableStatistics);
verifyTable(events, EventNames.StringTableStatistics);
- verifyTable(events, EventNames.PlaceholderTableStatistics);
- verifyTable(events, EventNames.LoaderConstraintsTableStatistics);
- verifyTable(events, EventNames.ProtectionDomainCacheTableStatistics);
}
}
diff --git a/test/lib/jdk/test/lib/jfr/EventNames.java b/test/lib/jdk/test/lib/jfr/EventNames.java
index 1d9c76cba97..c296cc2085d 100644
--- a/test/lib/jdk/test/lib/jfr/EventNames.java
+++ b/test/lib/jdk/test/lib/jfr/EventNames.java
@@ -85,9 +85,6 @@ public class EventNames {
public static final String BiasedLockClassRevocation = PREFIX + "BiasedLockClassRevocation";
public static final String SymbolTableStatistics = PREFIX + "SymbolTableStatistics";
public static final String StringTableStatistics = PREFIX + "StringTableStatistics";
- public static final String PlaceholderTableStatistics = PREFIX + "PlaceholderTableStatistics";
- public static final String LoaderConstraintsTableStatistics = PREFIX + "LoaderConstraintsTableStatistics";
- public static final String ProtectionDomainCacheTableStatistics = PREFIX + "ProtectionDomainCacheTableStatistics";
public static final String RedefineClasses = PREFIX + "RedefineClasses";
public static final String RetransformClasses = PREFIX + "RetransformClasses";
public static final String ClassRedefinition = PREFIX + "ClassRedefinition";