commit f563d6eaf585c1d9098ce764683edbc5aaa28bb0
author Yuanfang Chen <yuanfang.chen@sony.com> Mon Feb 10 14:33:27 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Mar 25 23:20:41 2021 -0700
tree 72634126c49d1432c5d453a8f6c95e515967a1dd
parent 70ac3f6f5bed231bfc807b18c56a59853bec3947

[NFC][libFuzzer] Prefix TempPath with string showing the work it is doing.

GitOrigin-RevId: 8a29cb4421f1196bc40c4db5298ca13df516bf19

FuzzerDriver.cpp

diff --git a/FuzzerDriver.cpp b/FuzzerDriver.cpp
index 0f50450..c80e415 100644
--- a/FuzzerDriver.cpp
+++ b/FuzzerDriver.cpp
@@ -345,7 +345,7 @@
   assert(Cmd.hasArgument(InputFilePath));
   Cmd.removeArgument(InputFilePath);
 
-  auto TmpFilePath = TempPath(".repro");
+  auto TmpFilePath = TempPath("CleanseCrashInput", ".repro");
   Cmd.addArgument(TmpFilePath);
   Cmd.setOutputFile(getDevNull());
   Cmd.combineOutAndErr();
@@ -499,7 +499,7 @@
   std::sort(OldCorpus.begin(), OldCorpus.end());
   std::sort(NewCorpus.begin(), NewCorpus.end());
 
-  std::string CFPath = CFPathOrNull ? CFPathOrNull : TempPath(".txt");
+  std::string CFPath = CFPathOrNull ? CFPathOrNull : TempPath("Merge", ".txt");
   Vector<std::string> NewFiles;
   Set<uint32_t> NewFeatures, NewCov;
   CrashResistantMerge(Args, OldCorpus, NewCorpus, &NewFiles, {}, &NewFeatures,

FuzzerFork.cpp

diff --git a/FuzzerFork.cpp b/FuzzerFork.cpp
index 95ed365..d9e6b79 100644
--- a/FuzzerFork.cpp
+++ b/FuzzerFork.cpp
@@ -297,7 +297,7 @@
   for (auto &Dir : CorpusDirs)
     GetSizedFilesFromDir(Dir, &SeedFiles);
   std::sort(SeedFiles.begin(), SeedFiles.end());
-  Env.TempDir = TempPath(".dir");
+  Env.TempDir = TempPath("FuzzWithFork", ".dir");
   Env.DFTDir = DirPlusFile(Env.TempDir, "DFT");
   RmDirRecursive(Env.TempDir);  // in case there is a leftover from old runs.
   MkDir(Env.TempDir);

FuzzerIO.cpp

diff --git a/FuzzerIO.cpp b/FuzzerIO.cpp
index f070816..ae4c703 100644
--- a/FuzzerIO.cpp
+++ b/FuzzerIO.cpp
@@ -151,9 +151,8 @@
       [](const std::string &Path) { RemoveFile(Path); });
 }
 
-std::string TempPath(const char *Extension) {
-  return DirPlusFile(TmpDir(),
-                     "libFuzzerTemp." + std::to_string(GetPid()) + Extension);
+std::string TempPath(const char *Prefix, const char *Extension) {
+  return DirPlusFile(TmpDir(), Prefix + std::to_string(GetPid()) + Extension);
 }
 
 }  // namespace fuzzer

FuzzerIO.h

diff --git a/FuzzerIO.h b/FuzzerIO.h
index ae8dd24..6e4368b 100644
--- a/FuzzerIO.h
+++ b/FuzzerIO.h
@@ -42,7 +42,7 @@
 // Returns path to a TmpDir.
 std::string TmpDir();
 
-std::string TempPath(const char *Extension);
+std::string TempPath(const char *Prefix, const char *Extension);
 
 bool IsInterestingCoverageFile(const std::string &FileName);
 

FuzzerLoop.cpp

diff --git a/FuzzerLoop.cpp b/FuzzerLoop.cpp
index 451a4c1..09f319d 100644
--- a/FuzzerLoop.cpp
+++ b/FuzzerLoop.cpp
@@ -256,7 +256,7 @@
 void Fuzzer::MaybeExitGracefully() {
   if (!F->GracefulExitRequested) return;
   Printf("==%lu== INFO: libFuzzer: exiting as requested\n", GetPid());
-  RmDirRecursive(TempPath(".dir"));
+  RmDirRecursive(TempPath("FuzzWithFork", ".dir"));
   F->PrintFinalStats();
   _Exit(0);
 }
@@ -265,7 +265,7 @@
   Printf("==%lu== libFuzzer: run interrupted; exiting\n", GetPid());
   PrintFinalStats();
   ScopedDisableMsanInterceptorChecks S; // RmDirRecursive may call opendir().
-  RmDirRecursive(TempPath(".dir"));
+  RmDirRecursive(TempPath("FuzzWithFork", ".dir"));
   // Stop right now, don't perform any at-exit actions.
   _Exit(Options.InterruptExitCode);
 }