aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pkg/corpus/corpus.go8
-rw-r--r--pkg/corpus/corpus_test.go6
-rw-r--r--pkg/fuzzer/cover.go6
-rw-r--r--pkg/fuzzer/fuzzer.go14
-rw-r--r--pkg/fuzzer/fuzzer_test.go2
-rw-r--r--syz-fuzzer/fuzzer.go2
-rw-r--r--syz-manager/http.go2
-rw-r--r--syz-manager/manager.go8
8 files changed, 24 insertions, 24 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))
}
diff --git a/syz-fuzzer/fuzzer.go b/syz-fuzzer/fuzzer.go
index 0b4970b23..037b356d0 100644
--- a/syz-fuzzer/fuzzer.go
+++ b/syz-fuzzer/fuzzer.go
@@ -271,7 +271,7 @@ func main() {
for needCandidates, more := true, true; more; needCandidates = false {
more = fuzzerTool.poll(needCandidates, nil)
// This loop lead to "no output" in qemu emulation, tell manager we are not dead.
- stat := fuzzerObj.Stat()
+ stat := fuzzerObj.Stats()
log.Logf(0, "fetching corpus: %v, signal %v/%v (executing program)",
stat.Progs, stat.Signal, stat.MaxSignal)
}
diff --git a/syz-manager/http.go b/syz-manager/http.go
index 43cb6f198..f38a7713b 100644
--- a/syz-manager/http.go
+++ b/syz-manager/http.go
@@ -130,7 +130,7 @@ func (mgr *Manager) collectStats() []UIStat {
{Name: "config", Value: configName, Link: "/config"},
{Name: "uptime", Value: fmt.Sprint(time.Since(mgr.startTime) / 1e9 * 1e9)},
{Name: "fuzzing", Value: fmt.Sprint(mgr.fuzzingTime / 60e9 * 60e9)},
- {Name: "corpus", Value: fmt.Sprint(mgr.corpus.Stat().Progs), Link: "/corpus"},
+ {Name: "corpus", Value: fmt.Sprint(mgr.corpus.Stats().Progs), Link: "/corpus"},
{Name: "triage queue", Value: fmt.Sprint(len(mgr.candidates))},
{Name: "signal", Value: fmt.Sprint(rawStats["signal"])},
{Name: "coverage", Value: fmt.Sprint(rawStats["coverage"]), Link: "/cover"},
diff --git a/syz-manager/manager.go b/syz-manager/manager.go
index ca35d6660..4bd63b65f 100644
--- a/syz-manager/manager.go
+++ b/syz-manager/manager.go
@@ -275,7 +275,7 @@ func (mgr *Manager) initBench() {
continue
}
mgr.minimizeCorpusUnlocked()
- stat := mgr.corpus.Stat()
+ stat := mgr.corpus.Stats()
vals["corpus"] = uint64(stat.Progs)
vals["uptime"] = uint64(time.Since(mgr.firstConnect)) / 1e9
vals["fuzzing"] = uint64(mgr.fuzzingTime) / 1e9
@@ -1247,12 +1247,12 @@ func (mgr *Manager) addNewCandidates(candidates []rpctype.Candidate) {
}
func (mgr *Manager) minimizeCorpusUnlocked() {
- currSize := mgr.corpus.Stat().Progs
+ currSize := mgr.corpus.Stats().Progs
if mgr.phase < phaseLoadedCorpus || currSize <= mgr.lastMinCorpus*103/100 {
return
}
mgr.corpus.Minimize(mgr.cfg.Cover)
- newSize := mgr.corpus.Stat().Progs
+ newSize := mgr.corpus.Stats().Progs
log.Logf(1, "minimized corpus: %v -> %v", currSize, newSize)
mgr.lastMinCorpus = newSize
@@ -1488,7 +1488,7 @@ func (mgr *Manager) dashboardReporter() {
crashes := mgr.stats.crashes.get()
suppressedCrashes := mgr.stats.crashSuppressed.get()
execs := mgr.stats.execTotal.get()
- corpusStat := mgr.corpus.Stat()
+ corpusStat := mgr.corpus.Stats()
req := &dashapi.ManagerStatsReq{
Name: mgr.cfg.Name,
Addr: webAddr,