jdk-sandbox: comparison src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java

equal deleted inserted replaced

-:4cab5edc2950
+:5d043a159d5c
 /*
-* 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 static jdk.jfr.internal.LogLevel.TRACE;
 import static jdk.jfr.internal.LogLevel.WARN;
 import static jdk.jfr.internal.LogTag.JFR;
 import static jdk.jfr.internal.LogTag.JFR_SYSTEM;
-import java.io.IOException;
 import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
 try {
 List<Timer> result = new CopyOnWriteArrayList<>();
 Thread t = SecuritySupport.createThreadWitNoPermissions("Permissionless thread", ()-> {
 result.add(new Timer("JFR Recording Scheduler", true));
 });
+jvm.exclude(t);
 t.start();
 t.join();
 return result.get(0);
 } catch (InterruptedException e) {
 throw new IllegalStateException("Not able to create timer task. " + e.getMessage(), e);
 jvm.destroyNativeJFR();
 }
 repository.clear();
 }
-synchronized void start(PlatformRecording recording) {
+synchronized long start(PlatformRecording recording) {
 // State can only be NEW or DELAYED because of previous checks
 Instant now = Instant.now();
 recording.setStartTime(now);
 recording.updateTimer();
 Duration duration = recording.getDuration();
 if (duration != null) {
 recording.setStopTime(now.plus(duration));
 }
 boolean toDisk = recording.isToDisk();
 boolean beginPhysical = true;
+long streamInterval = recording.getStreamIntervalMillis();
 for (PlatformRecording s : getRecordings()) {
 if (s.getState() == RecordingState.RUNNING) {
 beginPhysical = false;
 if (s.isToDisk()) {
 toDisk = true;
 }
-}
+streamInterval = Math.min(streamInterval, s.getStreamIntervalMillis());
 }
+}
+long startNanos = -1;
 if (beginPhysical) {
 RepositoryChunk newChunk = null;
 if (toDisk) {
 newChunk = repository.newChunk(now);
 MetadataRepository.getInstance().setOutput(newChunk.getUnfishedFile().toString());
 } else {
 MetadataRepository.getInstance().setOutput(null);
 }
 currentChunk = newChunk;
 jvm.beginRecording_();
+startNanos = jvm.getChunkStartNanos();
 recording.setState(RecordingState.RUNNING);
 updateSettings();
 writeMetaEvents();
 } else {
 RepositoryChunk newChunk = null;
 if (toDisk) {
 newChunk = repository.newChunk(now);
 RequestEngine.doChunkEnd();
 MetadataRepository.getInstance().setOutput(newChunk.getUnfishedFile().toString());
+startNanos = jvm.getChunkStartNanos();
 }
 recording.setState(RecordingState.RUNNING);
 updateSettings();
 writeMetaEvents();
 if (currentChunk != null) {
 finishChunk(currentChunk, now, recording);
 }
 currentChunk = newChunk;
 }
+if (toDisk) {
+RequestEngine.setFlushInterval(streamInterval);
+}
 RequestEngine.doChunkBegin();
+return startNanos;
 }
 synchronized void stop(PlatformRecording recording) {
 RecordingState state = recording.getState();
 throw new IllegalStateException("Recording must be started before it can be stopped.");
 }
 Instant now = Instant.now();
 boolean toDisk = false;
 boolean endPhysical = true;
+long streamInterval = Long.MAX_VALUE;
 for (PlatformRecording s : getRecordings()) {
 RecordingState rs = s.getState();
 if (s != recording && RecordingState.RUNNING == rs) {
 endPhysical = false;
 if (s.isToDisk()) {
 toDisk = true;
 }
+streamInterval = Math.min(streamInterval, s.getStreamIntervalMillis());
 }
 }
 OldObjectSample.emit(recording);
 if (endPhysical) {
 finishChunk(currentChunk, now, null);
 }
 currentChunk = newChunk;
 RequestEngine.doChunkBegin();
 }
+if (toDisk) {
+RequestEngine.setFlushInterval(streamInterval);
+} else {
+RequestEngine.setFlushInterval(Long.MAX_VALUE);
+}
 recording.setState(RecordingState.STOPPED);
 }
 private void dumpMemoryToDestination(PlatformRecording recording)  {
 WriteableUserPath dest = recording.getDestination();
 for (PlatformRecording r : getRecordings()) {
 if (r != ignoreMe && r.getState() == RecordingState.RUNNING) {
 r.appendChunk(chunk);
 }
 }
+FilePurger.purge();
 }
 private void writeMetaEvents() {
 if (activeRecordingEvent.isEnabled()) {
 event.maxAge = age == null ? Long.MAX_VALUE : age.toMillis();
 Long size = r.getMaxSize();
 event.maxSize = size == null ? Long.MAX_VALUE : size;
 Instant start = r.getStartTime();
 event.recordingStart = start == null ? Long.MAX_VALUE : start.toEpochMilli();
+Duration fi = r.getFlushInterval();
+event.flushInterval = fi == null ? Long.MAX_VALUE : fi.toMillis();
 event.commit();
 }
 }
 }
 if (activeSettingEvent.isEnabled()) {
 try {
 synchronized (JVM.FILE_DELTA_CHANGE) {
 JVM.FILE_DELTA_CHANGE.wait(duration < 10 ? 10 : duration);
 }
 } catch (InterruptedException e) {
-e.printStackTrace();
+// Ignore
 }
 }
 synchronized Recording newCopy(PlatformRecording r, boolean stop) {
 Recording newRec = new Recording();

branch	JEP-349-branch
changeset 57360	5d043a159d5c
parent 53014	339d2fbe8675
child 57470	025c9b8eaefd