pkg: export PreciseCoverage in config

Author: jiangenj

pkg/cover/backend/backend.go

@@ -67,12 +67,12 @@ type SecRange struct {
 const LineEnd = 1 << 30
 
 func Make(target *targets.Target, vm string, kernelDirs *mgrconfig.KernelDirs, splitBuild bool,
-	moduleObj []string, modules []*vminfo.KernelModule) (*Impl, error) {
+	moduleObj []string, modules []*vminfo.KernelModule, preciseCoverage bool) (*Impl, error) {
 	if kernelDirs.Obj == "" {
 		return nil, fmt.Errorf("kernel obj directory is not specified")
 	}
 	if target.OS == targets.Darwin {
-		return makeMachO(target, kernelDirs, moduleObj, modules)
+		return makeMachO(target, kernelDirs, moduleObj, modules, preciseCoverage)
 	}
 	if vm == targets.GVisor {
 		return makeGvisor(target, kernelDirs, modules)
@@ -84,7 +84,7 @@ func Make(target *targets.Target, vm string, kernelDirs *mgrconfig.KernelDirs, s
 		// details.
 		delimiters = []string{"/aosp/", "/private/"}
 	}
-	return makeELF(target, kernelDirs, delimiters, moduleObj, modules)
+	return makeELF(target, kernelDirs, delimiters, moduleObj, modules, preciseCoverage)
 }
 
 func GetPCBase(cfg *mgrconfig.Config) (uint64, error) {

pkg/cover/backend/dwarf.go

@@ -37,6 +37,7 @@ type dwarfParams struct {
 	readModuleCoverPoints func(*targets.Target, *vminfo.KernelModule, *symbolInfo) ([2][]uint64, error)
 	readTextRanges        func(*vminfo.KernelModule) ([]pcRange, []*CompileUnit, error)
 	getCompilerVersion    func(string) string
+	preciseCoverage       bool
 }
 
 type Arch struct {
@@ -141,14 +142,14 @@ func makeDWARFUnsafe(params *dwarfParams) (*Impl, error) {
 	kernelDirs := params.kernelDirs
 	splitBuildDelimiters := params.splitBuildDelimiters
 	modules := params.hostModules
+	preciseCoverage := params.preciseCoverage
 
 	// Here and below index 0 refers to coverage callbacks (__sanitizer_cov_trace_pc(_guard))
 	// and index 1 refers to comparison callbacks (__sanitizer_cov_trace_cmp*).
 	var allCoverPoints [2][]uint64
 	var allSymbols []*Symbol
 	var allRanges []pcRange
 	var allUnits []*CompileUnit
-	preciseCoverage := true
 	type binResult struct {
 		symbols     []*Symbol
 		coverPoints [2][]uint64

pkg/cover/backend/elf.go

@@ -18,7 +18,7 @@ import (
 )
 
 func makeELF(target *targets.Target, kernelDirs *mgrconfig.KernelDirs, splitBuildDelimiters, moduleObj []string,
-	hostModules []*vminfo.KernelModule) (*Impl, error) {
+	hostModules []*vminfo.KernelModule, preciseCoverage bool) (*Impl, error) {
 	return makeDWARF(&dwarfParams{
 		target:                target,
 		kernelDirs:            kernelDirs,
@@ -30,6 +30,7 @@ func makeELF(target *targets.Target, kernelDirs *mgrconfig.KernelDirs, splitBuil
 		readModuleCoverPoints: elfReadModuleCoverPoints,
 		readTextRanges:        elfReadTextRanges,
 		getCompilerVersion:    elfGetCompilerVersion,
+		preciseCoverage:       preciseCoverage,
 	})
 }
 

pkg/cover/backend/mach-o.go

@@ -16,7 +16,7 @@ import (
 )
 
 func makeMachO(target *targets.Target, kernelDirs *mgrconfig.KernelDirs,
-	moduleObj []string, hostModules []*vminfo.KernelModule) (*Impl, error) {
+	moduleObj []string, hostModules []*vminfo.KernelModule, preciseCoverage bool) (*Impl, error) {
 	return makeDWARF(&dwarfParams{
 		target:                target,
 		kernelDirs:            kernelDirs,
@@ -26,6 +26,7 @@ func makeMachO(target *targets.Target, kernelDirs *mgrconfig.KernelDirs,
 		readTextData:          machoReadTextData,
 		readModuleCoverPoints: machoReadModuleCoverPoints,
 		readTextRanges:        machoReadTextRanges,
+		preciseCoverage:       preciseCoverage,
 	})
 }
 

pkg/cover/report.go

@@ -34,7 +34,8 @@ func GetPCBase(cfg *mgrconfig.Config) (uint64, error) {
 }
 
 func MakeReportGenerator(cfg *mgrconfig.Config, modules []*vminfo.KernelModule) (*ReportGenerator, error) {
-	impl, err := backend.Make(cfg.SysTarget, cfg.Type, cfg.KernelDirs(), cfg.AndroidSplitBuild, cfg.ModuleObj, modules)
+	impl, err := backend.Make(cfg.SysTarget, cfg.Type, cfg.KernelDirs(), cfg.AndroidSplitBuild, cfg.ModuleObj,
+		modules, cfg.PreciseCoverage)
 	if err != nil {
 		return nil, err
 	}

pkg/mgrconfig/config.go

@@ -225,6 +225,9 @@ type Config struct {
 	// More details can be found in pkg/asset/config.go.
 	AssetStorage *asset.Config `json:"asset_storage"`
 
+	// Enable preciseCoverage or not, default to true.
+	PreciseCoverage bool `json:"precise_coverage"`
+
 	// Experimental options.
 	Experimental Experimental
 

pkg/mgrconfig/load.go

@@ -86,15 +86,16 @@ func LoadPartialFile(filename string) (*Config, error) {
 
 func defaultValues() *Config {
 	return &Config{
-		SSHUser:        "root",
-		Cover:          true,
-		Reproduce:      true,
-		Sandbox:        "none",
-		RPC:            ":0",
-		MaxCrashLogs:   100,
-		Procs:          6,
-		PreserveCorpus: true,
-		RunFsck:        true,
+		SSHUser:         "root",
+		Cover:           true,
+		Reproduce:       true,
+		Sandbox:         "none",
+		RPC:             ":0",
+		MaxCrashLogs:    100,
+		Procs:           6,
+		PreserveCorpus:  true,
+		RunFsck:         true,
+		PreciseCoverage: true,
 		Experimental: Experimental{
 			RemoteCover:      true,
 			CoverEdges:       true,