Skip to content

8291733: Remove JFR events that expose hashtable #4047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

8291733: Remove JFR events that expose hashtable #4047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions src/hotspot/share/classfile/systemDictionary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
8 changes: 1 addition & 7 deletions src/hotspot/share/classfile/systemDictionary.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -79,7 +79,6 @@ class ProtectionDomainCacheEntry;
class GCTimer;
class EventClassLoad;
class Symbol;
class TableStatistics;

class SystemDictionary : AllStatic {
friend class BootstrapInfo;
Expand Down Expand Up @@ -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
36 changes: 0 additions & 36 deletions src/hotspot/share/jfr/metadata/metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,42 +811,6 @@
<Field type="float" name="removalRate" label="Removal Rate" description="How many items were removed since last event (per second)" />
</Event>

<Event name="PlaceholderTableStatistics" category="Java Virtual Machine, Runtime, Tables" label="Placeholder Table Statistics" period="everyChunk">
<Field type="ulong" name="bucketCount" label="Bucket Count" description="Number of buckets" />
<Field type="ulong" name="entryCount" label="Entry Count" description="Number of all entries" />
<Field type="ulong" contentType="bytes" name="totalFootprint" label="Total Footprint" description="Total memory footprint (the table itself plus all of the entries)" />
<Field type="ulong" name="bucketCountMaximum" label="Maximum Bucket Count" description="The maximum bucket length (entries in a single bucket)" />
<Field type="float" name="bucketCountAverage" label="Average Bucket Count" description="The average bucket length" />
<Field type="float" name="bucketCountVariance" label="Bucket Count Variance" description="How far bucket lengths are spread out from their average value" />
<Field type="float" name="bucketCountStandardDeviation" label="Bucket Count Standard Deviation" description="How far bucket lengths are spread out from their mean (expected) value" />
<Field type="float" name="insertionRate" label="Insertion Rate" description="How many items were added since last event (per second)" />
<Field type="float" name="removalRate" label="Removal Rate" description="How many items were removed since last event (per second)" />
</Event>

<Event name="LoaderConstraintsTableStatistics" category="Java Virtual Machine, Runtime, Tables" label="Loader Constraints Table Statistics" period="everyChunk">
<Field type="ulong" name="bucketCount" label="Bucket Count" />
<Field type="ulong" name="entryCount" label="Entry Count" description="Number of all entries" />
<Field type="ulong" contentType="bytes" name="totalFootprint" label="Total Footprint" description="Total memory footprint (the table itself plus all of the entries)" />
<Field type="ulong" name="bucketCountMaximum" label="Maximum Bucket Count" description="The maximum bucket length (entries in a single bucket)" />
<Field type="float" name="bucketCountAverage" label="Average Bucket Count" description="The average bucket length" />
<Field type="float" name="bucketCountVariance" label="Bucket Count Variance" description="How far bucket lengths are spread out from their average value" />
<Field type="float" name="bucketCountStandardDeviation" label="Bucket Count Standard Deviation" description="How far bucket lengths are spread out from their mean (expected) value" />
<Field type="float" name="insertionRate" label="Insertion Rate" description="How many items were added since last event (per second)" />
<Field type="float" name="removalRate" label="Removal Rate" description="How many items were removed since last event (per second)" />
</Event>

<Event name="ProtectionDomainCacheTableStatistics" category="Java Virtual Machine, Runtime, Tables" label="Protection Domain Cache Table Statistics" period="everyChunk">
<Field type="ulong" name="bucketCount" label="Bucket Count" description="Number of buckets" />
<Field type="ulong" name="entryCount" label="Entry Count" description="Number of all entries" />
<Field type="ulong" contentType="bytes" name="totalFootprint" label="Total Footprint" description="Total memory footprint (the table itself plus all of the entries)" />
<Field type="ulong" name="bucketCountMaximum" label="Maximum Bucket Count" description="The maximum bucket length (entries in a single bucket)" />
<Field type="float" name="bucketCountAverage" label="Average Bucket Count" description="The average bucket length" />
<Field type="float" name="bucketCountVariance" label="Bucket Count Variance" description="How far bucket lengths are spread out from their average value" />
<Field type="float" name="bucketCountStandardDeviation" label="Bucket Count Standard Deviation" description="How far bucket lengths are spread out from their mean (expected) value" />
<Field type="float" name="insertionRate" label="Insertion Rate" description="How many items were added since last event (per second)" />
<Field type="float" name="removalRate" label="Removal Rate" description="How many items were removed since last event (per second)" />
</Event>

<Event name="ThreadAllocationStatistics" category="Java Application, Statistics" label="Thread Allocation Statistics" period="everyChunk">
<Field type="ulong" contentType="bytes" name="allocated" label="Allocated" description="Approximate number of bytes allocated since thread start" />
<Field type="Thread" name="thread" label="Thread" />
Expand Down
15 changes: 0 additions & 15 deletions src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,21 +547,6 @@ TRACE_REQUEST_FUNC(StringTableStatistics) {
emit_table_statistics<EventStringTableStatistics>(statistics);
}

TRACE_REQUEST_FUNC(PlaceholderTableStatistics) {
TableStatistics statistics = SystemDictionary::placeholders_statistics();
emit_table_statistics<EventPlaceholderTableStatistics>(statistics);
}

TRACE_REQUEST_FUNC(LoaderConstraintsTableStatistics) {
TableStatistics statistics = SystemDictionary::loader_constraints_statistics();
emit_table_statistics<EventLoaderConstraintsTableStatistics>(statistics);
}

TRACE_REQUEST_FUNC(ProtectionDomainCacheTableStatistics) {
TableStatistics statistics = SystemDictionary::protection_domain_cache_statistics();
emit_table_statistics<EventProtectionDomainCacheTableStatistics>(statistics);
}

TRACE_REQUEST_FUNC(CompilerStatistics) {
EventCompilerStatistics event;
event.set_compileCount(CompileBroker::get_total_compile_count());
Expand Down
15 changes: 0 additions & 15 deletions src/jdk.jfr/share/conf/jfr/default.jfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,6 @@
<setting name="period">10 s</setting>
</event>

<event name="jdk.PlaceholderTableStatistics">
<setting name="enabled">true</setting>
<setting name="period">10 s</setting>
</event>

<event name="jdk.LoaderConstraintsTableStatistics">
<setting name="enabled">true</setting>
<setting name="period">10 s</setting>
</event>

<event name="jdk.ProtectionDomainCacheTableStatistics">
<setting name="enabled">true</setting>
<setting name="period">10 s</setting>
</event>

<event name="jdk.ThreadStart">
<setting name="enabled">true</setting>
<setting name="stackTrace">true</setting>
Expand Down
15 changes: 0 additions & 15 deletions src/jdk.jfr/share/conf/jfr/profile.jfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,6 @@
<setting name="period">10 s</setting>
</event>

<event name="jdk.PlaceholderTableStatistics">
<setting name="enabled">true</setting>
<setting name="period">10 s</setting>
</event>

<event name="jdk.LoaderConstraintsTableStatistics">
<setting name="enabled">true</setting>
<setting name="period">10 s</setting>
</event>

<event name="jdk.ProtectionDomainCacheTableStatistics">
<setting name="enabled">true</setting>
<setting name="period">10 s</setting>
</event>

<event name="jdk.ThreadStart">
<setting name="enabled">true</setting>
<setting name="stackTrace">true</setting>
Expand Down
8 changes: 1 addition & 7 deletions test/jdk/jdk/jfr/event/runtime/TestTableStatisticsEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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<RecordedEvent> events = Events.fromRecording(recording);
verifyTable(events, EventNames.SymbolTableStatistics);
verifyTable(events, EventNames.StringTableStatistics);
verifyTable(events, EventNames.PlaceholderTableStatistics);
verifyTable(events, EventNames.LoaderConstraintsTableStatistics);
verifyTable(events, EventNames.ProtectionDomainCacheTableStatistics);
}
}

Expand Down
3 changes: 0 additions & 3 deletions test/lib/jdk/test/lib/jfr/EventNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down