diff -r 2c3cc4b01880 -r c16ac7a2eba4 src/jdk.jfr/share/classes/jdk/jfr/internal/tool/EventPrintWriter.java --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/EventPrintWriter.java Wed Oct 30 16:14:56 2019 +0100 +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/EventPrintWriter.java Wed Oct 30 19:43:52 2019 +0100 @@ -30,6 +30,7 @@ import java.io.PrintWriter; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,7 +43,7 @@ import jdk.jfr.consumer.RecordedEvent; import jdk.jfr.consumer.RecordedObject; import jdk.jfr.consumer.RecordingFile; -import jdk.jfr.internal.consumer.RecordingInternals; +import jdk.jfr.internal.consumer.JdkJfrConsumer; abstract class EventPrintWriter extends StructuredWriter { @@ -52,6 +53,7 @@ protected static final String STACK_TRACE_FIELD = "stackTrace"; protected static final String EVENT_THREAD_FIELD = "eventThread"; + private static final JdkJfrConsumer PRIVATE_ACCESS = JdkJfrConsumer.instance(); private Predicate eventFilter = x -> true; private int stackDepth; @@ -74,8 +76,8 @@ if (acceptEvent(event)) { events.add(event); } - if (RecordingInternals.INSTANCE.isLastEventInChunk(file)) { - RecordingInternals.INSTANCE.sort(events); + if (PRIVATE_ACCESS.isLastEventInChunk(file)) { + Collections.sort(events, PRIVATE_ACCESS.eventComparator()); print(events); events.clear(); } @@ -121,7 +123,7 @@ case TIMESPAN: return object.getDuration(v.getName()); case TIMESTAMP: - return RecordingInternals.INSTANCE.getOffsetDataTime(object, v.getName()); + return PRIVATE_ACCESS.getOffsetDataTime(object, v.getName()); default: return object.getValue(v.getName()); }