X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Fust%2Flttng-tracepoint-event.h;h=46d8b93374304e451f893a8c76a318cf55713bbe;hb=b5a3dfa5923801ddeea22ce70758d1e61200eac2;hp=10b2d23fa57ee14af89517e2627c9242ff2a58bd;hpb=0a42beb627df1b9ea5cce4b1908e8a9cefaa1631;p=lttng-ust.git diff --git a/include/ust/lttng-tracepoint-event.h b/include/ust/lttng-tracepoint-event.h index 10b2d23f..46d8b933 100644 --- a/include/ust/lttng-tracepoint-event.h +++ b/include/ust/lttng-tracepoint-event.h @@ -18,7 +18,10 @@ */ #include +#include #include +#include +#include /* * Macro declarations used for all stages. @@ -40,6 +43,8 @@ #define ctf_integer_network_hex(_type, _item, _src) \ ctf_integer_ext(_type, _item, _src, BIG_ENDIAN, 16) +/* ctf_float is redefined at each step */ + #undef ctf_array #define ctf_array(_type, _item, _src, _length) \ ctf_array_encoded(_type, _item, _src, _length, none) @@ -79,6 +84,23 @@ TP_PARAMS(fields)) \ TRACEPOINT_EVENT_INSTANCE(name, name, TP_PARAMS(proto), TP_PARAMS(args)) +#undef TRACEPOINT_EVENT_NOARGS +#define TRACEPOINT_EVENT_NOARGS(name, fields) \ + TRACEPOINT_EVENT_CLASS_NOARGS(name, \ + TP_PARAMS(fields)) \ + TRACEPOINT_EVENT_INSTANCE_NOARGS(name, name) + +/* Helpers */ +#define _TP_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + +#define _tp_max_t(type, x, y) \ + ({ \ + type __max1 = (x); \ + type __max2 = (y); \ + __max1 > __max2 ? __max1: __max2; \ + }) + + /* * Stage 1 of the trace events. * @@ -86,8 +108,8 @@ * Each event produce an array of fields. */ -/* Reset all macros within TRACE_EVENT */ -#include "lttng-tracepoint-events-reset.h" +/* Reset all macros within TRACEPOINT_EVENT */ +#include /* Named field types must be defined in lttng-types.h */ @@ -98,6 +120,13 @@ .type = __type_integer(_type, _byte_order, _base, none),\ }, +#undef ctf_float +#define ctf_float(_type, _item, _src) \ + { \ + .name = #_item, \ + .type = __type_float(_type), \ + }, + #undef ctf_array_encoded #define ctf_array_encoded(_type, _item, _src, _length, _encoding) \ { \ @@ -143,13 +172,17 @@ #undef TP_FIELDS #define TP_FIELDS(args...) args /* Only one used in this phase */ -#undef TRACEPOINT_EVENT_CLASS -#define TRACEPOINT_EVENT_CLASS(_name, _proto, _args, _fields) \ +#undef TRACEPOINT_EVENT_CLASS_NOARGS +#define TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields) \ static const struct lttng_event_field __event_fields___##_name[] = { \ _fields \ }; -#include TRACE_INCLUDE(TRACE_INCLUDE_FILE) +#undef TRACEPOINT_EVENT_CLASS +#define TRACEPOINT_EVENT_CLASS(_name, _proto, _args, _fields) \ + TRACEPOINT_EVENT_CLASS_NOARGS(_name, TP_PARAMS(_fields)) + +#include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE) /* * Stage 2 of the trace events. @@ -157,17 +190,21 @@ * Create probe callback prototypes. */ -/* Reset all macros within TRACE_EVENT */ -#include "lttng-tracepoint-events-reset.h" +/* Reset all macros within TRACEPOINT_EVENT */ +#include #undef TP_PROTO #define TP_PROTO(args...) args #undef TRACEPOINT_EVENT_CLASS -#define TRACEPOINT_EVENT_CLASS(_name, _proto, _args, _fields) \ +#define TRACEPOINT_EVENT_CLASS(_name, _proto, _args, _fields) \ static void __event_probe__##_name(void *__data, _proto); -#include TRACE_INCLUDE(TRACE_INCLUDE_FILE) +#undef TRACEPOINT_EVENT_CLASS_NOARGS +#define TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields) \ +static void __event_probe__##_name(void *__data); + +#include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE) /* * Stage 3 of the trace events. @@ -177,23 +214,27 @@ static void __event_probe__##_name(void *__data, _proto); /* Named field types must be defined in lttng-types.h */ -/* Reset all macros within TRACE_EVENT */ -#include "lttng-tracepoint-events-reset.h" +/* Reset all macros within TRACEPOINT_EVENT */ +#include -#undef TRACEPOINT_EVENT_INSTANCE -#define TRACEPOINT_EVENT_INSTANCE(_template, _name, _proto, _args) \ +#undef TRACEPOINT_EVENT_INSTANCE_NOARGS +#define TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \ { \ .fields = __event_fields___##_template, \ .name = #_name, \ .probe_callback = (void *) &__event_probe__##_template,\ - .nr_fields = ARRAY_SIZE(__event_fields___##_template), \ + .nr_fields = _TP_ARRAY_SIZE(__event_fields___##_template), \ }, +#undef TRACEPOINT_EVENT_INSTANCE +#define TRACEPOINT_EVENT_INSTANCE(_template, _name, _proto, _args) \ + TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) + #define TP_ID1(_token, _system) _token##_system #define TP_ID(_token, _system) TP_ID1(_token, _system) -static const struct lttng_event_desc TP_ID(__event_desc___, TRACE_SYSTEM)[] = { -#include TRACE_INCLUDE(TRACE_INCLUDE_FILE) +static const struct lttng_event_desc TP_ID(__event_desc___, TRACEPOINT_SYSTEM)[] = { +#include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE) }; #undef TP_ID1 @@ -210,9 +251,9 @@ static const struct lttng_event_desc TP_ID(__event_desc___, TRACE_SYSTEM)[] = { #define TP_ID(_token, _system) TP_ID1(_token, _system) /* non-const because list head will be modified when registered. */ -static struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { - .event_desc = TP_ID(__event_desc___, TRACE_SYSTEM), - .nr_events = ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)), +static struct lttng_probe_desc TP_ID(__probe_desc___, TRACEPOINT_SYSTEM) = { + .event_desc = TP_ID(__event_desc___, TRACEPOINT_SYSTEM), + .nr_events = _TP_ARRAY_SIZE(TP_ID(__event_desc___, TRACEPOINT_SYSTEM)), }; #undef TP_ID1 @@ -224,28 +265,33 @@ static struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { * Create static inline function that calculates event size. */ -/* Reset all macros within TRACE_EVENT */ -#include "lttng-tracepoint-events-reset.h" +/* Reset all macros within TRACEPOINT_EVENT */ +#include /* Named field types must be defined in lttng-types.h */ #undef ctf_integer_ext #define ctf_integer_ext(_type, _item, _src, _byte_order, _base) \ - __event_len += lib_ring_buffer_align(__event_len, ltt_alignof(_type)); \ + __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \ + __event_len += sizeof(_type); + +#undef ctf_float +#define ctf_float(_type, _item, _src) \ + __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \ __event_len += sizeof(_type); #undef ctf_array_encoded -#define ctf_array_encoded(_type, _item, _src, _length) \ - __event_len += lib_ring_buffer_align(__event_len, ltt_alignof(_type)); \ +#define ctf_array_encoded(_type, _item, _src, _length, _encoding) \ + __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \ __event_len += sizeof(_type) * (_length); #undef ctf_sequence_encoded #define ctf_sequence_encoded(_type, _item, _src, _length_type, \ _src_length, _encoding) \ - __event_len += lib_ring_buffer_align(__event_len, ltt_alignof(_length_type)); \ + __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_length_type)); \ __event_len += sizeof(_length_type); \ - __event_len += lib_ring_buffer_align(__event_len, ltt_alignof(_type)); \ - __dynamic_len[__dynamic_len_idx] = (_length); \ + __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \ + __dynamic_len[__dynamic_len_idx] = (_src_length); \ __event_len += sizeof(_type) * __dynamic_len[__dynamic_len_idx]; \ __dynamic_len_idx++; @@ -272,7 +318,7 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len, _proto) \ return __event_len; \ } -#include TRACE_INCLUDE(TRACE_INCLUDE_FILE) +#include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE) /* * Stage 6 of the trace events. @@ -280,24 +326,28 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len, _proto) \ * Create static inline function that calculates event payload alignment. */ -/* Reset all macros within TRACE_EVENT */ -#include "lttng-tracepoint-events-reset.h" +/* Reset all macros within TRACEPOINT_EVENT */ +#include /* Named field types must be defined in lttng-types.h */ #undef ctf_integer_ext #define ctf_integer_ext(_type, _item, _src, _byte_order, _base) \ - __event_align = max_t(size_t, __event_align, ltt_alignof(_type)); + __event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type)); + +#undef ctf_float +#define ctf_float(_type, _item, _src) \ + __event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type)); #undef ctf_array_encoded -#define ctf_array_encoded(_type, _item, _src, _length) \ - __event_align = max_t(size_t, __event_align, ltt_alignof(_type)); +#define ctf_array_encoded(_type, _item, _src, _length, _encoding) \ + __event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type)); #undef ctf_sequence_encoded #define ctf_sequence_encoded(_type, _item, _src, _length_type, \ _src_length, _encoding) \ - __event_align = max_t(size_t, __event_align, ltt_alignof(_length_type)); \ - __event_align = max_t(size_t, __event_align, ltt_alignof(_type)); + __event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_length_type)); \ + __event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type)); #undef ctf_string #define ctf_string(_item, _src) @@ -317,7 +367,7 @@ static inline size_t __event_get_align__##_name(_proto) \ return __event_align; \ } -#include TRACE_INCLUDE(TRACE_INCLUDE_FILE) +#include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE) /* @@ -331,41 +381,50 @@ static inline size_t __event_get_align__##_name(_proto) \ * execution order, jumping to the appropriate assignment block. */ -/* Reset all macros within TRACE_EVENT */ -#include "lttng-tracepoint-events-reset.h" +/* Reset all macros within TRACEPOINT_EVENT */ +#include #undef ctf_integer_ext #define ctf_integer_ext(_type, _item, _src, _byte_order, _base) \ { \ _type __tmp = (_src); \ - lib_ring_buffer_align_ctx(&ctx, ltt_alignof(__tmp)); \ - __chan->ops->event_write(&ctx, &__tmp, sizeof(__tmp)); \ + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__tmp));\ + __chan->ops->event_write(&__ctx, &__tmp, sizeof(__tmp));\ + } + +#undef ctf_float +#define ctf_float(_type, _item, _src) \ + { \ + _type __tmp = (_src); \ + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__tmp));\ + __chan->ops->event_write(&__ctx, &__tmp, sizeof(__tmp));\ } #undef ctf_array_encoded -#define ctf_array_encoded(_type, _item, _src, _length) \ - lib_ring_buffer_align_ctx(&ctx, ltt_alignof(_type)); \ - __chan->ops->event_write(&ctx, _src, _length); +#define ctf_array_encoded(_type, _item, _src, _length, _encoding) \ + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type)); \ + __chan->ops->event_write(&__ctx, _src, sizeof(_type) * (_length)); #undef ctf_sequence_encoded #define ctf_sequence_encoded(_type, _item, _src, _length_type, \ _src_length, _encoding) \ { \ _length_type __tmpl = __dynamic_len[__dynamic_len_idx]; \ - lib_ring_buffer_align_ctx(&ctx, ltt_alignof(_length_type)); \ - __chan->ops->event_write(&ctx, &__tmpl, sizeof(_length_type)); \ + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_length_type));\ + __chan->ops->event_write(&__ctx, &__tmpl, sizeof(_length_type));\ } \ - lib_ring_buffer_align_ctx(&ctx, ltt_alignof(_type)); \ - __chan->ops->event_write(&ctx, _src, \ - sizeof(_type) * __get_sequence_len(dest)); + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type)); \ + __chan->ops->event_write(&__ctx, _src, \ + sizeof(_type) * __get_dynamic_len(dest)); #undef ctf_string #define ctf_string(_item, _src) \ - tp_memcpy(dest, _src, __get_sequence_len(dest)) + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(*(_src))); \ + __chan->ops->event_write(&__ctx, _src, __get_dynamic_len(dest)); /* Beware: this get len actually consumes the len value */ -#undef __get_sequence_len -#define __get_sequence_len(field) __dynamic_len[__dynamic_len_idx++] +#undef __get_dynamic_len +#define __get_dynamic_len(field) __dynamic_len[__dynamic_len_idx++] #undef TP_PROTO #define TP_PROTO(args...) args @@ -382,32 +441,61 @@ static void __event_probe__##_name(void *__data, _proto) \ { \ struct ltt_event *__event = __data; \ struct ltt_channel *__chan = __event->chan; \ - struct lib_ring_buffer_ctx ctx; \ + struct lttng_ust_lib_ring_buffer_ctx __ctx; \ size_t __event_len, __event_align; \ size_t __dynamic_len_idx = 0; \ - size_t __dynamic_len[ARRAY_SIZE(__event_fields___##_name)]; \ + size_t __dynamic_len[_TP_ARRAY_SIZE(__event_fields___##_name)]; \ int __ret; \ \ if (0) \ (void) __dynamic_len_idx; /* don't warn if unused */ \ - if (unlikely(!ACCESS_ONCE(__chan->session->active))) \ + if (caa_unlikely(!CMM_ACCESS_ONCE(__chan->session->active))) \ return; \ - if (unlikely(!ACCESS_ONCE(__chan->enabled))) \ + if (caa_unlikely(!CMM_ACCESS_ONCE(__chan->enabled))) \ return; \ - if (unlikely(!ACCESS_ONCE(__event->enabled))) \ + if (caa_unlikely(!CMM_ACCESS_ONCE(__event->enabled))) \ return; \ __event_len = __event_get_size__##_name(__dynamic_len, _args); \ __event_align = __event_get_align__##_name(_args); \ - lib_ring_buffer_ctx_init(&ctx, __chan->chan, __event, __event_len, \ - __event_align, -1); \ - __ret = __chan->ops->event_reserve(&ctx, __event->id); \ + 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(_name, _fields) \ +static void __event_probe__##_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; \ + 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); \ + __chan->ops->event_commit(&__ctx); \ } -#include TRACE_INCLUDE(TRACE_INCLUDE_FILE) +#include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE) + +#undef __get_dynamic_len /* * Stage 8 of the trace events. @@ -415,25 +503,25 @@ static void __event_probe__##_name(void *__data, _proto) \ * Register/unregister probes at module load/unload. */ -/* Reset all macros within TRACE_EVENT */ -#include "lttng-tracepoint-events-reset.h" +/* Reset all macros within TRACEPOINT_EVENT */ +#include #define TP_ID1(_token, _system) _token##_system #define TP_ID(_token, _system) TP_ID1(_token, _system) static void __attribute__((constructor)) -TP_ID(__lttng_events_init__, TRACE_SYSTEM)(void) +TP_ID(__lttng_events_init__, TRACEPOINT_SYSTEM)(void) { int ret; - ret = ltt_probe_register(&TP_ID(__probe_desc___, TRACE_SYSTEM)); + ret = ltt_probe_register(&TP_ID(__probe_desc___, TRACEPOINT_SYSTEM)); assert(!ret); } static void __attribute__((destructor)) -TP_ID(__lttng_events_exit__, TRACE_SYSTEM)(void) +TP_ID(__lttng_events_exit__, TRACEPOINT_SYSTEM)(void) { - ltt_probe_unregister(&TP_ID(__probe_desc___, TRACE_SYSTEM)); + ltt_probe_unregister(&TP_ID(__probe_desc___, TRACEPOINT_SYSTEM)); } #undef TP_ID1