/* Reset all macros within TRACEPOINT_EVENT */
#include <lttng/ust-tracepoint-event-reset.h>
-static inline lttng_ust_notrace
-void _TP_COMBINE_TOKENS(__tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void);
+static inline
+void _TP_COMBINE_TOKENS(__tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void)
+ lttng_ust_notrace;
static inline
void _TP_COMBINE_TOKENS(__tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void)
{
#define _TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
__tracepoint_provider_mismatch_##_provider();
-static inline lttng_ust_notrace
-void _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void);
+static inline
+void _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void)
+ lttng_ust_notrace;
static inline
void _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void)
{
__LTTNG_COMPOUND_LITERAL(struct lttng_ust_enum_entry, { \
.struct_size = sizeof(struct lttng_ust_enum_entry), \
.start = { \
- .value = lttng_is_signed_type(__typeof__(_value)) ? \
+ .value = lttng_ust_is_signed_type(__typeof__(_value)) ? \
(long long) (_value) : (_value), \
- .signedness = lttng_is_signed_type(__typeof__(_value)), \
+ .signedness = lttng_ust_is_signed_type(__typeof__(_value)), \
}, \
.end = { \
- .value = lttng_is_signed_type(__typeof__(_value)) ? \
+ .value = lttng_ust_is_signed_type(__typeof__(_value)) ? \
(long long) (_value) : (_value), \
- .signedness = lttng_is_signed_type(__typeof__(_value)), \
+ .signedness = lttng_ust_is_signed_type(__typeof__(_value)), \
}, \
.string = (_string), \
}),
__LTTNG_COMPOUND_LITERAL(struct lttng_ust_enum_entry, { \
.struct_size = sizeof(struct lttng_ust_enum_entry), \
.start = { \
- .value = lttng_is_signed_type(__typeof__(_range_start)) ? \
+ .value = lttng_ust_is_signed_type(__typeof__(_range_start)) ? \
(long long) (_range_start) : (_range_start), \
- .signedness = lttng_is_signed_type(__typeof__(_range_start)), \
+ .signedness = lttng_ust_is_signed_type(__typeof__(_range_start)), \
}, \
.end = { \
- .value = lttng_is_signed_type(__typeof__(_range_end)) ? \
+ .value = lttng_ust_is_signed_type(__typeof__(_range_end)) ? \
(long long) (_range_end) : (_range_end), \
- .signedness = lttng_is_signed_type(__typeof__(_range_end)), \
+ .signedness = lttng_ust_is_signed_type(__typeof__(_range_end)), \
}, \
.string = (_string), \
}),
#define _ctf_array_encoded(_type, _item, _src, _byte_order, \
_length, _encoding, _nowrite, \
_elem_type_base) \
- _lttng_array_element_type_is_supported(_type, _item)
+ lttng_ust_ctf_array_element_type_is_supported(_type, _item)
#undef _ctf_sequence_encoded
#define _ctf_sequence_encoded(_type, _item, _src, _byte_order, \
_length_type, _src_length, _encoding, _nowrite, \
_elem_type_base) \
- _lttng_array_element_type_is_supported(_type, _item)
+ lttng_ust_ctf_array_element_type_is_supported(_type, _item)
#undef TP_FIELDS
#define TP_FIELDS(...) __VA_ARGS__ /* Only one used in this phase */
.nofilter = 0, \
}),
+#undef _ctf_unused
+#define _ctf_unused(_src)
+
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
__LTTNG_COMPOUND_LITERAL(struct lttng_ust_event_field, { \
#undef _ctf_integer_ext
#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
- __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
+ if (0) \
+ (void) (_src); /* Unused */ \
+ __event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
__event_len += sizeof(_type);
#undef _ctf_float
#define _ctf_float(_type, _item, _src, _nowrite) \
- __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
+ if (0) \
+ (void) (_src); /* Unused */ \
+ __event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
__event_len += sizeof(_type);
#undef _ctf_array_encoded
#define _ctf_array_encoded(_type, _item, _src, _byte_order, _length, _encoding, \
_nowrite, _elem_type_base) \
- __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
+ if (0) \
+ (void) (_src); /* Unused */ \
+ __event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
__event_len += sizeof(_type) * (_length);
#undef _ctf_sequence_encoded
#define _ctf_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \
_src_length, _encoding, _nowrite, _elem_type_base) \
- __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_length_type)); \
+ if (0) \
+ (void) (_src); /* Unused */ \
+ __event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_length_type)); \
__event_len += sizeof(_length_type); \
- __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
+ __event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
__dynamic_len[__dynamic_len_idx] = (_src_length); \
__event_len += sizeof(_type) * __dynamic_len[__dynamic_len_idx]; \
__dynamic_len_idx++;
__event_len += __dynamic_len[__dynamic_len_idx++] = \
strlen((_src) ? (_src) : __LTTNG_UST_NULL_STRING) + 1;
+#undef _ctf_unused
+#define _ctf_unused(_src) \
+ if (0) \
+ (void) (_src); /* Unused */
+
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
_ctf_integer_ext(_type, _item, _src, BYTE_ORDER, 10, _nowrite)
#undef _TRACEPOINT_EVENT_CLASS
#define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
-static inline lttng_ust_notrace \
-size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS_DATA_PROTO(_args)); \
static inline \
size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS_DATA_PROTO(_args)) \
+ lttng_ust_notrace; \
+static inline \
+size_t __event_get_size__##_provider##___##_name( \
+ size_t *__dynamic_len __attribute__((__unused__)), \
+ _TP_ARGS_DATA_PROTO(_args)) \
{ \
size_t __event_len = 0; \
- unsigned int __dynamic_len_idx = 0; \
+ unsigned int __dynamic_len_idx __attribute__((__unused__)) = 0; \
\
if (0) \
- (void) __dynamic_len_idx; /* don't warn if unused */ \
+ (void) __tp_data; /* don't warn if unused */ \
+ \
_fields \
return __event_len; \
}
#undef _ctf_integer_ext
#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
- if (lttng_is_signed_type(_type)) { \
+ if (lttng_ust_is_signed_type(_type)) { \
int64_t __ctf_tmp_int64; \
switch (sizeof(_type)) { \
case 1: \
__stack_data += sizeof(void *); \
}
+#undef _ctf_unused
+#define _ctf_unused(_src) \
+ if (0) \
+ (void) (_src);
+
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
_ctf_integer_ext(_type, _item, _src, BYTE_ORDER, 10, _nowrite)
void __event_prepare_interpreter_stack__##_provider##___##_name(char *__stack_data,\
_TP_ARGS_DATA_PROTO(_args)) \
{ \
+ if (0) { \
+ (void) __tp_data; /* don't warn if unused */ \
+ (void) __stack_data; /* don't warn if unused */ \
+ } \
+ \
_fields \
}
#undef _ctf_integer_ext
#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
- __event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type));
+ if (0) \
+ (void) (_src); /* Unused */ \
+ __event_align = _tp_max_t(size_t, __event_align, lttng_ust_rb_alignof(_type));
#undef _ctf_float
#define _ctf_float(_type, _item, _src, _nowrite) \
- __event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type));
+ if (0) \
+ (void) (_src); /* Unused */ \
+ __event_align = _tp_max_t(size_t, __event_align, lttng_ust_rb_alignof(_type));
#undef _ctf_array_encoded
#define _ctf_array_encoded(_type, _item, _src, _byte_order, _length, \
_encoding, _nowrite, _elem_type_base) \
- __event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type));
+ if (0) \
+ (void) (_src); /* Unused */ \
+ __event_align = _tp_max_t(size_t, __event_align, lttng_ust_rb_alignof(_type));
#undef _ctf_sequence_encoded
#define _ctf_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \
_src_length, _encoding, _nowrite, _elem_type_base) \
- __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));
+ if (0) \
+ (void) (_src); /* Unused */ \
+ if (0) \
+ (void) (_src_length); /* Unused */ \
+ __event_align = _tp_max_t(size_t, __event_align, lttng_ust_rb_alignof(_length_type)); \
+ __event_align = _tp_max_t(size_t, __event_align, lttng_ust_rb_alignof(_type));
#undef _ctf_string
-#define _ctf_string(_item, _src, _nowrite)
+#define _ctf_string(_item, _src, _nowrite) \
+ if (0) \
+ (void) (_src); /* Unused */
+
+#undef _ctf_unused
+#define _ctf_unused(_src) \
+ if (0) \
+ (void) (_src); /* Unused */
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
#undef _TRACEPOINT_EVENT_CLASS
#define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
-static inline lttng_ust_notrace \
-size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)); \
+static inline \
+size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \
+ lttng_ust_notrace; \
static inline \
size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \
{ \
#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
{ \
_type __tmp = (_src); \
- lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__tmp));\
- __chan->ops->event_write(&__ctx, &__tmp, sizeof(__tmp));\
+ __chan->ops->event_write(&__ctx, &__tmp, sizeof(__tmp), lttng_ust_rb_alignof(__tmp));\
}
#undef _ctf_float
#define _ctf_float(_type, _item, _src, _nowrite) \
{ \
_type __tmp = (_src); \
- lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__tmp));\
- __chan->ops->event_write(&__ctx, &__tmp, sizeof(__tmp));\
+ __chan->ops->event_write(&__ctx, &__tmp, sizeof(__tmp), lttng_ust_rb_alignof(__tmp));\
}
#undef _ctf_array_encoded
#define _ctf_array_encoded(_type, _item, _src, _byte_order, _length, \
_encoding, _nowrite, _elem_type_base) \
- lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type)); \
if (lttng_ust_string_encoding_##_encoding == lttng_ust_string_encoding_none) \
- __chan->ops->event_write(&__ctx, _src, sizeof(_type) * (_length)); \
+ __chan->ops->event_write(&__ctx, _src, sizeof(_type) * (_length), lttng_ust_rb_alignof(_type)); \
else \
__chan->ops->event_pstrcpy_pad(&__ctx, (const char *) (_src), _length); \
_src_length, _encoding, _nowrite, _elem_type_base) \
{ \
_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));\
+ __chan->ops->event_write(&__ctx, &__tmpl, sizeof(_length_type), lttng_ust_rb_alignof(_length_type));\
} \
- lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type)); \
if (lttng_ust_string_encoding_##_encoding == lttng_ust_string_encoding_none) \
__chan->ops->event_write(&__ctx, _src, \
- sizeof(_type) * __get_dynamic_len(dest)); \
+ sizeof(_type) * __get_dynamic_len(dest), lttng_ust_rb_alignof(_type)); \
else \
__chan->ops->event_pstrcpy_pad(&__ctx, (const char *) (_src), __get_dynamic_len(dest)); \
#undef _ctf_string
-#define _ctf_string(_item, _src, _nowrite) \
+#define _ctf_string(_item, _src, _nowrite) \
{ \
const char *__ctf_tmp_string = \
((_src) ? (_src) : __LTTNG_UST_NULL_STRING); \
- lib_ring_buffer_align_ctx(&__ctx, \
- lttng_alignof(*__ctf_tmp_string)); \
__chan->ops->event_strcpy(&__ctx, __ctf_tmp_string, \
__get_dynamic_len(dest)); \
}
+#undef _ctf_unused
+#define _ctf_unused(_src)
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
*/
#undef _TRACEPOINT_EVENT_CLASS
#define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
-static lttng_ust_notrace \
-void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)); \
+static \
+void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)) \
+ lttng_ust_notrace; \
static \
void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)) \
{ \
struct lttng_ust_event_recorder *__event_recorder = (struct lttng_ust_event_recorder *) __event->child; \
struct lttng_ust_channel_buffer *__chan = __event_recorder->chan; \
struct lttng_ust_lib_ring_buffer_ctx __ctx; \
- struct lttng_ust_stack_ctx __lttng_ctx; \
\
__event_len = __event_get_size__##_provider##___##_name(__stackvar.__dynamic_len, \
_TP_ARGS_DATA_VAR(_args)); \
__event_align = __event_get_align__##_provider##___##_name(_TP_ARGS_VAR(_args)); \
- memset(&__lttng_ctx, 0, sizeof(__lttng_ctx)); \
- __lttng_ctx.struct_size = sizeof(struct lttng_ust_stack_ctx); \
- __lttng_ctx.event_recorder = __event_recorder; \
- lib_ring_buffer_ctx_init(&__ctx, __chan->chan, &__lttng_ctx, __event_len, \
- __event_align, __chan->handle); \
- __ctx.ip = _TP_IP_PARAM(TP_IP_PARAM); \
- __ret = __chan->ops->event_reserve(&__ctx, __event_recorder->id); \
+ lttng_ust_lib_ring_buffer_ctx_init(&__ctx, __event_recorder, __event_len, __event_align, \
+ _TP_IP_PARAM(TP_IP_PARAM)); \
+ __ret = __chan->ops->event_reserve(&__ctx); \
if (__ret < 0) \
return; \
_fields \
#undef LTTNG_TP_EXTERN_C
+/*
+ * Stage 7.0 of tracepoint event generation.
+ *
+ * Declare toplevel descriptor for the whole probe.
+ * Unlike C, C++ does not allow tentative definitions. Therefore, we
+ * need to explicitly declare the variable with "extern", using hidden
+ * visibility to keep this symbol from being exported to the global
+ * symbol table.
+ */
+
+extern struct lttng_ust_probe_desc _TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER)
+ __attribute__((visibility("hidden")));
+
/*
* Stage 7.1 of tracepoint event generation.
*
__attribute__((weakref ("_model_emf_uri___" #_provider "___" #_name)));\
static struct lttng_ust_event_desc __event_desc___##_provider##_##_name = { \
.struct_size = sizeof(struct lttng_ust_event_desc), \
- .name = #_provider ":" #_name, \
+ .event_name = #_name, \
+ .probe_desc = &__probe_desc___##_provider, \
.probe_callback = (void (*)(void)) &__event_probe__##_provider##___##_template, \
.ctx = NULL, \
.fields = __event_fields___##_provider##___##_template, \
* Create a toplevel descriptor for the whole probe.
*/
-/* non-const because list head will be modified when registered. */
-static struct lttng_ust_probe_desc _TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER) = {
+struct lttng_ust_probe_desc _TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER) = {
.struct_size = sizeof(struct lttng_ust_probe_desc),
- .provider = __tp_stringify(TRACEPOINT_PROVIDER),
+ .provider_name = __tp_stringify(TRACEPOINT_PROVIDER),
.event_desc = _TP_COMBINE_TOKENS(__event_desc___, TRACEPOINT_PROVIDER),
.nr_events = _TP_ARRAY_SIZE(_TP_COMBINE_TOKENS(__event_desc___, TRACEPOINT_PROVIDER)) - 1,
.head = { NULL, NULL },
/* Reset all macros within TRACEPOINT_EVENT */
#include <lttng/ust-tracepoint-event-reset.h>
-static void lttng_ust_notrace __attribute__((constructor))
-_TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void);
+static void
+_TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
+ lttng_ust_notrace __attribute__((constructor));
static void
_TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
{
}
}
-static void lttng_ust_notrace __attribute__((destructor))
-_TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void);
+static void
+_TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void)
+ lttng_ust_notrace __attribute__((destructor));
static void
_TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void)
{
}
int _TP_COMBINE_TOKENS(__tracepoint_provider_, TRACEPOINT_PROVIDER)
-__attribute__((visibility("default")));
+ __attribute__((visibility("default")));
projects / lttng-ust.git / blobdiff