Better profiling

apple2.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/ivanizag/apple2/core6502"
-	"github.com/pkg/profile"
 )
 
 // Apple2 represents all the components and state of the emulated machine
@@ -26,7 +25,6 @@ type Apple2 struct {
 	isColor             bool
 	fastMode            bool
 	fastRequestsCounter int
-	profile             bool
 	showSpeed           bool
 }
 
@@ -40,11 +38,6 @@ const maxWaitDuration = 100 * time.Millisecond
 
 // Run starts the Apple2 emulation
 func (a *Apple2) Run() {
-	if a.profile {
-		// See the log with:
-		//    go tool pprof --pdf ~/go/bin/apple2sdl /tmp/profile329536248/cpu.pprof > profile.pdf
-		defer profile.Start().Stop()
-	}
 
 	// Start the processor
 	a.cpu.Reset()
@@ -98,10 +91,6 @@ func (a *Apple2) Run() {
 	}
 }
 
-func (a *Apple2) setProfile(value bool) {
-	a.profile = value
-}
-
 const (
 	// CommandToggleSpeed toggles cpu speed between full speed and actual Apple II speed
 	CommandToggleSpeed = iota + 1

apple2main.go

@@ -97,10 +97,6 @@ func MainApple() *Apple2 {
 		"model",
 		"2enh",
 		"set base model. Models available 2plus, 2e, 2enh, base64a")
-	profile := flag.Bool(
-		"profile",
-		false,
-		"generate profile trace to analyse with pprof")
 	flag.Parse()
 
 	if *wozImage != "" {
@@ -174,7 +170,6 @@ func MainApple() *Apple2 {
 	a.cpu.SetTrace(*traceCPU)
 	a.io.setTrace(*traceSS)
 	a.io.setPanicNotImplemented(*panicSS)
-	a.setProfile(*profile)
 
 	// Load ROM if not loaded already
 	if *romFile != "" {

apple2sdl/main.go

@@ -1,13 +1,26 @@
 package main
 
 import (
+	"flag"
 	"unsafe"
 
 	"github.com/ivanizag/apple2"
+	"github.com/pkg/profile"
 	"github.com/veandco/go-sdl2/sdl"
 )
 
 func main() {
+	prof := flag.Bool(
+		"profile",
+		false,
+		"generate profile trace to analyse with pprof")
+	flag.Parse()
+	if *prof {
+		// See the log with:
+		//    go tool pprof --pdf ~/go/bin/apple2sdl /tmp/profile329536248/cpu.pprof > profile.pdf
+		defer profile.Start().Stop()
+	}
+
 	a := apple2.MainApple()
 	if a != nil {
 		SDLRun(a)