Skip to content

Commit 7166a2e

Browse files
thurkathurka
committed
JDK 9 is obsolete - jfr.jdk9 merged to jfr.jdk11
1 parent 9e91a1e commit 7166a2e

24 files changed

+200
-619
lines changed

‎visualvm/jfr.jdk11/manifest.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ OpenIDE-Module: org.graalvm.visualvm.jfr.jdk11/2
44
OpenIDE-Module-Install: org/graalvm/visualvm/jfr/jdk11/Installer.class
55
OpenIDE-Module-Java-Dependencies: Java > 11
66
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/jfr/jdk11/Bundle.properties
7-
OpenIDE-Module-Specification-Version: 2.1
7+
OpenIDE-Module-Specification-Version: 2.2
88
OpenIDE-Module-Provides: jfr.implementation

‎visualvm/jfr.jdk11/nbproject/project.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@
2424
<specification-version>2.1</specification-version>
2525
</run-dependency>
2626
</dependency>
27-
<dependency>
28-
<code-name-base>org.graalvm.visualvm.jfr.jdk9</code-name-base>
29-
<build-prerequisite/>
30-
<compile-dependency/>
31-
<run-dependency>
32-
<release-version>2</release-version>
33-
<specification-version>2.1</specification-version>
34-
</run-dependency>
35-
</dependency>
3627
<dependency>
3728
<code-name-base>org.openide.modules</code-name-base>
3829
<build-prerequisite/>

‎visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/DisplayableSupport.java renamed to ‎visualvm/jfr.jdk11/src/org/graalvm/visualvm/jfr/jdk11/model/impl/DisplayableSupport.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* or visit www.oracle.com if you need additional information or have any
2323
* questions.
2424
*/
25-
package org.graalvm.visualvm.jfr.jdk9.model.impl;
25+
package org.graalvm.visualvm.jfr.jdk11.model.impl;
2626

2727
import java.lang.annotation.Annotation;
2828
import java.text.FieldPosition;
@@ -164,7 +164,7 @@ static JFRDataDescriptor getDataDescriptor(ValueDescriptor descriptor) {
164164
}
165165

166166

167-
static Comparable getDisplayValue(JFRJDK9Event event, ValueDescriptor descriptor) {
167+
static Comparable getDisplayValue(JFRJDK11Event event, ValueDescriptor descriptor) {
168168
// List<AnnotationElement> annotations = descriptor.getAnnotationElements();
169169
// for (AnnotationElement annotation : annotations) System.err.println(">>> ANNOTATION " + annotation.getTypeName() + " - " + annotation.getValues());
170170
// System.err.println(">>> ContentType " + descriptor.getContentType());
@@ -232,7 +232,7 @@ Format createFormat(ValueDescriptor descriptor, A annotation) {
232232
return null;
233233
}
234234

235-
Comparable createValue(JFRJDK9Event event, ValueDescriptor descriptor, A annotation) throws JFRPropertyNotAvailableException {
235+
Comparable createValue(JFRJDK11Event event, ValueDescriptor descriptor, A annotation) throws JFRPropertyNotAvailableException {
236236
Object value = event.getValue(descriptor.getName());
237237
return value instanceof Comparable ? (Comparable)value :
238238
value != null ? value.toString() : null;
@@ -258,7 +258,7 @@ Format createFormat(ValueDescriptor descriptor, Timestamp annotation) {
258258
}
259259

260260
@Override
261-
Comparable createValue(JFRJDK9Event event, ValueDescriptor descriptor, Timestamp annotation) throws JFRPropertyNotAvailableException {
261+
Comparable createValue(JFRJDK11Event event, ValueDescriptor descriptor, Timestamp annotation) throws JFRPropertyNotAvailableException {
262262
return event.getInstant(descriptor.getName());
263263
}
264264

@@ -290,7 +290,7 @@ Format createFormat(ValueDescriptor descriptor, Timespan annotation) {
290290
}
291291

292292
@Override
293-
Comparable createValue(JFRJDK9Event event, ValueDescriptor descriptor, Timespan annotation) throws JFRPropertyNotAvailableException {
293+
Comparable createValue(JFRJDK11Event event, ValueDescriptor descriptor, Timespan annotation) throws JFRPropertyNotAvailableException {
294294
return event.getDuration(descriptor.getName());
295295
}
296296

@@ -470,7 +470,7 @@ Format createFormat() {
470470
return null;
471471
}
472472

473-
Comparable createValue(JFRJDK9Event event, ValueDescriptor descriptor) throws JFRPropertyNotAvailableException {
473+
Comparable createValue(JFRJDK11Event event, ValueDescriptor descriptor) throws JFRPropertyNotAvailableException {
474474
Object value = event.getValue(descriptor.getName());
475475
return value instanceof Comparable ? (Comparable)value :
476476
value == null ? "" : value.toString();
@@ -491,7 +491,7 @@ boolean handlesType(String typeName) {
491491
}
492492

493493
@Override
494-
String createValue(JFRJDK9Event event, ValueDescriptor descriptor) throws JFRPropertyNotAvailableException {
494+
String createValue(JFRJDK11Event event, ValueDescriptor descriptor) throws JFRPropertyNotAvailableException {
495495
Object value = event.getValue(descriptor.getName());
496496
RecordedThread thread = value instanceof RecordedThread ? (RecordedThread)value : null;
497497
if (thread == null) return "";
@@ -509,7 +509,7 @@ boolean handlesType(String typeName) {
509509
}
510510

511511
@Override
512-
String createValue(JFRJDK9Event event, ValueDescriptor descriptor) throws JFRPropertyNotAvailableException {
512+
String createValue(JFRJDK11Event event, ValueDescriptor descriptor) throws JFRPropertyNotAvailableException {
513513
Object value = event.getValue(descriptor.getName());
514514
return value instanceof RecordedClass ? ((RecordedClass)value).getName(): "";
515515
}
@@ -525,7 +525,7 @@ boolean handlesType(String typeName) {
525525
}
526526

527527
@Override
528-
String createValue(JFRJDK9Event event, ValueDescriptor descriptor) throws JFRPropertyNotAvailableException {
528+
String createValue(JFRJDK11Event event, ValueDescriptor descriptor) throws JFRPropertyNotAvailableException {
529529
Object value = event.getValue(descriptor.getName());
530530
return value instanceof RecordedClassLoader ? ((RecordedClassLoader)value).getType().getName(): ""; // NOTE: should actually be "bootstrap"
531531
}
@@ -535,7 +535,7 @@ String createValue(JFRJDK9Event event, ValueDescriptor descriptor) throws JFRPro
535535

536536
private static class DefaultProcessor {
537537

538-
Comparable createValue(JFRJDK9Event event, ValueDescriptor descriptor) throws JFRPropertyNotAvailableException {
538+
Comparable createValue(JFRJDK11Event event, ValueDescriptor descriptor) throws JFRPropertyNotAvailableException {
539539
Object value = event.getValue(descriptor.getName());
540540

541541
if (value == null) return null;

‎visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/JFRJDK9Class.java renamed to ‎visualvm/jfr.jdk11/src/org/graalvm/visualvm/jfr/jdk11/model/impl/JFRJDK11Class.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* or visit www.oracle.com if you need additional information or have any
2323
* questions.
2424
*/
25-
package org.graalvm.visualvm.jfr.jdk9.model.impl;
25+
package org.graalvm.visualvm.jfr.jdk11.model.impl;
2626

2727
import jdk.jfr.consumer.RecordedClass;
2828
import org.graalvm.visualvm.jfr.model.JFRClass;
@@ -31,12 +31,12 @@
3131
*
3232
* @author Jiri Sedlacek
3333
*/
34-
final class JFRJDK9Class extends JFRClass {
34+
final class JFRJDK11Class extends JFRClass {
3535

3636
private final RecordedClass rclass;
3737

3838

39-
JFRJDK9Class(RecordedClass rclass) {
39+
JFRJDK11Class(RecordedClass rclass) {
4040
this.rclass = rclass;
4141
}
4242

@@ -54,7 +54,7 @@ public int hashCode() {
5454

5555
@Override
5656
public boolean equals(Object o) {
57-
return o instanceof JFRJDK9Class ? rclass.equals(((JFRJDK9Class)o).rclass) : false;
57+
return o instanceof JFRJDK11Class ? rclass.equals(((JFRJDK11Class)o).rclass) : false;
5858
}
5959

6060
}

‎visualvm/jfr.jdk11/src/org/graalvm/visualvm/jfr/jdk11/model/impl/JFRJDK11Event.java

Lines changed: 75 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,84 @@
2626

2727
import java.time.Duration;
2828
import java.time.Instant;
29+
import java.util.ArrayList;
30+
import java.util.Iterator;
31+
import java.util.List;
32+
import jdk.jfr.ValueDescriptor;
33+
import jdk.jfr.consumer.RecordedClass;
2934
import jdk.jfr.consumer.RecordedEvent;
30-
import org.graalvm.visualvm.jfr.jdk9.model.impl.JFRJDK9Event;
35+
import jdk.jfr.consumer.RecordedStackTrace;
36+
import jdk.jfr.consumer.RecordedThread;
37+
import org.graalvm.visualvm.jfr.model.JFRClass;
38+
import org.graalvm.visualvm.jfr.model.JFREvent;
3139
import org.graalvm.visualvm.jfr.model.JFRPropertyNotAvailableException;
40+
import org.graalvm.visualvm.jfr.model.JFRStackTrace;
41+
import org.graalvm.visualvm.jfr.model.JFRThread;
3242

3343
/**
3444
*
3545
* @author Jiri Sedlacek
3646
*/
37-
final class JFRJDK11Event extends JFRJDK9Event {
47+
final class JFRJDK11Event extends JFREvent {
3848

39-
JFRJDK11Event(RecordedEvent event, long id) {
40-
super(event, id);
49+
protected final RecordedEvent event;
50+
51+
public JFRJDK11Event(RecordedEvent event, long id) {
52+
super(id);
53+
this.event = event;
54+
}
55+
56+
@Override
57+
public JFRClass getClass(String key) throws JFRPropertyNotAvailableException {
58+
Object rclass = getValue(key);
59+
60+
if (rclass == null) return null;
61+
else if (rclass instanceof RecordedClass) return new JFRJDK11Class((RecordedClass)rclass);
62+
else throw new JFRPropertyNotAvailableException("No class value available: " + key);
63+
}
64+
65+
@Override
66+
public JFRThread getThread(String key) throws JFRPropertyNotAvailableException {
67+
if ("eventThread".equals(key)) { // NOI18N
68+
RecordedThread thread = event.getThread();
69+
return thread == null ? null : new JFRJDK11Thread(thread);
70+
}
71+
72+
Object thread = getValue(key);
73+
if (thread instanceof RecordedThread) return new JFRJDK11Thread((RecordedThread)thread);
74+
else if (thread == null) return null;
75+
else throw new JFRPropertyNotAvailableException("No thread value available: " + key);
76+
}
77+
78+
@Override
79+
public JFRStackTrace getStackTrace(String key) throws JFRPropertyNotAvailableException {
80+
if ("eventStackTrace".equals(key)) { // NOI18N
81+
RecordedStackTrace stackTrace = event.getStackTrace();
82+
return stackTrace == null ? null : new JFRJDK11StackTrace(stackTrace);
83+
}
84+
85+
Object stackTrace = getValue(key);
86+
if (stackTrace instanceof RecordedStackTrace) return new JFRJDK11StackTrace((RecordedStackTrace)stackTrace);
87+
else if (stackTrace == null) return null;
88+
else throw new JFRPropertyNotAvailableException("No stacktrace value available: " + key);
89+
}
90+
91+
@Override
92+
public Object getValue(String key) throws JFRPropertyNotAvailableException {
93+
try {
94+
return event.getValue(key);
95+
} catch (IllegalArgumentException e) {
96+
throw new JFRPropertyNotAvailableException(e);
97+
}
98+
}
99+
100+
101+
@Override
102+
public List<Comparable> getDisplayableValues(boolean includeExperimental) {
103+
List<Comparable> values = new ArrayList();
104+
Iterator<ValueDescriptor> descriptors = DisplayableSupport.displayableValueDescriptors(event.getEventType(), includeExperimental);
105+
while (descriptors.hasNext()) values.add(DisplayableSupport.getDisplayValue(this, descriptors.next()));
106+
return values;
41107
}
42108

43109

@@ -153,6 +219,11 @@ public Duration getDuration(String key) throws JFRPropertyNotAvailableException
153219
}
154220

155221

222+
@Override
223+
public int hashCode() {
224+
return event.hashCode();
225+
}
226+
156227
@Override
157228
public boolean equals(Object o) {
158229
return o instanceof JFRJDK11Event ? event.equals(((JFRJDK11Event)o).event) : false;

‎visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/JFRJDK9EventType.java renamed to ‎visualvm/jfr.jdk11/src/org/graalvm/visualvm/jfr/jdk11/model/impl/JFRJDK11EventType.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* or visit www.oracle.com if you need additional information or have any
2323
* questions.
2424
*/
25-
package org.graalvm.visualvm.jfr.jdk9.model.impl;
25+
package org.graalvm.visualvm.jfr.jdk11.model.impl;
2626

2727
import java.util.ArrayList;
2828
import java.util.Iterator;
@@ -37,12 +37,12 @@
3737
*
3838
* @author Jiri Sedlacek
3939
*/
40-
final class JFRJDK9EventType extends JFREventType {
40+
final class JFRJDK11EventType extends JFREventType {
4141

4242
private final EventType type;
4343

4444

45-
JFRJDK9EventType(EventType type) {
45+
JFRJDK11EventType(EventType type) {
4646
this.type = type;
4747
}
4848

@@ -95,7 +95,7 @@ public int hashCode() {
9595

9696
@Override
9797
public boolean equals(Object o) {
98-
return o instanceof JFRJDK9EventType ? type.equals(((JFRJDK9EventType)o).type) : false;
98+
return o instanceof JFRJDK11EventType ? type.equals(((JFRJDK11EventType)o).type) : false;
9999
}
100100

101101
}

‎visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/JFRJDK9Method.java renamed to ‎visualvm/jfr.jdk11/src/org/graalvm/visualvm/jfr/jdk11/model/impl/JFRJDK11Method.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* or visit www.oracle.com if you need additional information or have any
2323
* questions.
2424
*/
25-
package org.graalvm.visualvm.jfr.jdk9.model.impl;
25+
package org.graalvm.visualvm.jfr.jdk11.model.impl;
2626

2727
import jdk.jfr.consumer.RecordedClass;
2828
import jdk.jfr.consumer.RecordedMethod;
@@ -33,12 +33,12 @@
3333
*
3434
* @author Jiri Sedlacek
3535
*/
36-
final class JFRJDK9Method extends JFRMethod {
36+
final class JFRJDK11Method extends JFRMethod {
3737

3838
private final RecordedMethod method;
3939

4040

41-
JFRJDK9Method(RecordedMethod method) {
41+
JFRJDK11Method(RecordedMethod method) {
4242
this.method = method;
4343
}
4444

@@ -56,7 +56,7 @@ public String getDescriptor() {
5656
@Override
5757
public JFRClass getType() {
5858
RecordedClass rclass = method.getType();
59-
return rclass == null ? null : new JFRJDK9Class(rclass);
59+
return rclass == null ? null : new JFRJDK11Class(rclass);
6060
}
6161

6262

@@ -67,7 +67,7 @@ public int hashCode() {
6767

6868
@Override
6969
public boolean equals(Object o) {
70-
return o instanceof JFRJDK9Method ? method.equals(((JFRJDK9Method)o).method) : false;
70+
return o instanceof JFRJDK11Method ? method.equals(((JFRJDK11Method)o).method) : false;
7171
}
7272

7373
}

0 commit comments

Comments
 (0)