bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bpftool: Fix C++ additions to skeleton

Browse source 
Mark C++-specific T::open() and other methods as static inline to avoid
symbol redefinition when multiple files use the same skeleton header in
an application.

Fixes: bb8ffe61ea ("bpftool: Add C++-specific open/load/etc skeleton wrappers")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220216233540.216642-1-andrii@kernel.org
This commit is contained in:
Andrii Nakryiko 2022-02-16 15:35:40 -08:00 • committed by Alexei Starovoitov
parent f76d8507d2
commit 9b6eb0478d
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tools/bpf/bpftool/gen.c
View file

@ -834,13 +834,13 @@ static int do_skeleton(int argc, char **argv)
\n\ \n\
\n\ \n\
#ifdef __cplusplus \n\ #ifdef __cplusplus \n\
static struct %1$s *open(const struct bpf_object_open_opts *opts = nullptr);\n\ static inline struct %1$s *open(const struct bpf_object_open_opts *opts = nullptr);\n\
static struct %1$s *open_and_load(); \n\ static inline struct %1$s *open_and_load(); \n\
static int load(struct %1$s *skel); \n\ static inline int load(struct %1$s *skel); \n\
static int attach(struct %1$s *skel); \n\ static inline int attach(struct %1$s *skel); \n\
static void detach(struct %1$s *skel); \n\ static inline void detach(struct %1$s *skel); \n\
static void destroy(struct %1$s *skel); \n\ static inline void destroy(struct %1$s *skel); \n\
static const void *elf_bytes(size_t *sz); \n\ static inline const void *elf_bytes(size_t *sz); \n\
#endif /* __cplusplus */ \n\ #endif /* __cplusplus */ \n\
}; \n\ }; \n\
\n\ \n\