Skip to content

Commit 1151343

Browse files
GoeLinGoeLin
committed
backport b7d2bde8e37817e827e685bd675b075c1f29b4c2
1 parent 2717034 commit 1151343

File tree

8 files changed

+2
-113
lines changed

8 files changed

+2
-113
lines changed

‎src/hotspot/share/classfile/systemDictionary.cpp‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2457,21 +2457,6 @@ void SystemDictionary::dump(outputStream *st, bool verbose) {
24572457
}
24582458
}
24592459

2460-
TableStatistics SystemDictionary::placeholders_statistics() {
2461-
MutexLocker ml(SystemDictionary_lock);
2462-
return placeholders()->statistics_calculate();
2463-
}
2464-
2465-
TableStatistics SystemDictionary::loader_constraints_statistics() {
2466-
MutexLocker ml(SystemDictionary_lock);
2467-
return constraints()->statistics_calculate();
2468-
}
2469-
2470-
TableStatistics SystemDictionary::protection_domain_cache_statistics() {
2471-
MutexLocker ml(SystemDictionary_lock);
2472-
return pd_cache_table()->statistics_calculate();
2473-
}
2474-
24752460
// Utility for dumping dictionaries.
24762461
SystemDictionaryDCmd::SystemDictionaryDCmd(outputStream* output, bool heap) :
24772462
DCmdWithParser(output, heap),

‎src/hotspot/share/classfile/systemDictionary.hpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,6 @@ class ProtectionDomainCacheEntry;
7979
class GCTimer;
8080
class EventClassLoad;
8181
class Symbol;
82-
class TableStatistics;
8382

8483
class SystemDictionary : AllStatic {
8584
friend class BootstrapInfo;
@@ -411,11 +410,6 @@ class SystemDictionary : AllStatic {
411410
bool defining, TRAPS);
412411
static void update_dictionary(unsigned int hash,
413412
InstanceKlass* k, Handle loader);
414-
415-
public:
416-
static TableStatistics placeholders_statistics();
417-
static TableStatistics loader_constraints_statistics();
418-
static TableStatistics protection_domain_cache_statistics();
419413
};
420414

421415
#endif // SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP

‎src/hotspot/share/jfr/metadata/metadata.xml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -811,42 +811,6 @@
811811
<Field type="float" name="removalRate" label="Removal Rate" description="How many items were removed since last event (per second)" />
812812
</Event>
813813

814-
<Event name="PlaceholderTableStatistics" category="Java Virtual Machine, Runtime, Tables" label="Placeholder Table Statistics" period="everyChunk">
815-
<Field type="ulong" name="bucketCount" label="Bucket Count" description="Number of buckets" />
816-
<Field type="ulong" name="entryCount" label="Entry Count" description="Number of all entries" />
817-
<Field type="ulong" contentType="bytes" name="totalFootprint" label="Total Footprint" description="Total memory footprint (the table itself plus all of the entries)" />
818-
<Field type="ulong" name="bucketCountMaximum" label="Maximum Bucket Count" description="The maximum bucket length (entries in a single bucket)" />
819-
<Field type="float" name="bucketCountAverage" label="Average Bucket Count" description="The average bucket length" />
820-
<Field type="float" name="bucketCountVariance" label="Bucket Count Variance" description="How far bucket lengths are spread out from their average value" />
821-
<Field type="float" name="bucketCountStandardDeviation" label="Bucket Count Standard Deviation" description="How far bucket lengths are spread out from their mean (expected) value" />
822-
<Field type="float" name="insertionRate" label="Insertion Rate" description="How many items were added since last event (per second)" />
823-
<Field type="float" name="removalRate" label="Removal Rate" description="How many items were removed since last event (per second)" />
824-
</Event>
825-
826-
<Event name="LoaderConstraintsTableStatistics" category="Java Virtual Machine, Runtime, Tables" label="Loader Constraints Table Statistics" period="everyChunk">
827-
<Field type="ulong" name="bucketCount" label="Bucket Count" />
828-
<Field type="ulong" name="entryCount" label="Entry Count" description="Number of all entries" />
829-
<Field type="ulong" contentType="bytes" name="totalFootprint" label="Total Footprint" description="Total memory footprint (the table itself plus all of the entries)" />
830-
<Field type="ulong" name="bucketCountMaximum" label="Maximum Bucket Count" description="The maximum bucket length (entries in a single bucket)" />
831-
<Field type="float" name="bucketCountAverage" label="Average Bucket Count" description="The average bucket length" />
832-
<Field type="float" name="bucketCountVariance" label="Bucket Count Variance" description="How far bucket lengths are spread out from their average value" />
833-
<Field type="float" name="bucketCountStandardDeviation" label="Bucket Count Standard Deviation" description="How far bucket lengths are spread out from their mean (expected) value" />
834-
<Field type="float" name="insertionRate" label="Insertion Rate" description="How many items were added since last event (per second)" />
835-
<Field type="float" name="removalRate" label="Removal Rate" description="How many items were removed since last event (per second)" />
836-
</Event>
837-
838-
<Event name="ProtectionDomainCacheTableStatistics" category="Java Virtual Machine, Runtime, Tables" label="Protection Domain Cache Table Statistics" period="everyChunk">
839-
<Field type="ulong" name="bucketCount" label="Bucket Count" description="Number of buckets" />
840-
<Field type="ulong" name="entryCount" label="Entry Count" description="Number of all entries" />
841-
<Field type="ulong" contentType="bytes" name="totalFootprint" label="Total Footprint" description="Total memory footprint (the table itself plus all of the entries)" />
842-
<Field type="ulong" name="bucketCountMaximum" label="Maximum Bucket Count" description="The maximum bucket length (entries in a single bucket)" />
843-
<Field type="float" name="bucketCountAverage" label="Average Bucket Count" description="The average bucket length" />
844-
<Field type="float" name="bucketCountVariance" label="Bucket Count Variance" description="How far bucket lengths are spread out from their average value" />
845-
<Field type="float" name="bucketCountStandardDeviation" label="Bucket Count Standard Deviation" description="How far bucket lengths are spread out from their mean (expected) value" />
846-
<Field type="float" name="insertionRate" label="Insertion Rate" description="How many items were added since last event (per second)" />
847-
<Field type="float" name="removalRate" label="Removal Rate" description="How many items were removed since last event (per second)" />
848-
</Event>
849-
850814
<Event name="ThreadAllocationStatistics" category="Java Application, Statistics" label="Thread Allocation Statistics" period="everyChunk">
851815
<Field type="ulong" contentType="bytes" name="allocated" label="Allocated" description="Approximate number of bytes allocated since thread start" />
852816
<Field type="Thread" name="thread" label="Thread" />

‎src/hotspot/share/jfr/periodic/jfrPeriodic.cpp‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -547,21 +547,6 @@ TRACE_REQUEST_FUNC(StringTableStatistics) {
547547
emit_table_statistics<EventStringTableStatistics>(statistics);
548548
}
549549

550-
TRACE_REQUEST_FUNC(PlaceholderTableStatistics) {
551-
TableStatistics statistics = SystemDictionary::placeholders_statistics();
552-
emit_table_statistics<EventPlaceholderTableStatistics>(statistics);
553-
}
554-
555-
TRACE_REQUEST_FUNC(LoaderConstraintsTableStatistics) {
556-
TableStatistics statistics = SystemDictionary::loader_constraints_statistics();
557-
emit_table_statistics<EventLoaderConstraintsTableStatistics>(statistics);
558-
}
559-
560-
TRACE_REQUEST_FUNC(ProtectionDomainCacheTableStatistics) {
561-
TableStatistics statistics = SystemDictionary::protection_domain_cache_statistics();
562-
emit_table_statistics<EventProtectionDomainCacheTableStatistics>(statistics);
563-
}
564-
565550
TRACE_REQUEST_FUNC(CompilerStatistics) {
566551
EventCompilerStatistics event;
567552
event.set_compileCount(CompileBroker::get_total_compile_count());

‎src/jdk.jfr/share/conf/jfr/default.jfc‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,6 @@
3737
<setting name="period">10 s</setting>
3838
</event>
3939

40-
<event name="jdk.PlaceholderTableStatistics">
41-
<setting name="enabled">true</setting>
42-
<setting name="period">10 s</setting>
43-
</event>
44-
45-
<event name="jdk.LoaderConstraintsTableStatistics">
46-
<setting name="enabled">true</setting>
47-
<setting name="period">10 s</setting>
48-
</event>
49-
50-
<event name="jdk.ProtectionDomainCacheTableStatistics">
51-
<setting name="enabled">true</setting>
52-
<setting name="period">10 s</setting>
53-
</event>
54-
5540
<event name="jdk.ThreadStart">
5641
<setting name="enabled">true</setting>
5742
<setting name="stackTrace">true</setting>

‎src/jdk.jfr/share/conf/jfr/profile.jfc‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,6 @@
3737
<setting name="period">10 s</setting>
3838
</event>
3939

40-
<event name="jdk.PlaceholderTableStatistics">
41-
<setting name="enabled">true</setting>
42-
<setting name="period">10 s</setting>
43-
</event>
44-
45-
<event name="jdk.LoaderConstraintsTableStatistics">
46-
<setting name="enabled">true</setting>
47-
<setting name="period">10 s</setting>
48-
</event>
49-
50-
<event name="jdk.ProtectionDomainCacheTableStatistics">
51-
<setting name="enabled">true</setting>
52-
<setting name="period">10 s</setting>
53-
</event>
54-
5540
<event name="jdk.ThreadStart">
5641
<setting name="enabled">true</setting>
5742
<setting name="stackTrace">true</setting>

‎test/jdk/jdk/jfr/event/runtime/TestTableStatisticsEvent.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* 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 {
4848
try (Recording recording = new Recording()) {
4949
recording.enable(EventNames.SymbolTableStatistics);
5050
recording.enable(EventNames.StringTableStatistics);
51-
recording.enable(EventNames.PlaceholderTableStatistics);
52-
recording.enable(EventNames.LoaderConstraintsTableStatistics);
53-
recording.enable(EventNames.ProtectionDomainCacheTableStatistics);
5451
recording.start();
5552
recording.stop();
5653

5754
List<RecordedEvent> events = Events.fromRecording(recording);
5855
verifyTable(events, EventNames.SymbolTableStatistics);
5956
verifyTable(events, EventNames.StringTableStatistics);
60-
verifyTable(events, EventNames.PlaceholderTableStatistics);
61-
verifyTable(events, EventNames.LoaderConstraintsTableStatistics);
62-
verifyTable(events, EventNames.ProtectionDomainCacheTableStatistics);
6357
}
6458
}
6559

‎test/lib/jdk/test/lib/jfr/EventNames.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ public class EventNames {
8585
public static final String BiasedLockClassRevocation = PREFIX + "BiasedLockClassRevocation";
8686
public static final String SymbolTableStatistics = PREFIX + "SymbolTableStatistics";
8787
public static final String StringTableStatistics = PREFIX + "StringTableStatistics";
88-
public static final String PlaceholderTableStatistics = PREFIX + "PlaceholderTableStatistics";
89-
public static final String LoaderConstraintsTableStatistics = PREFIX + "LoaderConstraintsTableStatistics";
90-
public static final String ProtectionDomainCacheTableStatistics = PREFIX + "ProtectionDomainCacheTableStatistics";
9188
public static final String RedefineClasses = PREFIX + "RedefineClasses";
9289
public static final String RetransformClasses = PREFIX + "RetransformClasses";
9390
public static final String ClassRedefinition = PREFIX + "ClassRedefinition";

0 commit comments

Comments
 (0)