diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2024-03-19 15:05:10 +0100 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2024-03-19 14:22:23 +0000 |
| commit | a516ab122dfe9fe0d8c86a50bb46b1333f794205 (patch) | |
| tree | dcd2607d4ec71b64e287bea0ae3fa8c0d5d50d30 /pkg | |
| parent | 972d94f8bee0e06c8785470ff7f04434fe2fa82e (diff) | |
pkg/fuzzer: expose the number of candidates and running jobs
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/fuzzer/fuzzer.go | 15 | ||||
| -rw-r--r-- | pkg/fuzzer/fuzzer_test.go | 4 |
2 files changed, 14 insertions, 5 deletions
diff --git a/pkg/fuzzer/fuzzer.go b/pkg/fuzzer/fuzzer.go index bc13bec88..35f409689 100644 --- a/pkg/fuzzer/fuzzer.go +++ b/pkg/fuzzer/fuzzer.go @@ -38,6 +38,7 @@ type Fuzzer struct { runningExecs map[*Request]time.Time nextJobID atomic.Int64 + runningJobs atomic.Int64 queuedCandidates atomic.Int64 // If the source of candidates runs out of them, we risk // generating too many needCandidate requests (one for @@ -214,7 +215,11 @@ func (fuzzer *Fuzzer) nextInput() *Request { func (fuzzer *Fuzzer) startJob(newJob job) { fuzzer.Logf(2, "started %T", newJob) newJob.saveID(-fuzzer.nextJobID.Add(1)) - go newJob.run(fuzzer) + go func() { + fuzzer.runningJobs.Add(1) + newJob.run(fuzzer) + fuzzer.runningJobs.Add(-1) + }() } func (fuzzer *Fuzzer) Logf(level int, msg string, args ...interface{}) { @@ -353,11 +358,15 @@ func (fuzzer *Fuzzer) logCurrentStats() { type Stats struct { CoverStats corpus.Stats + Candidates int + RunningJobs int } func (fuzzer *Fuzzer) Stats() Stats { return Stats{ - CoverStats: fuzzer.Cover.Stats(), - Stats: fuzzer.Config.Corpus.Stats(), + CoverStats: fuzzer.Cover.Stats(), + Stats: fuzzer.Config.Corpus.Stats(), + Candidates: int(fuzzer.queuedCandidates.Load()), + RunningJobs: int(fuzzer.runningJobs.Load()), } } diff --git a/pkg/fuzzer/fuzzer_test.go b/pkg/fuzzer/fuzzer_test.go index ed64a803f..4f8cf41c5 100644 --- a/pkg/fuzzer/fuzzer_test.go +++ b/pkg/fuzzer/fuzzer_test.go @@ -164,8 +164,8 @@ func (f *testFuzzer) oneMore() bool { f.iter++ if f.iter%100 == 0 { stat := f.fuzzer.Stats() - f.t.Logf("<iter %d>: corpus %d, signal %d, max signal %d, crash types %d", - f.iter, stat.Progs, stat.Signal, stat.MaxSignal, len(f.crashes)) + f.t.Logf("<iter %d>: corpus %d, signal %d, max signal %d, crash types %d, running jobs %d", + f.iter, stat.Progs, stat.Signal, stat.MaxSignal, len(f.crashes), stat.RunningJobs) } return f.iter < f.iterLimit && (f.expectedCrashes == nil || len(f.crashes) != len(f.expectedCrashes)) |