X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fust%2Flttng-tracepoint-event.h;h=ab9c25252d08afdf105e1a51b07bcc1ad7902a0b;hb=4e2ee1f5ad0b837440f3b850e971f25db209cca1;hp=70d7c653263c0edc43ef1a69ea101a4cb3600855;hpb=1dbfff0c0126804b07e9c11ba2307f65a95a650b;p=lttng-ust.git diff --git a/include/ust/lttng-tracepoint-event.h b/include/ust/lttng-tracepoint-event.h index 70d7c653..ab9c2525 100644 --- a/include/ust/lttng-tracepoint-event.h +++ b/include/ust/lttng-tracepoint-event.h @@ -43,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) @@ -279,7 +281,7 @@ static struct lttng_probe_desc TP_ID(__probe_desc___, TRACEPOINT_SYSTEM) = { __event_len += sizeof(_type); #undef ctf_array_encoded -#define ctf_array_encoded(_type, _item, _src, _length) \ +#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); @@ -289,7 +291,7 @@ static struct lttng_probe_desc TP_ID(__probe_desc___, TRACEPOINT_SYSTEM) = { __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, lttng_alignof(_type)); \ - __dynamic_len[__dynamic_len_idx] = (_length); \ + __dynamic_len[__dynamic_len_idx] = (_src_length); \ __event_len += sizeof(_type) * __dynamic_len[__dynamic_len_idx]; \ __dynamic_len_idx++; @@ -316,19 +318,6 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len, _proto) \ return __event_len; \ } -#undef TRACEPOINT_EVENT_CLASS_NOARGS -#define TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields) \ -static inline size_t __event_get_size__##_name(size_t *__dynamic_len) \ -{ \ - size_t __event_len = 0; \ - unsigned int __dynamic_len_idx = 0; \ - \ - if (0) \ - (void) __dynamic_len_idx; /* don't warn if unused */ \ - _fields \ - return __event_len; \ -} - #include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE) /* @@ -351,7 +340,7 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len) \ __event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type)); #undef ctf_array_encoded -#define ctf_array_encoded(_type, _item, _src, _length) \ +#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 @@ -378,15 +367,6 @@ static inline size_t __event_get_align__##_name(_proto) \ return __event_align; \ } -#undef TRACEPOINT_EVENT_CLASS_NOARGS -#define TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields) \ -static inline size_t __event_get_align__##_name(void) \ -{ \ - size_t __event_align = 1; \ - _fields \ - return __event_align; \ -} - #include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE) @@ -421,7 +401,7 @@ static inline size_t __event_get_align__##_name(void) \ } #undef ctf_array_encoded -#define ctf_array_encoded(_type, _item, _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, _length); @@ -430,20 +410,21 @@ static inline size_t __event_get_align__##_name(void) \ _src_length, _encoding) \ { \ _length_type __tmpl = __dynamic_len[__dynamic_len_idx]; \ - lib_ring_buffer_align_ctx(&ctx, lttng_alignof(_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, lttng_alignof(_type)); \ __chan->ops->event_write(&ctx, _src, \ - sizeof(_type) * __get_sequence_len(dest)); + 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 @@ -477,7 +458,7 @@ static void __event_probe__##_name(void *__data, _proto) \ __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); \ + __event_align, -1, __chan->handle); \ __ret = __chan->ops->event_reserve(&ctx, __event->id); \ if (__ret < 0) \ return; \ @@ -493,22 +474,18 @@ static void __event_probe__##_name(void *__data) \ struct ltt_channel *__chan = __event->chan; \ struct lib_ring_buffer_ctx ctx; \ size_t __event_len, __event_align; \ - size_t __dynamic_len_idx = 0; \ - 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(!CMM_ACCESS_ONCE(__chan->session->active))) \ return; \ if (unlikely(!CMM_ACCESS_ONCE(__chan->enabled))) \ return; \ if (unlikely(!CMM_ACCESS_ONCE(__event->enabled))) \ return; \ - __event_len = __event_get_size__##_name(__dynamic_len); \ - __event_align = __event_get_align__##_name(); \ + __event_len = 0; \ + __event_align = 1; \ lib_ring_buffer_ctx_init(&ctx, __chan->chan, __event, __event_len, \ - __event_align, -1); \ + __event_align, -1, __chan->handle); \ __ret = __chan->ops->event_reserve(&ctx, __event->id); \ if (__ret < 0) \ return; \ @@ -518,6 +495,8 @@ static void __event_probe__##_name(void *__data) \ #include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE) +#undef __get_dynamic_len + /* * Stage 8 of the trace events. *