Add missing comma to tracepoint STAP_PROBEV call
[lttng-ust.git] / include / lttng / tracepoint.h
index dafede03465a2a78b546389c1ec1f982a0668bdd..a59bef21a48bc950423297f7b46c7895a3d581fa 100644 (file)
 #include <lttng/tracepoint-rcu.h>
 #include <urcu/compiler.h>
 #include <dlfcn.h>     /* for dlopen */
+#include <string.h>    /* for memset */
 #include <assert.h>
+#include <lttng/ust-config.h>  /* for sdt */
+
+#ifdef LTTNG_UST_HAVE_SDT_INTEGRATION
+#define SDT_USE_VARIADIC
+#include <sys/sdt.h>
+#else
+#define STAP_PROBEV(...)
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,6 +35,7 @@ extern "C" {
 
 #define tracepoint(provider, name, ...)                                            \
        do {                                                                \
+               STAP_PROBEV(provider, name, ## __VA_ARGS__);                \
                if (caa_unlikely(__tracepoint_##provider##___##name.state)) \
                        __tracepoint_cb_##provider##___##name(__VA_ARGS__); \
        } while (0)
@@ -114,16 +124,16 @@ extern "C" {
 #define _TP_ARGS_DATA_VAR(...)         _TP_DATA_VAR_N(_TP_NARGS(0, ##__VA_ARGS__), ##__VA_ARGS__)
 #define _TP_PARAMS(...)                        __VA_ARGS__
 
-#define _DECLARE_TRACEPOINT(provider, name, ...)                                       \
-extern struct tracepoint __tracepoint_##provider##___##name;                           \
-static inline void __tracepoint_cb_##provider##___##name(_TP_ARGS_PROTO(__VA_ARGS__))  \
+#define _DECLARE_TRACEPOINT(_provider, _name, ...)                                     \
+extern struct tracepoint __tracepoint_##_provider##___##_name;                         \
+static inline void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__))        \
 {                                                                                      \
        struct tracepoint_probe *__tp_probe;                                            \
                                                                                        \
        if (!TP_RCU_LINK_TEST())                                                        \
                return;                                                                 \
        tp_rcu_read_lock_bp();                                                          \
-       __tp_probe = tp_rcu_dereference_bp(__tracepoint_##provider##___##name.probes);  \
+       __tp_probe = tp_rcu_dereference_bp(__tracepoint_##_provider##___##_name.probes); \
        if (caa_unlikely(!__tp_probe))                                                  \
                goto end;                                                               \
        do {                                                                            \
@@ -136,12 +146,12 @@ static inline void __tracepoint_cb_##provider##___##name(_TP_ARGS_PROTO(__VA_ARG
 end:                                                                                   \
        tp_rcu_read_unlock_bp();                                                        \
 }                                                                                      \
-static inline void __tracepoint_register_##provider##___##name(char *name,             \
+static inline void __tracepoint_register_##_provider##___##_name(char *name,           \
                void *func, void *data)                                                 \
 {                                                                                      \
        __tracepoint_probe_register(name, func, data);                                  \
 }                                                                                      \
-static inline void __tracepoint_unregister_##provider##___##name(char *name,           \
+static inline void __tracepoint_unregister_##_provider##___##_name(char *name,         \
                void *func, void *data)                                                 \
 {                                                                                      \
        __tracepoint_probe_unregister(name, func, data);                                \
@@ -150,6 +160,25 @@ static inline void __tracepoint_unregister_##provider##___##name(char *name,               \
 extern int __tracepoint_probe_register(const char *name, void *func, void *data);
 extern int __tracepoint_probe_unregister(const char *name, void *func, void *data);
 
+/*
+ * tracepoint dynamic linkage handling (callbacks). Hidden visibility:
+ * shared across objects in a module/main executable.
+ */
+struct tracepoint_dlopen {
+       void *liblttngust_handle;
+
+       int (*tracepoint_register_lib)(struct tracepoint * const *tracepoints_start,
+               int tracepoints_count);
+       int (*tracepoint_unregister_lib)(struct tracepoint * const *tracepoints_start);
+#ifndef _LGPL_SOURCE
+       void (*rcu_read_lock_sym_bp)(void);
+       void (*rcu_read_unlock_sym_bp)(void);
+       void *(*rcu_dereference_sym_bp)(void *p);
+#endif
+};
+
+extern struct tracepoint_dlopen tracepoint_dlopen;
+
 #ifdef TRACEPOINT_DEFINE
 
 /*
@@ -185,11 +214,6 @@ extern int __tracepoint_probe_unregister(const char *name, void *func, void *dat
                __attribute__((used, section("__tracepoints_ptrs"))) =          \
                        &__tracepoint_##provider##___##name;
 
-static int (*tracepoint_register_lib)(struct tracepoint * const *tracepoints_start,
-               int tracepoints_count);
-static int (*tracepoint_unregister_lib)(struct tracepoint * const *tracepoints_start);
-static void *liblttngust_handle;
-
 /*
  * These weak symbols, the constructor, and destructor take care of
  * registering only _one_ instance of the tracepoints per shared-ojbect
@@ -201,38 +225,41 @@ extern struct tracepoint * const __stop___tracepoints_ptrs[]
        __attribute__((weak, visibility("hidden")));
 int __tracepoint_registered
        __attribute__((weak, visibility("hidden")));
+struct tracepoint_dlopen tracepoint_dlopen
+       __attribute__((weak, visibility("hidden")));
 
 static void __attribute__((constructor)) __tracepoints__init(void)
 {
        if (__tracepoint_registered++)
                return;
 
-       liblttngust_handle = dlopen("liblttng-ust-tracepoint.so.0", RTLD_NOW | RTLD_GLOBAL);
-       if (!liblttngust_handle)
+       tracepoint_dlopen.liblttngust_handle =
+               dlopen("liblttng-ust-tracepoint.so.0", RTLD_NOW | RTLD_GLOBAL);
+       if (!tracepoint_dlopen.liblttngust_handle)
                return;
-       tracepoint_register_lib =
+       tracepoint_dlopen.tracepoint_register_lib =
                URCU_FORCE_CAST(int (*)(struct tracepoint * const *, int),
-                               dlsym(liblttngust_handle,
+                               dlsym(tracepoint_dlopen.liblttngust_handle,
                                        "tracepoint_register_lib"));
-       tracepoint_unregister_lib =
+       tracepoint_dlopen.tracepoint_unregister_lib =
                URCU_FORCE_CAST(int (*)(struct tracepoint * const *),
-                               dlsym(liblttngust_handle,
+                               dlsym(tracepoint_dlopen.liblttngust_handle,
                                        "tracepoint_unregister_lib"));
 #ifndef _LGPL_SOURCE
-       tp_rcu_read_lock_bp =
+       tracepoint_dlopen.rcu_read_lock_sym_bp =
                URCU_FORCE_CAST(void (*)(void),
-                               dlsym(liblttngust_handle,
+                               dlsym(tracepoint_dlopen.liblttngust_handle,
                                        "tp_rcu_read_lock_bp"));
-       tp_rcu_read_unlock_bp =
+       tracepoint_dlopen.rcu_read_unlock_sym_bp =
                URCU_FORCE_CAST(void (*)(void),
-                               dlsym(liblttngust_handle,
+                               dlsym(tracepoint_dlopen.liblttngust_handle,
                                        "tp_rcu_read_unlock_bp"));
-       tp_rcu_dereference_sym_bp =
+       tracepoint_dlopen.rcu_dereference_sym_bp =
                URCU_FORCE_CAST(void *(*)(void *p),
-                               dlsym(liblttngust_handle,
+                               dlsym(tracepoint_dlopen.liblttngust_handle,
                                        "tp_rcu_dereference_sym_bp"));
 #endif
-       tracepoint_register_lib(__start___tracepoints_ptrs,
+       tracepoint_dlopen.tracepoint_register_lib(__start___tracepoints_ptrs,
                                __stop___tracepoints_ptrs -
                                __start___tracepoints_ptrs);
 }
@@ -240,15 +267,15 @@ static void __attribute__((constructor)) __tracepoints__init(void)
 static void __attribute__((destructor)) __tracepoints__destroy(void)
 {
        int ret;
+
        if (--__tracepoint_registered)
                return;
-       if (tracepoint_unregister_lib)
-               tracepoint_unregister_lib(__start___tracepoints_ptrs);
-       if (liblttngust_handle) {
-               tracepoint_unregister_lib = NULL;
-               tracepoint_register_lib = NULL;
-               ret = dlclose(liblttngust_handle);
+       if (tracepoint_dlopen.tracepoint_unregister_lib)
+               tracepoint_dlopen.tracepoint_unregister_lib(__start___tracepoints_ptrs);
+       if (tracepoint_dlopen.liblttngust_handle) {
+               ret = dlclose(tracepoint_dlopen.liblttngust_handle);
                assert(!ret);
+               memset(&tracepoint_dlopen, 0, sizeof(tracepoint_dlopen));
        }
 }
 
This page took 0.026312 seconds and 4 git commands to generate.