X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=blobdiff_plain;f=probes%2Flttng-events.h;h=1b7df762b92586b29b90b6301b0f7fbf25b06cf7;hp=5fc4d9f30361168d7fb08d0af1cc20966eca6845;hb=f127e61ee231d002fb9a7803643a157e06f6d2e2;hpb=07dfc1d0e4b093ad02682499a702dc11e54e8302 diff --git a/probes/lttng-events.h b/probes/lttng-events.h index 5fc4d9f3..1b7df762 100644 --- a/probes/lttng-events.h +++ b/probes/lttng-events.h @@ -2,7 +2,7 @@ * lttng-events.h * * Copyright (C) 2009 Steven Rostedt - * Copyright (C) 2009-2012 Mathieu Desnoyers + * Copyright (C) 2009-2014 Mathieu Desnoyers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,8 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + #include #include +#include #include "lttng.h" #include "lttng-types.h" #include "lttng-probe-user.h" @@ -37,59 +39,37 @@ * enforce name-spacing. */ #undef LTTNG_TRACEPOINT_EVENT_MAP -#define LTTNG_TRACEPOINT_EVENT_MAP(name, map, proto, args, tstruct, assign, print) \ +#define LTTNG_TRACEPOINT_EVENT_MAP(name, map, proto, args, fields) \ LTTNG_TRACEPOINT_EVENT_CLASS(map, \ PARAMS(proto), \ PARAMS(args), \ - PARAMS(tstruct), \ - PARAMS(assign), \ - PARAMS(print)) \ + PARAMS(fields)) \ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto), PARAMS(args)) #undef LTTNG_TRACEPOINT_EVENT_MAP_NOARGS -#define LTTNG_TRACEPOINT_EVENT_MAP_NOARGS(name, map, tstruct, assign, print) \ +#define LTTNG_TRACEPOINT_EVENT_MAP_NOARGS(name, map, fields) \ LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(map, \ - PARAMS(tstruct), \ - PARAMS(assign), \ - PARAMS(print)) \ + PARAMS(fields)) \ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(map, name, map) +#undef LTTNG_TRACEPOINT_EVENT_CODE_MAP +#define LTTNG_TRACEPOINT_EVENT_CODE_MAP(name, map, proto, args, _locvar, _code, fields) \ + LTTNG_TRACEPOINT_EVENT_CLASS_CODE(map, \ + PARAMS(proto), \ + PARAMS(args), \ + PARAMS(_locvar), \ + PARAMS(_code), \ + PARAMS(fields)) \ + LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto), PARAMS(args)) + #undef LTTNG_TRACEPOINT_EVENT_CODE -#define LTTNG_TRACEPOINT_EVENT_CODE(name, proto, args, _locvar, _code, tstruct, assign, print) \ - LTTNG_TRACEPOINT_EVENT_CLASS_CODE(name, \ +#define LTTNG_TRACEPOINT_EVENT_CODE(name, proto, args, _locvar, _code, fields) \ + LTTNG_TRACEPOINT_EVENT_CODE_MAP(name, name, \ PARAMS(proto), \ PARAMS(args), \ PARAMS(_locvar), \ PARAMS(_code), \ - PARAMS(tstruct), \ - PARAMS(assign), \ - PARAMS(print)) \ - LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(name, name, name, PARAMS(proto), PARAMS(args)) - - -#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT_MAP -#define LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT_MAP(template, name, map, proto, args, print) \ - LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(template, name, map, PARAMS(proto), PARAMS(args)) - -/* Callbacks are meaningless to LTTng. */ -#undef LTTNG_TRACEPOINT_EVENT_FN_MAP -#define LTTNG_TRACEPOINT_EVENT_FN_MAP(name, map, proto, args, tstruct, \ - assign, print, reg, unreg) \ - LTTNG_TRACEPOINT_EVENT_MAP(name, map, PARAMS(proto), PARAMS(args), \ - PARAMS(tstruct), PARAMS(assign), PARAMS(print)) - -#undef LTTNG_TRACEPOINT_EVENT_CONDITION_MAP -#define LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(name, map, proto, args, cond, tstruct, assign, print) \ - LTTNG_TRACEPOINT_EVENT_MAP(name, map, \ - PARAMS(proto), \ - PARAMS(args), \ - PARAMS(tstruct), \ - PARAMS(assign), \ - PARAMS(print)) - -#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION_MAP -#define LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION_MAP(template, name, map, proto, args, cond) \ - LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(template, name, map, PARAMS(proto), PARAMS(args)) + PARAMS(fields)) /* * LTTNG_TRACEPOINT_EVENT_CLASS can be used to add a generic function @@ -103,32 +83,15 @@ */ #undef LTTNG_TRACEPOINT_EVENT -#define LTTNG_TRACEPOINT_EVENT(name, proto, args, tstruct, assign, print) \ +#define LTTNG_TRACEPOINT_EVENT(name, proto, args, fields) \ LTTNG_TRACEPOINT_EVENT_MAP(name, name, \ PARAMS(proto), \ PARAMS(args), \ - PARAMS(tstruct), \ - PARAMS(assign), \ - PARAMS(print)) + PARAMS(fields)) #undef LTTNG_TRACEPOINT_EVENT_NOARGS -#define LTTNG_TRACEPOINT_EVENT_NOARGS(name, tstruct, assign, print) \ - LTTNG_TRACEPOINT_EVENT_MAP_NOARGS(name, name, \ - PARAMS(tstruct), \ - PARAMS(assign), \ - PARAMS(print)) - -#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT -#define LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT(template, name, proto, args, print) \ - LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT_MAP(template, name, name, \ - PARAMS(proto), PARAMS(args), PARAMS(print_)) - -#undef LTTNG_TRACEPOINT_EVENT_FN -#define LTTNG_TRACEPOINT_EVENT_FN(name, proto, args, tstruct, \ - assign, print, reg, unreg) \ - LTTNG_TRACEPOINT_EVENT_FN_MAP(name, name, PARAMS(proto), PARAMS(args), \ - PARAMS(tstruct), PARAMS(assign), PARAMS(print), \ - PARAMS(reg), PARAMS(unreg)) \ +#define LTTNG_TRACEPOINT_EVENT_NOARGS(name, fields) \ + LTTNG_TRACEPOINT_EVENT_MAP_NOARGS(name, name, PARAMS(fields)) #undef LTTNG_TRACEPOINT_EVENT_INSTANCE #define LTTNG_TRACEPOINT_EVENT_INSTANCE(template, name, proto, args) \ @@ -138,25 +101,14 @@ #define LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(template, name) \ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(template, name, name) -#undef LTTNG_TRACEPOINT_EVENT_CONDITION -#define LTTNG_TRACEPOINT_EVENT_CONDITION(name, proto, args, cond, tstruct, assign, print) \ - LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(name, name, \ - PARAMS(proto), \ - PARAMS(args), \ - PARAMS(cond), \ - PARAMS(tstruct), \ - PARAMS(assign), \ - PARAMS(print)) - #undef LTTNG_TRACEPOINT_EVENT_CLASS -#define LTTNG_TRACEPOINT_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \ +#define LTTNG_TRACEPOINT_EVENT_CLASS(_name, _proto, _args, _fields) \ LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, PARAMS(_proto), PARAMS(_args), , , \ - PARAMS(_tstruct), PARAMS(_assign), PARAMS(_print)) + PARAMS(_fields)) #undef LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS -#define LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \ - LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, , , PARAMS(_tstruct), \ - PARAMS(_assign), PARAMS(_print)) +#define LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields) \ + LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, , , PARAMS(_fields)) /* @@ -167,13 +119,14 @@ * out by the compiler. */ -#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */ +/* Reset all macros within TRACEPOINT_EVENT */ +#include "lttng-events-reset.h" #undef TP_PROTO -#define TP_PROTO(args...) args +#define TP_PROTO(...) __VA_ARGS__ #undef TP_ARGS -#define TP_ARGS(args...) args +#define TP_ARGS(...) __VA_ARGS__ #undef LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP #define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(_template, _name, _map, _proto, _args) \ @@ -192,139 +145,90 @@ void trace_##_name(void *__data); * Each event produce an array of fields. */ -#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */ +/* Reset all macros within TRACEPOINT_EVENT */ +#include "lttng-events-reset.h" +#include "lttng-events-write.h" +#include "lttng-events-nowrite.h" -/* Named field types must be defined in lttng-types.h */ - -#undef __field_full -#define __field_full(_type, _item, _order, _base) \ +#undef _ctf_integer_ext +#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _user, _nowrite) \ { \ .name = #_item, \ - .type = __type_integer(_type, _order, _base, none), \ + .type = __type_integer(_type, _byte_order, _base, none),\ + .nowrite = _nowrite, \ + .user = _user, \ }, -#undef __field -#define __field(_type, _item) \ - __field_full(_type, _item, __BYTE_ORDER, 10) - -#undef __field_ext -#define __field_ext(_type, _item, _filter_type) \ - __field(_type, _item) - -#undef __field_hex -#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) - -#undef __field_network_hex -#define __field_network_hex(_type, _item) \ - __field_full(_type, _item, __BIG_ENDIAN, 16) - -#undef __array_enc_ext -#define __array_enc_ext(_type, _item, _length, _order, _base, _encoding)\ +#undef _ctf_array_encoded +#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _user, _nowrite) \ { \ .name = #_item, \ .type = \ { \ .atype = atype_array, \ - .u.array = \ + .u = \ { \ - .length = _length, \ - .elem_type = __type_integer(_type, _order, _base, _encoding), \ - }, \ + .array = \ + { \ + .elem_type = __type_integer(_type, __BYTE_ORDER, 10, _encoding), \ + .length = _length, \ + } \ + } \ }, \ + .nowrite = _nowrite, \ + .user = _user, \ }, -#undef __array -#define __array(_type, _item, _length) \ - __array_enc_ext(_type, _item, _length, __BYTE_ORDER, 10, none) - -#undef __array_text -#define __array_text(_type, _item, _length) \ - __array_enc_ext(_type, _item, _length, __BYTE_ORDER, 10, UTF8) - -#undef __array_hex -#define __array_hex(_type, _item, _length) \ - __array_enc_ext(_type, _item, _length, __BYTE_ORDER, 16, none) - -#undef __dynamic_array_enc_ext -#define __dynamic_array_enc_ext(_type, _item, _length, _order, _base, _encoding) \ +#undef _ctf_sequence_encoded +#define _ctf_sequence_encoded(_type, _item, _src, \ + _length_type, _src_length, _encoding, \ + _base, _user, _nowrite) \ { \ .name = #_item, \ .type = \ { \ .atype = atype_sequence, \ - .u.sequence = \ + .u = \ { \ - .length_type = __type_integer(u32, __BYTE_ORDER, 10, none), \ - .elem_type = __type_integer(_type, _order, _base, _encoding), \ + .sequence = \ + { \ + .length_type = __type_integer(_length_type, __BYTE_ORDER, 10, none), \ + .elem_type = __type_integer(_type, __BYTE_ORDER, _base, _encoding), \ + }, \ }, \ }, \ + .nowrite = _nowrite, \ + .user = _user, \ }, -#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) - -#undef __dynamic_array_text -#define __dynamic_array_text(_type, _item, _length) \ - __dynamic_array_enc_ext(_type, _item, _length, __BYTE_ORDER, 10, UTF8) - -#undef __dynamic_array_hex -#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) \ +#undef _ctf_string +#define _ctf_string(_item, _src, _user, _nowrite) \ { \ .name = #_item, \ .type = \ { \ .atype = atype_string, \ - .u.basic.string.encoding = lttng_encode_UTF8, \ + .u = \ + { \ + .basic = { .string = { .encoding = lttng_encode_UTF8 } } \ + }, \ }, \ + .nowrite = _nowrite, \ + .user = _user, \ }, -#undef __string_from_user -#define __string_from_user(_item, _src) \ - __string(_item, _src) - -#undef TP_STRUCT__entry -#define TP_STRUCT__entry(args...) args /* Only one used in this phase */ +#undef TP_FIELDS +#define TP_FIELDS(...) __VA_ARGS__ /* Only one used in this phase */ #undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS -#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) \ +#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, _fields) \ static const struct lttng_event_field __event_fields___##_name[] = { \ - _tstruct \ + _fields \ }; #undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE -#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, _proto, _args, _locvar, _code, _tstruct, _assign, _print) \ - LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, PARAMS(_tstruct), PARAMS(_assign), \ - PARAMS(_print)) +#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, _proto, _args, _locvar, _code, _fields) \ + LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, PARAMS(_fields)) #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) @@ -334,169 +238,76 @@ void trace_##_name(void *__data); * Create probe callback prototypes. */ -#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */ +/* Reset all macros within TRACEPOINT_EVENT */ +#include "lttng-events-reset.h" #undef TP_PROTO -#define TP_PROTO(args...) args +#define TP_PROTO(...) __VA_ARGS__ #undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE -#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, _proto, _args, _locvar, _code, _tstruct, _assign, _print) \ +#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, _proto, _args, _locvar, _code, _fields) \ static void __event_probe__##_name(void *__data, _proto); #undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS -#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) \ +#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, _fields) \ static void __event_probe__##_name(void *__data); #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) -/* - * Stage 3.9 of the trace events. - * - * Create event descriptions. - */ - -/* Named field types must be defined in lttng-types.h */ - -#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */ - -#ifndef TP_PROBE_CB -#define TP_PROBE_CB(_template) &__event_probe__##_template -#endif - -#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS -#define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(_template, _name, _map) \ -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, \ -}; - -#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP -#define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(_template, _name, _map, _proto, _args) \ - LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(_template, _name, _map) - -#include TRACE_INCLUDE(TRACE_INCLUDE_FILE) - - /* * Stage 4 of the trace events. * - * Create an array of event description pointers. - */ - -/* Named field types must be defined in lttng-types.h */ - -#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */ - -#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS -#define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(_template, _name, _map) \ - &__event_desc___##_map, - -#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP -#define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(_template, _name, _map, _proto, _args) \ - LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(_template, _name, _map) - -#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) -}; - -#undef TP_ID1 -#undef TP_ID - - -/* - * Stage 5 of the trace events. - * - * Create a toplevel descriptor for the whole probe. - */ - -#define TP_ID1(_token, _system) _token##_system -#define TP_ID(_token, _system) TP_ID1(_token, _system) - -/* non-const because list head will be modified when registered. */ -static __used struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { - .provider = __stringify(TRACE_SYSTEM), - .event_desc = TP_ID(__event_desc___, TRACE_SYSTEM), - .nr_events = ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)), - .head = { NULL, NULL }, - .lazy_init_head = { NULL, NULL }, - .lazy = 0, -}; - -#undef TP_ID1 -#undef TP_ID - -/* - * Stage 6 of the trace events. - * * Create static inline function that calculates event size. */ -#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */ - -/* Named field types must be defined in lttng-types.h */ +/* Reset all macros within TRACEPOINT_EVENT */ +#include "lttng-events-reset.h" +#include "lttng-events-write.h" -#undef __field_full -#define __field_full(_type, _item, _order, _base) \ +#undef _ctf_integer_ext +#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _user, _nowrite) \ __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \ __event_len += sizeof(_type); -#undef __array_enc_ext -#define __array_enc_ext(_type, _item, _length, _order, _base, _encoding) \ +#undef _ctf_array_encoded +#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _user, _nowrite) \ __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \ __event_len += sizeof(_type) * (_length); -#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 += sizeof(u32); \ +#undef _ctf_sequence_encoded +#define _ctf_sequence_encoded(_type, _item, _src, _length_type, \ + _src_length, _encoding, _base, _user, _nowrite) \ + __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++; -#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; - /* - * strlen_user includes \0. If returns 0, it faulted, so we set size to + * ctf_user_string includes \0. If returns 0, it faulted, so we set size to * 1 (\0 only). */ -#undef __string_from_user -#define __string_from_user(_item, _src) \ - __event_len += __dynamic_len[__dynamic_len_idx++] = \ - max_t(size_t, lttng_strlen_user_inatomic(_src), 1); +#undef _ctf_string +#define _ctf_string(_item, _src, _user, _nowrite) \ + if (_user) \ + __event_len += __dynamic_len[__dynamic_len_idx++] = \ + strlen(_src) + 1; \ + else \ + __event_len += __dynamic_len[__dynamic_len_idx++] = \ + max_t(size_t, lttng_strlen_user_inatomic(_src), 1); #undef TP_PROTO -#define TP_PROTO(args...) args +#define TP_PROTO(...) __VA_ARGS__ -#undef TP_STRUCT__entry -#define TP_STRUCT__entry(args...) args +#undef TP_FIELDS +#define TP_FIELDS(...) __VA_ARGS__ #undef TP_locvar #define TP_locvar(...) __VA_ARGS__ #undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE -#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, _proto, _args, _locvar, _code, _tstruct, _assign, _print) \ +#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, _proto, _args, _locvar, _code, _fields) \ static inline size_t __event_get_size__##_name(size_t *__dynamic_len, \ void *__tp_locvar, _proto) \ { \ @@ -504,12 +315,12 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len, \ unsigned int __dynamic_len_idx __attribute__((unused)) = 0; \ struct { _locvar } *tp_locvar __attribute__((unused)) = __tp_locvar; \ \ - _tstruct \ + _fields \ return __event_len; \ } #undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS -#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) \ +#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, _fields) \ static inline size_t __event_get_size__##_name(size_t *__dynamic_len, \ void *__tp_locvar) \ { \ @@ -517,300 +328,318 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len, \ unsigned int __dynamic_len_idx __attribute__((unused)) = 0; \ struct { _locvar } *tp_locvar __attribute__((unused)) = __tp_locvar; \ \ - _tstruct \ + _fields \ return __event_len; \ } #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) + /* - * Stage 7 of the trace events. + * Stage 4.1 of tracepoint event generation. * - * Create static inline function that calculates event payload alignment. + * Create static inline function that layout the filter stack data. + * We make both write and nowrite data available to the filter. */ -#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */ - -/* Named field types must be defined in lttng-types.h */ - -#undef __field_full -#define __field_full(_type, _item, _order, _base) \ - __event_align = max_t(size_t, __event_align, lttng_alignof(_type)); - -#undef __array_enc_ext -#define __array_enc_ext(_type, _item, _length, _order, _base, _encoding) \ - __event_align = max_t(size_t, __event_align, lttng_alignof(_type)); - -#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(_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) +/* Reset all macros within TRACEPOINT_EVENT */ +#include "lttng-events-reset.h" +#include "lttng-events-write.h" +#include "lttng-events-nowrite.h" + +#undef _ctf_integer_ext_fetched +#define _ctf_integer_ext_fetched(_type, _item, _src, _byte_order, _base, _nowrite) \ + if (lttng_is_signed_type(_type)) { \ + int64_t __ctf_tmp_int64; \ + switch (sizeof(_type)) { \ + case 1: \ + { \ + union { _type t; int8_t v; } __tmp = { (_type) (_src) }; \ + __ctf_tmp_int64 = (int64_t) __tmp.v; \ + break; \ + } \ + case 2: \ + { \ + union { _type t; int16_t v; } __tmp = { (_type) (_src) }; \ + __ctf_tmp_int64 = (int64_t) __tmp.v; \ + break; \ + } \ + case 4: \ + { \ + union { _type t; int32_t v; } __tmp = { (_type) (_src) }; \ + __ctf_tmp_int64 = (int64_t) __tmp.v; \ + break; \ + } \ + case 8: \ + { \ + union { _type t; int64_t v; } __tmp = { (_type) (_src) }; \ + __ctf_tmp_int64 = (int64_t) __tmp.v; \ + break; \ + } \ + default: \ + BUG_ON(1); \ + }; \ + memcpy(__stack_data, &__ctf_tmp_int64, sizeof(int64_t)); \ + } else { \ + uint64_t __ctf_tmp_uint64; \ + switch (sizeof(_type)) { \ + case 1: \ + { \ + union { _type t; uint8_t v; } __tmp = { (_type) (_src) }; \ + __ctf_tmp_uint64 = (uint64_t) __tmp.v; \ + break; \ + } \ + case 2: \ + { \ + union { _type t; uint16_t v; } __tmp = { (_type) (_src) }; \ + __ctf_tmp_uint64 = (uint64_t) __tmp.v; \ + break; \ + } \ + case 4: \ + { \ + union { _type t; uint32_t v; } __tmp = { (_type) (_src) }; \ + __ctf_tmp_uint64 = (uint64_t) __tmp.v; \ + break; \ + } \ + case 8: \ + { \ + union { _type t; uint64_t v; } __tmp = { (_type) (_src) }; \ + __ctf_tmp_uint64 = (uint64_t) __tmp.v; \ + break; \ + } \ + default: \ + BUG_ON(1); \ + }; \ + memcpy(__stack_data, &__ctf_tmp_uint64, sizeof(uint64_t)); \ + } \ + __stack_data += sizeof(int64_t); + +#undef _ctf_integer_ext_isuser0 +#define _ctf_integer_ext_isuser0(_type, _item, _src, _byte_order, _base, _nowrite) \ + _ctf_integer_ext_fetched(_type, _item, _src, _byte_order, _base, _nowrite) + +#undef _ctf_integer_ext_isuser1 +#define _ctf_integer_ext_isuser1(_type, _item, _user_src, _byte_order, _base, _nowrite) \ +{ \ + __typeof__(_user_src) _src; \ + if (get_user(_src, &(_user_src))) \ + _src = 0; \ + _ctf_integer_ext_fetched(_type, _item, _src, _byte_order, _base, _nowrite) \ +} -#undef __string_from_user -#define __string_from_user(_item, _src) +#undef _ctf_integer_ext +#define _ctf_integer_ext(_type, _item, _user_src, _byte_order, _base, _user, _nowrite) \ + _ctf_integer_ext_isuser##_user(_type, _item, _user_src, _byte_order, _base, _nowrite) + +#undef _ctf_array_encoded +#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _user, _nowrite) \ + { \ + unsigned long __ctf_tmp_ulong = (unsigned long) (_length); \ + const void *__ctf_tmp_ptr = (_src); \ + memcpy(__stack_data, &__ctf_tmp_ulong, sizeof(unsigned long)); \ + __stack_data += sizeof(unsigned long); \ + memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **)); \ + __stack_data += sizeof(void **); \ + } + +#undef _ctf_sequence_encoded +#define _ctf_sequence_encoded(_type, _item, _src, _length_type, \ + _src_length, _encoding, _base, _user, _nowrite) \ + { \ + unsigned long __ctf_tmp_ulong = (unsigned long) (_src_length); \ + const void *__ctf_tmp_ptr = (_src); \ + memcpy(__stack_data, &__ctf_tmp_ulong, sizeof(unsigned long)); \ + __stack_data += sizeof(unsigned long); \ + memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **)); \ + __stack_data += sizeof(void **); \ + } + +#undef _ctf_string +#define _ctf_string(_item, _src, _user, _nowrite) \ + { \ + const void *__ctf_tmp_ptr = (_src); \ + memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **)); \ + __stack_data += sizeof(void **); \ + } #undef TP_PROTO -#define TP_PROTO(args...) args +#define TP_PROTO(...) __VA_ARGS__ -#undef TP_STRUCT__entry -#define TP_STRUCT__entry(args...) args +#undef TP_FIELDS +#define TP_FIELDS(...) __VA_ARGS__ #undef TP_locvar #define TP_locvar(...) __VA_ARGS__ -#undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE -#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, _proto, _args, _locvar, _code, _tstruct, _assign, _print) \ -static inline size_t __event_get_align__##_name(void *__tp_locvar, _proto) \ +#undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS +#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, _fields) \ +static inline \ +void __event_prepare_filter_stack__##_name(char *__stack_data, \ + void *__tp_locvar) \ { \ - size_t __event_align = 1; \ struct { _locvar } *tp_locvar __attribute__((unused)) = __tp_locvar; \ \ - _tstruct \ - return __event_align; \ + _fields \ } -#undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS -#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) \ -static inline size_t __event_get_align__##_name(void *__tp_locvar) \ +#undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE +#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, _proto, _args, _locvar, _code, _fields) \ +static inline \ +void __event_prepare_filter_stack__##_name(char *__stack_data, \ + void *__tp_locvar, _proto) \ { \ - size_t __event_align = 1; \ struct { _locvar } *tp_locvar __attribute__((unused)) = __tp_locvar; \ \ - _tstruct \ - return __event_align; \ + _fields \ } #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) /* - * Stage 8 of the trace events. + * Stage 5 of the trace events. * - * Create structure declaration that allows the "assign" macros to access the - * field types. + * Create static inline function that calculates event payload alignment. */ -#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */ +/* Reset all macros within TRACEPOINT_EVENT */ +#include "lttng-events-reset.h" +#include "lttng-events-write.h" -/* Named field types must be defined in lttng-types.h */ +#undef _ctf_integer_ext +#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _user, _nowrite) \ + __event_align = max_t(size_t, __event_align, lttng_alignof(_type)); -#undef __field_full -#define __field_full(_type, _item, _order, _base) _type _item; +#undef _ctf_array_encoded +#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _user, _nowrite) \ + __event_align = max_t(size_t, __event_align, lttng_alignof(_type)); -#undef __array_enc_ext -#define __array_enc_ext(_type, _item, _length, _order, _base, _encoding) \ - _type _item; +#undef _ctf_sequence_encoded +#define _ctf_sequence_encoded(_type, _item, _src, _length_type, \ + _src_length, _encoding, _base, _user, _nowrite) \ + __event_align = max_t(size_t, __event_align, lttng_alignof(_length_type)); \ + __event_align = max_t(size_t, __event_align, lttng_alignof(_type)); -#undef __dynamic_array_enc_ext -#define __dynamic_array_enc_ext(_type, _item, _length, _order, _base, _encoding)\ - _type _item; +#undef _ctf_string +#define _ctf_string(_item, _src, _user, _nowrite) -#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 TP_PROTO +#define TP_PROTO(...) __VA_ARGS__ -#undef __string -#define __string(_item, _src) char _item; +#undef TP_FIELDS +#define TP_FIELDS(...) __VA_ARGS__ -#undef __string_from_user -#define __string_from_user(_item, _src) \ - __string(_item, _src) +#undef TP_locvar +#define TP_locvar(...) __VA_ARGS__ -#undef TP_STRUCT__entry -#define TP_STRUCT__entry(args...) args +#undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE +#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, _proto, _args, _locvar, _code, _fields) \ +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; \ + \ + _fields \ + return __event_align; \ +} #undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS -#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) \ -struct __event_typemap__##_name { \ - _tstruct \ -}; - -#undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE -#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, _proto, _args, _locvar, _code, _tstruct, _assign, _print) \ - LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) +#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, _fields) \ +static inline size_t __event_get_align__##_name(void *__tp_locvar) \ +{ \ + size_t __event_align = 1; \ + struct { _locvar } *tp_locvar __attribute__((unused)) = __tp_locvar; \ + \ + _fields \ + return __event_align; \ +} #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) - /* - * Stage 9 of the trace events. - * - * Create the probe function : call even size calculation and write event data - * into the buffer. + * Stage 6 of tracepoint event generation. * - * We use both the field and assignment macros to write the fields in the order - * defined in the field declaration. The field declarations control the - * execution order, jumping to the appropriate assignment block. + * Create the probe function. This function calls event size calculation + * and writes event data into the buffer. */ -#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */ - -#undef __field_full -#define __field_full(_type, _item, _order, _base) \ - goto __assign_##_item; \ -__end_field_##_item: - -#undef __array_enc_ext -#define __array_enc_ext(_type, _item, _length, _order, _base, _encoding)\ - goto __assign_##_item; \ -__end_field_##_item: - -#undef __dynamic_array_enc_ext -#define __dynamic_array_enc_ext(_type, _item, _length, _order, _base, _encoding)\ - goto __assign_##_item##_1; \ -__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; \ -__end_field_##_item: - -#undef __string_from_user -#define __string_from_user(_item, _src) \ - __string(_item, _src) +/* Reset all macros within TRACEPOINT_EVENT */ +#include "lttng-events-reset.h" +#include "lttng-events-write.h" -/* - * Macros mapping tp_assign() to "=", tp_memcpy() to memcpy() and tp_strcpy() to - * strcpy(). - */ -#undef tp_assign -#define tp_assign(dest, src) \ -__assign_##dest: \ +#undef _ctf_integer_ext_fetched +#define _ctf_integer_ext_fetched(_type, _item, _src, _byte_order, _base, _nowrite) \ { \ - __typeof__(__typemap.dest) __tmp = (src); \ - lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__tmp)); \ + _type __tmp = _src; \ + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__tmp));\ __chan->ops->event_write(&__ctx, &__tmp, sizeof(__tmp));\ - } \ - goto __end_field_##dest; - -/* fixed length array memcpy */ -#undef tp_memcpy_gen -#define tp_memcpy_gen(write_ops, dest, src, len) \ -__assign_##dest: \ - if (0) \ - (void) __typemap.dest; \ - lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__typemap.dest)); \ - __chan->ops->write_ops(&__ctx, src, len); \ - goto __end_field_##dest; - -#undef tp_memcpy -#define tp_memcpy(dest, src, len) \ - tp_memcpy_gen(event_write, dest, src, len) - -#undef tp_memcpy_from_user -#define tp_memcpy_from_user(dest, src, len) \ - tp_memcpy_gen(event_write_from_user, dest, src, len) - -/* variable length sequence memcpy */ -#undef tp_memcpy_dyn_gen -#define tp_memcpy_dyn_gen(write_ops, dest, src) \ -__assign_##dest##_1: \ - { \ - u32 __tmpl = __dynamic_len[__dynamic_len_idx]; \ - 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, src, \ - 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: \ + } + +#undef _ctf_integer_ext_isuser0 +#define _ctf_integer_ext_isuser0(_type, _item, _src, _byte_order, _base, _nowrite) \ + _ctf_integer_ext_fetched(_type, _item, _src, _byte_order, _base, _nowrite) + +#undef _ctf_integer_ext_isuser1 +#define _ctf_integer_ext_isuser1(_type, _item, _user_src, _byte_order, _base, _nowrite) \ +{ \ + __typeof__(_user_src) _src; \ + if (get_user(_src, &(_user_src))) \ + _src = 0; \ + _ctf_integer_ext_fetched(_type, _item, _src, _byte_order, _base, _nowrite) \ +} + +#undef _ctf_integer_ext +#define _ctf_integer_ext(_type, _item, _user_src, _byte_order, _base, _user, _nowrite) \ + _ctf_integer_ext_isuser##_user(_type, _item, _user_src, _byte_order, _base, _nowrite) + +#undef _ctf_array_encoded +#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _user, _nowrite) \ + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type)); \ + if (_user) { \ + __chan->ops->event_write_from_user(&__ctx, _src, sizeof(_type) * (_length)); \ + } else { \ + __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, _base, _user, _nowrite) \ { \ - 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)); \ + _length_type __tmpl = __stackvar.__dynamic_len[__dynamic_len_idx]; \ + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_length_type));\ + __chan->ops->event_write(&__ctx, &__tmpl, sizeof(_length_type));\ } \ - 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) - -/* - * The string length including the final \0. - */ -#undef tp_copy_string_from_user -#define tp_copy_string_from_user(dest, src) \ -__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) \ -__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 */ - -#undef __get_str -#define __get_str(field) field - -#undef __get_dynamic_array -#define __get_dynamic_array(field) field + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type)); \ + if (_user) { \ + __chan->ops->event_write_from_user(&__ctx, _src, \ + sizeof(_type) * __get_dynamic_len(dest)); \ + } else { \ + __chan->ops->event_write(&__ctx, _src, \ + sizeof(_type) * __get_dynamic_len(dest)); \ + } + +#undef _ctf_string +#define _ctf_string(_item, _src, _user, _nowrite) \ + lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(*(_src))); \ + if (_user) { \ + __chan->ops->event_strcpy_from_user(&__ctx, _src, \ + __get_dynamic_len(dest)); \ + } else { \ + __chan->ops->event_strcpy(&__ctx, _src, \ + __get_dynamic_len(dest)); \ + } /* Beware: this get len actually consumes the len value */ -#undef __get_dynamic_array_len -#define __get_dynamic_array_len(field) __dynamic_len[__dynamic_len_idx++] +#undef __get_dynamic_len +#define __get_dynamic_len(field) __stackvar.__dynamic_len[__dynamic_len_idx++] #undef TP_PROTO -#define TP_PROTO(args...) args +#define TP_PROTO(...) __VA_ARGS__ #undef TP_ARGS -#define TP_ARGS(args...) args +#define TP_ARGS(...) __VA_ARGS__ -#undef TP_STRUCT__entry -#define TP_STRUCT__entry(args...) args - -#undef TP_fast_assign -#define TP_fast_assign(args...) args +#undef TP_FIELDS +#define TP_FIELDS(...) __VA_ARGS__ #undef TP_locvar #define TP_locvar(...) __VA_ARGS__ @@ -830,12 +659,14 @@ __assign_##dest: \ #endif /* TP_SESSION_CHECK */ /* - * __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. + * Using twice size for filter stack data to hold size and pointer for + * each field (worse case). For integers, max size required is 64-bit. + * Same for double-precision floats. Those fit within + * 2*sizeof(unsigned long) for all supported architectures. + * Perform UNION (||) of filter runtime list. */ #undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE -#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, _proto, _args, _locvar, _code, _tstruct, _assign, _print) \ +#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, _proto, _args, _locvar, _code, _fields) \ static void __event_probe__##_name(void *__data, _proto) \ { \ struct probe_local_vars { _locvar }; \ @@ -845,8 +676,10 @@ static void __event_probe__##_name(void *__data, _proto) \ 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)); \ + union { \ + size_t __dynamic_len[ARRAY_SIZE(__event_fields___##_name)]; \ + char __filter_stack_data[2 * sizeof(unsigned long) * ARRAY_SIZE(__event_fields___##_name)]; \ + } __stackvar; \ int __ret; \ struct probe_local_vars __tp_locvar; \ struct probe_local_vars *tp_locvar __attribute__((unused)) = \ @@ -865,24 +698,34 @@ static void __event_probe__##_name(void *__data, _proto) \ if (__lpf && likely(!lttng_pid_tracker_lookup(__lpf, current->pid))) \ return; \ _code \ - __event_len = __event_get_size__##_name(__dynamic_len, tp_locvar, \ - _args); \ + if (unlikely(!list_empty(&__event->bytecode_runtime_head))) { \ + struct lttng_bytecode_runtime *bc_runtime; \ + int __filter_record = __event->has_enablers_without_bytecode; \ + \ + __event_prepare_filter_stack__##_name(__stackvar.__filter_stack_data, \ + tp_locvar, _args); \ + list_for_each_entry_rcu(bc_runtime, &__event->bytecode_runtime_head, node) { \ + if (unlikely(bc_runtime->filter(bc_runtime, \ + __stackvar.__filter_stack_data) & LTTNG_FILTER_RECORD_FLAG)) \ + __filter_record = 1; \ + } \ + if (likely(!__filter_record)) \ + return; \ + } \ + __event_len = __event_get_size__##_name(__stackvar.__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); \ if (__ret < 0) \ return; \ - /* Control code (field ordering) */ \ - _tstruct \ + _fields \ __chan->ops->event_commit(&__ctx); \ - return; \ - /* Copy code, steered by control code */ \ - _assign \ } #undef LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS -#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, _tstruct, _assign, _print) \ +#define LTTNG_TRACEPOINT_EVENT_CLASS_CODE_NOARGS(_name, _locvar, _code, _fields) \ static void __event_probe__##_name(void *__data) \ { \ struct probe_local_vars { _locvar }; \ @@ -892,8 +735,10 @@ static void __event_probe__##_name(void *__data) \ 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)); \ + union { \ + size_t __dynamic_len[ARRAY_SIZE(__event_fields___##_name)]; \ + char __filter_stack_data[2 * sizeof(unsigned long) * ARRAY_SIZE(__event_fields___##_name)]; \ + } __stackvar; \ int __ret; \ struct probe_local_vars __tp_locvar; \ struct probe_local_vars *tp_locvar __attribute__((unused)) = \ @@ -912,30 +757,121 @@ static void __event_probe__##_name(void *__data) \ if (__lpf && likely(!lttng_pid_tracker_lookup(__lpf, current->pid))) \ return; \ _code \ - __event_len = __event_get_size__##_name(__dynamic_len, tp_locvar); \ + if (unlikely(!list_empty(&__event->bytecode_runtime_head))) { \ + struct lttng_bytecode_runtime *bc_runtime; \ + int __filter_record = __event->has_enablers_without_bytecode; \ + \ + __event_prepare_filter_stack__##_name(__stackvar.__filter_stack_data, \ + tp_locvar); \ + list_for_each_entry_rcu(bc_runtime, &__event->bytecode_runtime_head, node) { \ + if (unlikely(bc_runtime->filter(bc_runtime, \ + __stackvar.__filter_stack_data) & LTTNG_FILTER_RECORD_FLAG)) \ + __filter_record = 1; \ + } \ + if (likely(!__filter_record)) \ + return; \ + } \ + __event_len = __event_get_size__##_name(__stackvar.__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); \ if (__ret < 0) \ return; \ - /* Control code (field ordering) */ \ - _tstruct \ + _fields \ __chan->ops->event_commit(&__ctx); \ - return; \ - /* Copy code, steered by control code */ \ - _assign \ } #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) +#undef __get_dynamic_len + +/* + * Stage 7 of the trace events. + * + * Create event descriptions. + */ + +/* Named field types must be defined in lttng-types.h */ + +#include "lttng-events-reset.h" /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ + +#ifndef TP_PROBE_CB +#define TP_PROBE_CB(_template) &__event_probe__##_template +#endif + +#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS +#define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(_template, _name, _map) \ +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, \ +}; + +#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP +#define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(_template, _name, _map, _proto, _args) \ + LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(_template, _name, _map) + +#include TRACE_INCLUDE(TRACE_INCLUDE_FILE) + +/* + * Stage 8 of the trace events. + * + * Create an array of event description pointers. + */ + +#include "lttng-events-reset.h" /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ + +#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS +#define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(_template, _name, _map) \ + &__event_desc___##_map, + +#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP +#define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(_template, _name, _map, _proto, _args) \ + LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(_template, _name, _map) + +#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) +}; + +#undef TP_ID1 +#undef TP_ID + +/* + * Stage 9 of the trace events. + * + * Create a toplevel descriptor for the whole probe. + */ + +#define TP_ID1(_token, _system) _token##_system +#define TP_ID(_token, _system) TP_ID1(_token, _system) + +/* non-const because list head will be modified when registered. */ +static __used struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { + .provider = __stringify(TRACE_SYSTEM), + .event_desc = TP_ID(__event_desc___, TRACE_SYSTEM), + .nr_events = ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)), + .head = { NULL, NULL }, + .lazy_init_head = { NULL, NULL }, + .lazy = 0, +}; + +#undef TP_ID1 +#undef TP_ID + /* * Stage 10 of the trace events. * * Register/unregister probes at module load/unload. */ -#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */ +#include "lttng-events-reset.h" /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ #define TP_ID1(_token, _system) _token##_system #define TP_ID(_token, _system) TP_ID1(_token, _system)