stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8304844: JFR: Missing disk parameter in ActiveRecording event

Browse Source 
Reviewed-by: mgronlun
This commit is contained in:
Erik Gahlin 2023-03-31 15:50:33 +00:00
parent e012685051
commit dae1ab3aad
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jdk.jfr/share/classes/jdk/jfr/events/ActiveRecordingEvent.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -52,6 +52,9 @@ public final class ActiveRecordingEvent extends AbstractJDKEvent {
@Label("Destination") @Label("Destination")
public String destination; public String destination;
@Label("To Disk")
public boolean disk;
@Label("Max Age") @Label("Max Age")
@Timespan(Timespan.MILLISECONDS) @Timespan(Timespan.MILLISECONDS)
public long maxAge; public long maxAge;
@ -77,7 +80,7 @@ public final class ActiveRecordingEvent extends AbstractJDKEvent {
} }
public static void commit(long timestamp, long duration, long id, String name, public static void commit(long timestamp, long duration, long id, String name,
String destination, long maxAge, long flushInterval, String destination, boolean disk, long maxAge, long flushInterval,
long maxSize, long recordingStart, long recordingDuration) { long maxSize, long recordingStart, long recordingDuration) {
// Generated // Generated
} }

1
src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
View File

@ -474,6 +474,7 @@ public final class PlatformRecorder {
r.getId(), r.getId(),
r.getName(), r.getName(),
path == null ? null : path.getRealPathText(), path == null ? null : path.getRealPathText(),
r.isToDisk(),
age == null ? Long.MAX_VALUE : age.toMillis(), age == null ? Long.MAX_VALUE : age.toMillis(),
flush == null ? Long.MAX_VALUE : flush.toMillis(), flush == null ? Long.MAX_VALUE : flush.toMillis(),
size == null ? Long.MAX_VALUE : size, size == null ? Long.MAX_VALUE : size,

4
test/jdk/jdk/jfr/event/runtime/TestActiveRecordingEvent.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -118,6 +118,8 @@ public final class TestActiveRecordingEvent {
assertEquals(recording.getId(), ev.getValue("id")); assertEquals(recording.getId(), ev.getValue("id"));
assertEquals(recording.isToDisk(), ev.getValue("disk"));
ValueDescriptor maxAgeField = evType.getField("maxAge"); ValueDescriptor maxAgeField = evType.getField("maxAge");
assertEquals(maxAgeField.getAnnotation(Timespan.class).value(), Timespan.MILLISECONDS); assertEquals(maxAgeField.getAnnotation(Timespan.class).value(), Timespan.MILLISECONDS);
} }