#include <stdio.h>
#include <urcu/compiler.h>
+#include <urcu/rculist.h>
#include <lttng/ust-events.h>
#include <lttng/ringbuffer-config.h>
#include <lttng/ust-compiler.h>
#include <lttng/ust-tracepoint-event-nowrite.h>
#undef _ctf_integer_ext
-#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _written) \
+#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
{ \
.name = #_item, \
.type = __type_integer(_type, _byte_order, _base, none),\
- .written = _written, \
+ .nowrite = _nowrite, \
},
#undef _ctf_float
-#define _ctf_float(_type, _item, _src, _written) \
+#define _ctf_float(_type, _item, _src, _nowrite) \
{ \
.name = #_item, \
.type = __type_float(_type), \
- .written = _written, \
+ .nowrite = _nowrite, \
},
#undef _ctf_array_encoded
-#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _written) \
+#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _nowrite) \
{ \
.name = #_item, \
.type = \
.elem_type = __type_integer(_type, BYTE_ORDER, 10, _encoding), \
}, \
}, \
- .written = _written, \
+ .nowrite = _nowrite, \
},
#undef _ctf_sequence_encoded
#define _ctf_sequence_encoded(_type, _item, _src, \
- _length_type, _src_length, _encoding, _written) \
+ _length_type, _src_length, _encoding, _nowrite) \
{ \
.name = #_item, \
.type = \
.elem_type = __type_integer(_type, BYTE_ORDER, 10, _encoding), \
}, \
}, \
- .written = _written, \
+ .nowrite = _nowrite, \
},
#undef _ctf_string
-#define _ctf_string(_item, _src, _written) \
+#define _ctf_string(_item, _src, _nowrite) \
{ \
.name = #_item, \
.type = \
.atype = atype_string, \
.u.basic.string.encoding = lttng_encode_UTF8, \
}, \
- .written = _written, \
+ .nowrite = _nowrite, \
},
#undef TP_FIELDS
#include <lttng/ust-tracepoint-event-write.h>
#undef _ctf_integer_ext
-#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _written) \
+#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
__event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
__event_len += sizeof(_type);
#undef _ctf_float
-#define _ctf_float(_type, _item, _src, _written) \
+#define _ctf_float(_type, _item, _src, _nowrite) \
__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, _encoding, _written) \
+#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _nowrite) \
__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, _written) \
+ _src_length, _encoding, _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_idx++;
#undef _ctf_string
-#define _ctf_string(_item, _src, _written) \
+#define _ctf_string(_item, _src, _nowrite) \
__event_len += __dynamic_len[__dynamic_len_idx++] = strlen(_src) + 1;
#undef TP_ARGS
#include <lttng/ust-tracepoint-event-nowrite.h>
#undef _ctf_integer_ext
-#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _written) \
+#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
if (lttng_is_signed_type(_type)) { \
int64_t __ctf_tmp_int64 = (int64_t) (_type) (_src); \
memcpy(__stack_data, &__ctf_tmp_int64, sizeof(int64_t)); \
__stack_data += sizeof(int64_t);
#undef _ctf_float
-#define _ctf_float(_type, _item, _src, _written) \
+#define _ctf_float(_type, _item, _src, _nowrite) \
{ \
double __ctf_tmp_double = (double) (_type) (_src); \
memcpy(__stack_data, &__ctf_tmp_double, sizeof(double)); \
}
#undef _ctf_array_encoded
-#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _written) \
+#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _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, (_src), sizeof(void **)); \
+ 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, _written) \
+ _src_length, _encoding, _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, (_src), sizeof(void **)); \
+ memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **)); \
__stack_data += sizeof(void **); \
}
#undef _ctf_string
-#define _ctf_string(_item, _src, _written) \
+#define _ctf_string(_item, _src, _nowrite) \
{ \
- memcpy(__stack_data, (_src), sizeof(void **)); \
- __stack_data += sizeof(void *); \
+ const void *__ctf_tmp_ptr = (_src); \
+ memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **)); \
+ __stack_data += sizeof(void **); \
}
#undef TP_ARGS
#include <lttng/ust-tracepoint-event-write.h>
#undef _ctf_integer_ext
-#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _written) \
+#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
__event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type));
#undef _ctf_float
-#define _ctf_float(_type, _item, _src, _written) \
+#define _ctf_float(_type, _item, _src, _nowrite) \
__event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type));
#undef _ctf_array_encoded
-#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _written) \
+#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _nowrite) \
__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, _written) \
+ _src_length, _encoding, _nowrite) \
__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, _written)
+#define _ctf_string(_item, _src, _nowrite)
#undef TP_ARGS
#define TP_ARGS(...) __VA_ARGS__
#include <lttng/ust-tracepoint-event-write.h>
#undef _ctf_integer_ext
-#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _written) \
+#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
{ \
_type __tmp = (_src); \
lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__tmp));\
}
#undef _ctf_float
-#define _ctf_float(_type, _item, _src, _written) \
+#define _ctf_float(_type, _item, _src, _nowrite) \
{ \
_type __tmp = (_src); \
lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__tmp));\
}
#undef _ctf_array_encoded
-#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _written) \
+#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _nowrite) \
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, _written) \
+ _src_length, _encoding, _nowrite) \
{ \
_length_type __tmpl = __stackvar.__dynamic_len[__dynamic_len_idx]; \
lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_length_type));\
sizeof(_type) * __get_dynamic_len(dest));
#undef _ctf_string
-#define _ctf_string(_item, _src, _written) \
+#define _ctf_string(_item, _src, _nowrite) \
lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(*(_src))); \
__chan->ops->event_write(&__ctx, _src, __get_dynamic_len(dest));
* 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 TRACEPOINT_EVENT_CLASS
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
static \
void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)) \
{ \
- struct ltt_event *__event = __tp_data; \
- struct ltt_channel *__chan = __event->chan; \
+ struct lttng_event *__event = __tp_data; \
+ struct lttng_channel *__chan = __event->chan; \
struct lttng_ust_lib_ring_buffer_ctx __ctx; \
size_t __event_len, __event_align; \
size_t __dynamic_len_idx = 0; \
return; \
if (caa_unlikely(!CMM_ACCESS_ONCE(__event->enabled))) \
return; \
- if (caa_unlikely(__event->filter)) { \
+ if (caa_unlikely(!cds_list_empty(&__event->bytecode_runtime_head))) { \
+ struct lttng_bytecode_runtime *bc_runtime; \
+ int __filter_record = 0; \
+ \
__event_prepare_filter_stack__##_provider##___##_name(__stackvar.__filter_stack_data, \
- _TP_ARGS_DATA_VAR(_args)); \
- if (caa_likely(!__event->filter(__event->filter_data, __stackvar.__filter_stack_data))) \
+ _TP_ARGS_DATA_VAR(_args)); \
+ cds_list_for_each_entry_rcu(bc_runtime, &__event->bytecode_runtime_head, node) { \
+ if (caa_unlikely(bc_runtime->filter(bc_runtime, \
+ __stackvar.__filter_stack_data) & LTTNG_FILTER_RECORD_FLAG)) \
+ __filter_record = 1; \
+ } \
+ if (caa_likely(!__filter_record)) \
return; \
} \
__event_len = __event_get_size__##_provider##___##_name(__stackvar.__dynamic_len, \
#include TRACEPOINT_INCLUDE
+/*
+ * Stage 6.1 of tracepoint event generation.
+ *
+ * Tracepoint UML URI info.
+ */
+
+/* Reset all macros within TRACEPOINT_EVENT */
+#include <lttng/ust-tracepoint-event-reset.h>
+
+#undef TRACEPOINT_MODEL_EMF_URI
+#define TRACEPOINT_MODEL_EMF_URI(__provider, __name, __uri) \
+static const char *_model_emf_uri___##__provider##___##__name = __uri;
+
+#include TRACEPOINT_INCLUDE
+
/*
* Stage 7.1 of tracepoint event generation.
*
static const int * \
__ref_loglevel___##_provider##___##_name \
__attribute__((weakref ("_loglevel___" #_provider "___" #_name))); \
+static const char * \
+ __ref_model_emf_uri___##_provider##___##_name \
+ __attribute__((weakref ("_model_emf_uri___" #_provider "___" #_name)));\
const struct lttng_event_desc __event_desc___##_provider##_##_name = { \
.fields = __event_fields___##_provider##___##_template, \
.name = #_provider ":" #_name, \
.nr_fields = _TP_ARRAY_SIZE(__event_fields___##_provider##___##_template), \
.loglevel = &__ref_loglevel___##_provider##___##_name, \
.signature = __tp_event_signature___##_provider##___##_template, \
+ .u.ext.model_emf_uri = &__ref_model_emf_uri___##_provider##___##_name, \
};
#include TRACEPOINT_INCLUDE
{
int ret;
- ret = ltt_probe_register(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
+ ret = lttng_probe_register(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
assert(!ret);
}
static void
_TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void)
{
- ltt_probe_unregister(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
+ lttng_probe_unregister(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
}
int _TP_COMBINE_TOKENS(__tracepoint_provider_, TRACEPOINT_PROVIDER);
projects / lttng-ust.git / blobdiff