commit 5809ec2a674c4e3d47b5430e208d422286eb382f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 03 09:16:33 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 03 09:16:33 2024 +0000
tree b0c611726cd0c84d5d94525b259ee9e97c5c1a88
parent 156928671843ec852ccbea5aa51b1d012b139083
parent b67822c134ab6cc607de011249758dbe83e412c2

Merge "Automatically delete trace files after generating report" into main

profcollectd/libprofcollectd/config.rs

diff --git a/profcollectd/libprofcollectd/config.rs b/profcollectd/libprofcollectd/config.rs
index af71424..8a6c9e4 100644
--- a/profcollectd/libprofcollectd/config.rs
+++ b/profcollectd/libprofcollectd/config.rs
@@ -166,3 +166,11 @@
     remove_files(&REPORT_OUTPUT_DIR)?;
     Ok(())
 }
+pub fn clear_processed_files() -> Result<()> {
+    read_dir(&PROFILE_OUTPUT_DIR as &Path)?
+        .filter_map(|e| e.ok())
+        .map(|e| e.path())
+        .filter(|e| e.is_file() && e != (&CONFIG_FILE as &Path))
+        .try_for_each(remove_file)?;
+    Ok(())
+}

profcollectd/libprofcollectd/report.rs

diff --git a/profcollectd/libprofcollectd/report.rs b/profcollectd/libprofcollectd/report.rs
index e0f2ec8..60410c1 100644
--- a/profcollectd/libprofcollectd/report.rs
+++ b/profcollectd/libprofcollectd/report.rs
@@ -29,7 +29,7 @@
 use zip::CompressionMethod::Deflated;
 use zip::ZipWriter;
 
-use crate::config::Config;
+use crate::config::{clear_processed_files, Config};
 
 pub const NO_USAGE_SETTING: i32 = -1;
 
@@ -80,6 +80,7 @@
         zip.write_all(usage_setting.to_string().as_bytes())?;
     }
     zip.finish()?;
+    clear_processed_files()?;
 
     Ok(report_filename)
 }