In preparation of folding of both TP_PROTO and TP_ARGS into TP_ARGS.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
#define TP_PARAMS(args...) args
#define TP_PROTO(args...) args
#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, \
#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)); \
static inline void __trace_##provider##___##name(proto) \
{ \
__CHECK_TRACE(provider, name, TP_PROTO(data_proto), \
static inline void __trace_##provider##___##name(proto) \
{ \
__CHECK_TRACE(provider, name, TP_PROTO(data_proto), \
} \
static inline int \
__register_trace_##provider##___##name(void (*probe)(data_proto), void *data) \
} \
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),
* 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_FIELDS(
*
* * Integer, printed in base 10 *
* * TP_PROTO1/TP_PROTO2/TP_PROTO3 ugliness.)
* *
*
* * 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
*
* *
* * Fast binary tracing: define the trace record via
#undef TP_PROTO
#define TP_PROTO(args...)
#undef TP_PROTO
#define TP_PROTO(args...)
-#undef TP_ARGS
-#define TP_ARGS(args...)
+#undef TP_VARS
+#define TP_VARS(args...)
#undef TP_FIELDS
#define TP_FIELDS(args...)
#undef TP_FIELDS
#define TP_FIELDS(args...)
#undef TP_PROTO
#define TP_PROTO(args...) args
#undef TP_PROTO
#define TP_PROTO(args...) args
-#undef TP_ARGS
-#define TP_ARGS(args...) args
+#undef TP_VARS
+#define TP_VARS(args...) args
#undef TP_FIELDS
#define TP_FIELDS(args...) args
#undef TP_FIELDS
#define TP_FIELDS(args...) args
TRACEPOINT_EVENT(lttng_ust_java_string,
TP_PROTO(const char *name, const char *args),
TRACEPOINT_EVENT(lttng_ust_java_string,
TP_PROTO(const char *name, const char *args),
TP_FIELDS(
ctf_string(name, name)
ctf_string(args, args)
TP_FIELDS(
ctf_string(name, name)
ctf_string(args, args)
TP_PROTO(const char *str),
TP_PROTO(const char *str),
/*
* Not exactly a string: more a sequence of bytes (dynamic
/*
* Not exactly a string: more a sequence of bytes (dynamic
TRACEPOINT_EVENT(ust_tests_fork, after_fork_child,
TP_PROTO(pid_t pid),
TRACEPOINT_EVENT(ust_tests_fork, after_fork_child,
TP_PROTO(pid_t pid),
TP_FIELDS(
ctf_integer(pid_t, pid, pid)
)
TP_FIELDS(
ctf_integer(pid_t, pid, pid)
)
TP_PROTO(int anint, int netint, long *values,
char *text, size_t textlen,
double doublearg, float floatarg),
TP_PROTO(int anint, int netint, long *values,
char *text, size_t textlen,
double doublearg, float floatarg),
- TP_ARGS(anint, netint, values, text, textlen,
+ TP_VARS(anint, netint, values, text, textlen,
doublearg, floatarg),
TP_FIELDS(
ctf_integer(int, intfield, anint)
doublearg, floatarg),
TP_FIELDS(
ctf_integer(int, intfield, anint)
TRACEPOINT_EVENT(hello_tptest,
TP_PROTO(int anint),
TRACEPOINT_EVENT(hello_tptest,
TP_PROTO(int anint),
TP_FIELDS());
#endif /* _TRACE_TP_H */
TP_FIELDS());
#endif /* _TRACE_TP_H */
TP_PROTO(unsigned long time, unsigned long count),
TP_PROTO(unsigned long time, unsigned long count),
TP_FIELDS(
tp_field(unsigned long, time, time)
TP_FIELDS(
tp_field(unsigned long, time, time)
TRACEPOINT_EVENT(ust_event,
TP_PROTO(unsigned int v),
TRACEPOINT_EVENT(ust_event,
TP_PROTO(unsigned int v),
TP_FIELDS());
#endif /* _TRACE_TRACEPOINT_BENCHMARK_H */
TP_FIELDS());
#endif /* _TRACE_TRACEPOINT_BENCHMARK_H */
#include <ust/tracepoint.h>
#include <ust/tracepoint.h>
-DECLARE_TRACEPOINT(ust_event, TP_PROTO(unsigned int v), TP_ARGS(v));
-DECLARE_TRACEPOINT(ust_event2, TP_PROTO(unsigned int v), TP_ARGS(v));
+DECLARE_TRACEPOINT(ust_event, TP_PROTO(unsigned int v), TP_VARS(v));
+DECLARE_TRACEPOINT(ust_event2, TP_PROTO(unsigned int v), TP_VARS(v));
struct message {
char *payload;
struct message {
char *payload;