diff options
| author | Joey Jiao <quic_jiangenj@quicinc.com> | 2024-05-15 15:54:48 +0800 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2024-09-05 08:31:53 +0000 |
| commit | cc20438302bdafe6d4e1b1373a94515cd5a3ccb6 (patch) | |
| tree | c07ec6d8fb995b6f5897014ebab7a68acef1c8f4 | |
| parent | dfbe2ed44f34f8bdabc5ca598387d7543fb9591b (diff) | |
all: rename html functions to meaningful ones
| -rw-r--r-- | pkg/cover/html.go | 6 | ||||
| -rw-r--r-- | pkg/cover/report_test.go | 6 | ||||
| -rw-r--r-- | syz-manager/http.go | 30 | ||||
| -rw-r--r-- | tools/syz-cover/syz-cover.go | 2 |
4 files changed, 22 insertions, 22 deletions
diff --git a/pkg/cover/html.go b/pkg/cover/html.go index 4ff407977..ba38cd884 100644 --- a/pkg/cover/html.go +++ b/pkg/cover/html.go @@ -393,7 +393,7 @@ func (rg *ReportGenerator) convertToStats(progs []Prog) ([]fileStats, error) { return data, nil } -func (rg *ReportGenerator) DoCSVFiles(w io.Writer, params HandlerParams) error { +func (rg *ReportGenerator) DoFileCover(w io.Writer, params HandlerParams) error { var progs = fixUpPCs(rg.target.Arch, params.Progs, params.Filter) data, err := rg.convertToStats(progs) if err != nil { @@ -493,7 +493,7 @@ func groupCoverByFilePrefixes(datas []fileStats, subsystems []mgrconfig.Subsyste return d } -func (rg *ReportGenerator) DoHTMLTable(w io.Writer, params HandlerParams) error { +func (rg *ReportGenerator) DoSubsystemCover(w io.Writer, params HandlerParams) error { var progs = fixUpPCs(rg.target.Arch, params.Progs, params.Filter) data, err := rg.convertToStats(progs) if err != nil { @@ -589,7 +589,7 @@ var csvHeader = []string{ "Total PCs", } -func (rg *ReportGenerator) DoCSV(w io.Writer, params HandlerParams) error { +func (rg *ReportGenerator) DoFuncCover(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 { diff --git a/pkg/cover/report_test.go b/pkg/cover/report_test.go index ac0afd6c7..c021856cd 100644 --- a/pkg/cover/report_test.go +++ b/pkg/cover/report_test.go @@ -389,16 +389,16 @@ func generateReport(t *testing.T, target *targets.Target, test *Test) (*reports, return nil, err } htmlTable := new(bytes.Buffer) - if err := rg.DoHTMLTable(htmlTable, params); err != nil { + if err := rg.DoSubsystemCover(htmlTable, params); err != nil { return nil, err } _ = htmlTable csv := new(bytes.Buffer) - if err := rg.DoCSV(csv, params); err != nil { + if err := rg.DoFuncCover(csv, params); err != nil { return nil, err } csvFiles := new(bytes.Buffer) - if err := rg.DoCSVFiles(csvFiles, params); err != nil { + if err := rg.DoFileCover(csvFiles, params); err != nil { return nil, err } _ = csvFiles diff --git a/syz-manager/http.go b/syz-manager/http.go index 7c01b9ca5..288d043fc 100644 --- a/syz-manager/http.go +++ b/syz-manager/http.go @@ -278,10 +278,10 @@ func (mgr *Manager) httpDownloadCorpus(w http.ResponseWriter, r *http.Request) { const ( DoHTML int = iota - DoHTMLTable + DoSubsystemCover DoModuleCover - DoCSV - DoCSVFiles + DoFuncCover + DoFileCover DoRawCoverFiles DoRawCover DoFilterPCs @@ -305,7 +305,7 @@ func (mgr *Manager) httpSubsystemCover(w http.ResponseWriter, r *http.Request) { mgr.httpCoverFallback(w, r) return } - mgr.httpCoverCover(w, r, DoHTMLTable) + mgr.httpCoverCover(w, r, DoSubsystemCover) } func (mgr *Manager) httpModuleCover(w http.ResponseWriter, r *http.Request) { @@ -407,15 +407,15 @@ func (mgr *Manager) httpCoverCover(w http.ResponseWriter, r *http.Request, funcF Do handlerFuncType contentType string }{ - DoHTML: {rg.DoHTML, ""}, - DoHTMLTable: {rg.DoHTMLTable, ""}, - DoModuleCover: {rg.DoModuleCover, ""}, - DoCSV: {rg.DoCSV, ctTextPlain}, - DoCSVFiles: {rg.DoCSVFiles, ctTextPlain}, - DoRawCoverFiles: {rg.DoRawCoverFiles, ctTextPlain}, - DoRawCover: {rg.DoRawCover, ctTextPlain}, - DoFilterPCs: {rg.DoFilterPCs, ctTextPlain}, - DoCoverJSONL: {rg.DoCoverJSONL, ctApplicationJSON}, + DoHTML: {rg.DoHTML, ""}, + DoSubsystemCover: {rg.DoSubsystemCover, ""}, + DoModuleCover: {rg.DoModuleCover, ""}, + DoFuncCover: {rg.DoFuncCover, ctTextPlain}, + DoFileCover: {rg.DoFileCover, ctTextPlain}, + DoRawCoverFiles: {rg.DoRawCoverFiles, ctTextPlain}, + DoRawCover: {rg.DoRawCover, ctTextPlain}, + DoFilterPCs: {rg.DoFilterPCs, ctTextPlain}, + DoCoverJSONL: {rg.DoCoverJSONL, ctApplicationJSON}, } if ct := flagToFunc[funcFlag].contentType; ct != "" { @@ -458,11 +458,11 @@ func (mgr *Manager) httpCoverFallback(w http.ResponseWriter, r *http.Request) { } func (mgr *Manager) httpFuncCover(w http.ResponseWriter, r *http.Request) { - mgr.httpCoverCover(w, r, DoCSV) + mgr.httpCoverCover(w, r, DoFuncCover) } func (mgr *Manager) httpFileCover(w http.ResponseWriter, r *http.Request) { - mgr.httpCoverCover(w, r, DoCSVFiles) + mgr.httpCoverCover(w, r, DoFileCover) } func (mgr *Manager) httpPrio(w http.ResponseWriter, r *http.Request) { diff --git a/tools/syz-cover/syz-cover.go b/tools/syz-cover/syz-cover.go index 4cb28352e..365f66b85 100644 --- a/tools/syz-cover/syz-cover.go +++ b/tools/syz-cover/syz-cover.go @@ -161,7 +161,7 @@ func main() { Progs: progs, } if *flagExportCSV != "" { - if err := rg.DoCSV(buf, params); err != nil { + if err := rg.DoFuncCover(buf, params); err != nil { tool.Fail(err) } if err := osutil.WriteFile(*flagExportCSV, buf.Bytes()); err != nil { |
