#include <urcu/system.h>
#include <dlfcn.h> /* for dlopen */
#include <string.h> /* for memset */
+
#include <lttng/ust-config.h> /* for sdt */
#include <lttng/ust-compiler.h>
+#include <lttng/ust-tracer.h>
#ifdef LTTNG_UST_HAVE_SDT_INTEGRATION
/*
*/
#define _DECLARE_TRACEPOINT(_provider, _name, ...) \
extern struct lttng_ust_tracepoint __tracepoint_##_provider##___##_name; \
-static inline __attribute__((always_inline, unused)) lttng_ust_notrace \
-void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)); \
+static inline \
+void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) \
+ __attribute__((always_inline, unused)) lttng_ust_notrace; \
static \
void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) \
{ \
end: \
tp_rcu_read_unlock(); \
} \
-static inline lttng_ust_notrace \
+static inline \
void __tracepoint_register_##_provider##___##_name(char *name, \
- void (*func)(void), void *data); \
+ void (*func)(void), void *data) \
+ lttng_ust_notrace; \
static inline \
void __tracepoint_register_##_provider##___##_name(char *name, \
void (*func)(void), void *data) \
__tracepoint_probe_register(name, func, data, \
__tracepoint_##_provider##___##_name.signature); \
} \
-static inline lttng_ust_notrace \
+static inline \
void __tracepoint_unregister_##_provider##___##_name(char *name, \
- void (*func)(void), void *data); \
+ void (*func)(void), void *data) \
+ lttng_ust_notrace; \
static inline \
void __tracepoint_unregister_##_provider##___##_name(char *name, \
void (*func)(void), void *data) \
/*
* tracepoint dynamic linkage handling (callbacks). Hidden visibility:
* shared across objects in a module/main executable.
+ *
+ * IMPORTANT: this structure is part of the ABI between instrumented
+ * applications and UST. Fields need to be only added at the end, never
+ * reordered, never removed.
+ *
+ * The field @struct_size should be used to determine the size of the
+ * structure. It should be queried before using additional fields added
+ * at the end of the structure.
*/
struct lttng_ust_tracepoint_dlopen {
+ uint32_t struct_size;
+
void *liblttngust_handle;
int (*tracepoint_register_lib)(struct lttng_ust_tracepoint * const *tracepoints_start,
void (*rcu_read_lock_sym)(void);
void (*rcu_read_unlock_sym)(void);
void *(*rcu_dereference_sym)(void *p);
+
+ /* End of base ABI. Fields below should be used after checking struct_size. */
};
extern struct lttng_ust_tracepoint_dlopen tracepoint_dlopen;
int __tracepoint_ptrs_registered
__attribute__((weak, visibility("hidden")));
struct lttng_ust_tracepoint_dlopen tracepoint_dlopen
- __attribute__((weak, visibility("hidden")));
+ __attribute__((weak, visibility("hidden"))) = {
+ .struct_size = sizeof(struct lttng_ust_tracepoint_dlopen),
+};
/*
* Deal with gcc O1 optimisation issues with weak hidden symbols. gcc
* 4.8 and prior does not have the same behavior for symbol scoping on
* Tracepoint dynamic linkage handling (callbacks). Hidden visibility: shared
* across objects in a module/main executable. The callbacks are used to
* control and check if the destructors should be executed.
+ *
+ * IMPORTANT: this structure is part of the ABI between instrumented
+ * applications and UST. Fields need to be only added at the end, never
+ * reordered, never removed.
+ *
+ * The field @struct_size should be used to determine the size of the
+ * structure. It should be queried before using additional fields added
+ * at the end of the structure.
*/
struct lttng_ust_tracepoint_destructors_syms {
+ uint32_t struct_size;
+
void (*tracepoint_disable_destructors)(void);
int (*tracepoint_get_destructors_state)(void);
+
+ /* End of base ABI. Fields below should be used after checking struct_size. */
};
extern struct lttng_ust_tracepoint_destructors_syms tracepoint_destructors_syms;
extern struct lttng_ust_tracepoint_destructors_syms *tracepoint_destructors_syms_ptr;
struct lttng_ust_tracepoint_destructors_syms tracepoint_destructors_syms
- __attribute__((weak, visibility("hidden")));
+ __attribute__((weak, visibility("hidden"))) = {
+ .struct_size = sizeof(struct lttng_ust_tracepoint_destructors_syms),
+};
struct lttng_ust_tracepoint_destructors_syms *tracepoint_destructors_syms_ptr
__attribute__((weak, visibility("hidden")));
}
#ifndef _LGPL_SOURCE
-static inline void lttng_ust_notrace
-__tracepoint__init_urcu_sym(void);
+static inline void
+__tracepoint__init_urcu_sym(void)
+ lttng_ust_notrace;
static inline void
__tracepoint__init_urcu_sym(void)
{
"tp_rcu_dereference_sym"));
}
#else
-static inline void lttng_ust_notrace
-__tracepoint__init_urcu_sym(void);
+static inline void
+__tracepoint__init_urcu_sym(void)
+ lttng_ust_notrace;
static inline void
__tracepoint__init_urcu_sym(void)
{
}
#endif
-static void lttng_ust_notrace __attribute__((constructor))
-__tracepoints__init(void);
+static void
+__tracepoints__init(void)
+ lttng_ust_notrace __attribute__((constructor));
static void
__tracepoints__init(void)
{
tracepoint_dlopen_ptr = &tracepoint_dlopen;
if (!tracepoint_dlopen_ptr->liblttngust_handle)
tracepoint_dlopen_ptr->liblttngust_handle =
- dlopen("liblttng-ust-tracepoint.so.1", RTLD_NOW | RTLD_GLOBAL);
+ dlopen(LTTNG_UST_TRACEPOINT_LIB_SONAME, RTLD_NOW | RTLD_GLOBAL);
if (!tracepoint_dlopen_ptr->liblttngust_handle)
return;
__tracepoint__init_urcu_sym();
}
-static void lttng_ust_notrace __attribute__((destructor))
-__tracepoints__destroy(void);
+static void
+__tracepoints__destroy(void)
+ lttng_ust_notrace __attribute__((destructor));
static void
__tracepoints__destroy(void)
{
__attribute__((section("__tracepoints_strings"))) = \
#_provider ":" #_name; \
struct lttng_ust_tracepoint __tracepoint_##_provider##___##_name \
- __attribute__((section("__tracepoints"))) = \
- { \
+ __attribute__((section("__tracepoints"))) = { \
+ sizeof(struct lttng_ust_tracepoint), \
__tp_strtab_##_provider##___##_name, \
0, \
NULL, \
_TRACEPOINT_UNDEFINED_REF(_provider), \
_TP_EXTRACT_STRING(_args), \
- { }, \
}; \
static struct lttng_ust_tracepoint * \
__tracepoint_ptr_##_provider##___##_name \
__lttng_ust_variable_attribute_no_sanitize_address = \
&__tracepoint_##_provider##___##_name;
-static void lttng_ust_notrace __attribute__((constructor))
-__tracepoints__ptrs_init(void);
+static void
+__tracepoints__ptrs_init(void)
+ lttng_ust_notrace __attribute__((constructor));
static void
__tracepoints__ptrs_init(void)
{
tracepoint_dlopen_ptr = &tracepoint_dlopen;
if (!tracepoint_dlopen_ptr->liblttngust_handle)
tracepoint_dlopen_ptr->liblttngust_handle =
- dlopen("liblttng-ust-tracepoint.so.1", RTLD_NOW | RTLD_GLOBAL);
+ dlopen(LTTNG_UST_TRACEPOINT_LIB_SONAME, RTLD_NOW | RTLD_GLOBAL);
if (!tracepoint_dlopen_ptr->liblttngust_handle)
return;
if (!tracepoint_destructors_syms_ptr)
}
}
-static void lttng_ust_notrace __attribute__((destructor))
-__tracepoints__ptrs_destroy(void);
+static void
+__tracepoints__ptrs_destroy(void)
+ lttng_ust_notrace __attribute__((destructor));
static void
__tracepoints__ptrs_destroy(void)
{
projects / lttng-ust.git / blobdiff