From f8d4203387f7c85af6a0e77404fd9ebf5622909f Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 16 Feb 2023 14:25:16 -0500 Subject: [PATCH] Fix: trace events in C++ constructors/destructors Wrap constructor and destructor functions to invoke them as functions with the constructor/destructor GNU C attributes, which ensures that those constructors/destructors are ordered before/after C++ constructors/destructors. Wrap constructor and destructor functions as the constructor/destructor of a variable defined within an anonymous namespace when building as C++ with LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP defined. With this option, there are no guarantees that the events in C++ constructors/destructors will be traced. Fixes: 05bfa3dc3a6e ("Fix: generate probe registration constructor as a C++ constuctor") Signed-off-by: Mathieu Desnoyers Change-Id: If058b15af6b4d8852fa29d0a21b8233bcb4b43a2 --- include/lttng/ust-compiler.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h index e81246a3..38c89b08 100644 --- a/include/lttng/ust-compiler.h +++ b/include/lttng/ust-compiler.h @@ -103,11 +103,17 @@ LTTNG_UST_COMPILER__COMBINE_TOKENS(_tokena, _tokenb) /* * Wrap constructor and destructor functions to invoke them as functions with - * the constructor/destructor GNU C attributes when building as C, or as the - * constructor/destructor of a variable defined within an anonymous namespace - * when building as C++. + * the constructor/destructor GNU C attributes, which ensures that those + * constructors/destructors are ordered before/after C++ + * constructors/destructors. + * + * Wrap constructor and destructor functions as the constructor/destructor of a + * variable defined within an anonymous namespace when building as C++ with + * LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP defined. With this option, + * there are no guarantees that the events in C++ constructors/destructors will + * be traced. */ -#ifdef __cplusplus +#if defined (__cplusplus) && defined (LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP) #define LTTNG_UST_DECLARE_CONSTRUCTOR_DESTRUCTOR(name, constructor_func, \ destructor_func, ...) \ namespace lttng { \ @@ -136,7 +142,7 @@ const lttng::ust::details::LTTNG_UST_COMPILER_COMBINE_TOKENS( \ lttng_ust_constructor_destructor_, name) \ LTTNG_UST_COMPILER_COMBINE_TOKENS(name, registration_instance); \ } -#else /* __cplusplus */ +#else #define LTTNG_UST_DECLARE_CONSTRUCTOR_DESTRUCTOR(name, constructor_func, \ destructor_func, ...) \ static void LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_, name)(void) \ -- 2.34.1