--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/Utils.java	Sun Jun 24 16:25:47 2018 +0100
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/Utils.java	Mon Jun 25 02:07:42 2018 +0200
@@ -43,6 +43,7 @@
 import java.lang.reflect.Modifier;
 import java.nio.file.Path;
 import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -55,6 +56,7 @@
 import jdk.internal.org.objectweb.asm.util.CheckClassAdapter;
 import jdk.jfr.Event;
 import jdk.jfr.FlightRecorderPermission;
+import jdk.jfr.Recording;
 import jdk.jfr.RecordingState;
 import jdk.jfr.internal.handlers.EventHandler;
 import jdk.jfr.internal.settings.PeriodSetting;
@@ -484,13 +486,6 @@
         return Collections.unmodifiableList(list);
     }
 
-    public static void updateSettingPathToGcRoots(Map<String, String> settings, Boolean pathToGcRoots) {
-        if (pathToGcRoots != null) {
-            settings.put(Type.EVENT_NAME_PREFIX + "OldObjectSample#cutoff", pathToGcRoots ? "infinity" : "0 ns" );
-        }
-    }
-
-
     public static String upgradeLegacyJDKEvent(String eventName) {
         if (eventName.length() <= LEGACY_EVENT_NAME_PREFIX.length()) {
             return eventName;
@@ -503,4 +498,11 @@
         }
         return eventName;
     }
+
+    public static String makeFilename(Recording recording) {
+        String pid = JVM.getJVM().getPid();
+        String date = Repository.REPO_DATE_FORMAT.format(LocalDateTime.now());
+        String idText = recording == null ? "" :  "-id-" + Long.toString(recording.getId());
+        return "hotspot-" + "pid-" + pid + idText + "-" + date + ".jfr";
+    }
 }