diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2024-03-19 14:52:01 +0100 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2024-03-19 14:22:23 +0000 |
| commit | 70ea129de66278631e12681d4e18d560aa717d4e (patch) | |
| tree | 04d8dbe41eb40fc2e40d70f7cbc3c8613a70ee16 /pkg | |
| parent | 48ac978206fd44a33bf0758509b90fbe9a40bb70 (diff) | |
all: rename corpus and fuzzer Stat objects
Stats() seems to be a more sound choice since these structures include
multiple data points.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/corpus/corpus.go | 8 | ||||
| -rw-r--r-- | pkg/corpus/corpus_test.go | 6 | ||||
| -rw-r--r-- | pkg/fuzzer/cover.go | 6 | ||||
| -rw-r--r-- | pkg/fuzzer/fuzzer.go | 14 | ||||
| -rw-r--r-- | pkg/fuzzer/fuzzer_test.go | 2 |
5 files changed, 18 insertions, 18 deletions
diff --git a/pkg/corpus/corpus.go b/pkg/corpus/corpus.go index 66ac4d4bb..772037178 100644 --- a/pkg/corpus/corpus.go +++ b/pkg/corpus/corpus.go @@ -198,17 +198,17 @@ func (corpus *Corpus) Item(sig string) *Item { return corpus.progs[sig] } -// Stat is a snapshot of the relevant current state figures. -type Stat struct { +// Stats is a snapshot of the relevant current state figures. +type Stats struct { Progs int Signal int Cover int } -func (corpus *Corpus) Stat() Stat { +func (corpus *Corpus) Stats() Stats { corpus.mu.RLock() defer corpus.mu.RUnlock() - return Stat{ + return Stats{ Progs: len(corpus.progs), Signal: len(corpus.signal), Cover: len(corpus.cover), diff --git a/pkg/corpus/corpus_test.go b/pkg/corpus/corpus_test.go index 04768838a..0b5a85505 100644 --- a/pkg/corpus/corpus_test.go +++ b/pkg/corpus/corpus_test.go @@ -48,8 +48,8 @@ func TestCorpusOperation(t *testing.T) { } // Verify the total signal. - stat := corpus.Stat() - assert.Equal(t, Stat{ + stat := corpus.Stats() + assert.Equal(t, Stats{ Signal: 5, Cover: 0, Progs: 2, @@ -77,7 +77,7 @@ func TestCorpusCoverage(t *testing.T) { assert.Equal(t, []uint32{12}, event.NewCover) // Check the total corpus size. - assert.Equal(t, corpus.Stat().Cover, 3) + assert.Equal(t, corpus.Stats().Cover, 3) } func TestCorpusSaveConcurrency(t *testing.T) { 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("<iter %d>: corpus %d, signal %d, max signal %d, crash types %d", f.iter, stat.Progs, stat.Signal, stat.MaxSignal, len(f.crashes)) } |
