pull out enums from main BPF class to avoid namespace collisions #3490
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
In iovisor#3479, the `bpf_attach_type` enum was pulled into the `BPF` class so that its members could be used in `attach_func` and `detach_func` functions introduced to the Python API. Unfortunately this caused a redefinition of BPF.XDP, which was similarly pulled in from `bpf_prog_type` enum, thus breaking program loading (iovisor#3489). Let's pull these enum- and flag-type class variables out into their own wrapper classes. For backwards compatibility, keep them all (except for `bpf_attach_type`, which was merged 2 days ago) defined in the BPF class, but add a comment to not continue doing this.
davemarchevsky
requested review from
4ast,
brendangregg,
drzaeus77,
goldshtn and
yonghong-song
as code owners
|
[buildbot, test this please] |
1 similar comment
|
[buildbot, test this please] |
|
[buildbot, ok to test] |
|
LGTM. Thanks! |
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.
In #3479, the
bpf_attach_typeenum was pulled into theBPFclass sothat its members could be used in
attach_funcanddetach_funcfunctions introduced to the Python API.
Unfortunately this caused a redefinition of BPF.XDP, which was similarly
pulled in from
bpf_prog_typeenum, thus breaking program loading(#3489).
Let's pull these enum- and flag-type class variables out into their own
wrapper classes. For backwards compatibility, keep them all (except for
bpf_attach_type, which was merged 2 days ago) defined in the BPFclass, but add a comment to not continue doing this.