From 11dfd4ee2d1833b4f67c3016631f8fa411646012 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 11 Nov 2011 12:22:41 -0500 Subject: [PATCH] tracepoint API change: rename TP_ARGS to TP_VARS In preparation of folding of both TP_PROTO and TP_ARGS into TP_ARGS. Signed-off-by: Mathieu Desnoyers --- include/lttng/tracepoint.h | 10 +++++----- include/lttng/ust-tracepoint-event-reset.h | 4 ++-- include/lttng/ust-tracepoint-event.h | 4 ++-- liblttng-ust-java/lttng_ust_java.h | 2 +- liblttng-ust/probes/lttng-probe-ust.h | 2 +- tests/fork/ust_tests_fork.h | 2 +- tests/hello/ust_tests_hello.h | 2 +- tests/register_test/tp.h | 2 +- tests/trace_event/trace_event_test.h | 2 +- tests/tracepoint/benchmark/tracepoint_benchmark.h | 2 +- tests/tracepoint/tracepoint_test.h | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h index 6023ba5e..e44c0331 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -62,13 +62,13 @@ extern "C" { #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) /* @@ -81,7 +81,7 @@ extern "C" { 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) \ @@ -196,7 +196,7 @@ static void __attribute__((destructor)) __tracepoints__destroy(void) * 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 * @@ -283,7 +283,7 @@ static void __attribute__((destructor)) __tracepoints__destroy(void) * * 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 diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h index 43044ac9..0d5611d2 100644 --- a/include/lttng/ust-tracepoint-event-reset.h +++ b/include/lttng/ust-tracepoint-event-reset.h @@ -27,8 +27,8 @@ #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...) diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h index 90e58e09..901f4917 100644 --- a/include/lttng/ust-tracepoint-event.h +++ b/include/lttng/ust-tracepoint-event.h @@ -421,8 +421,8 @@ static inline size_t __event_get_align__##_provider##___##_name(_proto) \ #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 diff --git a/liblttng-ust-java/lttng_ust_java.h b/liblttng-ust-java/lttng_ust_java.h index ccb62331..67e8d2d7 100644 --- a/liblttng-ust-java/lttng_ust_java.h +++ b/liblttng-ust-java/lttng_ust_java.h @@ -26,7 +26,7 @@ TRACEPOINT_EVENT(lttng_ust_java_string, TP_PROTO(const char *name, const char *args), - TP_ARGS(name, args), + TP_VARS(name, args), TP_FIELDS( ctf_string(name, name) ctf_string(args, args) diff --git a/liblttng-ust/probes/lttng-probe-ust.h b/liblttng-ust/probes/lttng-probe-ust.h index 8835dba6..c8525fd9 100644 --- a/liblttng-ust/probes/lttng-probe-ust.h +++ b/liblttng-ust/probes/lttng-probe-ust.h @@ -28,7 +28,7 @@ TRACEPOINT_EVENT(lttng, metadata, TP_PROTO(const char *str), - TP_ARGS(str), + TP_VARS(str), /* * Not exactly a string: more a sequence of bytes (dynamic diff --git a/tests/fork/ust_tests_fork.h b/tests/fork/ust_tests_fork.h index 4bd105bd..f86df70a 100644 --- a/tests/fork/ust_tests_fork.h +++ b/tests/fork/ust_tests_fork.h @@ -31,7 +31,7 @@ TRACEPOINT_EVENT_NOARGS(ust_tests_fork, before_fork, TRACEPOINT_EVENT(ust_tests_fork, after_fork_child, TP_PROTO(pid_t pid), - TP_ARGS(pid), + TP_VARS(pid), TP_FIELDS( ctf_integer(pid_t, pid, pid) ) diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h index 40f2cc19..9f38e983 100644 --- a/tests/hello/ust_tests_hello.h +++ b/tests/hello/ust_tests_hello.h @@ -32,7 +32,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest, 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) diff --git a/tests/register_test/tp.h b/tests/register_test/tp.h index 2a908134..ced2478d 100644 --- a/tests/register_test/tp.h +++ b/tests/register_test/tp.h @@ -26,7 +26,7 @@ TRACEPOINT_EVENT(hello_tptest, TP_PROTO(int anint), - TP_ARGS(anint), + TP_VARS(anint), TP_FIELDS()); #endif /* _TRACE_TP_H */ diff --git a/tests/trace_event/trace_event_test.h b/tests/trace_event/trace_event_test.h index 19fab2ff..72528b82 100644 --- a/tests/trace_event/trace_event_test.h +++ b/tests/trace_event/trace_event_test.h @@ -29,7 +29,7 @@ TRACEPOINT_EVENT(test, TP_PROTO(unsigned long time, unsigned long count), - TP_ARGS(time, count), + TP_VARS(time, count), TP_FIELDS( tp_field(unsigned long, time, time) diff --git a/tests/tracepoint/benchmark/tracepoint_benchmark.h b/tests/tracepoint/benchmark/tracepoint_benchmark.h index 3b735ff2..b64fb14c 100644 --- a/tests/tracepoint/benchmark/tracepoint_benchmark.h +++ b/tests/tracepoint/benchmark/tracepoint_benchmark.h @@ -26,7 +26,7 @@ TRACEPOINT_EVENT(ust_event, TP_PROTO(unsigned int v), - TP_ARGS(v), + TP_VARS(v), TP_FIELDS()); #endif /* _TRACE_TRACEPOINT_BENCHMARK_H */ diff --git a/tests/tracepoint/tracepoint_test.h b/tests/tracepoint/tracepoint_test.h index 1899fe4e..bca4be2f 100644 --- a/tests/tracepoint/tracepoint_test.h +++ b/tests/tracepoint/tracepoint_test.h @@ -1,7 +1,7 @@ #include -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; -- 2.34.1