* SOFTWARE.
*/
+#include <stdio.h>
+#include <stdlib.h>
#include <lttng/tracepoint-types.h>
#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 */
#include <lttng/ust-compiler.h>
#define _TP_ARGS_DATA_VAR(...) _TP_DATA_VAR_N(_TP_NARGS(0, ##__VA_ARGS__), ##__VA_ARGS__)
#define _TP_PARAMS(...) __VA_ARGS__
+/*
+ * The tracepoint cb is marked always inline so we can distinguish
+ * between caller's ip addresses within the probe using the return
+ * address.
+ */
#define _DECLARE_TRACEPOINT(_provider, _name, ...) \
extern struct tracepoint __tracepoint_##_provider##___##_name; \
-static inline lttng_ust_notrace \
+static inline __attribute__((always_inline)) lttng_ust_notrace \
void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)); \
-static inline \
+static \
void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) \
{ \
struct tracepoint_probe *__tp_probe; \
return;
if (tracepoint_dlopen.liblttngust_handle && !__tracepoint_ptrs_registered) {
ret = dlclose(tracepoint_dlopen.liblttngust_handle);
- assert(!ret);
+ if (ret) {
+ fprintf(stderr, "Error (%d) in dlclose\n", ret);
+ abort();
+ }
memset(&tracepoint_dlopen, 0, sizeof(tracepoint_dlopen));
}
}
NULL, \
_TRACEPOINT_UNDEFINED_REF(_provider), \
_TP_EXTRACT_STRING(_args), \
+ { }, \
}; \
static struct tracepoint * __tracepoint_ptr_##_provider##___##_name \
__attribute__((used, section("__tracepoints_ptrs"))) = \
tracepoint_dlopen.tracepoint_unregister_lib(__start___tracepoints_ptrs);
if (tracepoint_dlopen.liblttngust_handle && !__tracepoint_registered) {
ret = dlclose(tracepoint_dlopen.liblttngust_handle);
- assert(!ret);
+ if (ret) {
+ fprintf(stderr, "Error (%d) in dlclose\n", ret);
+ abort();
+ }
memset(&tracepoint_dlopen, 0, sizeof(tracepoint_dlopen));
}
}