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;
+extern struct lttng_ust_tracepoint_dlopen *tracepoint_dlopen_ptr;
/* Disable tracepoint destructors. */
int __tracepoints__disable_destructors __attribute__((weak));
__tracepoints__disable_destructors = 1;
}
-#if defined(TRACEPOINT_DEFINE) || defined(TRACEPOINT_CREATE_PROBES)
-
/*
* These weak symbols, the constructor, and destructor take care of
* registering only _one_ instance of the tracepoints per shared-ojbect
__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_ptr)
+ tracepoint_dlopen_ptr = &tracepoint_dlopen;
if (!__tracepoints__disable_destructors
- && tracepoint_dlopen.liblttngust_handle
+ && tracepoint_dlopen_ptr->liblttngust_handle
&& !__tracepoint_ptrs_registered) {
- ret = dlclose(tracepoint_dlopen.liblttngust_handle);
+ 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
/*
}; \
static struct lttng_ust_tracepoint * \
__tracepoint_ptr_##_provider##___##_name \
- __attribute__((used, section("__tracepoints_ptrs"))) = \
+ __attribute__((section("__tracepoints_ptrs"), used)) \
+ __lttng_ust_variable_attribute_no_sanitize_address = \
&__tracepoint_##_provider##___##_name;
static void lttng_ust_notrace __attribute__((constructor))
{
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_ptr)
+ tracepoint_dlopen_ptr = &tracepoint_dlopen;
+ if (tracepoint_dlopen_ptr->tracepoint_unregister_lib)
+ tracepoint_dlopen_ptr->tracepoint_unregister_lib(__start___tracepoints_ptrs);
if (!__tracepoints__disable_destructors
- && tracepoint_dlopen.liblttngust_handle
+ && tracepoint_dlopen_ptr->liblttngust_handle
&& !__tracepoint_ptrs_registered) {
- ret = dlclose(tracepoint_dlopen.liblttngust_handle);
+ 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));
}
}
* How to use the TRACEPOINT_EVENT macro:
*
* An example:
- *
+ *
* TRACEPOINT_EVENT(someproject_component, event_name,
*
* * TP_ARGS takes from 0 to 10 "type, field_name" pairs *
* * TP_FIELDS describes the event payload layout in the trace *
*
* TP_FIELDS(
- * * Integer, printed in base 10 *
+ * * Integer, printed in base 10 *
* ctf_integer(int, field_a, arg0)
*
- * * Integer, printed with 0x base 16 *
+ * * Integer, printed with 0x base 16 *
* ctf_integer_hex(unsigned long, field_d, arg1)
*
* * Enumeration *
* ctf_enum(someproject_component, enum_name, int, field_e, arg0)
*
- * * Array Sequence, printed as UTF8-encoded array of bytes *
+ * * Array Sequence, printed as UTF8-encoded array of bytes *
* ctf_array_text(char, field_b, string, FIXED_LEN)
* ctf_sequence_text(char, field_c, string, size_t, strlen)
*
- * * String, printed as UTF8-encoded string *
+ * * String, printed as UTF8-encoded string *
* ctf_string(field_e, string)
*
- * * Array sequence of signed integer values *
+ * * Array sequence of signed integer values *
* ctf_array(long, field_f, arg4, FIXED_LEN4)
* ctf_sequence(long, field_g, arg4, size_t, arg4_len)
* )
projects / lttng-ust.git / blobdiff