-
Notifications
You must be signed in to change notification settings - Fork 18
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(godeltaprof): handle renamed runtime.pprof_cyclesPerSecond #107
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
//go:build go1.21 && !go1.23 | ||
// +build go1.21,!go1.23 | ||
|
||
package compat | ||
|
||
import ( | ||
"testing" | ||
) | ||
|
||
func TestRuntimeFrameSymbolName(t *testing.T) { | ||
checkSignature(t, "runtime/pprof", | ||
"runtime_FrameSymbolName", | ||
"func runtime/pprof.runtime_FrameSymbolName(f *runtime.Frame) string") | ||
checkSignature(t, "github.com/grafana/pyroscope-go/godeltaprof/internal/pprof", | ||
"runtime_FrameSymbolName", | ||
"func github.com/grafana/pyroscope-go/godeltaprof/internal/pprof.runtime_FrameSymbolName(f *runtime.Frame) string") | ||
} | ||
|
||
func TestRuntimeFrameStartLine(t *testing.T) { | ||
checkSignature(t, "runtime/pprof", | ||
"runtime_FrameStartLine", | ||
"func runtime/pprof.runtime_FrameStartLine(f *runtime.Frame) int") | ||
checkSignature(t, "github.com/grafana/pyroscope-go/godeltaprof/internal/pprof", | ||
"runtime_FrameStartLine", | ||
"func github.com/grafana/pyroscope-go/godeltaprof/internal/pprof.runtime_FrameStartLine(f *runtime.Frame) int") | ||
} | ||
|
||
func TestRuntimeExpandFinalInlineFrame(t *testing.T) { | ||
checkSignature(t, "runtime/pprof", | ||
"runtime_expandFinalInlineFrame", | ||
"func runtime/pprof.runtime_expandFinalInlineFrame(stk []uintptr) []uintptr") | ||
checkSignature(t, "github.com/grafana/pyroscope-go/godeltaprof/internal/pprof", | ||
"runtime_expandFinalInlineFrame", | ||
"func github.com/grafana/pyroscope-go/godeltaprof/internal/pprof.runtime_expandFinalInlineFrame(stk []uintptr) []uintptr") | ||
} | ||
|
||
func TestRuntimeCyclesPerSecond(t *testing.T) { | ||
checkSignature(t, "runtime/pprof", | ||
"runtime_cyclesPerSecond", | ||
"func runtime/pprof.runtime_cyclesPerSecond() int64") | ||
checkSignature(t, "github.com/grafana/pyroscope-go/godeltaprof/internal/pprof", | ||
"runtime_cyclesPerSecond", | ||
"func github.com/grafana/pyroscope-go/godeltaprof/internal/pprof.runtime_cyclesPerSecond() int64") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
//go:build go1.23 | ||
// +build go1.23 | ||
|
||
package compat | ||
|
||
import "testing" | ||
|
||
func TestRuntimeFrameSymbolName(t *testing.T) { | ||
checkSignature(t, "runtime/pprof", | ||
"runtime_FrameSymbolName", | ||
"func runtime/pprof.runtime_FrameSymbolName(f *runtime.Frame) string") | ||
checkSignature(t, "github.com/grafana/pyroscope-go/godeltaprof/internal/pprof", | ||
"runtime_FrameSymbolName", | ||
"func github.com/grafana/pyroscope-go/godeltaprof/internal/pprof.runtime_FrameSymbolName(f *runtime.Frame) string") | ||
} | ||
|
||
func TestRuntimeFrameStartLine(t *testing.T) { | ||
checkSignature(t, "runtime/pprof", | ||
"runtime_FrameStartLine", | ||
"func runtime/pprof.runtime_FrameStartLine(f *runtime.Frame) int") | ||
checkSignature(t, "github.com/grafana/pyroscope-go/godeltaprof/internal/pprof", | ||
"runtime_FrameStartLine", | ||
"func github.com/grafana/pyroscope-go/godeltaprof/internal/pprof.runtime_FrameStartLine(f *runtime.Frame) int") | ||
} | ||
|
||
func TestRuntimeExpandFinalInlineFrame(t *testing.T) { | ||
checkSignature(t, "runtime/pprof", | ||
"runtime_expandFinalInlineFrame", | ||
"func runtime/pprof.runtime_expandFinalInlineFrame(stk []uintptr) []uintptr") | ||
checkSignature(t, "github.com/grafana/pyroscope-go/godeltaprof/internal/pprof", | ||
"runtime_expandFinalInlineFrame", | ||
"func github.com/grafana/pyroscope-go/godeltaprof/internal/pprof.runtime_expandFinalInlineFrame(stk []uintptr) []uintptr") | ||
} | ||
|
||
func TestRuntimeCyclesPerSecond(t *testing.T) { | ||
checkSignature(t, "runtime", | ||
"pprof_cyclesPerSecond", | ||
"func runtime.pprof_cyclesPerSecond() int64") | ||
checkSignature(t, "github.com/grafana/pyroscope-go/godeltaprof/internal/pprof", | ||
"runtime_cyclesPerSecond", | ||
"func github.com/grafana/pyroscope-go/godeltaprof/internal/pprof.runtime_cyclesPerSecond() int64") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,5 @@ | ||
package pprof | ||
|
||
// unsafe is required for go:linkname | ||
import _ "unsafe" | ||
|
||
//go:linkname runtime_expandFinalInlineFrame runtime/pprof.runtime_expandFinalInlineFrame | ||
func runtime_expandFinalInlineFrame(stk []uintptr) []uintptr | ||
|
||
//go:linkname runtime_cyclesPerSecond runtime/pprof.runtime_cyclesPerSecond | ||
func runtime_cyclesPerSecond() int64 | ||
|
||
func Runtime_cyclesPerSecond() int64 { | ||
return runtime_cyclesPerSecond() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
//go:build go1.21 && !go1.23 | ||
// +build go1.21,!go1.23 | ||
|
||
package pprof | ||
|
||
import ( | ||
"runtime" | ||
_ "unsafe" | ||
) | ||
|
||
// runtime_FrameStartLine is defined in runtime/symtab.go. | ||
// | ||
//go:noescape | ||
//go:linkname runtime_FrameStartLine runtime/pprof.runtime_FrameStartLine | ||
func runtime_FrameStartLine(f *runtime.Frame) int | ||
|
||
// runtime_FrameSymbolName is defined in runtime/symtab.go. | ||
// | ||
//go:noescape | ||
//go:linkname runtime_FrameSymbolName runtime/pprof.runtime_FrameSymbolName | ||
func runtime_FrameSymbolName(f *runtime.Frame) string | ||
|
||
//go:linkname runtime_expandFinalInlineFrame runtime/pprof.runtime_expandFinalInlineFrame | ||
func runtime_expandFinalInlineFrame(stk []uintptr) []uintptr | ||
|
||
//go:linkname runtime_cyclesPerSecond runtime/pprof.runtime_cyclesPerSecond | ||
func runtime_cyclesPerSecond() int64 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you forgot to remove this test:
pyroscope-go/godeltaprof/compat/stub_test.go
Lines 25 to 29 in ffd2615
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually I think all of the tests in
stub_tests.go
are duplicated by the version-specific tests. So I removed all tests fromstub_test.go
.