From 70ea129de66278631e12681d4e18d560aa717d4e Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Tue, 19 Mar 2024 14:52:01 +0100 Subject: all: rename corpus and fuzzer Stat objects Stats() seems to be a more sound choice since these structures include multiple data points. --- pkg/fuzzer/cover.go | 6 +++--- pkg/fuzzer/fuzzer.go | 14 +++++++------- pkg/fuzzer/fuzzer_test.go | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'pkg/fuzzer') diff --git a/pkg/fuzzer/cover.go b/pkg/fuzzer/cover.go index cc18862bd..886da004d 100644 --- a/pkg/fuzzer/cover.go +++ b/pkg/fuzzer/cover.go @@ -43,14 +43,14 @@ func (cover *Cover) GrabNewSignal() signal.Signal { return sign } -type CoverStat struct { +type CoverStats struct { MaxSignal int } -func (cover *Cover) Stat() CoverStat { +func (cover *Cover) Stats() CoverStats { cover.mu.RLock() defer cover.mu.RUnlock() - return CoverStat{ + return CoverStats{ MaxSignal: len(cover.maxSignal), } } diff --git a/pkg/fuzzer/fuzzer.go b/pkg/fuzzer/fuzzer.go index 17513716a..bc13bec88 100644 --- a/pkg/fuzzer/fuzzer.go +++ b/pkg/fuzzer/fuzzer.go @@ -350,14 +350,14 @@ func (fuzzer *Fuzzer) logCurrentStats() { } } -type Stat struct { - CoverStat - corpus.Stat +type Stats struct { + CoverStats + corpus.Stats } -func (fuzzer *Fuzzer) Stat() Stat { - return Stat{ - CoverStat: fuzzer.Cover.Stat(), - Stat: fuzzer.Config.Corpus.Stat(), +func (fuzzer *Fuzzer) Stats() Stats { + return Stats{ + CoverStats: fuzzer.Cover.Stats(), + Stats: fuzzer.Config.Corpus.Stats(), } } diff --git a/pkg/fuzzer/fuzzer_test.go b/pkg/fuzzer/fuzzer_test.go index 7000bb062..f92b5b3fc 100644 --- a/pkg/fuzzer/fuzzer_test.go +++ b/pkg/fuzzer/fuzzer_test.go @@ -162,7 +162,7 @@ func (f *testFuzzer) oneMore() bool { defer f.mu.Unlock() f.iter++ if f.iter%100 == 0 { - stat := f.fuzzer.Stat() + stat := f.fuzzer.Stats() f.t.Logf(": corpus %d, signal %d, max signal %d, crash types %d", f.iter, stat.Progs, stat.Signal, stat.MaxSignal, len(f.crashes)) } -- cgit mrf-deployment