From 337657e0d5b5c120b163c09fbcfc49ae5897cb39 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 18 Apr 2024 11:34:25 +0200 Subject: pkg/mgrconfig: add HasCovFilter helper To reduce diff in the next change. --- pkg/mgrconfig/load.go | 4 ++++ syz-manager/covfilter.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/mgrconfig/load.go b/pkg/mgrconfig/load.go index 4a5febf79..cfe26c573 100644 --- a/pkg/mgrconfig/load.go +++ b/pkg/mgrconfig/load.go @@ -220,6 +220,10 @@ func checkNonEmpty(fields ...string) error { return nil } +func (cfg *Config) HasCovFilter() bool { + return len(cfg.CovFilter.Functions)+len(cfg.CovFilter.Files)+len(cfg.CovFilter.RawPCs) != 0 +} + func (cfg *Config) CompleteKernelDirs() { cfg.KernelObj = osutil.Abs(cfg.KernelObj) if cfg.KernelSrc == "" { diff --git a/syz-manager/covfilter.go b/syz-manager/covfilter.go index 5844c4bc3..06f941e3d 100644 --- a/syz-manager/covfilter.go +++ b/syz-manager/covfilter.go @@ -18,7 +18,7 @@ import ( ) func (mgr *Manager) createCoverageFilter() (map[uint32]uint32, map[uint32]uint32, error) { - if len(mgr.cfg.CovFilter.Functions)+len(mgr.cfg.CovFilter.Files)+len(mgr.cfg.CovFilter.RawPCs) == 0 { + if !mgr.cfg.HasCovFilter() { return nil, nil, nil } // Always initialize ReportGenerator because RPCServer.NewInput will need it to filter coverage. -- cgit mrf-deployment