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

equal deleted inserted replaced

-:2c3cc4b01880
+:c16ac7a2eba4
 /*
-* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 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
 * @return result output
 *
 * @throws DCmdException if recording could not be started
 */
 @SuppressWarnings("resource")
-public String execute(String name, String[] settings, Long delay, Long duration, Boolean disk, String path, Long maxAge, Long maxSize, Boolean dumpOnExit, Boolean pathToGcRoots) throws DCmdException {
+public String execute(String name, String[] settings, Long delay, Long duration, Boolean disk, String path, Long maxAge, Long maxSize, Long flush, Boolean dumpOnExit, Boolean pathToGcRoots) throws DCmdException {
 if (Logger.shouldLog(LogTag.JFR_DCMD, LogLevel.DEBUG)) {
 Logger.log(LogTag.JFR_DCMD, LogLevel.DEBUG, "Executing DCmdStart: name=" + name +
 ", settings=" + Arrays.asList(settings) +
 ", delay=" + delay +
 ", duration=" + duration +
 ", disk=" + disk+
 ", filename=" + path +
 ", maxage=" + maxAge +
+", flush=" + flush +
 ", maxsize=" + maxSize +
 ", dumponexit =" + dumpOnExit +
 ", path-to-gc-roots=" + pathToGcRoots);
 }
 if (name != null) {
 // to avoid typo, delay shorter than 1s makes no sense.
 throw new DCmdException("Could not start recording, delay must be at least 1 second.");
 }
 }
+if (flush != null) {
+if (Boolean.FALSE.equals(disk)) {
+throw new DCmdException("Flush can only be set for recordings that are to disk.");
+}
+}
 if (!FlightRecorder.isInitialized() && delay == null) {
 initializeWithForcedInstrumentation(s);
 }
 Recording recording = new Recording();
 }
 if (disk != null) {
 recording.setToDisk(disk.booleanValue());
 }
 recording.setSettings(s);
 SafePath safePath = null;
 if (path != null) {
 try {
 if (maxAge != null) {
 recording.setMaxAge(Duration.ofNanos(maxAge));
 }
+if (flush != null) {
+recording.setFlushInterval(Duration.ofNanos(flush));
+}
 if (maxSize != null) {
 recording.setMaxSize(maxSize);
 }
 if (duration != null) {
 recordingspecifier = "name=" + quoteIfNeeded(name);
 }
 print("Use jcmd " + getPid() + " JFR." + cmd + " " + recordingspecifier + " " + fileOption + "to copy recording data to file.");
 println();
 }
 return getResult();
 }
 // Instruments JDK-events on class load to reduce startup time

changeset 58863	c16ac7a2eba4
parent 55302	686dedba1d9a