commit 11450516471ce5f83202815c09439b43aaf9120b
author Kevin Jeon <kevinjeon@google.com> Tue Nov 15 02:21:17 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 15 02:21:17 2022 +0000
tree 8844f11036f65de9dc25d2cb75f41267f4fb0058
parent cc00f3e25f24aa408313ed0b924f39c5b7dd26d5
parent 368706f9ba5e631d97411d65c345dbffc35a407f

Merge "Save existing temporary traces on reboot"

src/com/android/traceur/PerfettoUtils.java

diff --git a/src/com/android/traceur/PerfettoUtils.java b/src/com/android/traceur/PerfettoUtils.java
index 7a43908..33d9ae7 100644
--- a/src/com/android/traceur/PerfettoUtils.java
+++ b/src/com/android/traceur/PerfettoUtils.java
@@ -82,11 +82,11 @@
             Log.e(TAG, "Attempting to start perfetto trace but trace is already in progress");
             return false;
         } else {
-            // Ensure the temporary trace file is cleared.
-            try {
-                Files.deleteIfExists(Paths.get(TEMP_TRACE_LOCATION));
-            } catch (Exception e) {
-                throw new RuntimeException(e);
+            // If a temporary trace file already exists, save it before beginning a new trace.
+            File recoveredFile = TraceUtils.getOutputFile(
+                    TraceUtils.getRecoveredFilename());
+            if (!traceDump(recoveredFile)) {
+                Log.w(TAG, "Failed to recover in-progress trace.");
             }
         }
 

src/com/android/traceur/TraceUtils.java

diff --git a/src/com/android/traceur/TraceUtils.java b/src/com/android/traceur/TraceUtils.java
index b813a1e..e4d744e 100644
--- a/src/com/android/traceur/TraceUtils.java
+++ b/src/com/android/traceur/TraceUtils.java
@@ -97,7 +97,8 @@
     }
 
     public static void clearSavedTraces() {
-        String cmd = "rm -f " + TRACE_DIRECTORY + "trace-*.*trace";
+        String cmd = "rm -f " + TRACE_DIRECTORY + "trace-*.*trace " +
+                TRACE_DIRECTORY + "recovered-trace*.*trace";
 
         Log.v(TAG, "Clearing trace directory: " + cmd);
         try {
@@ -159,6 +160,10 @@
             mTraceEngine.getOutputExtension());
     }
 
+    public static String getRecoveredFilename() {
+        return "recovered-" + getOutputFilename();
+    }
+
     public static File getOutputFile(String filename) {
         return new File(TraceUtils.TRACE_DIRECTORY, filename);
     }