dashboard/app: fixes

google · Jul 17, 2024 · 0c8537d · 0c8537d
1 parent 4fb5540
commit 0c8537d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 47 deletions.
diff --git a/dashboard/app/graphs.go b/dashboard/app/graphs.go
@@ -191,31 +191,14 @@ func handleFoundBugsGraph(c context.Context, w http.ResponseWriter, r *http.Requ
 }
 
 func handleCoverageHeatmap(c context.Context, w http.ResponseWriter, r *http.Request) error {
-	hdr, err := commonHeader(c, r, w, "")
-	if err != nil {
-		return err
-	}
-	dateFrom := civil.DateOf(time.Now().Add(-14 * 24 * time.Hour))
-	dateTo := civil.DateOf(time.Now())
-	var style template.CSS
-	var body, js template.HTML
-	if style, body, js, err = cover.DoHeatMapStyleBodyJS("syzkaller", hdr.Namespace, dateFrom, dateTo); err != nil {
-		return fmt.Errorf("failed to generate heatmap: %w", err)
-	}
-	return serveTemplate(w, "custom_content.html", struct {
-		Header *uiHeader
-		Style  template.CSS
-		Body   template.HTML
-		JS     template.HTML
-	}{
-		Header: hdr,
-		Style:  style,
-		Body:   body,
-		JS:     js,
-	})
+	return handleHeatmap(c, w, r, "dir")
 }
 
 func handleSubsystemsCoverageHeatmap(c context.Context, w http.ResponseWriter, r *http.Request) error {
+	return handleHeatmap(c, w, r, "subsystems")
+}
+
+func handleHeatmap(c context.Context, w http.ResponseWriter, r *http.Request, heatmapType string) error {
 	hdr, err := commonHeader(c, r, w, "")
 	if err != nil {
 		return err
@@ -224,7 +207,13 @@ func handleSubsystemsCoverageHeatmap(c context.Context, w http.ResponseWriter, r
 	dateTo := civil.DateOf(time.Now())
 	var style template.CSS
 	var body, js template.HTML
-	if style, body, js, err = cover.DoHeatMapStyleBodyJS("syzkaller", hdr.Namespace, dateFrom, dateTo); err != nil {
+	f := cover.DoHeatMapStyleBodyJS
+	switch heatmapType {
+	case "dir":
+	case "subsystems":
+		f = cover.DoSubsystemsHeatMapStyleBodyJS
+	}
+	if style, body, js, err = f("syzkaller", hdr.Namespace, dateFrom, dateTo); err != nil {
 		return fmt.Errorf("failed to generate heatmap: %w", err)
 	}
 	return serveTemplate(w, "custom_content.html", struct {

diff --git a/pkg/cover/heatmap.go b/pkg/cover/heatmap.go
@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"html/template"
 	"io"
-	"log"
 	"sort"
 	"strings"
 
@@ -169,12 +168,30 @@ where namespace=$1 and dateto>=$2 and dateto<=$3
 	return res, nil
 }
 
-func DoHeatMap(w io.Writer, projectID, ns string, dateFrom, dateTo civil.Date) error {
-	style, body, js, err := DoHeatMapStyleBodyJS(projectID, ns, dateFrom, dateTo)
-	if err != nil {
-		return fmt.Errorf("failed to DoHeatMapStyleAndBody() %w", err)
+func DoDirHeatMap(w io.Writer, projectID, ns string, dateFrom, dateTo civil.Date) error {
+	return DoHeatMap(w, projectID, ns, dateFrom, dateTo, "dir")
+}
+
+func DoSubsystemsHeatMap(w io.Writer, projectID, ns string, dateFrom, dateTo civil.Date) error {
+	return DoHeatMap(w, projectID, ns, dateFrom, dateTo, "subsystems")
+}
+
+func DoHeatMap(w io.Writer, projectID, ns string, dateFrom, dateTo civil.Date, hmType string) error {
+	var style template.CSS
+	var body, js template.HTML
+	var err error
+	switch hmType {
+	case "dir":
+		style, body, js, err = DoHeatMapStyleBodyJS(projectID, ns, dateFrom, dateTo)
+		if err != nil {
+			return fmt.Errorf("failed to DoHeatMapStyleAndBody() %w", err)
+		}
+	case "subsystems":
+		style, body, js, err = DoSubsystemsHeatMapStyleBodyJS(projectID, ns, dateFrom, dateTo)
+		if err != nil {
+			return fmt.Errorf("failed to DoSubsystemsHeatMapStyleBodyJS() %w", err)
+		}
 	}
-	log.Printf("%s", js)
 	return heatmapTemplate.Execute(w, struct {
 		Style template.CSS
 		Body  template.HTML
@@ -249,23 +266,6 @@ func DoSubsystemsHeatMapStyleBodyJS(projectID, ns string, dateFrom, dateTo civil
 		template.HTML(js.Bytes()), nil
 }
 
-func DoSubsystemsHeatMap(w io.Writer, projectID, ns string, dateFrom, dateTo civil.Date) error {
-	style, body, js, err := DoSubsystemsHeatMapStyleBodyJS(projectID, ns, dateFrom, dateTo)
-	if err != nil {
-		return fmt.Errorf("failed to DoHeatMapStyleAndBody() %w", err)
-	}
-	log.Printf("%s", js)
-	return heatmapTemplate.Execute(w, struct {
-		Style template.CSS
-		Body  template.HTML
-		JS    template.HTML
-	}{
-		Style: style,
-		Body:  body,
-		JS:    js,
-	})
-}
-
 func approximateInstrumented(points int64) string {
 	dim := "_"
 	if points > 10000 {

diff --git a/tools/syz-cover/syz-cover.go b/tools/syz-cover/syz-cover.go
@@ -68,7 +68,7 @@ func toolBuildNsHeatmap() {
 	}
 	switch *flagNsHeatmapGroupBy {
 	case "dir":
-		if err = cover.DoHeatMap(buf, *flagProjectID, *flagNsHeatmap, dateFrom, dateTo); err != nil {
+		if err = cover.DoDirHeatMap(buf, *flagProjectID, *flagNsHeatmap, dateFrom, dateTo); err != nil {
 			tool.Fail(err)
 		}
 	case "subsystem":