Update licensing info

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

diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index 9aaf1573b2576742faa6d79d1e197e1dcfa430fa..16e268044aefda3a77534605f6b67198ecc56474 100644 (file)
--- a/probes/lttng-events.h
+++ b/probes/lttng-events.h
@@ -1,3 +1,12 @@
+/*
+ * lttng-events.h
+ *
+ * Copyright (C) 2009 Steven Rostedt <rostedt@goodmis.org>
+ * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
 #include <linux/debugfs.h>
 #include "lttng.h"
 #include "lttng-types.h"
@@ -195,6 +204,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
@@ -258,7 +268,9 @@ static struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = {
        __event_len += lib_ring_buffer_align(__event_len, ltt_alignof(u32));   \
        __event_len += sizeof(u32);                                            \
        __event_len += lib_ring_buffer_align(__event_len, ltt_alignof(_type)); \
-       __event_len += sizeof(_type) * (_length);
+       __dynamic_len[__dynamic_len_idx] = (_length);                          \
+       __event_len += sizeof(_type) * __dynamic_len[__dynamic_len_idx];       \
+       __dynamic_len_idx++;
 
 #undef __dynamic_array_text
 #define __dynamic_array_text(_type, _item, _length)                           \
@@ -460,17 +472,18 @@ __assign_##dest:                                                  \
        goto __end_field_##dest;
 
 #undef tp_memcpy_dyn
-#define tp_memcpy_dyn(dest, src, len)                                  \
+#define tp_memcpy_dyn(dest, src)                                       \
 __assign_##dest##_1:                                                   \
        {                                                               \
-               u32 __tmpl = (len);                                     \
+               u32 __tmpl = __dynamic_len[__dynamic_len_idx];          \
                lib_ring_buffer_align_ctx(&ctx, ltt_alignof(u32));      \
                __chan->ops->event_write(&ctx, &__tmpl, sizeof(u32));   \
        }                                                               \
        goto __end_field_##dest##_1;                                    \
 __assign_##dest##_2:                                                   \
        lib_ring_buffer_align_ctx(&ctx, ltt_alignof(__typemap.dest));   \
-       __chan->ops->event_write(&ctx, src, len);                       \
+       __chan->ops->event_write(&ctx, src,                             \
+               sizeof(__typemap.dest) * __get_dynamic_array_len(dest));\
        goto __end_field_##dest##_2;
 
 #undef tp_strcpy
@@ -520,7 +533,7 @@ static void __event_probe__##_name(void *__data, _proto)                  \
                return;                                                       \
        __event_len = __event_get_size__##_name(__dynamic_len, _args);        \
        __event_align = __event_get_align__##_name(_args);                    \
-       lib_ring_buffer_ctx_init(&ctx, __chan->chan, NULL, __event_len,       \
+       lib_ring_buffer_ctx_init(&ctx, __chan->chan, __event, __event_len,    \
                                 __event_align, -1);                          \
        __ret = __chan->ops->event_reserve(&ctx, __event->id);                \
        if (__ret < 0)                                                        \