pkg/cover: cover less

Rename CoverHandlerParams to HandlerParams.
Everything in cover package is Cover-something,
adding cover prefix to everything is excessive.
And cover.CoverHandlerParams.CoverFilter is way more cover
I am ready to handle. Filter is just fine.

4 files changed, 35 insertions, 38 deletions

diff --git a/pkg/cover/html.go b/pkg/cover/html.go
index 935a19efc..e2c3145ee 100644
--- a/pkg/cover/html.go
+++ b/pkg/cover/html.go
@@ -23,15 +23,15 @@ import (
 	"github.com/google/syzkaller/pkg/mgrconfig"
 )
 
-type CoverHandlerParams struct {
-	Progs       []Prog
-	CoverFilter map[uint64]uint32
-	Debug       bool
-	Force       bool
+type HandlerParams struct {
+	Progs  []Prog
+	Filter map[uint64]uint32
+	Debug  bool
+	Force  bool
 }
 
-func (rg *ReportGenerator) DoHTML(w io.Writer, params CoverHandlerParams) error {
-	var progs = fixUpPCs(rg.target.Arch, params.Progs, params.CoverFilter)
+func (rg *ReportGenerator) DoHTML(w io.Writer, params HandlerParams) error {
+	var progs = fixUpPCs(rg.target.Arch, params.Progs, params.Filter)
 	files, err := rg.prepareFileMap(progs, params.Force, params.Debug)
 	if err != nil {
 		return err
@@ -126,8 +126,8 @@ type lineCoverExport struct {
 	Both      []int `json:",omitempty"`
 }
 
-func (rg *ReportGenerator) DoLineJSON(w io.Writer, params CoverHandlerParams) error {
-	var progs = fixUpPCs(rg.target.Arch, params.Progs, params.CoverFilter)
+func (rg *ReportGenerator) DoLineJSON(w io.Writer, params HandlerParams) error {
+	var progs = fixUpPCs(rg.target.Arch, params.Progs, params.Filter)
 	files, err := rg.prepareFileMap(progs, params.Force, params.Debug)
 	if err != nil {
 		return err
@@ -178,8 +178,8 @@ func fileLineContents(file *file, lines [][]byte) lineCoverExport {
 	return lce
 }
 
-func (rg *ReportGenerator) DoRawCoverFiles(w io.Writer, params CoverHandlerParams) error {
-	progs := fixUpPCs(rg.target.Arch, params.Progs, params.CoverFilter)
+func (rg *ReportGenerator) DoRawCoverFiles(w io.Writer, params HandlerParams) error {
+	progs := fixUpPCs(rg.target.Arch, params.Progs, params.Filter)
 	if err := rg.symbolizePCs(uniquePCs(progs)); err != nil {
 		return err
 	}
@@ -218,13 +218,13 @@ type CoverageInfo struct {
 }
 
 // DoCoverJSONL is a handler for "/cover?jsonl=1".
-func (rg *ReportGenerator) DoCoverJSONL(w io.Writer, params CoverHandlerParams) error {
+func (rg *ReportGenerator) DoCoverJSONL(w io.Writer, params HandlerParams) error {
 	if rg.CallbackPoints != nil {
 		if err := rg.symbolizePCs(rg.CallbackPoints); err != nil {
 			return fmt.Errorf("failed to symbolize PCs(): %w", err)
 		}
 	}
-	progs := fixUpPCs(rg.target.Arch, params.Progs, params.CoverFilter)
+	progs := fixUpPCs(rg.target.Arch, params.Progs, params.Filter)
 	if err := rg.symbolizePCs(uniquePCs(progs)); err != nil {
 		return err
 	}
@@ -258,8 +258,8 @@ func (rg *ReportGenerator) DoCoverJSONL(w io.Writer, params CoverHandlerParams)
 	return nil
 }
 
-func (rg *ReportGenerator) DoRawCover(w io.Writer, params CoverHandlerParams) error {
-	progs := fixUpPCs(rg.target.Arch, params.Progs, params.CoverFilter)
+func (rg *ReportGenerator) DoRawCover(w io.Writer, params HandlerParams) error {
+	progs := fixUpPCs(rg.target.Arch, params.Progs, params.Filter)
 	var pcs []uint64
 	if len(progs) == 1 && rg.rawCoverEnabled {
 		pcs = append([]uint64{}, progs[0].PCs...)
@@ -287,8 +287,8 @@ func (rg *ReportGenerator) DoRawCover(w io.Writer, params CoverHandlerParams) er
 	return nil
 }
 
-func (rg *ReportGenerator) DoFilterPCs(w io.Writer, params CoverHandlerParams) error {
-	progs := fixUpPCs(rg.target.Arch, params.Progs, params.CoverFilter)
+func (rg *ReportGenerator) DoFilterPCs(w io.Writer, params HandlerParams) error {
+	progs := fixUpPCs(rg.target.Arch, params.Progs, params.Filter)
 	var pcs []uint64
 	uniquePCs := make(map[uint64]bool)
 	for _, prog := range progs {
@@ -297,7 +297,7 @@ func (rg *ReportGenerator) DoFilterPCs(w io.Writer, params CoverHandlerParams) e
 				continue
 			}
 			uniquePCs[pc] = true
-			if params.CoverFilter[pc] != 0 {
+			if params.Filter[pc] != 0 {
 				pcs = append(pcs, pc)
 			}
 		}
@@ -392,8 +392,8 @@ func (rg *ReportGenerator) convertToStats(progs []Prog) ([]fileStats, error) {
 	return data, nil
 }
 
-func (rg *ReportGenerator) DoCSVFiles(w io.Writer, params CoverHandlerParams) error {
-	var progs = fixUpPCs(rg.target.Arch, params.Progs, params.CoverFilter)
+func (rg *ReportGenerator) DoCSVFiles(w io.Writer, params HandlerParams) error {
+	var progs = fixUpPCs(rg.target.Arch, params.Progs, params.Filter)
 	data, err := rg.convertToStats(progs)
 	if err != nil {
 		return err
@@ -492,8 +492,8 @@ func groupCoverByFilePrefixes(datas []fileStats, subsystems []mgrconfig.Subsyste
 	return d
 }
 
-func (rg *ReportGenerator) DoHTMLTable(w io.Writer, params CoverHandlerParams) error {
-	var progs = fixUpPCs(rg.target.Arch, params.Progs, params.CoverFilter)
+func (rg *ReportGenerator) DoHTMLTable(w io.Writer, params HandlerParams) error {
+	var progs = fixUpPCs(rg.target.Arch, params.Progs, params.Filter)
 	data, err := rg.convertToStats(progs)
 	if err != nil {
 		return err
@@ -568,8 +568,8 @@ func groupCoverByModule(datas []fileStats) map[string]map[string]string {
 	return d
 }
 
-func (rg *ReportGenerator) DoModuleCover(w io.Writer, params CoverHandlerParams) error {
-	var progs = fixUpPCs(rg.target.Arch, params.Progs, params.CoverFilter)
+func (rg *ReportGenerator) DoModuleCover(w io.Writer, params HandlerParams) error {
+	var progs = fixUpPCs(rg.target.Arch, params.Progs, params.Filter)
 	data, err := rg.convertToStats(progs)
 	if err != nil {
 		return err
@@ -588,8 +588,8 @@ var csvHeader = []string{
 	"Total PCs",
 }
 
-func (rg *ReportGenerator) DoCSV(w io.Writer, params CoverHandlerParams) error {
-	var progs = fixUpPCs(rg.target.Arch, params.Progs, params.CoverFilter)
+func (rg *ReportGenerator) DoCSV(w io.Writer, params HandlerParams) error {
+	var progs = fixUpPCs(rg.target.Arch, params.Progs, params.Filter)
 	files, err := rg.prepareFileMap(progs, params.Force, params.Debug)
 	if err != nil {
 		return err
diff --git a/pkg/cover/report_test.go b/pkg/cover/report_test.go
index 4ed39fa4e..5fad4ebfc 100644
--- a/pkg/cover/report_test.go
+++ b/pkg/cover/report_test.go
@@ -378,7 +378,7 @@ func generateReport(t *testing.T, target *targets.Target, test *Test) (*reports,
 		progs = append(progs, Prog{Data: "main", PCs: pcs})
 	}
 	html := new(bytes.Buffer)
-	params := CoverHandlerParams{
+	params := HandlerParams{
 		Progs: progs,
 	}
 	if err := rg.DoHTML(html, params); err != nil {
diff --git a/syz-manager/http.go b/syz-manager/http.go
index 60d53430f..296e1c056 100644
--- a/syz-manager/http.go
+++ b/syz-manager/http.go
@@ -321,14 +321,14 @@ func (mgr *Manager) httpCoverCover(w http.ResponseWriter, r *http.Request, funcF
 		coverFilter = mgr.serv.coverFilter
 	}
 
-	params := cover.CoverHandlerParams{
-		Progs:       progs,
-		CoverFilter: coverFilter,
-		Debug:       r.FormValue("debug") != "",
-		Force:       r.FormValue("force") != "",
+	params := cover.HandlerParams{
+		Progs:  progs,
+		Filter: coverFilter,
+		Debug:  r.FormValue("debug") != "",
+		Force:  r.FormValue("force") != "",
 	}
 
-	type handlerFuncType func(w io.Writer, params cover.CoverHandlerParams) error
+	type handlerFuncType func(w io.Writer, params cover.HandlerParams) error
 	flagToFunc := map[int]struct {
 		Do          handlerFuncType
 		contentType string
diff --git a/tools/syz-cover/syz-cover.go b/tools/syz-cover/syz-cover.go
index 325bd4157..1b5846ebf 100644
--- a/tools/syz-cover/syz-cover.go
+++ b/tools/syz-cover/syz-cover.go
@@ -77,11 +77,8 @@ func main() {
 	}
 	progs := []cover.Prog{{PCs: pcs}}
 	buf := new(bytes.Buffer)
-	params := cover.CoverHandlerParams{
-		Progs:       progs,
-		CoverFilter: nil,
-		Debug:       false,
-		Force:       false,
+	params := cover.HandlerParams{
+		Progs: progs,
 	}
 	if *flagExportCSV != "" {
 		if err := rg.DoCSV(buf, params); err != nil {