diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-01-05 11:46:34 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-01-05 11:46:34 +0100 |
| commit | 90408076e697f47d8da739b9ee6ea1da33c74bbd (patch) | |
| tree | 35e05c4b07ec5018a5906ada9dd49bfb337c6e85 | |
| parent | 147b97431bbce5682a6b209ab18bbbe9be28d420 (diff) | |
syz-manager: don't show hub stats if hub is not enabled
| -rw-r--r-- | syz-manager/manager.go | 2 | ||||
| -rw-r--r-- | syz-manager/stats.go | 35 |
2 files changed, 20 insertions, 17 deletions
diff --git a/syz-manager/manager.go b/syz-manager/manager.go index 8ff5d024e..ba5ab54a3 100644 --- a/syz-manager/manager.go +++ b/syz-manager/manager.go @@ -164,7 +164,7 @@ func RunManager(cfg *mgrconfig.Config, target *prog.Target, sysTarget *targets.T reporter: reporter, crashdir: crashdir, startTime: time.Now(), - stats: new(Stats), + stats: &Stats{haveHub: cfg.HubClient != ""}, crashTypes: make(map[string]bool), enabledSyscalls: syscalls, corpus: make(map[string]rpctype.RPCInput), diff --git a/syz-manager/stats.go b/syz-manager/stats.go index 4dd1a584e..8d265f984 100644 --- a/syz-manager/stats.go +++ b/syz-manager/stats.go @@ -30,26 +30,29 @@ type Stats struct { mu sync.Mutex namedStats map[string]uint64 + haveHub bool } func (stats *Stats) all() map[string]uint64 { m := map[string]uint64{ - "crashes": stats.crashes.get(), - "crash types": stats.crashTypes.get(), - "suppressed": stats.crashSuppressed.get(), - "vm restarts": stats.vmRestarts.get(), - "new inputs": stats.newInputs.get(), - "rotated inputs": stats.rotatedInputs.get(), - "exec total": stats.execTotal.get(), - "hub: send prog add": stats.hubSendProgAdd.get(), - "hub: send prog del": stats.hubSendProgDel.get(), - "hub: send repro": stats.hubSendRepro.get(), - "hub: recv prog": stats.hubRecvProg.get(), - "hub: recv prog drop": stats.hubRecvProgDrop.get(), - "hub: recv repro": stats.hubRecvRepro.get(), - "hub: recv repro drop": stats.hubRecvReproDrop.get(), - "cover": stats.corpusCover.get(), - "signal": stats.corpusSignal.get(), + "crashes": stats.crashes.get(), + "crash types": stats.crashTypes.get(), + "suppressed": stats.crashSuppressed.get(), + "vm restarts": stats.vmRestarts.get(), + "new inputs": stats.newInputs.get(), + "rotated inputs": stats.rotatedInputs.get(), + "exec total": stats.execTotal.get(), + "cover": stats.corpusCover.get(), + "signal": stats.corpusSignal.get(), + } + if stats.haveHub { + m["hub: send prog add"] = stats.hubSendProgAdd.get() + m["hub: send prog del"] = stats.hubSendProgDel.get() + m["hub: send repro"] = stats.hubSendRepro.get() + m["hub: recv prog"] = stats.hubRecvProg.get() + m["hub: recv prog drop"] = stats.hubRecvProgDrop.get() + m["hub: recv repro"] = stats.hubRecvRepro.get() + m["hub: recv repro drop"] = stats.hubRecvReproDrop.get() } stats.mu.Lock() defer stats.mu.Unlock() |