From 63ef26930fe613a266cc69f5089cf643dd59b012 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 13 Nov 2011 14:07:57 -0500 Subject: [PATCH] Tracepoint API change: combine TP_PROTO and TP_VARS into TP_ARGS, remove _NOARGS macros New API for tracepoints, combining the TP_PROTO and TP_VARS arguments into a single "TP_ARGS" macro. It takes up to 10 parameters (from 0 to 10). The "_NOARGS" special-case is not needed anymore: it can be achieved simply by passing an empty TP_ARGS: TP_ARGS(), to the standard tracepoint event declarations. Signed-off-by: Mathieu Desnoyers --- include/lttng/tracepoint-event.h | 15 +- include/lttng/tracepoint.h | 158 +++++++++++++-------- include/lttng/ust-tracepoint-event-reset.h | 17 +-- include/lttng/ust-tracepoint-event.h | 115 ++++----------- liblttng-ust/probes/lttng-probe-ust.h | 4 +- tests/fork/ust_tests_fork.h | 12 +- tests/hello/ust_tests_hello.h | 11 +- 7 files changed, 149 insertions(+), 183 deletions(-) diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h index 686db1e3..e7ea461b 100644 --- a/include/lttng/tracepoint-event.h +++ b/include/lttng/tracepoint-event.h @@ -52,19 +52,11 @@ extern "C" { #endif #undef TRACEPOINT_EVENT -#define TRACEPOINT_EVENT(provider, name, proto, args, fields) \ +#define TRACEPOINT_EVENT(provider, name, args, fields) \ _DEFINE_TRACEPOINT(provider, name) #undef TRACEPOINT_EVENT_INSTANCE -#define TRACEPOINT_EVENT_INSTANCE(provider, template, name, proto, args) \ - _DEFINE_TRACEPOINT(provider, name) - -#undef TRACEPOINT_EVENT_NOARGS -#define TRACEPOINT_EVENT_NOARGS(provider, name, fields) \ - _DEFINE_TRACEPOINT(provider, name) - -#undef TRACEPOINT_EVENT_INSTANCE_NOARGS -#define TRACEPOINT_EVENT_INSTANCE_NOARGS(provider, template, name) \ +#define TRACEPOINT_EVENT_INSTANCE(provider, template, name, args) \ _DEFINE_TRACEPOINT(provider, name) #undef TRACEPOINT_INCLUDE @@ -95,9 +87,6 @@ extern "C" { #undef TRACEPOINT_EVENT #undef TRACEPOINT_EVENT_CLASS #undef TRACEPOINT_EVENT_INSTANCE -#undef TRACEPOINT_EVENT_NOARGS -#undef TRACEPOINT_EVENT_CLASS_NOARGS -#undef TRACEPOINT_EVENT_INSTANCE_NOARGS #undef TRACEPOINT_HEADER_MULTI_READ /* Only undef what we defined in this file */ diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h index f4d7d609..b487370b 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -42,7 +42,7 @@ extern "C" { * it_func[0] is never NULL because there is at least one element in the array * when the array itself is non NULL. */ -#define __DO_TRACE(tp, proto, args) \ +#define __DO_TRACE(tp, proto, vars) \ do { \ struct tracepoint_probe *__tp_it_probe_ptr; \ void *__tp_it_func; \ @@ -54,21 +54,97 @@ extern "C" { do { \ __tp_it_func = __tp_it_probe_ptr->func; \ __tp_cb_data = __tp_it_probe_ptr->data; \ - URCU_FORCE_CAST(void(*)(proto), __tp_it_func)(args); \ + URCU_FORCE_CAST(void(*)(proto), __tp_it_func)(vars); \ } while ((++__tp_it_probe_ptr)->func); \ } \ rcu_read_unlock(); \ } while (0) #define TP_PARAMS(args...) args -#define TP_PROTO(args...) args -#define TP_VARS(args...) args +#define TP_ARGS(args...) args + +/* + * TP_ARGS takes tuples of type, argument separated by a comma. It can + * take up to 10 tuples (which means that less than 10 tuples is fine + * too). Each tuple is also separated by a comma. + */ + +#define TP_COMBINE_TOKENS1(_tokena, _tokenb) _tokena##_tokenb +#define TP_COMBINE_TOKENS(_tokena, _tokenb) TP_COMBINE_TOKENS1(_tokena, _tokenb) + +/* _TP_EVEN* extracts the vars names. */ +#define _TP_EVEN0() +#define _TP_EVEN2(a,b) b +#define _TP_EVEN4(a,b,c,d) b,d +#define _TP_EVEN6(a,b,c,d,e,f) b,d,f +#define _TP_EVEN8(a,b,c,d,e,f,g,h) b,d,f,h +#define _TP_EVEN10(a,b,c,d,e,f,g,h,i,j) b,d,f,h,j +#define _TP_EVEN12(a,b,c,d,e,f,g,h,i,j,k,l) b,d,f,h,j,l +#define _TP_EVEN14(a,b,c,d,e,f,g,h,i,j,k,l,m,n) b,d,f,h,j,l,n +#define _TP_EVEN16(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) b,d,f,h,j,l,n,p +#define _TP_EVEN18(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r) b,d,f,h,j,l,n,p,r +#define _TP_EVEN20(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t) b,d,f,h,j,l,n,p,r,t + +#define _TP_EVEN_DATA0() __tp_cb_data +#define _TP_EVEN_DATA2(a,b) __tp_cb_data,b +#define _TP_EVEN_DATA4(a,b,c,d) __tp_cb_data,b,d +#define _TP_EVEN_DATA6(a,b,c,d,e,f) __tp_cb_data,b,d,f +#define _TP_EVEN_DATA8(a,b,c,d,e,f,g,h) __tp_cb_data,b,d,f,h +#define _TP_EVEN_DATA10(a,b,c,d,e,f,g,h,i,j) __tp_cb_data,b,d,f,h,j +#define _TP_EVEN_DATA12(a,b,c,d,e,f,g,h,i,j,k,l) __tp_cb_data,b,d,f,h,j,l +#define _TP_EVEN_DATA14(a,b,c,d,e,f,g,h,i,j,k,l,m,n) __tp_cb_data,b,d,f,h,j,l,n +#define _TP_EVEN_DATA16(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) __tp_cb_data,b,d,f,h,j,l,n,p +#define _TP_EVEN_DATA18(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r) __tp_cb_data,b,d,f,h,j,l,n,p,r +#define _TP_EVEN_DATA20(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t) __tp_cb_data,b,d,f,h,j,l,n,p,r,t + +/* _TP_SPLIT extracts tuples of type, var */ +#define _TP_SPLIT0() +#define _TP_SPLIT2(a,b) a b +#define _TP_SPLIT4(a,b,c,d) a b,c d +#define _TP_SPLIT6(a,b,c,d,e,f) a b,c d,e f +#define _TP_SPLIT8(a,b,c,d,e,f,g,h) a b,c d,e f,g h +#define _TP_SPLIT10(a,b,c,d,e,f,g,h,i,j) a b,c d,e f,g h,i j +#define _TP_SPLIT12(a,b,c,d,e,f,g,h,i,j,k,l) a b,c d,e f,g h,i j,k l +#define _TP_SPLIT14(a,b,c,d,e,f,g,h,i,j,k,l,m,n) a b,c d,e f,g h,i j,k l,m n +#define _TP_SPLIT16(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) a b,c d,e f,g h,i j,k l,m n,o p +#define _TP_SPLIT18(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r) a b,c d,e f,g h,i j,k l,m n,o p,q r +#define _TP_SPLIT20(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t) a b,c d,e f,g h,i j,k l,m n,o p,q r,s t + +#define _TP_SPLIT_DATA0() void *__tp_cb_data +#define _TP_SPLIT_DATA2(a,b) void *__tp_cb_data,a b +#define _TP_SPLIT_DATA4(a,b,c,d) void *__tp_cb_data,a b,c d +#define _TP_SPLIT_DATA6(a,b,c,d,e,f) void *__tp_cb_data,a b,c d,e f +#define _TP_SPLIT_DATA8(a,b,c,d,e,f,g,h) void *__tp_cb_data,a b,c d,e f,g h +#define _TP_SPLIT_DATA10(a,b,c,d,e,f,g,h,i,j) void *__tp_cb_data,a b,c d,e f,g h,i j +#define _TP_SPLIT_DATA12(a,b,c,d,e,f,g,h,i,j,k,l) void *__tp_cb_data,a b,c d,e f,g h,i j,k l +#define _TP_SPLIT_DATA14(a,b,c,d,e,f,g,h,i,j,k,l,m,n) void *__tp_cb_data,a b,c d,e f,g h,i j,k l,m n +#define _TP_SPLIT_DATA16(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) void *__tp_cb_data,a b,c d,e f,g h,i j,k l,m n,o p +#define _TP_SPLIT_DATA18(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r) void *__tp_cb_data,a b,c d,e f,g h,i j,k l,m n,o p,q r +#define _TP_SPLIT_DATA20(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t) void *__tp_cb_data,a b,c d,e f,g h,i j,k l,m n,o p,q r,s t + +/* Preprocessor trick to count arguments. Inspired from sdt.h. */ +#define _TP_NARGS(...) __TP_NARGS(__VA_ARGS__, 20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0) +#define __TP_NARGS(_0,_1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13,_14,_15,_16,_17,_18,_19,_20, N, ...) N +#define _TP_PROTO_N(N, ...) \ + TP_PARAMS(TP_COMBINE_TOKENS(_TP_SPLIT, N)(__VA_ARGS__)) +#define _TP_VARS_N(N, ...) \ + TP_PARAMS(TP_COMBINE_TOKENS(_TP_EVEN, N)(__VA_ARGS__)) +#define _TP_PROTO_DATA_N(N, ...) \ + TP_PARAMS(TP_COMBINE_TOKENS(_TP_SPLIT_DATA, N)(__VA_ARGS__)) +#define _TP_VARS_DATA_N(N, ...) \ + TP_PARAMS(TP_COMBINE_TOKENS(_TP_EVEN_DATA, N)(__VA_ARGS__)) + +#define _TP_ARGS_PROTO(...) _TP_PROTO_N(_TP_NARGS(0, ##__VA_ARGS__), ##__VA_ARGS__) +#define _TP_ARGS_VARS(...) _TP_VARS_N(_TP_NARGS(0, ##__VA_ARGS__), ##__VA_ARGS__) + +#define _TP_ARGS_PROTO_DATA(...) _TP_PROTO_DATA_N(_TP_NARGS(0, ##__VA_ARGS__), ##__VA_ARGS__) +#define _TP_ARGS_VARS_DATA(...) _TP_VARS_DATA_N(_TP_NARGS(0, ##__VA_ARGS__), ##__VA_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_VARS(args)); \ + TP_PARAMS(proto), TP_PARAMS(args)); \ } while (0) /* @@ -80,8 +156,8 @@ extern "C" { extern struct tracepoint __tracepoint_##provider##___##name; \ static inline void __trace_##provider##___##name(proto) \ { \ - __CHECK_TRACE(provider, name, TP_PROTO(data_proto), \ - TP_VARS(data_args)); \ + __CHECK_TRACE(provider, name, TP_PARAMS(data_proto), \ + TP_PARAMS(data_args)); \ } \ static inline int \ __register_trace_##provider##___##name(void (*probe)(data_proto), void *data) \ @@ -96,27 +172,9 @@ extern "C" { data); \ } -/* - * The need for the _DECLARE_TRACEPOINT_NOARGS() is to handle the prototype - * (void). "void" is a special value in a function prototype and can - * not be combined with other arguments. Since the DECLARE_TRACEPOINT() - * macro adds a data element at the beginning of the prototype, - * we need a way to differentiate "(void *data, proto)" from - * "(void *data, void)". The second prototype is invalid. - * - * DECLARE_TRACEPOINT_NOARGS() passes "void" as the tracepoint prototype - * and "void *__tp_cb_data" as the callback prototype. - * - * DECLARE_TRACEPOINT() passes "proto" as the tracepoint protoype and - * "void *__tp_cb_data, proto" as the callback prototype. - */ -#define _DECLARE_TRACEPOINT_NOARGS(provider, name) \ - __DECLARE_TRACEPOINT(provider, name, void, , void *__tp_cb_data, __tp_cb_data) - -#define _DECLARE_TRACEPOINT(provider, name, proto, args) \ - __DECLARE_TRACEPOINT(provider, name, TP_PARAMS(proto), TP_PARAMS(args), \ - TP_PARAMS(void *__tp_cb_data, proto), \ - TP_PARAMS(__tp_cb_data, args)) +#define _DECLARE_TRACEPOINT(provider, name, args) \ + __DECLARE_TRACEPOINT(provider, name, _TP_ARGS_PROTO(args), _TP_ARGS_VARS(args), \ + _TP_ARGS_PROTO_DATA(args), _TP_ARGS_VARS_DATA(args)) /* * __tracepoints_ptrs section is not const (read-only) to let the linker update @@ -194,9 +252,11 @@ static void __attribute__((destructor)) __tracepoints__destroy(void) * In short, an example: * * 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_VARS(arg0, arg1, string, strlen, arg4, arg4_len), + * + * * TP_ARGS takes from 0 to 10 "type, field_name" pairs * + * + * TP_ARGS(int, arg0, void *, arg1, char *, string, size_t, strlen, + * long *, arg4, size_t, arg4_len), * TP_FIELDS( * * * Integer, printed in base 10 * @@ -270,20 +330,12 @@ static void __attribute__((destructor)) __tracepoints__destroy(void) * TRACEPOINT_EVENT(someproject_sched, switch, * * * - * * A function has a regular function arguments - * * prototype, declare it via TP_PROTO(): - * * - * - * TP_PROTO(struct rq *rq, struct task_struct *prev, - * struct task_struct *next), - * - * * - * * Define the call signature of the 'function'. - * * (Design sidenote: we use this instead of a - * * TP_PROTO1/TP_PROTO2/TP_PROTO3 ugliness.) + * * Arguments to pass to the tracepoint. Supports from + * * 0 to 10 "type, name" tuples. * * * - * TP_VARS(rq, prev, next), + * TP_ARGS(struct rq *, rq, struct task_struct *, prev, + * struct task_struct *, next), * * * * * Fast binary tracing: define the trace record via @@ -331,22 +383,12 @@ static void __attribute__((destructor)) __tracepoints__destroy(void) * usage of other macros controlling TRACEPOINT_EVENT. */ -#define TRACEPOINT_EVENT(provider, name, proto, args, fields) \ - _DECLARE_TRACEPOINT(provider, name, TP_PARAMS(proto), TP_PARAMS(args)) - -#define TRACEPOINT_EVENT_CLASS(provider, name, proto, args, fields) -#define TRACEPOINT_EVENT_INSTANCE(provider, template, name, proto, args)\ - _DECLARE_TRACEPOINT(provider, name, TP_PARAMS(proto), TP_PARAMS(args)) - -/* - * Declaration of tracepoints that take 0 argument. - */ -#define TRACEPOINT_EVENT_NOARGS(provider, name, fields) \ - _DECLARE_TRACEPOINT_NOARGS(provider, name) +#define TRACEPOINT_EVENT(provider, name, args, fields) \ + _DECLARE_TRACEPOINT(provider, name, TP_PARAMS(args)) -#define TRACEPOINT_EVENT_CLASS_NOARGS(provider, name, fields) -#define TRACEPOINT_EVENT_INSTANCE_NOARGS(provider, template, name) \ - _DECLARE_TRACEPOINT_NOARGS(provider, name) +#define TRACEPOINT_EVENT_CLASS(provider, name, args, fields) +#define TRACEPOINT_EVENT_INSTANCE(provider, template, name, args)\ + _DECLARE_TRACEPOINT(provider, name, TP_PARAMS(args)) #endif /* #ifndef TRACEPOINT_EVENT */ diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h index 0d5611d2..43f18657 100644 --- a/include/lttng/ust-tracepoint-event-reset.h +++ b/include/lttng/ust-tracepoint-event-reset.h @@ -24,23 +24,14 @@ #undef ctf_string #define ctf_string(_item, _src) -#undef TP_PROTO -#define TP_PROTO(args...) - -#undef TP_VARS -#define TP_VARS(args...) +#undef TP_ARGS +#define TP_ARGS(args...) #undef TP_FIELDS #define TP_FIELDS(args...) #undef TRACEPOINT_EVENT_CLASS -#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields) - -#undef TRACEPOINT_EVENT_CLASS_NOARGS -#define TRACEPOINT_EVENT_CLASS_NOARGS(_provider, _name, _fields) +#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) #undef TRACEPOINT_EVENT_INSTANCE -#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _proto, _args) - -#undef TRACEPOINT_EVENT_INSTANCE_NOARGS -#define TRACEPOINT_EVENT_INSTANCE_NOARGS(_provider, _template, _name) +#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h index eb2e76a7..d5ffc8aa 100644 --- a/include/lttng/ust-tracepoint-event.h +++ b/include/lttng/ust-tracepoint-event.h @@ -77,18 +77,11 @@ */ #undef TRACEPOINT_EVENT -#define TRACEPOINT_EVENT(provider, name, proto, args, fields) \ +#define TRACEPOINT_EVENT(provider, name, args, fields) \ TRACEPOINT_EVENT_CLASS(provider, name, \ - TP_PARAMS(proto), \ TP_PARAMS(args), \ TP_PARAMS(fields)) \ - TRACEPOINT_EVENT_INSTANCE(provider, name, name, TP_PARAMS(proto), TP_PARAMS(args)) - -#undef TRACEPOINT_EVENT_NOARGS -#define TRACEPOINT_EVENT_NOARGS(provider, name, fields) \ - TRACEPOINT_EVENT_CLASS_NOARGS(provider, name, \ - TP_PARAMS(fields)) \ - TRACEPOINT_EVENT_INSTANCE_NOARGS(provider, name, name) + TRACEPOINT_EVENT_INSTANCE(provider, name, name, TP_PARAMS(args)) /* Helpers */ #define _TP_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) @@ -119,19 +112,11 @@ void TP_ID(__tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void) } #undef TRACEPOINT_EVENT_CLASS -#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields) \ - __tracepoint_provider_mismatch_##_provider(); - -#undef TRACEPOINT_EVENT_CLASS_NOARGS -#define TRACEPOINT_EVENT_CLASS_NOARGS(_provider, _name, _fields) \ +#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \ __tracepoint_provider_mismatch_##_provider(); #undef TRACEPOINT_EVENT_INSTANCE -#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _proto, _args) \ - __tracepoint_provider_mismatch_##_provider(); - -#undef TRACEPOINT_EVENT_INSTANCE_NOARGS -#define TRACEPOINT_EVENT_INSTANCE_NOARGS(_provider, _template, _name) \ +#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \ __tracepoint_provider_mismatch_##_provider(); static __attribute__((unused)) @@ -212,16 +197,12 @@ void TP_ID(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void) #undef TP_FIELDS #define TP_FIELDS(args...) args /* Only one used in this phase */ -#undef TRACEPOINT_EVENT_CLASS_NOARGS -#define TRACEPOINT_EVENT_CLASS_NOARGS(_provider, _name, _fields) \ +#undef TRACEPOINT_EVENT_CLASS +#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \ static const struct lttng_event_field __event_fields___##_provider##___##_name[] = { \ - _fields \ + _fields \ }; -#undef TRACEPOINT_EVENT_CLASS -#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields) \ - TRACEPOINT_EVENT_CLASS_NOARGS(_provider, _name, TP_PARAMS(_fields)) - #include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE) /* @@ -233,16 +214,12 @@ void TP_ID(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void) /* Reset all macros within TRACEPOINT_EVENT */ #include -#undef TP_PROTO -#define TP_PROTO(args...) args +#undef TP_ARGS +#define TP_ARGS(args...) args #undef TRACEPOINT_EVENT_CLASS -#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields) \ -static void __event_probe__##_provider##___##_name(void *__data, _proto); - -#undef TRACEPOINT_EVENT_CLASS_NOARGS -#define TRACEPOINT_EVENT_CLASS_NOARGS(_provider, _name, _fields) \ -static void __event_probe__##_provider##___##_name(void *__data); +#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \ +static void __event_probe__##_provider##___##_name(_TP_ARGS_PROTO_DATA(_args)); #include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE) @@ -255,8 +232,8 @@ static void __event_probe__##_provider##___##_name(void *__data); /* Reset all macros within TRACEPOINT_EVENT */ #include -#undef TRACEPOINT_EVENT_INSTANCE_NOARGS -#define TRACEPOINT_EVENT_INSTANCE_NOARGS(_provider, _template, _name) \ +#undef TRACEPOINT_EVENT_INSTANCE +#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \ { \ .fields = __event_fields___##_provider##___##_template,\ .name = #_provider ":" #_name, \ @@ -264,10 +241,6 @@ static void __event_probe__##_provider##___##_name(void *__data); .nr_fields = _TP_ARRAY_SIZE(__event_fields___##_provider##___##_template), \ }, -#undef TRACEPOINT_EVENT_INSTANCE -#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _proto, _args) \ - TRACEPOINT_EVENT_INSTANCE_NOARGS(_provider, _template, _name) - #define TP_ID1(_token, _provider) _token##_provider #define TP_ID(_token, _provider) TP_ID1(_token, _provider) @@ -335,15 +308,15 @@ static struct lttng_probe_desc TP_ID(__probe_desc___, TRACEPOINT_PROVIDER) = { #define ctf_string(_item, _src) \ __event_len += __dynamic_len[__dynamic_len_idx++] = strlen(_src) + 1; -#undef TP_PROTO -#define TP_PROTO(args...) args +#undef TP_ARGS +#define TP_ARGS(args...) args #undef TP_FIELDS #define TP_FIELDS(args...) args #undef TRACEPOINT_EVENT_CLASS -#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields) \ -static inline size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _proto) \ +#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \ +static inline size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS_PROTO_DATA(_args)) \ { \ size_t __event_len = 0; \ unsigned int __dynamic_len_idx = 0; \ @@ -386,15 +359,16 @@ static inline size_t __event_get_size__##_provider##___##_name(size_t *__dynamic #undef ctf_string #define ctf_string(_item, _src) -#undef TP_PROTO -#define TP_PROTO(args...) args +#undef TP_ARGS +#define TP_ARGS(args...) args #undef TP_FIELDS #define TP_FIELDS(args...) args #undef TRACEPOINT_EVENT_CLASS -#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields) \ -static inline size_t __event_get_align__##_provider##___##_name(_proto) \ +#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \ +static inline \ +size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \ { \ size_t __event_align = 1; \ _fields \ @@ -460,20 +434,17 @@ static inline size_t __event_get_align__##_provider##___##_name(_proto) \ #undef __get_dynamic_len #define __get_dynamic_len(field) __dynamic_len[__dynamic_len_idx++] -#undef TP_PROTO -#define TP_PROTO(args...) args - -#undef TP_VARS -#define TP_VARS(args...) args +#undef TP_ARGS +#define TP_ARGS(args...) args #undef TP_FIELDS #define TP_FIELDS(args...) args #undef TRACEPOINT_EVENT_CLASS -#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields) \ -static void __event_probe__##_provider##___##_name(void *__data, _proto) \ +#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \ +static void __event_probe__##_provider##___##_name(_TP_ARGS_PROTO_DATA(_args))\ { \ - struct ltt_event *__event = __data; \ + struct ltt_event *__event = __tp_cb_data; \ struct ltt_channel *__chan = __event->chan; \ struct lttng_ust_lib_ring_buffer_ctx __ctx; \ size_t __event_len, __event_align; \ @@ -489,35 +460,9 @@ static void __event_probe__##_provider##___##_name(void *__data, _proto) \ return; \ if (caa_unlikely(!CMM_ACCESS_ONCE(__event->enabled))) \ return; \ - __event_len = __event_get_size__##_provider##___##_name(__dynamic_len, _args); \ - __event_align = __event_get_align__##_provider##___##_name(_args); \ - lib_ring_buffer_ctx_init(&__ctx, __chan->chan, __event, __event_len, \ - __event_align, -1, __chan->handle); \ - __ret = __chan->ops->event_reserve(&__ctx, __event->id); \ - if (__ret < 0) \ - return; \ - _fields \ - __chan->ops->event_commit(&__ctx); \ -} - -#undef TRACEPOINT_EVENT_CLASS_NOARGS -#define TRACEPOINT_EVENT_CLASS_NOARGS(_provider, _name, _fields) \ -static void __event_probe__##_provider##___##_name(void *__data) \ -{ \ - struct ltt_event *__event = __data; \ - struct ltt_channel *__chan = __event->chan; \ - struct lttng_ust_lib_ring_buffer_ctx __ctx; \ - size_t __event_len, __event_align; \ - int __ret; \ - \ - if (caa_unlikely(!CMM_ACCESS_ONCE(__chan->session->active))) \ - return; \ - if (caa_unlikely(!CMM_ACCESS_ONCE(__chan->enabled))) \ - return; \ - if (caa_unlikely(!CMM_ACCESS_ONCE(__event->enabled))) \ - return; \ - __event_len = 0; \ - __event_align = 1; \ + __event_len = __event_get_size__##_provider##___##_name(__dynamic_len,\ + _TP_ARGS_VARS_DATA(_args)); \ + __event_align = __event_get_align__##_provider##___##_name(_TP_ARGS_VARS(_args)); \ lib_ring_buffer_ctx_init(&__ctx, __chan->chan, __event, __event_len, \ __event_align, -1, __chan->handle); \ __ret = __chan->ops->event_reserve(&__ctx, __event->id); \ diff --git a/liblttng-ust/probes/lttng-probe-ust.h b/liblttng-ust/probes/lttng-probe-ust.h index 3ae9e020..17b65442 100644 --- a/liblttng-ust/probes/lttng-probe-ust.h +++ b/liblttng-ust/probes/lttng-probe-ust.h @@ -26,9 +26,7 @@ TRACEPOINT_EVENT(lttng_ust, metadata, - TP_PROTO(const char *str), - - TP_VARS(str), + TP_ARGS(const char *, 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 4e078911..276fdc2d 100644 --- a/tests/fork/ust_tests_fork.h +++ b/tests/fork/ust_tests_fork.h @@ -25,23 +25,25 @@ #include #include -TRACEPOINT_EVENT_NOARGS(ust_tests_fork, before_fork, +TRACEPOINT_EVENT(ust_tests_fork, before_fork, + TP_ARGS(), TP_FIELDS() ) TRACEPOINT_EVENT(ust_tests_fork, after_fork_child, - TP_PROTO(pid_t pid), - TP_VARS(pid), + TP_ARGS(pid_t, pid), TP_FIELDS( ctf_integer(pid_t, pid, pid) ) ) -TRACEPOINT_EVENT_NOARGS(ust_tests_fork, after_fork_parent, +TRACEPOINT_EVENT(ust_tests_fork, after_fork_parent, + TP_ARGS(), TP_FIELDS() ) -TRACEPOINT_EVENT_NOARGS(ust_tests_fork, after_exec, +TRACEPOINT_EVENT(ust_tests_fork, after_exec, + TP_ARGS(), TP_FIELDS() ) diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h index 86e4ce7d..353c2f11 100644 --- a/tests/hello/ust_tests_hello.h +++ b/tests/hello/ust_tests_hello.h @@ -29,11 +29,9 @@ extern "C" { #include TRACEPOINT_EVENT(ust_tests_hello, tptest, - TP_PROTO(int anint, int netint, long *values, - char *text, size_t textlen, - double doublearg, float floatarg), - TP_VARS(anint, netint, values, text, textlen, - doublearg, floatarg), + TP_ARGS(int, anint, int, netint, long *, values, + char *, text, size_t, textlen, + double, doublearg, float, floatarg), TP_FIELDS( ctf_integer(int, intfield, anint) ctf_integer_hex(int, intfield2, anint) @@ -52,7 +50,8 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest, ) ) -TRACEPOINT_EVENT_NOARGS(ust_tests_hello, tptest_sighandler, +TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler, + TP_ARGS(), TP_FIELDS() ) -- 2.34.1