pkg/manager: store status in the diff storage

Author: a-nogikh

pkg/manager/diff/manager.go

@@ -191,13 +191,17 @@ loop:
 				}
 				log.Logf(1, "found repro for %q (orig title: %q, reliability: %2.f), took %.2f minutes",
 					ret.Repro.Report.Title, origTitle, ret.Repro.Reliability, ret.Stats.TotalTime.Minutes())
+
+				dc.store.UpdateStatus(ret.Repro.Report.Title, manager.DiffBugStatusVerifying)
+
 				g.Go(func() error {
 					runner.Run(groupCtx, ret.Repro, ret.Crash.FullRepro)
 					return nil
 				})
 			} else {
 				origTitle := ret.Crash.Report.Title
 				log.Logf(1, "failed repro for %q, err=%s", origTitle, ret.Err)
+				dc.store.UpdateStatus(origTitle, manager.DiffBugStatusCompleted)
 			}
 			dc.store.SaveRepro(ret)
 		case rep := <-dc.new.crashes:
@@ -208,7 +212,10 @@ loop:
 				rep.Title, need)
 			dc.store.PatchedCrashed(rep.Title, rep.Report, rep.Output)
 			if need {
+				dc.store.UpdateStatus(rep.Title, manager.DiffBugStatusVerifying)
 				reproLoop.Enqueue(crash)
+			} else {
+				dc.store.UpdateStatus(rep.Title, manager.DiffBugStatusIgnored)
 			}
 		}
 	}

pkg/manager/diff_store.go

@@ -16,8 +16,18 @@ import (
 	"github.com/google/syzkaller/pkg/osutil"
 )
 
+type DiffBugStatus string
+
+const (
+	DiffBugStatusPending   DiffBugStatus = "pending"
+	DiffBugStatusVerifying DiffBugStatus = "verifying"
+	DiffBugStatusCompleted DiffBugStatus = "completed"
+	DiffBugStatusIgnored   DiffBugStatus = "ignored"
+)
+
 type DiffBug struct {
 	Title   string
+	Status  DiffBugStatus
 	Base    DiffBugInfo
 	Patched DiffBugInfo
 }
@@ -49,8 +59,15 @@ type DiffFuzzerStore struct {
 	bugs map[string]*DiffBug
 }
 
+func (s *DiffFuzzerStore) UpdateStatus(title string, status DiffBugStatus) {
+	s.patch(title, func(obj *DiffBug) {
+		obj.Status = status
+	})
+}
+
 func (s *DiffFuzzerStore) BaseCrashed(title string, report []byte) {
 	s.patch(title, func(obj *DiffBug) {
+		obj.Status = DiffBugStatusCompleted
 		obj.Base.Crashes++
 		if len(report) > 0 {
 			obj.Base.Report = s.saveFile(title, "base_report", report)
@@ -67,6 +84,7 @@ func (s *DiffFuzzerStore) EverCrashedBase(title string) bool {
 
 func (s *DiffFuzzerStore) BaseNotCrashed(title string) {
 	s.patch(title, func(obj *DiffBug) {
+		obj.Status = DiffBugStatusCompleted
 		if obj.Base.Crashes == 0 {
 			obj.Base.NotCrashed = true
 		}
@@ -131,7 +149,7 @@ func (s *DiffFuzzerStore) PlainTextDump() []byte {
 	})
 	var buf bytes.Buffer
 	w := tabwriter.NewWriter(&buf, 0, 0, 1, ' ', 0)
-	fmt.Fprintln(w, "Title\tOn-Base\tOn-Patched")
+	fmt.Fprintln(w, "Title\tOn-Base\tOn-Patched\tStatus")
 
 	printInfo := func(info *DiffBugInfo) {
 		if info.Crashes > 0 {
@@ -147,7 +165,7 @@ func (s *DiffFuzzerStore) PlainTextDump() []byte {
 		printInfo(&item.Base)
 		fmt.Fprintf(w, "\t")
 		printInfo(&item.Patched)
-		fmt.Fprintf(w, "\n")
+		fmt.Fprintf(w, "\t%s\n", item.Status)
 	}
 	w.Flush()
 	return buf.Bytes()