Handle refcount of modules having dynamically alloc event description

[lttng-modules.git] / probes / lttng-events.h

diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index 5ee61bc612472bb49e5e8b12915da50a319e96b1..beedb22b6bb4bce475dfb0ee03bd9f9ec389534f 100644 (file)
--- a/probes/lttng-events.h
+++ b/probes/lttng-events.h
@@ -78,7 +78,7 @@ void trace_##_name(_proto);
 #define __field(_type, _item)                                  \
        {                                                       \
          .name = #_item,                                       \
-         .type = __type_integer(_type, __BYTE_ORDER),          \
+         .type = __type_integer(_type, __BYTE_ORDER, 10, none),\
        },
 
 #undef __field_ext
@@ -88,11 +88,11 @@ void trace_##_name(_proto);
 #define __field_network(_type, _item)                          \
        {                                                       \
          .name = #_item,                                       \
-         .type = __type_integer(_type, __BIG_ENDIAN),          \
+         .type = __type_integer(_type, __BIG_ENDIAN, 10, none),\
        },
 
-#undef __array
-#define __array(_type, _item, _length)                         \
+#undef __array_enc
+#define __array_enc(_type, _item, _length, _encoding)          \
        {                                                       \
          .name = #_item,                                       \
          .type =                                               \
@@ -101,13 +101,21 @@ void trace_##_name(_proto);
                  .u.array =                                    \
                        {                                       \
                            .length = _length,                  \
-                           .elem_type = __type_integer(_type, __BYTE_ORDER), \
+                           .elem_type = __type_integer(_type, __BYTE_ORDER, 10, _encoding), \
                        },                                      \
                },                                              \
        },
 
-#undef __dynamic_array
-#define __dynamic_array(_type, _item, _length)                 \
+#undef __array
+#define __array(_type, _item, _length)                         \
+       __array_enc(_type, _item, _length, none)
+
+#undef __array_text
+#define __array_text(_type, _item, _length)                    \
+       __array_enc(_type, _item, _length, UTF8)
+
+#undef __dynamic_array_enc
+#define __dynamic_array_enc(_type, _item, _length, _encoding)  \
        {                                                       \
          .name = #_item,                                       \
          .type =                                               \
@@ -115,12 +123,20 @@ void trace_##_name(_proto);
                  .atype = atype_sequence,                      \
                  .u.sequence =                                 \
                        {                                       \
-                           .length_type = __type_integer(u32, __BYTE_ORDER), \
-                           .elem_type = __type_integer(_type, __BYTE_ORDER), \
+                           .length_type = __type_integer(u32, __BYTE_ORDER, 10, none), \
+                           .elem_type = __type_integer(_type, __BYTE_ORDER, 10, _encoding), \
                        },                                      \
                },                                              \
        },
 
+#undef __dynamic_array
+#define __dynamic_array(_type, _item, _length)                 \
+       __dynamic_array_enc(_type, _item, _length, none)
+
+#undef __dynamic_array_text
+#define __dynamic_array_text(_type, _item, _length)            \
+       __dynamic_array_enc(_type, _item, _length, UTF8)
+
 #undef __string
 #define __string(_item, _src)                                  \
        {                                                       \
@@ -179,6 +195,7 @@ static void __event_probe__##_name(void *__data, _proto);
                        .name = #_name,                                        \
                        .probe_callback = (void *) &__event_probe__##_template,\
                        .nr_fields = ARRAY_SIZE(__event_fields___##_template), \
+                       .owner = THIS_MODULE,                                  \
                },
 
 #define TP_ID1(_token, _system)        _token##_system
@@ -233,6 +250,10 @@ static struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = {
        __event_len += lib_ring_buffer_align(__event_len, ltt_alignof(_type)); \
        __event_len += sizeof(_type) * (_length);
 
+#undef __array_text
+#define __array_text(_type, _item, _length)                                   \
+       __array(_type, _item, _length)
+
 #undef __dynamic_array
 #define __dynamic_array(_type, _item, _length)                                \
        __event_len += lib_ring_buffer_align(__event_len, ltt_alignof(u32));   \
@@ -240,6 +261,10 @@ static struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = {
        __event_len += lib_ring_buffer_align(__event_len, ltt_alignof(_type)); \
        __event_len += sizeof(_type) * (_length);
 
+#undef __dynamic_array_text
+#define __dynamic_array_text(_type, _item, _length)                           \
+       __dynamic_array(_type, _item, _length)
+
 #undef __string
 #define __string(_item, _src)                                                 \
        __event_len += __dynamic_len[__dynamic_len_idx++] = strlen(_src) + 1;
@@ -286,11 +311,19 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len, _proto) \
 #define __array(_type, _item, _length)                                   \
        __event_align = max_t(size_t, __event_align, ltt_alignof(_type));
 
+#undef __array_text
+#define __array_text(_type, _item, _length)                              \
+       __array(_type, _item, _length)
+
 #undef __dynamic_array
 #define __dynamic_array(_type, _item, _length)                           \
        __event_align = max_t(size_t, __event_align, ltt_alignof(u32));   \
        __event_align = max_t(size_t, __event_align, ltt_alignof(_type));
 
+#undef __dynamic_array_text
+#define __dynamic_array_text(_type, _item, _length)                      \
+       __dynamic_array(_type, _item, _length)
+
 #undef __string
 #define __string(_item, _src)
 
@@ -332,9 +365,17 @@ static inline size_t __event_get_align__##_name(_proto)                          \
 #undef __array
 #define __array(_type, _item, _length) _type   _item;
 
+#undef __array_text
+#define __array_text(_type, _item, _length)                              \
+       __array(_type, _item, _length)
+
 #undef __dynamic_array
 #define __dynamic_array(_type, _item, _length) _type   _item;
 
+#undef __dynamic_array_text
+#define __dynamic_array_text(_type, _item, _length)                      \
+       __dynamic_array(_type, _item, _length)
+
 #undef __string
 #define __string(_item, _src)  char _item;
 
@@ -376,6 +417,10 @@ __end_field_##_item:
        goto __assign_##_item;                                          \
 __end_field_##_item:
 
+#undef __array_text
+#define __array_text(_type, _item, _length)                            \
+       __array(_type, _item, _length)
+
 #undef __dynamic_array
 #define __dynamic_array(_type, _item, _length)                         \
        goto __assign_##_item##_1;                                      \
@@ -383,6 +428,10 @@ __end_field_##_item##_1:                                           \
        goto __assign_##_item##_2;                                      \
 __end_field_##_item##_2:
 
+#undef __dynamic_array_text
+#define __dynamic_array_text(_type, _item, _length)                    \
+       __dynamic_array(_type, _item, _length)
+
 #undef __string
 #define __string(_item, _src)                                          \
        goto __assign_##_item;                                          \
@@ -474,7 +523,7 @@ static void __event_probe__##_name(void *__data, _proto)                  \
        __event_align = __event_get_align__##_name(_args);                    \
        lib_ring_buffer_ctx_init(&ctx, __chan->chan, NULL, __event_len,       \
                                 __event_align, -1);                          \
-       __ret = __chan->ops->event_reserve(&ctx);                             \
+       __ret = __chan->ops->event_reserve(&ctx, __event->id);                \
        if (__ret < 0)                                                        \
                return;                                                       \
        /* Control code (field ordering) */                                   \