Commit 9b6eb047 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

bpftool: Fix C++ additions to skeleton 



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: bb8ffe61 ("bpftool: Add C++-specific open/load/etc skeleton wrappers")
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220216233540.216642-1-andrii@kernel.org
parent f76d8507

tools/bpf/bpftool/gen.c

+7 −7
Original line number Diff line number Diff line
@@ -834,13 +834,13 @@ static int do_skeleton(int argc, char **argv) 
		\n\

									    \n\

		#ifdef __cplusplus					    \n\

			static struct %1$s *open(const struct bpf_object_open_opts *opts = nullptr);\n\

			static struct %1$s *open_and_load();		    \n\

			static int load(struct %1$s *skel);		    \n\

			static int attach(struct %1$s *skel);		    \n\

			static void detach(struct %1$s *skel);		    \n\

			static void destroy(struct %1$s *skel);		    \n\

			static const void *elf_bytes(size_t *sz);	    \n\

			static inline struct %1$s *open(const struct bpf_object_open_opts *opts = nullptr);\n\

			static inline struct %1$s *open_and_load();	    \n\

			static inline int load(struct %1$s *skel);	    \n\

			static inline int attach(struct %1$s *skel);	    \n\

			static inline void detach(struct %1$s *skel);	    \n\

			static inline void destroy(struct %1$s *skel);	    \n\

			static inline const void *elf_bytes(size_t *sz);    \n\

		#endif /* __cplusplus */				    \n\

		};							    \n\

									    \n\