Put syscall tracing without arg types back in place

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

diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index b32921ca67121fb2c3c89654fecebb60ac3ebd0e..a267991a2d239d7cc83786cfc0b348c24b777009 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"
@@ -259,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)                           \
@@ -446,8 +457,8 @@ __end_field_##_item:
 __assign_##dest:                                                       \
        {                                                               \
                __typeof__(__typemap.dest) __tmp = (src);               \
-               lib_ring_buffer_align_ctx(&ctx, ltt_alignof(__tmp));    \
-               __chan->ops->event_write(&ctx, &__tmp, sizeof(__tmp));  \
+               lib_ring_buffer_align_ctx(&__ctx, ltt_alignof(__tmp));  \
+               __chan->ops->event_write(&__ctx, &__tmp, sizeof(__tmp));\
        }                                                               \
        goto __end_field_##dest;
 
@@ -456,22 +467,23 @@ __assign_##dest:                                                  \
 __assign_##dest:                                                       \
        if (0)                                                          \
                (void) __typemap.dest;                                  \
-       lib_ring_buffer_align_ctx(&ctx, ltt_alignof(__typemap.dest));   \
-       __chan->ops->event_write(&ctx, src, len);                       \
+       lib_ring_buffer_align_ctx(&__ctx, ltt_alignof(__typemap.dest)); \
+       __chan->ops->event_write(&__ctx, src, len);                     \
        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);                                     \
-               lib_ring_buffer_align_ctx(&ctx, ltt_alignof(u32));      \
-               __chan->ops->event_write(&ctx, &__tmpl, sizeof(u32));   \
+               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);                       \
+       lib_ring_buffer_align_ctx(&__ctx, ltt_alignof(__typemap.dest)); \
+       __chan->ops->event_write(&__ctx, src,                           \
+               sizeof(__typemap.dest) * __get_dynamic_array_len(dest));\
        goto __end_field_##dest##_2;
 
 #undef tp_strcpy
@@ -508,7 +520,7 @@ static void __event_probe__##_name(void *__data, _proto)                  \
 {                                                                            \
        struct ltt_event *__event = __data;                                   \
        struct ltt_channel *__chan = __event->chan;                           \
-       struct lib_ring_buffer_ctx ctx;                                       \
+       struct lib_ring_buffer_ctx __ctx;                                     \
        size_t __event_len, __event_align;                                    \
        size_t __dynamic_len_idx = 0;                                         \
        size_t __dynamic_len[ARRAY_SIZE(__event_fields___##_name)];           \
@@ -517,18 +529,22 @@ static void __event_probe__##_name(void *__data, _proto)                \
                                                                              \
        if (0)                                                                \
                (void) __dynamic_len_idx;       /* don't warn if unused */    \
-       if (!ACCESS_ONCE(__chan->session->active))                            \
+       if (unlikely(!ACCESS_ONCE(__chan->session->active)))                  \
+               return;                                                       \
+       if (unlikely(!ACCESS_ONCE(__chan->enabled)))                          \
+               return;                                                       \
+       if (unlikely(!ACCESS_ONCE(__event->enabled)))                         \
                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, __event, __event_len,    \
+       lib_ring_buffer_ctx_init(&__ctx, __chan->chan, __event, __event_len,  \
                                 __event_align, -1);                          \
-       __ret = __chan->ops->event_reserve(&ctx, __event->id);                \
+       __ret = __chan->ops->event_reserve(&__ctx, __event->id);              \
        if (__ret < 0)                                                        \
                return;                                                       \
        /* Control code (field ordering) */                                   \
        _tstruct                                                              \
-       __chan->ops->event_commit(&ctx);                                      \
+       __chan->ops->event_commit(&__ctx);                                    \
        return;                                                               \
        /* Copy code, steered by control code */                              \
        _assign                                                               \