Skip to content

Commit 58b6937

Browse files
committed
8288982: JFR: Log event streaming actions
Reviewed-by: mgronlun
1 parent 82c77ca commit 58b6937

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/AbstractEventStream.java

+3
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ protected final Dispatcher dispatcher() {
8585
synchronized (streamConfiguration) {
8686
dispatcher = new Dispatcher(streamConfiguration);
8787
streamConfiguration.setChanged(false);
88+
if (Logger.shouldLog(LogTag.JFR_SYSTEM_STREAMING, LogLevel.DEBUG)) {
89+
Logger.log(LogTag.JFR_SYSTEM_STREAMING, LogLevel.DEBUG, dispatcher.toString());
90+
}
8891
}
8992
}
9093
return dispatcher;

src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/Dispatcher.java

+11
Original file line numberDiff line numberDiff line change
@@ -209,4 +209,15 @@ private void defaultErrorHandler(Throwable e) {
209209
public boolean hasMetadataHandler() {
210210
return metadataActions.length > 0;
211211
}
212+
213+
public String toString() {
214+
StringBuilder sb = new StringBuilder();
215+
sb.append("Error actions: " + errorActions.length + "\n");
216+
sb.append("Meta actions: " + metadataActions.length + "\n");
217+
sb.append("Flush actions: " + flushActions.length + "\n");
218+
sb.append("Close actions: " + closeActions.length+ "\n");
219+
sb.append("Event dispatchers: " + dispatchers.length+ "\n" );
220+
sb.append("Dispatch lookup size: " + dispatcherLookup.size());
221+
return sb.toString();
222+
}
212223
}

test/jdk/jdk/jfr/api/consumer/recordingstream/TestOnEvent.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* @key jfr
3636
* @requires vm.hasJFR
3737
* @library /test/lib /test/jdk
38-
* @run main/othervm jdk.jfr.api.consumer.recordingstream.TestOnEvent
38+
* @run main/othervm -Xlog:jfr+system+streaming=debug jdk.jfr.api.consumer.recordingstream.TestOnEvent
3939
*/
4040
public class TestOnEvent {
4141

@@ -154,12 +154,14 @@ private static void testOnEventAfterStart() {
154154
EventProducer p = new EventProducer();
155155
p.start();
156156
Thread addHandler = new Thread(() -> {
157+
log("About to add handler");
157158
r.onEvent(e -> {
158159
// Got event, close stream
159160
log("Executing onEvent");
160161
r.close();
161162
log("RecordingStream closed");
162163
});
164+
log("Handler added");
163165
});
164166
r.onFlush(() -> {
165167
// Only add handler once

0 commit comments

Comments
 (0)