Fix conditions for determining whether an event is included

Signed-off-by: zeroalphat <taichi-takemura@cybozu.co.jp>
cybozu-go · Oct 16, 2023 · 94620db · 94620db
1 parent 2da88b6
commit 94620db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/internal/constants/constants.go b/internal/constants/constants.go
@@ -5,7 +5,8 @@ const (
 	ScriptSubcommand  = "script"
 	ProfilingFileName = "perf.data"
 	ScriptFileName    = "perf.script"
-	CpuEvent          = "cpu-clock:pppH:"
+	CpuClockEvent     = "cpu-clock:"
+	CyclesEvent       = "cycles:"
 )
 
 const (

diff --git a/internal/resource/perf.go b/internal/resource/perf.go
@@ -96,7 +96,7 @@ func (p *PerfExecuter) GetEvent(ctx context.Context, path string) (*bytes.Buffer
 
 // Check if events are contained in the perf.data file.
 func (p *PerfExecuter) HasPerfEvent(ctx context.Context, buf *bytes.Buffer) bool {
-	return strings.Contains(buf.String(), constants.CpuEvent)
+	return strings.Contains(buf.String(), constants.CyclesEvent) || strings.Contains(buf.String(), constants.CpuClockEvent)
 }
 
 func (p *PerfExecuter) ExecScript(ctx context.Context, path, workDir string) (string, error) {