pkg/cmdprof: merge into pkg/tool

cmdprof functionality seems to fit well into pkg/tool.

2 files changed, 4 insertions, 6 deletions

diff --git a/tools/syz-check/check.go b/tools/syz-check/check.go
index de7145dfb..5961cb6e8 100644
--- a/tools/syz-check/check.go
+++ b/tools/syz-check/check.go
@@ -37,10 +37,10 @@ import (
 	"unsafe"
 
 	"github.com/google/syzkaller/pkg/ast"
-	"github.com/google/syzkaller/pkg/cmdprof"
 	"github.com/google/syzkaller/pkg/compiler"
 	"github.com/google/syzkaller/pkg/osutil"
 	"github.com/google/syzkaller/pkg/symbolizer"
+	"github.com/google/syzkaller/pkg/tool"
 	"github.com/google/syzkaller/prog"
 	"github.com/google/syzkaller/sys/targets"
 )
@@ -59,8 +59,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, msg+"\n", args...)
 		os.Exit(1)
 	}
-	flag.Parse()
-	defer cmdprof.Install()()
+	defer tool.Init()()
 	var warnings []Warn
 	for arch, obj := range arches {
 		if *obj == "" {
diff --git a/tools/syz-cover/syz-cover.go b/tools/syz-cover/syz-cover.go
index d019bfb78..2808cdd96 100644
--- a/tools/syz-cover/syz-cover.go
+++ b/tools/syz-cover/syz-cover.go
@@ -27,9 +27,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/google/syzkaller/pkg/cmdprof"
 	"github.com/google/syzkaller/pkg/cover"
 	"github.com/google/syzkaller/pkg/osutil"
+	"github.com/google/syzkaller/pkg/tool"
 	"github.com/google/syzkaller/sys/targets"
 )
 
@@ -43,8 +43,7 @@ func main() {
 		flagKernelObj      = flag.String("kernel_obj", "", "path to kernel build/obj dir")
 		flagExport         = flag.String("csv", "", "export coverage data in csv format (optional)")
 	)
-	flag.Parse()
-	defer cmdprof.Install()()
+	defer tool.Init()()
 
 	if len(flag.Args()) == 0 {
 		fmt.Fprintf(os.Stderr, "usage: syz-cover [flags] rawcover.file\n")