jdk-sandbox: comparison src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordingFile.java

equal deleted inserted replaced

-:2c3cc4b01880
+:c16ac7a2eba4
 /*
-* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2019, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import jdk.jfr.EventType;
 import jdk.jfr.internal.MetadataDescriptor;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.consumer.ChunkHeader;
+import jdk.jfr.internal.consumer.ChunkParser;
+import jdk.jfr.internal.consumer.FileAccess;
 import jdk.jfr.internal.consumer.RecordingInput;
-import jdk.jfr.internal.consumer.RecordingInternals;
 /**
 * A recording file.
 * <p>
 * The following example shows how read and print all events in a recording file.
 * </pre>
 *
 * @since 9
 */
 public final class RecordingFile implements Closeable {
-static{
-RecordingInternals.INSTANCE = new RecordingInternals() {
-public List<Type> readTypes(RecordingFile file) throws IOException {
-return file.readTypes();
-}
-public boolean isLastEventInChunk(RecordingFile file) {
-return file.isLastEventInChunk;
-}
-@Override
-public Object getOffsetDataTime(RecordedObject event, String name) {
-return event.getOffsetDateTime(name);
-}
-@Override
-public void sort(List<RecordedEvent> events) {
-Collections.sort(events, (e1, e2) -> Long.compare(e1.endTime, e2.endTime));
-}
-};
-}
 private boolean isLastEventInChunk;
 private final File file;
 private RecordingInput input;
 private ChunkParser chunkParser;
 * @throws SecurityException if a security manager exists and its
 *         {@code checkRead} method denies read access to the file.
 */
 public RecordingFile(Path file) throws IOException {
 this.file = file.toFile();
-this.input = new RecordingInput(this.file);
+this.input = new RecordingInput(this.file, FileAccess.UNPRIVILIGED);
 findNext();
 }
 /**
 * Reads the next event in the recording.
 *
 * @see #hasMoreEvents()
 */
 public List<EventType> readEventTypes() throws IOException {
 ensureOpen();
+MetadataDescriptor previous = null;
 List<EventType> types = new ArrayList<>();
 HashSet<Long> foundIds = new HashSet<>();
-try (RecordingInput ri = new RecordingInput(file)) {
+try (RecordingInput ri = new RecordingInput(file, FileAccess.UNPRIVILIGED)) {
 ChunkHeader ch = new ChunkHeader(ri);
-aggregateEventTypeForChunk(ch, types, foundIds);
+aggregateEventTypeForChunk(ch, null, types, foundIds);
 while (!ch.isLastChunk()) {
 ch = ch.nextHeader();
-aggregateEventTypeForChunk(ch, types, foundIds);
+previous = aggregateEventTypeForChunk(ch, previous, types, foundIds);
 }
 }
 return types;
 }
 List<Type> readTypes() throws IOException  {
 ensureOpen();
+MetadataDescriptor previous = null;
 List<Type> types = new ArrayList<>();
 HashSet<Long> foundIds = new HashSet<>();
-try (RecordingInput ri = new RecordingInput(file)) {
+try (RecordingInput ri = new RecordingInput(file, FileAccess.UNPRIVILIGED)) {
 ChunkHeader ch = new ChunkHeader(ri);
-aggregateTypeForChunk(ch, types, foundIds);
+ch.awaitFinished();
+aggregateTypeForChunk(ch, null, types, foundIds);
 while (!ch.isLastChunk()) {
 ch = ch.nextHeader();
-aggregateTypeForChunk(ch, types, foundIds);
+previous = aggregateTypeForChunk(ch, previous, types, foundIds);
 }
 }
 return types;
 }
-private void aggregateTypeForChunk(ChunkHeader ch, List<Type> types, HashSet<Long> foundIds) throws IOException {
+private MetadataDescriptor aggregateTypeForChunk(ChunkHeader ch, MetadataDescriptor previous, List<Type> types, HashSet<Long> foundIds) throws IOException {
-MetadataDescriptor m = ch.readMetadata();
+MetadataDescriptor m = ch.readMetadata(previous);
 for (Type t : m.getTypes()) {
 if (!foundIds.contains(t.getId())) {
 types.add(t);
 foundIds.add(t.getId());
 }
 }
-}
+return m;
+}
-private static void aggregateEventTypeForChunk(ChunkHeader ch, List<EventType> types, HashSet<Long> foundIds) throws IOException {
-MetadataDescriptor m = ch.readMetadata();
+private static MetadataDescriptor aggregateEventTypeForChunk(ChunkHeader ch,  MetadataDescriptor previous, List<EventType> types, HashSet<Long> foundIds) throws IOException {
+MetadataDescriptor m = ch.readMetadata(previous);
 for (EventType t : m.getEventTypes()) {
 if (!foundIds.contains(t.getId())) {
 types.add(t);
 foundIds.add(t.getId());
 }
 }
+return m;
 }
 /**
 * Closes this recording file and releases any system resources that are
 * associated with it.
 list.add(r.readEvent());
 }
 return list;
 }
 }
+// package protected
+File getFile() {
+return file;
+}
+// package protected
+boolean isLastEventInChunk() {
+return isLastEventInChunk;
+}
 // either sets next to an event or sets eof to true
 private void findNext() throws IOException {
 while (nextEvent == null) {
 if (chunkParser == null) {

changeset 58863	c16ac7a2eba4
parent 52850	f527b24990d7