aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/covermerger
diff options
context:
space:
mode:
authorTaras Madan <tarasmadan@google.com>2024-08-14 15:01:11 +0200
committerTaras Madan <tarasmadan@google.com>2024-08-14 17:56:00 +0000
commite4bacdaf3417006ad6aa0d911a44b49bb25a6e1a (patch)
tree938b9ac7e82f029e0803c4ffa610fc691ef60117 /pkg/covermerger
parenta172b9377314018315aa261c1ed3324008e8dcea (diff)
tools/syz-covermerger: move problems logging closer to the guilty code
Diffstat (limited to 'pkg/covermerger')
-rw-r--r--pkg/covermerger/covermerger.go1
-rw-r--r--pkg/covermerger/file_line_merger.go9
2 files changed, 5 insertions, 5 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,
}
}