diff options
| -rw-r--r-- | pkg/cover/heatmap.go | 27 | ||||
| -rw-r--r-- | tools/syz-cover/syz-cover.go | 53 |
2 files changed, 4 insertions, 76 deletions
diff --git a/pkg/cover/heatmap.go b/pkg/cover/heatmap.go index 3f860ac07..64568404d 100644 --- a/pkg/cover/heatmap.go +++ b/pkg/cover/heatmap.go @@ -9,7 +9,6 @@ import ( _ "embed" "fmt" "html/template" - "io" "sort" "strings" @@ -222,32 +221,6 @@ type StyleBodyJS struct { JS template.HTML } -// nolint: dupl -func DoDirHeatMap(w io.Writer, projectID, ns string, periods []coveragedb.TimePeriod) error { - style, body, js, err := DoHeatMapStyleBodyJS(context.Background(), projectID, ns, "", periods) - if err != nil { - return fmt.Errorf("failed to DoHeatMapStyleBodyJS() %w", err) - } - return heatmapTemplate.Execute(w, &StyleBodyJS{ - Style: style, - Body: body, - JS: js, - }) -} - -// nolint: dupl -func DoSubsystemsHeatMap(w io.Writer, projectID, ns string, periods []coveragedb.TimePeriod) error { - style, body, js, err := DoSubsystemsHeatMapStyleBodyJS(context.Background(), projectID, ns, "", periods) - if err != nil { - return fmt.Errorf("failed to DoSubsystemsHeatMapStyleBodyJS() %w", err) - } - return heatmapTemplate.Execute(w, &StyleBodyJS{ - Style: style, - Body: body, - JS: js, - }) -} - func stylesBodyJSTemplate(templData *templateHeatmap, ) (template.CSS, template.HTML, template.HTML, error) { var styles, body, js bytes.Buffer diff --git a/tools/syz-cover/syz-cover.go b/tools/syz-cover/syz-cover.go index 4b4270992..bbdb4bd96 100644 --- a/tools/syz-cover/syz-cover.go +++ b/tools/syz-cover/syz-cover.go @@ -30,7 +30,6 @@ import ( "io" "os" "os/exec" - "slices" "strconv" "strings" "time" @@ -50,14 +49,11 @@ var ( flagConfig = flag.String("config", "", "configuration file") flagModules = flag.String("modules", "", "modules JSON info obtained from /modules (optional)") - flagNsHeatmap = flag.String("heatmap", "", "generate namespace heatmap") - flagNsHeatmapGroupBy = flag.String("group-by", "dir", "dir or subsystem") - flagPeriod = flag.String("period", "day", "time period(day[default], month, quarter)") - flagDateTo = flag.String("to", + flagPeriod = flag.String("period", "day", "time period(day[default], month, quarter)") + flagDateTo = flag.String("to", civil.DateOf(time.Now()).String(), "heatmap date to(optional)") - flagProjectID = flag.String("project", "syzkaller", "spanner db project name") - flagForFile = flag.String("for-file", "", "[optional]show file coverage") - flagRepo = flag.String("repo", "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git", + flagForFile = flag.String("for-file", "", "[optional]show file coverage") + flagRepo = flag.String("repo", "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git", "[optional] repo to be used by -for-file") flagCommit = flag.String("commit", "latest", "[optional] commit to be used by -for-file") flagNamespace = flag.String("namespace", "upstream", "[optional] used by -for-file") @@ -70,43 +66,6 @@ var ( "there are missing coverage callbacks") ) -func dayPeriods(tp coveragedb.TimePeriod) []coveragedb.TimePeriod { - var res []coveragedb.TimePeriod - for i := 0; i < tp.Days; i++ { - res = append(res, coveragedb.TimePeriod{DateTo: tp.DateTo.AddDays(-i), Days: 1, Type: coveragedb.DayPeriod}) - } - slices.Reverse(res) - return res -} - -func toolBuildNsHeatmap() { - buf := new(bytes.Buffer) - dateTo, err := civil.ParseDate(*flagDateTo) - if err != nil { - tool.Fail(err) - } - tp, err := coveragedb.MakeTimePeriod(dateTo, *flagPeriod) - if err != nil { - tool.Fail(err) - } - periods := dayPeriods(tp) - switch *flagNsHeatmapGroupBy { - case "dir": - if err = cover.DoDirHeatMap(buf, *flagProjectID, *flagNsHeatmap, periods); err != nil { - tool.Fail(err) - } - case "subsystem": - if err = cover.DoSubsystemsHeatMap(buf, *flagProjectID, *flagNsHeatmap, periods); err != nil { - tool.Fail(err) - } - default: - tool.Failf("group by %s not supported", *flagNsHeatmapGroupBy) - } - if err = osutil.WriteFile(*flagNsHeatmap+".html", buf.Bytes()); err != nil { - tool.Fail(err) - } -} - func toolFileCover() { dateTo, err := civil.ParseDate(*flagDateTo) if err != nil { @@ -164,10 +123,6 @@ func main() { toolFileCover() return } - if *flagNsHeatmap != "" { - toolBuildNsHeatmap() - return - } cfg, err := mgrconfig.LoadFile(*flagConfig) if err != nil { tool.Fail(err) |