Fix btf.FindType to avoid copy #424
Merged
Conversation
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
Signed-off-by: Fabio Falzoi <fabio.falzoi84@gmail.com>
Signed-off-by: Fabio Falzoi <fabio.falzoi84@gmail.com>
lmb
requested changes
Sep 17, 2021
internal/btf/btf.go
Outdated
| @@ -498,8 +510,8 @@ func (s *Spec) FindType(name string, typ Type) error { | |||
| return fmt.Errorf("type %s: %w", name, ErrNotFound) | |||
| } | |||
|
|
|||
| value := reflect.Indirect(reflect.ValueOf(candidate)) | |||
| reflect.Indirect(reflect.ValueOf(typ)).Set(value) | |||
| typPtr.Set(reflect.Indirect(reflect.ValueOf(candidate)).Addr()) | |||
There was a problem hiding this comment.
Indirect() removes unwraps a Ptr, Addr returns a pointer to v. I think you can skip both?
Suggested change
| typPtr.Set(reflect.Indirect(reflect.ValueOf(candidate)).Addr()) | |
| typPtr.Set(reflect.ValueOf(candidate)) |
internal/btf/btf.go
Outdated
| return fmt.Errorf("%T is not a pointer", typ) | ||
| } | ||
|
|
||
| typPtr := reflect.Indirect(typValue) |
There was a problem hiding this comment.
This should be typValue.Elem(). We know that typValue is a Ptr, so no need for Indirect
internal/btf/btf_test.go
Outdated
| Struct{}, | ||
| &Struct{}, | ||
| } { | ||
| if err := spec.FindType("iphdr", nil); err == nil { |
There was a problem hiding this comment.
Suggested change
| if err := spec.FindType("iphdr", nil); err == nil { | |
| if err := spec.FindType("iphdr", typ); err == nil { |
There was a problem hiding this comment.
That's what happen when coding at late night 😅
| nil, | ||
| Struct{}, | ||
| &Struct{}, | ||
| } { |
There was a problem hiding this comment.
Yes, and now that I think about it, we should also check something like slices and maps as "strange" types.
|
Looks good, thanks for the quick turn around! |
added 2 commits
September 17, 2021 11:39
Signed-off-by: Fabio Falzoi <fabio.falzoi84@gmail.com>
Signed-off-by: Fabio Falzoi <fabio.falzoi84@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix
btf.FindTypeto return a pointer to the matching BTF type.This will allow to get exactly the same type (same address) for multiple calls requesting the same type name.
Fixes #416