-#ifndef _UST_TRACEPOINT_H
-#define _UST_TRACEPOINT_H
+#ifndef _LTTNG_TRACEPOINT_H
+#define _LTTNG_TRACEPOINT_H
/*
* Copyright (C) 2008-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Heavily inspired from the Linux Kernel Markers.
- *
- * Ported to userspace by Pierre-Marc Fournier.
*/
#include <urcu-bp.h>
#include <urcu/list.h>
+#include <lttng/tracepoint-types.h>
#ifdef __cplusplus
extern "C" {
#endif
-struct tracepoint_probe {
- void *func;
- void *data;
-};
-
-struct tracepoint {
- const char *name; /* Tracepoint name */
- char state; /* State. */
- struct tracepoint_probe *probes;
-};
-
/*
* Tracepoints should be added to the instrumented code using the
* "tracepoint()" macro.
#define TP_PARAMS(args...) args
#define TP_PROTO(args...) args
-#define TP_ARGS(args...) args
+#define TP_VARS(args...) args
#define __CHECK_TRACE(provider, name, proto, args) \
do { \
if (caa_unlikely(__tracepoint_##provider##___##name.state)) \
__DO_TRACE(&__tracepoint_##provider##___##name, \
- TP_PROTO(proto), TP_ARGS(args)); \
+ TP_PROTO(proto), TP_VARS(args)); \
} while (0)
/*
static inline void __trace_##provider##___##name(proto) \
{ \
__CHECK_TRACE(provider, name, TP_PROTO(data_proto), \
- TP_ARGS(data_args)); \
+ TP_VARS(data_args)); \
} \
static inline int \
__register_trace_##provider##___##name(void (*probe)(data_proto), void *data) \
* TRACEPOINT_EVENT(< [com_company_]project[_component] >, < event >,
* TP_PROTO(int arg0, void *arg1, char *string, size_t strlen,
* long *arg4, size_t arg4_len),
- * TP_ARGS(arg0, arg1, string, strlen, arg4, arg4_len),
+ * TP_VARS(arg0, arg1, string, strlen, arg4, arg4_len),
* TP_FIELDS(
*
* * Integer, printed in base 10 *
* * TP_PROTO1/TP_PROTO2/TP_PROTO3 ugliness.)
* *
*
- * TP_ARGS(rq, prev, next),
+ * TP_VARS(rq, prev, next),
*
* *
* * Fast binary tracing: define the trace record via
}
#endif
-#endif /* _UST_TRACEPOINT_H */
+#endif /* _LTTNG_TRACEPOINT_H */