X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=probes%2Flttng-events.h;h=62ed63610df45820fb2f0f4aad269bf8840cecc0;hb=7ca580f8aca4f8c2b9e0066ad52ebfc226b3d645;hp=8a3a886b79dfac7ea561ad4b4f14cc04c42f124b;hpb=76e4f0175e477c9ad0368523e3c0dd2cbbfd3678;p=lttng-modules.git diff --git a/probes/lttng-events.h b/probes/lttng-events.h index 8a3a886b..62ed6361 100644 --- a/probes/lttng-events.h +++ b/probes/lttng-events.h @@ -54,6 +54,18 @@ PARAMS(print)) \ DEFINE_EVENT_MAP_NOARGS(map, name, map) +#undef LTTNG_TRACE_EVENT +#define LTTNG_TRACE_EVENT(name, proto, args, _locvar, _code, tstruct, assign, print) \ + LTTNG_DECLARE_EVENT_CLASS(name, \ + PARAMS(proto), \ + PARAMS(args), \ + PARAMS(_locvar), \ + PARAMS(_code), \ + PARAMS(tstruct), \ + PARAMS(assign), \ + PARAMS(print)) \ + DEFINE_EVENT_MAP(name, name, name, PARAMS(proto), PARAMS(args)) + #undef DEFINE_EVENT_PRINT_MAP #define DEFINE_EVENT_PRINT_MAP(template, name, map, proto, args, print) \ DEFINE_EVENT_MAP(template, name, map, PARAMS(proto), PARAMS(args)) @@ -130,6 +142,17 @@ PARAMS(assign), \ PARAMS(print)) +#undef DECLARE_EVENT_CLASS +#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \ + LTTNG_DECLARE_EVENT_CLASS(_name, PARAMS(_proto), PARAMS(_args), , , \ + PARAMS(_tstruct), PARAMS(_assign), PARAMS(_print)) + +#undef DECLARE_EVENT_CLASS_NOARGS +#define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \ + LTTNG_DECLARE_EVENT_CLASS_NOARGS(_name, , , PARAMS(_tstruct), \ + PARAMS(_assign), PARAMS(_print)) + + /* * Stage 1 of the trace events. * @@ -186,6 +209,10 @@ void trace_##_name(void *__data); #define __field_hex(_type, _item) \ __field_full(_type, _item, __BYTE_ORDER, 16) +#undef __field_oct +#define __field_oct(_type, _item) \ + __field_full(_type, _item, __BYTE_ORDER, 8) + #undef __field_network #define __field_network(_type, _item) \ __field_full(_type, _item, __BIG_ENDIAN, 10) @@ -236,6 +263,10 @@ void trace_##_name(void *__data); }, \ }, +#undef __dynamic_array_enc_ext_2 +#define __dynamic_array_enc_ext_2(_type, _item, _length1, _length2, _order, _base, _encoding) \ + __dynamic_array_enc_ext(_type, _item, _length1 + _length2, _order, _base, _encoding) + #undef __dynamic_array #define __dynamic_array(_type, _item, _length) \ __dynamic_array_enc_ext(_type, _item, _length, __BYTE_ORDER, 10, none) @@ -248,6 +279,18 @@ void trace_##_name(void *__data); #define __dynamic_array_hex(_type, _item, _length) \ __dynamic_array_enc_ext(_type, _item, _length, __BYTE_ORDER, 16, none) +#undef __dynamic_array_network_hex +#define __dynamic_array_network_hex(_type, _item, _length) \ + __dynamic_array_enc_ext(_type, _item, _length, __BIG_ENDIAN, 16, none) + +#undef __dynamic_array_network +#define __dynamic_array_network(_type, _item, _length) \ + __dynamic_array_enc_ext(_type, _item, _length, __BIG_ENDIAN, 10, none) + +#undef __dynamic_array_text_2 +#define __dynamic_array_text_2(_type, _item, _length1, _length2) \ + __dynamic_array_enc_ext_2(_type, _item, _length1, _length2, __BYTE_ORDER, 10, UTF8) + #undef __string #define __string(_item, _src) \ { \ @@ -266,15 +309,15 @@ void trace_##_name(void *__data); #undef TP_STRUCT__entry #define TP_STRUCT__entry(args...) args /* Only one used in this phase */ -#undef DECLARE_EVENT_CLASS_NOARGS -#define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \ +#undef LTTNG_DECLARE_EVENT_CLASS_NOARGS +#define LTTNG_DECLARE_EVENT_CLASS_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) \ static const struct lttng_event_field __event_fields___##_name[] = { \ _tstruct \ }; -#undef DECLARE_EVENT_CLASS -#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \ - DECLARE_EVENT_CLASS_NOARGS(_name, PARAMS(_tstruct), PARAMS(_assign), \ +#undef LTTNG_DECLARE_EVENT_CLASS +#define LTTNG_DECLARE_EVENT_CLASS(_name, _proto, _args, _locvar, _code, _tstruct, _assign, _print) \ + LTTNG_DECLARE_EVENT_CLASS_NOARGS(_name, _locvar, _code, PARAMS(_tstruct), PARAMS(_assign), \ PARAMS(_print)) #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) @@ -290,12 +333,12 @@ void trace_##_name(void *__data); #undef TP_PROTO #define TP_PROTO(args...) args -#undef DECLARE_EVENT_CLASS -#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \ +#undef LTTNG_DECLARE_EVENT_CLASS +#define LTTNG_DECLARE_EVENT_CLASS(_name, _proto, _args, _locvar, _code, _tstruct, _assign, _print) \ static void __event_probe__##_name(void *__data, _proto); -#undef DECLARE_EVENT_CLASS_NOARGS -#define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \ +#undef LTTNG_DECLARE_EVENT_CLASS_NOARGS +#define LTTNG_DECLARE_EVENT_CLASS_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) \ static void __event_probe__##_name(void *__data); #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) @@ -319,6 +362,7 @@ static void __event_probe__##_name(void *__data); static const struct lttng_event_desc __event_desc___##_map = { \ .fields = __event_fields___##_template, \ .name = #_map, \ + .kname = #_name, \ .probe_callback = (void *) TP_PROBE_CB(_template), \ .nr_fields = ARRAY_SIZE(__event_fields___##_template), \ .owner = THIS_MODULE, \ @@ -400,13 +444,25 @@ static __used struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { #undef __dynamic_array_enc_ext #define __dynamic_array_enc_ext(_type, _item, _length, _order, _base, _encoding)\ - __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(u32)); \ + __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(u32)); \ __event_len += sizeof(u32); \ __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \ __dynamic_len[__dynamic_len_idx] = (_length); \ __event_len += sizeof(_type) * __dynamic_len[__dynamic_len_idx]; \ __dynamic_len_idx++; +#undef __dynamic_array_enc_ext_2 +#define __dynamic_array_enc_ext_2(_type, _item, _length1, _length2, _order, _base, _encoding)\ + __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(u32)); \ + __event_len += sizeof(u32); \ + __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \ + __dynamic_len[__dynamic_len_idx] = (_length1); \ + __event_len += sizeof(_type) * __dynamic_len[__dynamic_len_idx]; \ + __dynamic_len_idx++; \ + __dynamic_len[__dynamic_len_idx] = (_length2); \ + __event_len += sizeof(_type) * __dynamic_len[__dynamic_len_idx]; \ + __dynamic_len_idx++; + #undef __string #define __string(_item, _src) \ __event_len += __dynamic_len[__dynamic_len_idx++] = strlen(_src) + 1; @@ -426,15 +482,31 @@ static __used struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { #undef TP_STRUCT__entry #define TP_STRUCT__entry(args...) args -#undef DECLARE_EVENT_CLASS -#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \ -static inline size_t __event_get_size__##_name(size_t *__dynamic_len, _proto) \ +#undef TP_locvar +#define TP_locvar(...) __VA_ARGS__ + +#undef LTTNG_DECLARE_EVENT_CLASS +#define LTTNG_DECLARE_EVENT_CLASS(_name, _proto, _args, _locvar, _code, _tstruct, _assign, _print) \ +static inline size_t __event_get_size__##_name(size_t *__dynamic_len, \ + void *__tp_locvar, _proto) \ +{ \ + size_t __event_len = 0; \ + unsigned int __dynamic_len_idx __attribute__((unused)) = 0; \ + struct { _locvar } *tp_locvar __attribute__((unused)) = __tp_locvar; \ + \ + _tstruct \ + return __event_len; \ +} + +#undef LTTNG_DECLARE_EVENT_CLASS_NOARGS +#define LTTNG_DECLARE_EVENT_CLASS_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) \ +static inline size_t __event_get_size__##_name(size_t *__dynamic_len, \ + void *__tp_locvar) \ { \ size_t __event_len = 0; \ - unsigned int __dynamic_len_idx = 0; \ + unsigned int __dynamic_len_idx __attribute__((unused)) = 0; \ + struct { _locvar } *tp_locvar __attribute__((unused)) = __tp_locvar; \ \ - if (0) \ - (void) __dynamic_len_idx; /* don't warn if unused */ \ _tstruct \ return __event_len; \ } @@ -461,9 +533,13 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len, _proto) \ #undef __dynamic_array_enc_ext #define __dynamic_array_enc_ext(_type, _item, _length, _order, _base, _encoding)\ - __event_align = max_t(size_t, __event_align, lttng_alignof(u32)); \ + __event_align = max_t(size_t, __event_align, lttng_alignof(u32)); \ __event_align = max_t(size_t, __event_align, lttng_alignof(_type)); +#undef __dynamic_array_enc_ext_2 +#define __dynamic_array_enc_ext_2(_type, _item, _length1, _length2, _order, _base, _encoding)\ + __dynamic_array_enc_ext(_type, _item, _length1 + _length2, _order, _base, _encoding) + #undef __string #define __string(_item, _src) @@ -476,17 +552,32 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len, _proto) \ #undef TP_STRUCT__entry #define TP_STRUCT__entry(args...) args -#undef DECLARE_EVENT_CLASS -#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \ -static inline size_t __event_get_align__##_name(_proto) \ +#undef TP_locvar +#define TP_locvar(...) __VA_ARGS__ + +#undef LTTNG_DECLARE_EVENT_CLASS +#define LTTNG_DECLARE_EVENT_CLASS(_name, _proto, _args, _locvar, _code, _tstruct, _assign, _print) \ +static inline size_t __event_get_align__##_name(void *__tp_locvar, _proto) \ { \ size_t __event_align = 1; \ + struct { _locvar } *tp_locvar __attribute__((unused)) = __tp_locvar; \ + \ _tstruct \ return __event_align; \ } -#include TRACE_INCLUDE(TRACE_INCLUDE_FILE) +#undef LTTNG_DECLARE_EVENT_CLASS_NOARGS +#define LTTNG_DECLARE_EVENT_CLASS_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) \ +static inline size_t __event_get_align__##_name(void *__tp_locvar) \ +{ \ + size_t __event_align = 1; \ + struct { _locvar } *tp_locvar __attribute__((unused)) = __tp_locvar; \ + \ + _tstruct \ + return __event_align; \ +} +#include TRACE_INCLUDE(TRACE_INCLUDE_FILE) /* * Stage 8 of the trace events. @@ -510,6 +601,10 @@ static inline size_t __event_get_align__##_name(_proto) \ #define __dynamic_array_enc_ext(_type, _item, _length, _order, _base, _encoding)\ _type _item; +#undef __dynamic_array_enc_ext_2 +#define __dynamic_array_enc_ext_2(_type, _item, _length1, _length2, _order, _base, _encoding)\ + __dynamic_array_enc_ext(_type, _item, _length1 + _length2, _order, _base, _encoding) + #undef __string #define __string(_item, _src) char _item; @@ -520,12 +615,16 @@ static inline size_t __event_get_align__##_name(_proto) \ #undef TP_STRUCT__entry #define TP_STRUCT__entry(args...) args -#undef DECLARE_EVENT_CLASS -#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \ +#undef LTTNG_DECLARE_EVENT_CLASS_NOARGS +#define LTTNG_DECLARE_EVENT_CLASS_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) \ struct __event_typemap__##_name { \ _tstruct \ }; +#undef LTTNG_DECLARE_EVENT_CLASS +#define LTTNG_DECLARE_EVENT_CLASS(_name, _proto, _args, _locvar, _code, _tstruct, _assign, _print) \ + LTTNG_DECLARE_EVENT_CLASS_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) + #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) @@ -559,6 +658,15 @@ __end_field_##_item##_1: \ goto __assign_##_item##_2; \ __end_field_##_item##_2: +#undef __dynamic_array_enc_ext_2 +#define __dynamic_array_enc_ext_2(_type, _item, _length1, _length2, _order, _base, _encoding)\ + goto __assign_##_item##_1; \ +__end_field_##_item##_1: \ + goto __assign_##_item##_2; \ +__end_field_##_item##_2: \ + goto __assign_##_item##_3; \ +__end_field_##_item##_3: + #undef __string #define __string(_item, _src) \ goto __assign_##_item; \ @@ -616,10 +724,34 @@ __assign_##dest##_2: \ sizeof(__typemap.dest) * __get_dynamic_array_len(dest));\ goto __end_field_##dest##_2; +#undef tp_memcpy_dyn_gen_2 +#define tp_memcpy_dyn_gen_2(write_ops, dest, src1, src2) \ +__assign_##dest##_1: \ + { \ + u32 __tmpl = __dynamic_len[__dynamic_len_idx] \ + + __dynamic_len[__dynamic_len_idx + 1]; \ + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(u32)); \ + __chan->ops->event_write(&__ctx, &__tmpl, sizeof(u32)); \ + } \ + goto __end_field_##dest##_1; \ +__assign_##dest##_2: \ + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__typemap.dest)); \ + __chan->ops->write_ops(&__ctx, src1, \ + sizeof(__typemap.dest) * __get_dynamic_array_len(dest));\ + goto __end_field_##dest##_2; \ +__assign_##dest##_3: \ + __chan->ops->write_ops(&__ctx, src2, \ + sizeof(__typemap.dest) * __get_dynamic_array_len(dest));\ + goto __end_field_##dest##_3; + #undef tp_memcpy_dyn #define tp_memcpy_dyn(dest, src) \ tp_memcpy_dyn_gen(event_write, dest, src) +#undef tp_memcpy_dyn_2 +#define tp_memcpy_dyn_2(dest, src1, src2) \ + tp_memcpy_dyn_gen_2(event_write, dest, src1, src2) + #undef tp_memcpy_dyn_from_user #define tp_memcpy_dyn_from_user(dest, src) \ tp_memcpy_dyn_gen(event_write_from_user, dest, src) @@ -629,24 +761,22 @@ __assign_##dest##_2: \ */ #undef tp_copy_string_from_user #define tp_copy_string_from_user(dest, src) \ - __assign_##dest: \ - { \ - size_t __ustrlen; \ - \ - if (0) \ - (void) __typemap.dest; \ - lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__typemap.dest));\ - __ustrlen = __get_dynamic_array_len(dest); \ - if (likely(__ustrlen > 1)) { \ - __chan->ops->event_write_from_user(&__ctx, src, \ - __ustrlen - 1); \ - } \ - __chan->ops->event_memset(&__ctx, 0, 1); \ - } \ +__assign_##dest: \ + if (0) \ + (void) __typemap.dest; \ + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__typemap.dest)); \ + __chan->ops->event_strcpy_from_user(&__ctx, src, \ + __get_dynamic_array_len(dest)); \ goto __end_field_##dest; + #undef tp_strcpy #define tp_strcpy(dest, src) \ - tp_memcpy(dest, src, __get_dynamic_array_len(dest)) +__assign_##dest: \ + if (0) \ + (void) __typemap.dest; \ + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__typemap.dest)); \ + __chan->ops->event_strcpy(&__ctx, src, __get_dynamic_array_len(dest)); \ + goto __end_field_##dest; /* Named field types must be defined in lttng-types.h */ @@ -672,6 +802,12 @@ __assign_##dest##_2: \ #undef TP_fast_assign #define TP_fast_assign(args...) args +#undef TP_locvar +#define TP_locvar(...) __VA_ARGS__ + +#undef TP_code +#define TP_code(...) __VA_ARGS__ + /* * For state dump, check that "session" argument (mandatory) matches the * session this event belongs to. Ensures that we write state dump data only @@ -683,23 +819,28 @@ __assign_##dest##_2: \ #define _TP_SESSION_CHECK(session, csession) 1 #endif /* TP_SESSION_CHECK */ -#undef DECLARE_EVENT_CLASS -#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \ +/* + * __dynamic_len array length is twice the number of fields due to + * __dynamic_array_enc_ext_2() and tp_memcpy_dyn_2(), which are the + * worse case, needing 2 entries per field. + */ +#undef LTTNG_DECLARE_EVENT_CLASS +#define LTTNG_DECLARE_EVENT_CLASS(_name, _proto, _args, _locvar, _code, _tstruct, _assign, _print) \ static void __event_probe__##_name(void *__data, _proto) \ { \ + struct probe_local_vars { _locvar }; \ struct lttng_event *__event = __data; \ struct lttng_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[ARRAY_SIZE(__event_fields___##_name)]; \ - struct __event_typemap__##_name __typemap; \ + size_t __dynamic_len_idx __attribute__((unused)) = 0; \ + size_t __dynamic_len[2 * ARRAY_SIZE(__event_fields___##_name)] __attribute__((unused)); \ + struct __event_typemap__##_name __typemap __attribute__((unused)); \ int __ret; \ + struct probe_local_vars __tp_locvar; \ + struct probe_local_vars *tp_locvar __attribute__((unused)) = \ + &__tp_locvar; \ \ - if (0) { \ - (void) __dynamic_len_idx; /* don't warn if unused */ \ - (void) __typemap; /* don't warn if unused */ \ - } \ if (!_TP_SESSION_CHECK(session, __chan->session)) \ return; \ if (unlikely(!ACCESS_ONCE(__chan->session->active))) \ @@ -708,8 +849,10 @@ static void __event_probe__##_name(void *__data, _proto) \ return; \ if (unlikely(!ACCESS_ONCE(__event->enabled))) \ return; \ - __event_len = __event_get_size__##_name(__dynamic_len, _args); \ - __event_align = __event_get_align__##_name(_args); \ + _code \ + __event_len = __event_get_size__##_name(__dynamic_len, tp_locvar, \ + _args); \ + __event_align = __event_get_align__##_name(tp_locvar, _args); \ lib_ring_buffer_ctx_init(&__ctx, __chan->chan, __event, __event_len, \ __event_align, -1); \ __ret = __chan->ops->event_reserve(&__ctx, __event->id); \ @@ -723,15 +866,22 @@ static void __event_probe__##_name(void *__data, _proto) \ _assign \ } -#undef DECLARE_EVENT_CLASS_NOARGS -#define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \ +#undef LTTNG_DECLARE_EVENT_CLASS_NOARGS +#define LTTNG_DECLARE_EVENT_CLASS_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) \ static void __event_probe__##_name(void *__data) \ { \ + struct probe_local_vars { _locvar }; \ struct lttng_event *__event = __data; \ struct lttng_channel *__chan = __event->chan; \ struct lib_ring_buffer_ctx __ctx; \ size_t __event_len, __event_align; \ + size_t __dynamic_len_idx __attribute__((unused)) = 0; \ + size_t __dynamic_len[2 * ARRAY_SIZE(__event_fields___##_name)] __attribute__((unused)); \ + struct __event_typemap__##_name __typemap __attribute__((unused)); \ int __ret; \ + struct probe_local_vars __tp_locvar; \ + struct probe_local_vars *tp_locvar __attribute__((unused)) = \ + &__tp_locvar; \ \ if (!_TP_SESSION_CHECK(session, __chan->session)) \ return; \ @@ -741,8 +891,9 @@ static void __event_probe__##_name(void *__data) \ return; \ if (unlikely(!ACCESS_ONCE(__event->enabled))) \ return; \ - __event_len = 0; \ - __event_align = 1; \ + _code \ + __event_len = __event_get_size__##_name(__dynamic_len, tp_locvar); \ + __event_align = __event_get_align__##_name(tp_locvar); \ lib_ring_buffer_ctx_init(&__ctx, __chan->chan, __event, __event_len, \ __event_align, -1); \ __ret = __chan->ops->event_reserve(&__ctx, __event->id); \