#include <lttng/tracepoint-types.h>
#include <lttng/tracepoint-rcu.h>
#include <urcu/compiler.h>
+#include <urcu/system.h>
#include <dlfcn.h> /* for dlopen */
#include <string.h> /* for memset */
#include <lttng/ust-config.h> /* for sdt */
#ifdef LTTNG_UST_HAVE_SDT_INTEGRATION
#define SDT_USE_VARIADIC
#include <sys/sdt.h>
+#define LTTNG_STAP_PROBEV STAP_PROBEV
#else
-#define STAP_PROBEV(...)
+#define LTTNG_STAP_PROBEV(...)
#endif
#ifdef __cplusplus
#endif
#define tracepoint_enabled(provider, name) \
- caa_unlikely(__tracepoint_##provider##___##name.state)
+ caa_unlikely(CMM_LOAD_SHARED(__tracepoint_##provider##___##name.state))
#define do_tracepoint(provider, name, ...) \
__tracepoint_cb_##provider##___##name(__VA_ARGS__)
#define tracepoint(provider, name, ...) \
do { \
- STAP_PROBEV(provider, name, ## __VA_ARGS__); \
+ LTTNG_STAP_PROBEV(provider, name, ## __VA_ARGS__); \
if (tracepoint_enabled(provider, name)) \
do_tracepoint(provider, name, __VA_ARGS__); \
} while (0)
int (*tracepoint_register_lib)(struct lttng_ust_tracepoint * const *tracepoints_start,
int tracepoints_count);
int (*tracepoint_unregister_lib)(struct lttng_ust_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 lttng_ust_tracepoint_dlopen tracepoint_dlopen;
-
-#if defined(TRACEPOINT_DEFINE) || defined(TRACEPOINT_CREATE_PROBES)
+extern struct lttng_ust_tracepoint_dlopen *tracepoint_dlopen_ptr;
/*
* These weak symbols, the constructor, and destructor take care of
__attribute__((weak, visibility("hidden")));
struct lttng_ust_tracepoint_dlopen tracepoint_dlopen
__attribute__((weak, visibility("hidden")));
+/*
+ * 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
+ * 32-bit powerpc depending on the object size: symbols for objects of 8
+ * bytes or less have the same address throughout a module, whereas they
+ * have different addresses between compile units for objects larger
+ * than 8 bytes. Add this pointer indirection to ensure that the symbol
+ * scoping match that of the other weak hidden symbols found in this
+ * header.
+ */
+struct lttng_ust_tracepoint_dlopen *tracepoint_dlopen_ptr
+ __attribute__((weak, visibility("hidden")));
#ifndef _LGPL_SOURCE
static inline void lttng_ust_notrace
static inline void
__tracepoint__init_urcu_sym(void)
{
+ if (!tracepoint_dlopen_ptr)
+ tracepoint_dlopen_ptr = &tracepoint_dlopen;
/*
* Symbols below are needed by tracepoint call sites and probe
* providers.
*/
- if (!tracepoint_dlopen.rcu_read_lock_sym_bp)
- tracepoint_dlopen.rcu_read_lock_sym_bp =
+ if (!tracepoint_dlopen_ptr->rcu_read_lock_sym_bp)
+ tracepoint_dlopen_ptr->rcu_read_lock_sym_bp =
URCU_FORCE_CAST(void (*)(void),
- dlsym(tracepoint_dlopen.liblttngust_handle,
+ dlsym(tracepoint_dlopen_ptr->liblttngust_handle,
"tp_rcu_read_lock_bp"));
- if (!tracepoint_dlopen.rcu_read_unlock_sym_bp)
- tracepoint_dlopen.rcu_read_unlock_sym_bp =
+ if (!tracepoint_dlopen_ptr->rcu_read_unlock_sym_bp)
+ tracepoint_dlopen_ptr->rcu_read_unlock_sym_bp =
URCU_FORCE_CAST(void (*)(void),
- dlsym(tracepoint_dlopen.liblttngust_handle,
+ dlsym(tracepoint_dlopen_ptr->liblttngust_handle,
"tp_rcu_read_unlock_bp"));
- if (!tracepoint_dlopen.rcu_dereference_sym_bp)
- tracepoint_dlopen.rcu_dereference_sym_bp =
+ if (!tracepoint_dlopen_ptr->rcu_dereference_sym_bp)
+ tracepoint_dlopen_ptr->rcu_dereference_sym_bp =
URCU_FORCE_CAST(void *(*)(void *p),
- dlsym(tracepoint_dlopen.liblttngust_handle,
+ dlsym(tracepoint_dlopen_ptr->liblttngust_handle,
"tp_rcu_dereference_sym_bp"));
}
#else
static void
__tracepoints__init(void)
{
- if (__tracepoint_registered++)
+ if (__tracepoint_registered++) {
+ if (!tracepoint_dlopen_ptr->liblttngust_handle)
+ return;
+ __tracepoint__init_urcu_sym();
return;
+ }
- if (!tracepoint_dlopen.liblttngust_handle)
- tracepoint_dlopen.liblttngust_handle =
+ if (!tracepoint_dlopen_ptr)
+ tracepoint_dlopen_ptr = &tracepoint_dlopen;
+ if (!tracepoint_dlopen_ptr->liblttngust_handle)
+ tracepoint_dlopen_ptr->liblttngust_handle =
dlopen("liblttng-ust-tracepoint.so.0", RTLD_NOW | RTLD_GLOBAL);
- if (!tracepoint_dlopen.liblttngust_handle)
+ if (!tracepoint_dlopen_ptr->liblttngust_handle)
return;
__tracepoint__init_urcu_sym();
}
if (--__tracepoint_registered)
return;
- if (tracepoint_dlopen.liblttngust_handle && !__tracepoint_ptrs_registered) {
- ret = dlclose(tracepoint_dlopen.liblttngust_handle);
+ if (!tracepoint_dlopen_ptr)
+ tracepoint_dlopen_ptr = &tracepoint_dlopen;
+ if (tracepoint_dlopen_ptr->liblttngust_handle && !__tracepoint_ptrs_registered) {
+ ret = dlclose(tracepoint_dlopen_ptr->liblttngust_handle);
if (ret) {
fprintf(stderr, "Error (%d) in dlclose\n", ret);
abort();
}
- memset(&tracepoint_dlopen, 0, sizeof(tracepoint_dlopen));
+ memset(tracepoint_dlopen_ptr, 0, sizeof(*tracepoint_dlopen_ptr));
}
}
-#endif
-
#ifdef TRACEPOINT_DEFINE
/*
{
if (__tracepoint_ptrs_registered++)
return;
- if (!tracepoint_dlopen.liblttngust_handle)
- tracepoint_dlopen.liblttngust_handle =
+ if (!tracepoint_dlopen_ptr)
+ tracepoint_dlopen_ptr = &tracepoint_dlopen;
+ if (!tracepoint_dlopen_ptr->liblttngust_handle)
+ tracepoint_dlopen_ptr->liblttngust_handle =
dlopen("liblttng-ust-tracepoint.so.0", RTLD_NOW | RTLD_GLOBAL);
- if (!tracepoint_dlopen.liblttngust_handle)
+ if (!tracepoint_dlopen_ptr->liblttngust_handle)
return;
- tracepoint_dlopen.tracepoint_register_lib =
+ tracepoint_dlopen_ptr->tracepoint_register_lib =
URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *, int),
- dlsym(tracepoint_dlopen.liblttngust_handle,
+ dlsym(tracepoint_dlopen_ptr->liblttngust_handle,
"tracepoint_register_lib"));
- tracepoint_dlopen.tracepoint_unregister_lib =
+ tracepoint_dlopen_ptr->tracepoint_unregister_lib =
URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *),
- dlsym(tracepoint_dlopen.liblttngust_handle,
+ dlsym(tracepoint_dlopen_ptr->liblttngust_handle,
"tracepoint_unregister_lib"));
__tracepoint__init_urcu_sym();
- if (tracepoint_dlopen.tracepoint_register_lib) {
- tracepoint_dlopen.tracepoint_register_lib(__start___tracepoints_ptrs,
+ if (tracepoint_dlopen_ptr->tracepoint_register_lib) {
+ tracepoint_dlopen_ptr->tracepoint_register_lib(__start___tracepoints_ptrs,
__stop___tracepoints_ptrs -
__start___tracepoints_ptrs);
}
if (--__tracepoint_ptrs_registered)
return;
- if (tracepoint_dlopen.tracepoint_unregister_lib)
- tracepoint_dlopen.tracepoint_unregister_lib(__start___tracepoints_ptrs);
- if (tracepoint_dlopen.liblttngust_handle && !__tracepoint_registered) {
- ret = dlclose(tracepoint_dlopen.liblttngust_handle);
+ if (!tracepoint_dlopen_ptr)
+ tracepoint_dlopen_ptr = &tracepoint_dlopen;
+ if (tracepoint_dlopen_ptr->tracepoint_unregister_lib)
+ tracepoint_dlopen_ptr->tracepoint_unregister_lib(__start___tracepoints_ptrs);
+ if (tracepoint_dlopen_ptr->liblttngust_handle && !__tracepoint_registered) {
+ ret = dlclose(tracepoint_dlopen_ptr->liblttngust_handle);
if (ret) {
fprintf(stderr, "Error (%d) in dlclose\n", ret);
abort();
}
- memset(&tracepoint_dlopen, 0, sizeof(tracepoint_dlopen));
+ memset(tracepoint_dlopen_ptr, 0, sizeof(*tracepoint_dlopen_ptr));
}
}
projects / lttng-ust.git / blobdiff