Fix: ctf_enum_value() does not work with g++

[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 64c453578410ef17d6e62fd643e366a34a49e686..2b703dc57ce2b5c522ccdb8faad5c208178d833a 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 = {                                              \
-                       .signedness = lttng_is_signed_type(__typeof__(_value)), \
                        .value = lttng_is_signed_type(__typeof__(_value)) ? \
                                (long long) (_value) : (_value),        \
+                       .signedness = lttng_is_signed_type(__typeof__(_value)), \
                },                                                      \
                .end = {                                                \
-                       .signedness = lttng_is_signed_type(__typeof__(_value)), \
                        .value = lttng_is_signed_type(__typeof__(_value)) ? \
                                (long long) (_value) : (_value),        \
+                       .signedness = lttng_is_signed_type(__typeof__(_value)), \
                },                                                      \
                .string = (_string),                                    \
        },
@@ -149,14 +149,14 @@ static const char                                                 \
 #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), \
+                       .signedness = lttng_is_signed_type(__typeof__(_range_start)), \
                },                                                      \
                .end = {                                                \
-                       .signedness = lttng_is_signed_type(__typeof__(_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),                                    \
        },
@@ -169,6 +169,7 @@ static const char                                                   \
 #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
@@ -290,6 +291,7 @@ static const char                                                   \
 #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
@@ -297,7 +299,7 @@ static const char                                                   \
        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
@@ -735,8 +737,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 __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;                                                            \
                                                                              \
@@ -803,7 +805,7 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))           \
 
 #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
@@ -864,12 +866,12 @@ static const int *                                                               \
 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,                \
-       .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 = {                                                                 \
@@ -896,6 +898,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
+       NULL,   /* Dummy, C99 forbids 0-len array. */
 };
 
 
@@ -909,7 +912,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),
-       .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,