reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2024-11-27 13:20:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pkg/cover: factor out common code into combinePrefix

Browse Source 
Combining of prefixes is now repeated in 2 places.
Factor it out into a common function.
This commit is contained in:
Dmitry Vyukov 2019-05-26 14:05:34 +02:00
parent 59a32682c0
commit f5a25d38ac
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/cover/report.go
View File

@ -55,14 +55,13 @@ func MakeReportGenerator(vmlinux, srcDir, arch string) (*ReportGenerator, error)
}
func (rg *ReportGenerator) Do(w io.Writer, pcs []uint64) error {
var prefix string
if len(pcs) == 0 {
return fmt.Errorf("no coverage data available")
}
for i, pc := range pcs {
pcs[i] = PreviousInstructionPC(rg.arch, pc)
}
covered, prefix1, err := rg.symbolize(pcs)
covered, prefix, err := rg.symbolize(pcs)
if err != nil {
return err
}
@ -74,16 +73,8 @@ func (rg *ReportGenerator) Do(w io.Writer, pcs []uint64) error {
if err != nil {
return err
}
if len(uncoveredPCs) == 0 {
prefix = prefix1
} else {
i := 0
for ; i < len(prefix1) && i < len(prefix2); i++ {
if prefix1[i] != prefix2[i] {
break
}
}
prefix = prefix1[:i]
if len(uncoveredPCs) != 0 {
prefix = combinePrefix(prefix, prefix2)
}
return rg.generate(w, prefix, covered, uncovered)
}
@ -244,13 +235,7 @@ func (rg *ReportGenerator) symbolize(pcs []uint64) ([]symbolizer.Frame, string,
if prefix == "" {
prefix = frame.File
} else {
i := 0
for ; i < len(prefix) && i < len(frame.File); i++ {
if prefix[i] != frame.File[i] {
break
}
}
prefix = prefix[:i]
prefix = combinePrefix(prefix, frame.File)
if prefix == "" {
break
}
@ -259,6 +244,16 @@ func (rg *ReportGenerator) symbolize(pcs []uint64) ([]symbolizer.Frame, string,
return frames, prefix, nil
}
func combinePrefix(prefix, prefix2 string) string {
i := 0
for ; i < len(prefix) && i < len(prefix2); i++ {
if prefix[i] != prefix2[i] {
break
}
}
return prefix[:i]
}
func parseFile(fn string) ([][]byte, error) {
data, err := ioutil.ReadFile(fn)
if err != nil {