From e4bacdaf3417006ad6aa0d911a44b49bb25a6e1a Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Wed, 14 Aug 2024 15:01:11 +0200
Subject: tools/syz-covermerger: move problems logging closer to the guilty
 code

---
 pkg/covermerger/covermerger.go           |  1 -
 pkg/covermerger/file_line_merger.go      |  9 +++++----
 tools/syz-covermerger/syz_covermerger.go | 12 ------------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/pkg/covermerger/covermerger.go b/pkg/covermerger/covermerger.go
index 506d870b0..da4baef8f 100644
--- a/pkg/covermerger/covermerger.go
+++ b/pkg/covermerger/covermerger.go
@@ -67,7 +67,6 @@ func (fr FileRecord) HitCount() (int, error) {
 type MergeResult struct {
 	HitCounts  map[int]int
 	FileExists bool
-	LostFrames map[RepoBranchCommit]int64
 }
 
 type FileCoverageMerger interface {
diff --git a/pkg/covermerger/file_line_merger.go b/pkg/covermerger/file_line_merger.go
index b53509df5..04b437130 100644
--- a/pkg/covermerger/file_line_merger.go
+++ b/pkg/covermerger/file_line_merger.go
@@ -3,6 +3,8 @@
 
 package covermerger
 
+import "github.com/google/syzkaller/pkg/log"
+
 func makeFileLineCoverMerger(
 	fvs fileVersions, base RepoBranchCommit) FileCoverageMerger {
 	baseFile := ""
@@ -51,13 +53,12 @@ func (a *FileLineCoverMerger) AddRecord(rbc RepoBranchCommit, f *Frame, hitCount
 }
 
 func (a *FileLineCoverMerger) Result() *MergeResult {
-	lostFrames := a.lostFrames
-	if len(lostFrames) == 0 {
-		lostFrames = nil
+	for rbc, lostFrames := range a.lostFrames {
+		log.Logf(1, "\t[warn] lost %d frames from rbc(%s, %s, %s)",
+			lostFrames, rbc.Repo, rbc.Branch, rbc.Commit)
 	}
 	return &MergeResult{
 		HitCounts:  a.hitCounts,
 		FileExists: true,
-		LostFrames: lostFrames,
 	}
 }
diff --git a/tools/syz-covermerger/syz_covermerger.go b/tools/syz-covermerger/syz_covermerger.go
index 7b5c4f1ff..b152b3dee 100644
--- a/tools/syz-covermerger/syz_covermerger.go
+++ b/tools/syz-covermerger/syz_covermerger.go
@@ -110,25 +110,13 @@ func saveCoverage(dashboard, clientName string, d *dashapi.MergedCoverage) error
 }
 
 func printMergeResult(mergeResult map[string]*covermerger.MergeResult) {
-	totalLostFrames := map[covermerger.RepoBranchCommit]int64{}
 	coverage, totalInstrumentedLines, totalCoveredLines := mergeResultsToCoverage(mergeResult)
 	keys := maps.Keys(coverage)
 	sort.Strings(keys)
 	for _, fileName := range keys {
-		lineStat := mergeResult[fileName]
-		for rbc, lostFrames := range lineStat.LostFrames {
-			log.Logf(1, "\t[warn] lost %d frames from rbc(%s, %s, %s)",
-				lostFrames, rbc.Repo, rbc.Branch, rbc.Commit)
-			totalLostFrames[rbc] += lostFrames
-		}
 		printCoverage(fileName, coverage[fileName].Instrumented, coverage[fileName].Covered)
 	}
 	printCoverage("total", totalInstrumentedLines, totalCoveredLines)
-	for rbc, lostFrames := range totalLostFrames {
-		log.Logf(0, "\t[warn] lost %d frames from rbc(%s, %s, %s)",
-			lostFrames, rbc.Repo, rbc.Branch, rbc.Commit)
-		totalLostFrames[rbc] += lostFrames
-	}
 }
 
 func printCoverage(target string, instrumented, covered int64) {
-- 
cgit mrf-deployment