[fuzzer] make multi-process execution more verbose; fix mutation to actually respect mutation depth and to never produce empty units

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@228170 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Kostya Serebryany
2015-02-04 19:10:20 +00:00
parent 70e83e3a1c
commit eb884daa38
6 changed files with 46 additions and 18 deletions

View File

@@ -17,6 +17,7 @@
#include <iostream>
#include <thread>
#include <atomic>
#include <mutex>
// ASAN options:
// * don't dump the coverage to disk.
@@ -105,20 +106,30 @@ static void ParseFlags(int argc, char **argv) {
}
static void WorkerThread(const std::string &Cmd, std::atomic<int> *Counter,
int NumJobs) {
int NumJobs, std::atomic<bool> *HasErrors) {
static std::mutex CerrMutex;
while (true) {
int C = (*Counter)++;
if (C >= NumJobs) return;
std::string ToRun = Cmd + " > fuzz-" + std::to_string(C) + ".log 2>&1\n";
if (C >= NumJobs) break;
std::string Log = "fuzz-" + std::to_string(C) + ".log";
std::string ToRun = Cmd + " > " + Log + " 2>&1\n";
if (Flags.verbosity)
std::cerr << ToRun;
system(ToRun.c_str());
int ExitCode = system(ToRun.c_str());
if (ExitCode != 0)
*HasErrors = true;
std::lock_guard<std::mutex> Lock(CerrMutex);
std::cerr << "================== Job " << C
<< " exited with exit code " << ExitCode
<< " =================\n";
fuzzer::CopyFileToErr(Log);
}
}
static int RunInMultipleProcesses(int argc, char **argv, int NumWorkers,
int NumJobs) {
std::atomic<int> Counter(0);
std::atomic<bool> HasErrors(false);
std::string Cmd;
for (int i = 0; i < argc; i++) {
if (FlagValue(argv[i], "jobs") || FlagValue(argv[i], "workers")) continue;
@@ -127,10 +138,10 @@ static int RunInMultipleProcesses(int argc, char **argv, int NumWorkers,
}
std::vector<std::thread> V;
for (int i = 0; i < NumWorkers; i++)
V.push_back(std::thread(WorkerThread, Cmd, &Counter, NumJobs));
V.push_back(std::thread(WorkerThread, Cmd, &Counter, NumJobs, &HasErrors));
for (auto &T : V)
T.join();
return 0;
return HasErrors ? 1 : 0;
}
int main(int argc, char **argv) {