projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ctf_enum_auto() for autoincrementing enumeration values
[lttng-ust.git]
/
include
/
lttng
/
ust-tracepoint-event.h
diff --git
a/include/lttng/ust-tracepoint-event.h
b/include/lttng/ust-tracepoint-event.h
index 2b599a889662a562dc553e3019456eedb2e8d1e0..0b4e5a262b537ea7de75b4502a83c7480a5c9d27 100644
(file)
--- a/
include/lttng/ust-tracepoint-event.h
+++ b/
include/lttng/ust-tracepoint-event.h
@@
-132,14
+132,14
@@
static const char \
#define ctf_enum_value(_string, _value) \
{ \
.start = { \
#define ctf_enum_value(_string, _value) \
{ \
.start = { \
- .signedness = lttng_is_signed_type(__typeof__(_value)), \
.value = lttng_is_signed_type(__typeof__(_value)) ? \
(long long) (_value) : (_value), \
.value = lttng_is_signed_type(__typeof__(_value)) ? \
(long long) (_value) : (_value), \
+ .signedness = lttng_is_signed_type(__typeof__(_value)), \
}, \
.end = { \
}, \
.end = { \
- .signedness = lttng_is_signed_type(__typeof__(_value)), \
.value = lttng_is_signed_type(__typeof__(_value)) ? \
(long long) (_value) : (_value), \
.value = lttng_is_signed_type(__typeof__(_value)) ? \
(long long) (_value) : (_value), \
+ .signedness = lttng_is_signed_type(__typeof__(_value)), \
}, \
.string = (_string), \
},
}, \
.string = (_string), \
},
@@
-149,18
+149,38
@@
static const char \
#define ctf_enum_range(_string, _range_start, _range_end) \
{ \
.start = { \
#define ctf_enum_range(_string, _range_start, _range_end) \
{ \
.start = { \
- .signedness = lttng_is_signed_type(__typeof__(_range_start)), \
.value = lttng_is_signed_type(__typeof__(_range_start)) ? \
(long long) (_range_start) : (_range_start), \
.value = lttng_is_signed_type(__typeof__(_range_start)) ? \
(long long) (_range_start) : (_range_start), \
+ .signedness = lttng_is_signed_type(__typeof__(_range_start)), \
}, \
.end = { \
}, \
.end = { \
- .signedness = lttng_is_signed_type(__typeof__(_range_end)), \
.value = lttng_is_signed_type(__typeof__(_range_end)) ? \
(long long) (_range_end) : (_range_end), \
.value = lttng_is_signed_type(__typeof__(_range_end)) ? \
(long long) (_range_end) : (_range_end), \
+ .signedness = lttng_is_signed_type(__typeof__(_range_end)), \
}, \
.string = (_string), \
},
}, \
.string = (_string), \
},
+/* Enumeration entry (automatic value; follows the rules of CTF) */
+#undef ctf_enum_auto
+#define ctf_enum_auto(_string) \
+ { \
+ .start = { \
+ .value = -1ULL, \
+ .signedness = 0, \
+ }, \
+ .end = { \
+ .value = -1ULL, \
+ .signedness = 0, \
+ }, \
+ .string = (_string), \
+ .u = { \
+ .extra = { \
+ .options = LTTNG_ENUM_ENTRY_OPTION_IS_AUTO, \
+ }, \
+ }, \
+ },
+
#undef TP_ENUM_VALUES
#define TP_ENUM_VALUES(...) \
__VA_ARGS__
#undef TP_ENUM_VALUES
#define TP_ENUM_VALUES(...) \
__VA_ARGS__
@@
-169,6
+189,7
@@
static const char \
#define TRACEPOINT_ENUM(_provider, _name, _values) \
const struct lttng_enum_entry __enum_values__##_provider##_##_name[] = { \
_values \
#define TRACEPOINT_ENUM(_provider, _name, _values) \
const struct lttng_enum_entry __enum_values__##_provider##_##_name[] = { \
_values \
+ ctf_enum_value("", 0) /* Dummy, 0-len array forbidden by C99. */ \
};
#include TRACEPOINT_INCLUDE
};
#include TRACEPOINT_INCLUDE
@@
-202,7
+223,9
@@
static const char \
},
#undef _ctf_array_encoded
},
#undef _ctf_array_encoded
-#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _nowrite) \
+#define _ctf_array_encoded(_type, _item, _src, _byte_order, \
+ _length, _encoding, _nowrite, \
+ _elem_type_base) \
{ \
.name = #_item, \
.type = \
{ \
.name = #_item, \
.type = \
@@
-212,7
+235,7
@@
static const char \
{ \
.array = \
{ \
{ \
.array = \
{ \
- .elem_type = __type_integer(_type,
BYTE_ORDER, 10
, _encoding), \
+ .elem_type = __type_integer(_type,
_byte_order, _elem_type_base
, _encoding), \
.length = _length, \
} \
} \
.length = _length, \
} \
} \
@@
-288,6
+311,7
@@
static const char \
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
static const struct lttng_event_field __event_fields___##_provider##___##_name[] = { \
_fields \
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
static const struct lttng_event_field __event_fields___##_provider##___##_name[] = { \
_fields \
+ ctf_integer(int, dummy, 0) /* Dummy, C99 forbids 0-len array. */ \
};
#undef TRACEPOINT_ENUM
};
#undef TRACEPOINT_ENUM
@@
-295,7
+319,7
@@
static const char \
static const struct lttng_enum_desc __enum_##_provider##_##_name = { \
.name = #_provider "_" #_name, \
.entries = __enum_values__##_provider##_##_name, \
static const struct lttng_enum_desc __enum_##_provider##_##_name = { \
.name = #_provider "_" #_name, \
.entries = __enum_values__##_provider##_##_name, \
- .nr_entries = _TP_ARRAY_SIZE(__enum_values__##_provider##_##_name)
,
\
+ .nr_entries = _TP_ARRAY_SIZE(__enum_values__##_provider##_##_name)
- 1,
\
};
#include TRACEPOINT_INCLUDE
};
#include TRACEPOINT_INCLUDE
@@
-339,7
+363,8
@@
static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
__event_len += sizeof(_type);
#undef _ctf_array_encoded
__event_len += sizeof(_type);
#undef _ctf_array_encoded
-#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _nowrite) \
+#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)); \
__event_len += sizeof(_type) * (_length);
__event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
__event_len += sizeof(_type) * (_length);
@@
-486,7
+511,8
@@
size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS
}
#undef _ctf_array_encoded
}
#undef _ctf_array_encoded
-#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _nowrite) \
+#define _ctf_array_encoded(_type, _item, _src, _byte_order, _length, \
+ _encoding, _nowrite, _elem_type_base) \
{ \
unsigned long __ctf_tmp_ulong = (unsigned long) (_length); \
const void *__ctf_tmp_ptr = (_src); \
{ \
unsigned long __ctf_tmp_ulong = (unsigned long) (_length); \
const void *__ctf_tmp_ptr = (_src); \
@@
-557,7
+583,8
@@
void __event_prepare_filter_stack__##_provider##___##_name(char *__stack_data,\
__event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type));
#undef _ctf_array_encoded
__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, _nowrite) \
+#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));
#undef _ctf_sequence_encoded
__event_align = _tp_max_t(size_t, __event_align, lttng_alignof(_type));
#undef _ctf_sequence_encoded
@@
-622,7
+649,8
@@
size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \
}
#undef _ctf_array_encoded
}
#undef _ctf_array_encoded
-#define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _nowrite) \
+#define _ctf_array_encoded(_type, _item, _src, _byte_order, _length, \
+ _encoding, _nowrite, _elem_type_base) \
lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type)); \
__chan->ops->event_write(&__ctx, _src, sizeof(_type) * (_length));
lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type)); \
__chan->ops->event_write(&__ctx, _src, sizeof(_type) * (_length));
@@
-729,8
+757,8
@@
void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)) \
size_t __event_len, __event_align; \
size_t __dynamic_len_idx = 0; \
union { \
size_t __event_len, __event_align; \
size_t __dynamic_len_idx = 0; \
union { \
- size_t __dynamic_len[_TP_ARRAY_SIZE(__event_fields___##_provider##___##_name)]; \
- char __filter_stack_data[2 * sizeof(unsigned long) *
_TP_ARRAY_SIZE(__event_fields___##_provider##___##_name
)]; \
+ size_t __dynamic_len[_TP_ARRAY_SIZE(__event_fields___##_provider##___##_name)
- 1
]; \
+ char __filter_stack_data[2 * sizeof(unsigned long) *
(_TP_ARRAY_SIZE(__event_fields___##_provider##___##_name) - 1
)]; \
} __stackvar; \
int __ret; \
\
} __stackvar; \
int __ret; \
\
@@
-797,7
+825,7
@@
void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)) \
#undef TRACEPOINT_EVENT_CLASS
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
#undef TRACEPOINT_EVENT_CLASS
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
-
const char __tp_event_signature___##_provider##___##_name[] =
\
+
static const char __tp_event_signature___##_provider##___##_name[] =
\
_TP_EXTRACT_STRING2(_args);
#include TRACEPOINT_INCLUDE
_TP_EXTRACT_STRING2(_args);
#include TRACEPOINT_INCLUDE
@@
-858,12
+886,12
@@
static const int * \
static const char * \
__ref_model_emf_uri___##_provider##___##_name \
__attribute__((weakref ("_model_emf_uri___" #_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 = {
\
+
static const struct lttng_event_desc __event_desc___##_provider##_##_name = {
\
.name = #_provider ":" #_name, \
.probe_callback = (void (*)(void)) &__event_probe__##_provider##___##_template,\
.ctx = NULL, \
.fields = __event_fields___##_provider##___##_template, \
.name = #_provider ":" #_name, \
.probe_callback = (void (*)(void)) &__event_probe__##_provider##___##_template,\
.ctx = NULL, \
.fields = __event_fields___##_provider##___##_template, \
- .nr_fields = _TP_ARRAY_SIZE(__event_fields___##_provider##___##_template), \
+ .nr_fields = _TP_ARRAY_SIZE(__event_fields___##_provider##___##_template)
- 1
, \
.loglevel = &__ref_loglevel___##_provider##___##_name, \
.signature = __tp_event_signature___##_provider##___##_template, \
.u = { \
.loglevel = &__ref_loglevel___##_provider##___##_name, \
.signature = __tp_event_signature___##_provider##___##_template, \
.u = { \
@@
-890,6
+918,7
@@
const struct lttng_event_desc __event_desc___##_provider##_##_name = { \
static const struct lttng_event_desc *_TP_COMBINE_TOKENS(__event_desc___, TRACEPOINT_PROVIDER)[] = {
#include TRACEPOINT_INCLUDE
static const struct lttng_event_desc *_TP_COMBINE_TOKENS(__event_desc___, TRACEPOINT_PROVIDER)[] = {
#include TRACEPOINT_INCLUDE
+ NULL, /* Dummy, C99 forbids 0-len array. */
};
};
@@
-903,7
+932,7
@@
static const struct lttng_event_desc *_TP_COMBINE_TOKENS(__event_desc___, TRACEP
static struct lttng_probe_desc _TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER) = {
.provider = __tp_stringify(TRACEPOINT_PROVIDER),
.event_desc = _TP_COMBINE_TOKENS(__event_desc___, TRACEPOINT_PROVIDER),
static struct lttng_probe_desc _TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER) = {
.provider = __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)),
+ .nr_events = _TP_ARRAY_SIZE(_TP_COMBINE_TOKENS(__event_desc___, TRACEPOINT_PROVIDER))
- 1
,
.head = { NULL, NULL },
.lazy_init_head = { NULL, NULL },
.lazy = 0,
.head = { NULL, NULL },
.lazy_init_head = { NULL, NULL },
.lazy = 0,
This page took
0.026093 seconds
and
4
git commands to generate.