#undef tp_list_for_each_entry_rcu
#define tp_list_for_each_entry_rcu(pos, head, member) \
- for (pos = cds_list_entry(tp_rcu_dereference((head)->next), __typeof__(*pos), member); \
+ for (pos = cds_list_entry(lttng_ust_tp_rcu_dereference((head)->next), __typeof__(*pos), member); \
&pos->member != (head); \
- pos = cds_list_entry(tp_rcu_dereference(pos->member.next), __typeof__(*pos), member))
+ pos = cds_list_entry(lttng_ust_tp_rcu_dereference(pos->member.next), __typeof__(*pos), member))
/*
* LTTNG_UST_TRACEPOINT_EVENT_CLASS declares a class of tracepoints receiving the
#include <lttng/ust-tracepoint-event-write.h>
#include <lttng/ust-tracepoint-event-nowrite.h>
-#undef _ctf_integer_ext
-#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
+#undef lttng_ust__field_integer_ext
+#define lttng_ust__field_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, { \
.struct_size = sizeof(struct lttng_ust_event_field), \
.name = #_item, \
.nofilter = 0, \
}),
-#undef _ctf_float
-#define _ctf_float(_type, _item, _src, _nowrite) \
+#undef lttng_ust__field_float
+#define lttng_ust__field_float(_type, _item, _src, _nowrite) \
LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, { \
.struct_size = sizeof(struct lttng_ust_event_field), \
.name = #_item, \
LTTNG_UST_COMPOUND_LITERAL(const struct lttng_ust_event_field, { \
.struct_size = sizeof(struct lttng_ust_event_field), \
.name = "_" #_item "_length", \
- .type = lttng_ust_type_integer_define(_length_type, BYTE_ORDER, 10), \
+ .type = lttng_ust_type_integer_define(_length_type, LTTNG_UST_BYTE_ORDER, 10), \
.nowrite = _nowrite, \
.nofilter = 1, \
}), \
}, \
.struct_size = sizeof(struct lttng_ust_type_enum), \
.desc = &__enum_##_provider##_##_name, \
- .container_type = lttng_ust_type_integer_define(_type, BYTE_ORDER, 10), \
+ .container_type = lttng_ust_type_integer_define(_type, LTTNG_UST_BYTE_ORDER, 10), \
}), \
.nowrite = _nowrite, \
.nofilter = 0, \
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
static const struct lttng_ust_event_field * const lttng_ust__event_fields___##_provider##___##_name[] = { \
_fields \
- ctf_integer(int, dummy, 0) /* Dummy, C99 forbids 0-len array. */ \
+ lttng_ust_field_integer(int, dummy, 0) /* Dummy, C99 forbids 0-len array. */ \
};
#undef LTTNG_UST_TRACEPOINT_ENUM
#include <lttng/ust-tracepoint-event-reset.h>
#include <lttng/ust-tracepoint-event-write.h>
-#undef _ctf_integer_ext
-#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
+#undef lttng_ust__field_integer_ext
+#define lttng_ust__field_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
if (0) \
(void) (_src); /* Unused */ \
__event_len += lttng_ust_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
__event_len += sizeof(_type);
-#undef _ctf_float
-#define _ctf_float(_type, _item, _src, _nowrite) \
+#undef lttng_ust__field_float
+#define lttng_ust__field_float(_type, _item, _src, _nowrite) \
if (0) \
(void) (_src); /* Unused */ \
__event_len += lttng_ust_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
- _ctf_integer_ext(_type, _item, _src, BYTE_ORDER, 10, _nowrite)
+ lttng_ust__field_integer_ext(_type, _item, _src, LTTNG_UST_BYTE_ORDER, 10, _nowrite)
#undef LTTNG_UST_TP_ARGS
#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
#include <lttng/ust-tracepoint-event-write.h>
#include <lttng/ust-tracepoint-event-nowrite.h>
-#undef _ctf_integer_ext
-#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
+#undef lttng_ust__field_integer_ext
+#define lttng_ust__field_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
if (lttng_ust_is_signed_type(_type)) { \
int64_t __ctf_tmp_int64; \
switch (sizeof(_type)) { \
case 2: \
{ \
union { _type t; int16_t v; } __tmp = { (_type) (_src) }; \
- if (_byte_order != BYTE_ORDER) \
- __tmp.v = bswap_16(__tmp.v); \
+ if (_byte_order != LTTNG_UST_BYTE_ORDER) \
+ __tmp.v = lttng_ust_bswap_16(__tmp.v); \
__ctf_tmp_int64 = (int64_t) __tmp.v; \
break; \
} \
case 4: \
{ \
union { _type t; int32_t v; } __tmp = { (_type) (_src) }; \
- if (_byte_order != BYTE_ORDER) \
- __tmp.v = bswap_32(__tmp.v); \
+ if (_byte_order != LTTNG_UST_BYTE_ORDER) \
+ __tmp.v = lttng_ust_bswap_32(__tmp.v); \
__ctf_tmp_int64 = (int64_t) __tmp.v; \
break; \
} \
case 8: \
{ \
union { _type t; int64_t v; } __tmp = { (_type) (_src) }; \
- if (_byte_order != BYTE_ORDER) \
- __tmp.v = bswap_64(__tmp.v); \
+ if (_byte_order != LTTNG_UST_BYTE_ORDER) \
+ __tmp.v = lttng_ust_bswap_64(__tmp.v); \
__ctf_tmp_int64 = (int64_t) __tmp.v; \
break; \
} \
case 2: \
{ \
union { _type t; uint16_t v; } __tmp = { (_type) (_src) }; \
- if (_byte_order != BYTE_ORDER) \
- __tmp.v = bswap_16(__tmp.v); \
+ if (_byte_order != LTTNG_UST_BYTE_ORDER) \
+ __tmp.v = lttng_ust_bswap_16(__tmp.v); \
__ctf_tmp_uint64 = (uint64_t) __tmp.v; \
break; \
} \
case 4: \
{ \
union { _type t; uint32_t v; } __tmp = { (_type) (_src) }; \
- if (_byte_order != BYTE_ORDER) \
- __tmp.v = bswap_32(__tmp.v); \
+ if (_byte_order != LTTNG_UST_BYTE_ORDER) \
+ __tmp.v = lttng_ust_bswap_32(__tmp.v); \
__ctf_tmp_uint64 = (uint64_t) __tmp.v; \
break; \
} \
case 8: \
{ \
union { _type t; uint64_t v; } __tmp = { (_type) (_src) }; \
- if (_byte_order != BYTE_ORDER) \
- __tmp.v = bswap_64(__tmp.v); \
+ if (_byte_order != LTTNG_UST_BYTE_ORDER) \
+ __tmp.v = lttng_ust_bswap_64(__tmp.v); \
__ctf_tmp_uint64 = (uint64_t) __tmp.v; \
break; \
} \
} \
__stack_data += sizeof(int64_t);
-#undef _ctf_float
-#define _ctf_float(_type, _item, _src, _nowrite) \
+#undef lttng_ust__field_float
+#define lttng_ust__field_float(_type, _item, _src, _nowrite) \
{ \
double __ctf_tmp_double = (double) (_type) (_src); \
memcpy(__stack_data, &__ctf_tmp_double, sizeof(double)); \
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
- _ctf_integer_ext(_type, _item, _src, BYTE_ORDER, 10, _nowrite)
+ lttng_ust__field_integer_ext(_type, _item, _src, LTTNG_UST_BYTE_ORDER, 10, _nowrite)
#undef LTTNG_UST_TP_ARGS
#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
#include <lttng/ust-tracepoint-event-reset.h>
#include <lttng/ust-tracepoint-event-write.h>
-#undef _ctf_integer_ext
-#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
+#undef lttng_ust__field_integer_ext
+#define lttng_ust__field_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
if (0) \
(void) (_src); /* Unused */ \
lttng_ust__event_align = lttng_ust__tp_max_t(size_t, lttng_ust__event_align, lttng_ust_rb_alignof(_type));
-#undef _ctf_float
-#define _ctf_float(_type, _item, _src, _nowrite) \
+#undef lttng_ust__field_float
+#define lttng_ust__field_float(_type, _item, _src, _nowrite) \
if (0) \
(void) (_src); /* Unused */ \
lttng_ust__event_align = lttng_ust__tp_max_t(size_t, lttng_ust__event_align, lttng_ust_rb_alignof(_type));
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
- _ctf_integer_ext(_type, _item, _src, BYTE_ORDER, 10, _nowrite)
+ lttng_ust__field_integer_ext(_type, _item, _src, LTTNG_UST_BYTE_ORDER, 10, _nowrite)
#undef LTTNG_UST_TP_ARGS
#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
#include <lttng/ust-tracepoint-event-reset.h>
#include <lttng/ust-tracepoint-event-write.h>
-#undef _ctf_integer_ext
-#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
+#undef lttng_ust__field_integer_ext
+#define lttng_ust__field_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
{ \
_type __tmp = (_src); \
__chan->ops->event_write(&__ctx, &__tmp, sizeof(__tmp), lttng_ust_rb_alignof(__tmp));\
}
-#undef _ctf_float
-#define _ctf_float(_type, _item, _src, _nowrite) \
+#undef lttng_ust__field_float
+#define lttng_ust__field_float(_type, _item, _src, _nowrite) \
{ \
_type __tmp = (_src); \
__chan->ops->event_write(&__ctx, &__tmp, sizeof(__tmp), lttng_ust_rb_alignof(__tmp));\
} \
if (lttng_ust_string_encoding_##_encoding == lttng_ust_string_encoding_none) \
__chan->ops->event_write(&__ctx, _src, \
- sizeof(_type) * __get_dynamic_len(dest), lttng_ust_rb_alignof(_type)); \
+ sizeof(_type) * lttng_ust__get_dynamic_len(dest), lttng_ust_rb_alignof(_type)); \
else \
- __chan->ops->event_pstrcpy_pad(&__ctx, (const char *) (_src), __get_dynamic_len(dest)); \
+ __chan->ops->event_pstrcpy_pad(&__ctx, (const char *) (_src), lttng_ust__get_dynamic_len(dest)); \
#undef _ctf_string
#define _ctf_string(_item, _src, _nowrite) \
const char *__ctf_tmp_string = \
((_src) ? (_src) : LTTNG_UST__NULL_STRING); \
__chan->ops->event_strcpy(&__ctx, __ctf_tmp_string, \
- __get_dynamic_len(dest)); \
+ lttng_ust__get_dynamic_len(dest)); \
}
#undef _ctf_unused
#undef _ctf_enum
#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite) \
- _ctf_integer_ext(_type, _item, _src, BYTE_ORDER, 10, _nowrite)
+ lttng_ust__field_integer_ext(_type, _item, _src, LTTNG_UST_BYTE_ORDER, 10, _nowrite)
/* Beware: this get len actually consumes the len value */
-#undef __get_dynamic_len
-#define __get_dynamic_len(field) __stackvar.__dynamic_len[__dynamic_len_idx++]
+#undef lttng_ust__get_dynamic_len
+#define lttng_ust__get_dynamic_len(field) __stackvar.__dynamic_len[__dynamic_len_idx++]
#undef LTTNG_UST_TP_ARGS
#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
* architecture for now by always using the NULL value for the ip
* context.
*/
-#undef _TP_IP_PARAM
-#ifdef TP_IP_PARAM
-#define _TP_IP_PARAM(x) (x)
+#undef LTTNG_UST__TP_IP_PARAM
+
+#ifdef LTTNG_UST_TP_IP_PARAM
+#define LTTNG_UST__TP_IP_PARAM(x) (x)
#else /* TP_IP_PARAM */
#if defined(LTTNG_UST_ARCH_PPC) && !defined(LTTNG_UST_ARCH_PPC64)
-#define _TP_IP_PARAM(x) NULL
+#define LTTNG_UST__TP_IP_PARAM(x) NULL
#else
-#define _TP_IP_PARAM(x) __builtin_return_address(0)
+#define LTTNG_UST__TP_IP_PARAM(x) __builtin_return_address(0)
#endif
#endif /* TP_IP_PARAM */
} \
if (caa_unlikely(!CMM_ACCESS_ONCE(__event->enabled))) \
return; \
- if (caa_unlikely(!TP_RCU_LINK_TEST())) \
+ if (caa_unlikely(!LTTNG_UST_TP_RCU_LINK_TEST())) \
return; \
if (caa_unlikely(CMM_ACCESS_ONCE(__event->eval_filter))) { \
lttng_ust__event_prepare_interpreter_stack__##_provider##___##_name(__stackvar.__interpreter_stack_data, \
LTTNG_UST__TP_ARGS_DATA_VAR(_args)); \
lttng_ust__event_align = lttng_ust__event_get_align__##_provider##___##_name(LTTNG_UST__TP_ARGS_VAR(_args)); \
lttng_ust_ring_buffer_ctx_init(&__ctx, lttng_ust__event_recorder, __event_len, lttng_ust__event_align, \
- _TP_IP_PARAM(TP_IP_PARAM)); \
+ LTTNG_UST__TP_IP_PARAM(LTTNG_UST_TP_IP_PARAM)); \
__ret = __chan->ops->event_reserve(&__ctx); \
if (__ret < 0) \
return; \
#include LTTNG_UST_TRACEPOINT_INCLUDE
-#undef __get_dynamic_len
+#undef lttng_ust__get_dynamic_len
/*
* Stage 5.1 of tracepoint event generation.
#undef LTTNG_UST_TP_ARGS
#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__
-#define _TP_EXTRACT_STRING2(...) #__VA_ARGS__
+#define LTTNG_UST__TP_EXTRACT_STRING2(...) #__VA_ARGS__
#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
static const char __tp_event_signature___##_provider##___##_name[] = \
- _TP_EXTRACT_STRING2(_args);
+ LTTNG_UST__TP_EXTRACT_STRING2(_args);
#include LTTNG_UST_TRACEPOINT_INCLUDE
-#undef _TP_EXTRACT_STRING2
+#undef LTTNG_UST__TP_EXTRACT_STRING2
/*
* Stage 6 of tracepoint event generation.
* symbol table.
*/
-extern const struct lttng_ust_probe_desc LTTNG_UST__TP_COMBINE_TOKENS(__probe_desc___, LTTNG_UST_TRACEPOINT_PROVIDER)
+extern const struct lttng_ust_probe_desc LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__probe_desc___, LTTNG_UST_TRACEPOINT_PROVIDER)
__attribute__((visibility("hidden")));
/*
static const struct lttng_ust_event_desc lttng_ust__event_desc___##_provider##_##_name = { \
.struct_size = sizeof(struct lttng_ust_event_desc), \
.event_name = #_name, \
- .probe_desc = &__probe_desc___##_provider, \
+ .probe_desc = <tng_ust__probe_desc___##_provider, \
.probe_callback = (void (*)(void)) <tng_ust__event_probe__##_provider##___##_template, \
.fields = lttng_ust__event_fields___##_provider##___##_template, \
.nr_fields = LTTNG_UST__TP_ARRAY_SIZE(lttng_ust__event_fields___##_provider##___##_template) - 1, \
* Create a toplevel descriptor for the whole probe.
*/
-const struct lttng_ust_probe_desc LTTNG_UST__TP_COMBINE_TOKENS(__probe_desc___, LTTNG_UST_TRACEPOINT_PROVIDER) = {
+const struct lttng_ust_probe_desc LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__probe_desc___, LTTNG_UST_TRACEPOINT_PROVIDER) = {
.struct_size = sizeof(struct lttng_ust_probe_desc),
.provider_name = lttng_ust__tp_stringify(LTTNG_UST_TRACEPOINT_PROVIDER),
.event_desc = LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__event_desc___, LTTNG_UST_TRACEPOINT_PROVIDER),
.minor = LTTNG_UST_PROVIDER_MINOR,
};
-static int LTTNG_UST__TP_COMBINE_TOKENS(__probe_register_refcount___, LTTNG_UST_TRACEPOINT_PROVIDER);
-static struct lttng_ust_registered_probe *LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER);
+static int LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__probe_register_refcount___, LTTNG_UST_TRACEPOINT_PROVIDER);
+static struct lttng_ust_registered_probe *LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER);
/*
* Stage 9 of tracepoint event generation.
/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
#include <lttng/ust-tracepoint-event-reset.h>
static void
-LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_init__, LTTNG_UST_TRACEPOINT_PROVIDER)(void)
+LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__events_init__, LTTNG_UST_TRACEPOINT_PROVIDER)(void)
lttng_ust_notrace __attribute__((constructor));
static void
-LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_init__, LTTNG_UST_TRACEPOINT_PROVIDER)(void)
+LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__events_init__, LTTNG_UST_TRACEPOINT_PROVIDER)(void)
{
struct lttng_ust_registered_probe *reg_probe;
- if (LTTNG_UST__TP_COMBINE_TOKENS(__probe_register_refcount___,
+ if (LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__probe_register_refcount___,
LTTNG_UST_TRACEPOINT_PROVIDER)++) {
return;
}
* error will appear.
*/
LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, LTTNG_UST_TRACEPOINT_PROVIDER)();
- assert(!LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER));
- reg_probe = lttng_ust_probe_register(<TNG_UST__TP_COMBINE_TOKENS(__probe_desc___, LTTNG_UST_TRACEPOINT_PROVIDER));
+ assert(!LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER));
+ reg_probe = lttng_ust_probe_register(<TNG_UST__TP_COMBINE_TOKENS(lttng_ust__probe_desc___, LTTNG_UST_TRACEPOINT_PROVIDER));
if (!reg_probe) {
fprintf(stderr, "LTTng-UST: Error while registering tracepoint probe.\n");
abort();
}
- LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER) = reg_probe;
+ LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER) = reg_probe;
}
static void
-LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_exit__, LTTNG_UST_TRACEPOINT_PROVIDER)(void)
+LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__events_exit__, LTTNG_UST_TRACEPOINT_PROVIDER)(void)
lttng_ust_notrace __attribute__((destructor));
static void
-LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_exit__, LTTNG_UST_TRACEPOINT_PROVIDER)(void)
+LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__events_exit__, LTTNG_UST_TRACEPOINT_PROVIDER)(void)
{
- if (--LTTNG_UST__TP_COMBINE_TOKENS(__probe_register_refcount___,
+ if (--LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__probe_register_refcount___,
LTTNG_UST_TRACEPOINT_PROVIDER)) {
return;
}
- lttng_ust_probe_unregister(LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER));
- LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER) = NULL;
+ lttng_ust_probe_unregister(LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER));
+ LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust__probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER) = NULL;
}
int LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_, LTTNG_UST_TRACEPOINT_PROVIDER)
projects / lttng-ust.git / blobdiff