-#include <lttng.h>
-#include <lttng-types.h>
+/*
+ * lttng-events.h
+ *
+ * Copyright (C) 2009 Steven Rostedt <rostedt@goodmis.org>
+ * Copyright (C) 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
#include <linux/debugfs.h>
+#include "lttng.h"
+#include "lttng-types.h"
#include "../wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */
#include "../wrapper/ringbuffer/frontend_types.h"
-#include "../ltt-events.h"
-#include "../ltt-tracer-core.h"
-
-struct lttng_event_field {
- const char *name;
- const struct lttng_type type;
-};
-
-struct lttng_event_desc {
- const struct lttng_event_field *fields;
- const char *name;
- void *probe_callback;
- unsigned int nr_fields;
-};
+#include "../lttng-events.h"
+#include "../lttng-tracer-core.h"
/*
* Macro declarations used for all stages.
PARAMS(print)) \
DEFINE_EVENT(name, name, PARAMS(proto), PARAMS(args))
+#undef TRACE_EVENT_NOARGS
+#define TRACE_EVENT_NOARGS(name, tstruct, assign, print) \
+ DECLARE_EVENT_CLASS_NOARGS(name, \
+ PARAMS(tstruct), \
+ PARAMS(assign), \
+ PARAMS(print)) \
+ DEFINE_EVENT_NOARGS(name, name)
+
+
#undef DEFINE_EVENT_PRINT
#define DEFINE_EVENT_PRINT(template, name, proto, args, print) \
DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args))
PARAMS(tstruct), PARAMS(assign), PARAMS(print)) \
/*
- * Stage 0.1 of the trace events.
+ * Stage 1 of the trace events.
*
* Create dummy trace calls for each events, verifying that the LTTng module
* TRACE_EVENT headers match the kernel arguments. Will be optimized out by the
#undef DEFINE_EVENT
#define DEFINE_EVENT(_template, _name, _proto, _args) \
-void trace_##_name(proto);
+void trace_##_name(_proto);
+
+#undef DEFINE_EVENT_NOARGS
+#define DEFINE_EVENT_NOARGS(_template, _name) \
+void trace_##_name(void *__data);
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
/*
- * Stage 1 of the trace events.
+ * Stage 2 of the trace events.
*
* Create event field type metadata section.
* Each event produce an array of fields.
/* Named field types must be defined in lttng-types.h */
+#undef __field_full
+#define __field_full(_type, _item, _order, _base) \
+ { \
+ .name = #_item, \
+ .type = __type_integer(_type, _order, _base, none), \
+ },
+
#undef __field
#define __field(_type, _item) \
- { .name = #_item, .type = { .atype = atype_integer, .name = #_type} },
+ __field_full(_type, _item, __BYTE_ORDER, 10)
#undef __field_ext
-#define __field_ext(_type, _item, _filter_type) __field(_type, _item)
+#define __field_ext(_type, _item, _filter_type) \
+ __field(_type, _item)
-#undef __array
-#define __array(_type, _item, _length) \
+#undef __field_hex
+#define __field_hex(_type, _item) \
+ __field_full(_type, _item, __BYTE_ORDER, 16)
+
+#undef __field_network
+#define __field_network(_type, _item) \
+ __field_full(_type, _item, __BIG_ENDIAN, 10)
+
+#undef __field_network_hex
+#define __field_network_hex(_type, _item) \
+ __field_full(_type, _item, __BIG_ENDIAN, 16)
+
+#undef __array_enc_ext
+#define __array_enc_ext(_type, _item, _length, _order, _base, _encoding)\
{ \
- .name = #_item, \
- .type = { \
+ .name = #_item, \
+ .type = \
+ { \
.atype = atype_array, \
- .name = NULL, \
- .u.array.elem_type = #_type, \
- .u.array.length = _length, \
+ .u.array = \
+ { \
+ .length = _length, \
+ .elem_type = __type_integer(_type, _order, _base, _encoding), \
+ }, \
}, \
},
-#undef __dynamic_array
-#define __dynamic_array(_type, _item, _length) \
+#undef __array
+#define __array(_type, _item, _length) \
+ __array_enc_ext(_type, _item, _length, __BYTE_ORDER, 10, none)
+
+#undef __array_text
+#define __array_text(_type, _item, _length) \
+ __array_enc_ext(_type, _item, _length, __BYTE_ORDER, 10, UTF8)
+
+#undef __array_hex
+#define __array_hex(_type, _item, _length) \
+ __array_enc_ext(_type, _item, _length, __BYTE_ORDER, 16, none)
+
+#undef __dynamic_array_enc_ext
+#define __dynamic_array_enc_ext(_type, _item, _length, _order, _base, _encoding) \
{ \
- .name = #_item, \
- .type = { \
+ .name = #_item, \
+ .type = \
+ { \
.atype = atype_sequence, \
- .name = NULL, \
- .u.sequence.elem_type = #_type, \
- .u.sequence.length_type = "u32", \
+ .u.sequence = \
+ { \
+ .length_type = __type_integer(u32, __BYTE_ORDER, 10, none), \
+ .elem_type = __type_integer(_type, _order, _base, _encoding), \
+ }, \
}, \
},
+#undef __dynamic_array
+#define __dynamic_array(_type, _item, _length) \
+ __dynamic_array_enc_ext(_type, _item, _length, __BYTE_ORDER, 10, none)
+
+#undef __dynamic_array_text
+#define __dynamic_array_text(_type, _item, _length) \
+ __dynamic_array_enc_ext(_type, _item, _length, __BYTE_ORDER, 10, UTF8)
+
+#undef __dynamic_array_hex
+#define __dynamic_array_hex(_type, _item, _length) \
+ __dynamic_array_enc_ext(_type, _item, _length, __BYTE_ORDER, 16, none)
+
#undef __string
#define __string(_item, _src) \
{ \
- .name = #_item, \
- .type = { \
+ .name = #_item, \
+ .type = \
+ { \
.atype = atype_string, \
- .name = NULL, \
- .u.string.encoding = lttng_encode_UTF8, \
+ .u.basic.string.encoding = lttng_encode_UTF8, \
}, \
},
+#undef __string_from_user
+#define __string_from_user(_item, _src) \
+ __string(_item, _src)
+
#undef TP_STRUCT__entry
#define TP_STRUCT__entry(args...) args /* Only one used in this phase */
-#undef DECLARE_EVENT_CLASS
-#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \
+#undef DECLARE_EVENT_CLASS_NOARGS
+#define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \
static const struct lttng_event_field __event_fields___##_name[] = { \
_tstruct \
};
+#undef DECLARE_EVENT_CLASS
+#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \
+ DECLARE_EVENT_CLASS_NOARGS(_name, PARAMS(_tstruct), PARAMS(_assign), \
+ PARAMS(_print))
+
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
/*
- * Stage 1.1 of the trace events.
+ * Stage 3 of the trace events.
*
* Create probe callback prototypes.
*/
#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \
static void __event_probe__##_name(void *__data, _proto);
+#undef DECLARE_EVENT_CLASS_NOARGS
+#define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \
+static void __event_probe__##_name(void *__data);
+
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
/*
- * Stage 2 of the trace events.
+ * Stage 3.9 of the trace events.
*
- * Create an array of events.
+ * Create event descriptions.
*/
/* Named field types must be defined in lttng-types.h */
#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */
-#undef DEFINE_EVENT
-#define DEFINE_EVENT(_template, _name, _proto, _args) \
- { \
- .fields = __event_fields___##_template, \
- .name = #_name, \
- .probe_callback = (void *) &__event_probe__##_template,\
- .nr_fields = ARRAY_SIZE(__event_fields___##_template), \
- },
+#ifndef TP_PROBE_CB
+#define TP_PROBE_CB(_template) &__event_probe__##_template
+#endif
+
+#undef DEFINE_EVENT_NOARGS
+#define DEFINE_EVENT_NOARGS(_template, _name) \
+static const struct lttng_event_desc __event_desc___##_name = { \
+ .fields = __event_fields___##_template, \
+ .name = #_name, \
+ .probe_callback = (void *) TP_PROBE_CB(_template), \
+ .nr_fields = ARRAY_SIZE(__event_fields___##_template), \
+ .owner = THIS_MODULE, \
+};
-#define TP_ID1(_token, _system) _token##_system
-#define TP_ID(_token, _system) TP_ID1(_token, _system)
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(_template, _name, _proto, _args) \
+ DEFINE_EVENT_NOARGS(_template, _name)
-static const struct lttng_event_desc TP_ID(__event_desc___, TRACE_SYSTEM)[] = {
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
-};
-#undef TP_ID1
-#undef TP_ID
/*
- * Stage 3 of the trace events.
+ * Stage 4 of the trace events.
*
- * Create seq file metadata output.
+ * Create an array of event description pointers.
*/
-#define TP_ID1(_token, _system) _token##_system
-#define TP_ID(_token, _system) TP_ID1(_token, _system)
-
-static void *TP_ID(__lttng_seq_start__, TRACE_SYSTEM)(struct seq_file *m,
- loff_t *pos)
-{
- const struct lttng_event_desc *desc =
- &TP_ID(__event_desc___, TRACE_SYSTEM)[*pos];
-
- if (desc > &TP_ID(__event_desc___, TRACE_SYSTEM)
- [ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)) - 1])
- return NULL;
- return (void *) desc;
-}
+/* Named field types must be defined in lttng-types.h */
-static void *TP_ID(__lttng_seq_next__, TRACE_SYSTEM)(struct seq_file *m,
- void *p, loff_t *ppos)
-{
- const struct lttng_event_desc *desc =
- &TP_ID(__event_desc___, TRACE_SYSTEM)[++(*ppos)];
+#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */
- if (desc > &TP_ID(__event_desc___, TRACE_SYSTEM)
- [ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)) - 1])
- return NULL;
- return (void *) desc;
-}
+#undef DEFINE_EVENT_NOARGS
+#define DEFINE_EVENT_NOARGS(_template, _name) \
+ &__event_desc___##_name,
-static void TP_ID(__lttng_seq_stop__, TRACE_SYSTEM)(struct seq_file *m,
- void *p)
-{
-}
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(_template, _name, _proto, _args) \
+ DEFINE_EVENT_NOARGS(_template, _name)
-static int TP_ID(__lttng_seq_show__, TRACE_SYSTEM)(struct seq_file *m,
- void *p)
-{
- const struct lttng_event_desc *desc = p;
- int i;
-
- seq_printf(m, "event {\n"
- "\tname = %s;\n"
- "\tid = UNKNOWN;\n"
- "\tstream = UNKNOWN;\n"
- "\tfields = {\n",
- desc->name);
- for (i = 0; i < desc->nr_fields; i++) {
- if (desc->fields[i].type.name) /* Named type */
- seq_printf(m, "\t\t%s",
- desc->fields[i].type.name);
- else /* Nameless type */
- lttng_print_event_type(m, 2, &desc->fields[i].type);
- seq_printf(m, " %s;\n", desc->fields[i].name);
- }
- seq_printf(m, "\t};\n");
- seq_printf(m, "};\n");
- return 0;
-}
+#define TP_ID1(_token, _system) _token##_system
+#define TP_ID(_token, _system) TP_ID1(_token, _system)
-static const
-struct seq_operations TP_ID(__lttng_types_seq_ops__, TRACE_SYSTEM) = {
- .start = TP_ID(__lttng_seq_start__, TRACE_SYSTEM),
- .next = TP_ID(__lttng_seq_next__, TRACE_SYSTEM),
- .stop = TP_ID(__lttng_seq_stop__, TRACE_SYSTEM),
- .show = TP_ID(__lttng_seq_show__, TRACE_SYSTEM),
+static const struct lttng_event_desc *TP_ID(__event_desc___, TRACE_SYSTEM)[] = {
+#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
};
-static int
-TP_ID(__lttng_types_open__, TRACE_SYSTEM)(struct inode *inode, struct file *file)
-{
- return seq_open(file, &TP_ID(__lttng_types_seq_ops__, TRACE_SYSTEM));
-}
+#undef TP_ID1
+#undef TP_ID
-static const
-struct file_operations TP_ID(__lttng_types_fops__, TRACE_SYSTEM) = {
- .open = TP_ID(__lttng_types_open__, TRACE_SYSTEM),
- .read = seq_read,
- .llseek = seq_lseek,
- .release = seq_release_private,
-};
-static struct dentry *TP_ID(__lttng_types_dentry__, TRACE_SYSTEM);
+/*
+ * Stage 5 of the trace events.
+ *
+ * Create a toplevel descriptor for the whole probe.
+ */
-static int TP_ID(__lttng_types_init__, TRACE_SYSTEM)(void)
-{
- int ret = 0;
-
- TP_ID(__lttng_types_dentry__, TRACE_SYSTEM) =
- debugfs_create_file("lttng-events-" __stringify(TRACE_SYSTEM),
- S_IWUSR, NULL, NULL,
- &TP_ID(__lttng_types_fops__, TRACE_SYSTEM));
- if (IS_ERR(TP_ID(__lttng_types_dentry__, TRACE_SYSTEM))
- || !TP_ID(__lttng_types_dentry__, TRACE_SYSTEM)) {
- printk(KERN_ERR "Error creating LTTng type export file\n");
- ret = -ENOMEM;
- goto error;
- }
-error:
- return ret;
-}
+#define TP_ID1(_token, _system) _token##_system
+#define TP_ID(_token, _system) TP_ID1(_token, _system)
-static void TP_ID(__lttng_types_exit__, TRACE_SYSTEM)(void)
-{
- debugfs_remove(TP_ID(__lttng_types_dentry__, TRACE_SYSTEM));
-}
+/* non-const because list head will be modified when registered. */
+static __used struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = {
+ .event_desc = TP_ID(__event_desc___, TRACE_SYSTEM),
+ .nr_events = ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)),
+};
#undef TP_ID1
#undef TP_ID
/*
- * Stage 4 of the trace events.
+ * Stage 6 of the trace events.
*
* Create static inline function that calculates event size.
*/
/* Named field types must be defined in lttng-types.h */
-#undef __field
-#define __field(_type, _item) \
- __event_len += lib_ring_buffer_align(__event_len, __alignof__(_type)); \
+#undef __field_full
+#define __field_full(_type, _item, _order, _base) \
+ __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
__event_len += sizeof(_type);
-#undef __field_ext
-#define __field_ext(_type, _item, _filter_type) __field(_type, _item)
-
-#undef __array
-#define __array(_type, _item, _length) \
- __event_len += lib_ring_buffer_align(__event_len, __alignof__(_type)); \
+#undef __array_enc_ext
+#define __array_enc_ext(_type, _item, _length, _order, _base, _encoding) \
+ __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
__event_len += sizeof(_type) * (_length);
-#undef __dynamic_array
-#define __dynamic_array(_type, _item, _length) \
- __event_len += lib_ring_buffer_align(__event_len, __alignof__(u32)); \
+#undef __dynamic_array_enc_ext
+#define __dynamic_array_enc_ext(_type, _item, _length, _order, _base, _encoding)\
+ __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(u32)); \
__event_len += sizeof(u32); \
- __event_len += lib_ring_buffer_align(__event_len, __alignof__(_type)); \
- __event_len += sizeof(_type) * (_length);
+ __event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
+ __dynamic_len[__dynamic_len_idx] = (_length); \
+ __event_len += sizeof(_type) * __dynamic_len[__dynamic_len_idx]; \
+ __dynamic_len_idx++;
#undef __string
#define __string(_item, _src) \
__event_len += __dynamic_len[__dynamic_len_idx++] = strlen(_src) + 1;
+/*
+ * strlen_user includes \0. If returns 0, it faulted, so we set size to
+ * 1 (\0 only).
+ */
+#undef __string_from_user
+#define __string_from_user(_item, _src) \
+ __event_len += __dynamic_len[__dynamic_len_idx++] = \
+ max_t(size_t, strlen_user(_src), 1);
+
#undef TP_PROTO
#define TP_PROTO(args...) args
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
-
-
/*
- * Stage 5 of the trace events.
+ * Stage 7 of the trace events.
*
* Create static inline function that calculates event payload alignment.
*/
/* Named field types must be defined in lttng-types.h */
-#undef __field
-#define __field(_type, _item) \
- __event_align = max_t(size_t, __event_align, __alignof__(_type));
+#undef __field_full
+#define __field_full(_type, _item, _order, _base) \
+ __event_align = max_t(size_t, __event_align, lttng_alignof(_type));
-#undef __field_ext
-#define __field_ext(_type, _item, _filter_type) __field(_type, _item)
+#undef __array_enc_ext
+#define __array_enc_ext(_type, _item, _length, _order, _base, _encoding) \
+ __event_align = max_t(size_t, __event_align, lttng_alignof(_type));
-#undef __array
-#define __array(_type, _item, _length) \
- __event_align = max_t(size_t, __event_align, __alignof__(_type));
-
-#undef __dynamic_array
-#define __dynamic_array(_type, _item, _length) \
- __event_align = max_t(size_t, __event_align, __alignof__(u32)); \
- __event_align = max_t(size_t, __event_align, __alignof__(_type));
+#undef __dynamic_array_enc_ext
+#define __dynamic_array_enc_ext(_type, _item, _length, _order, _base, _encoding)\
+ __event_align = max_t(size_t, __event_align, lttng_alignof(u32)); \
+ __event_align = max_t(size_t, __event_align, lttng_alignof(_type));
#undef __string
#define __string(_item, _src)
+#undef __string_from_user
+#define __string_from_user(_item, _src)
+
#undef TP_PROTO
#define TP_PROTO(args...) args
/*
- * Stage 6 of the trace events.
+ * Stage 8 of the trace events.
*
* Create structure declaration that allows the "assign" macros to access the
* field types.
/* Named field types must be defined in lttng-types.h */
-#undef __field
-#define __field(_type, _item) _type _item;
+#undef __field_full
+#define __field_full(_type, _item, _order, _base) _type _item;
-#undef __field_ext
-#define __field_ext(_type, _item, _filter_type) __field(_type, _item)
+#undef __array_enc_ext
+#define __array_enc_ext(_type, _item, _length, _order, _base, _encoding) \
+ _type _item;
-#undef __array
-#define __array(_type, _item, _length) _type _item;
-
-#undef __dynamic_array
-#define __dynamic_array(_type, _item, _length) _type _item;
+#undef __dynamic_array_enc_ext
+#define __dynamic_array_enc_ext(_type, _item, _length, _order, _base, _encoding)\
+ _type _item;
#undef __string
-#define __string(_item, _src) char _item;
+#define __string(_item, _src) char _item;
+
+#undef __string_from_user
+#define __string_from_user(_item, _src) \
+ __string(_item, _src)
#undef TP_STRUCT__entry
#define TP_STRUCT__entry(args...) args
/*
- * Stage 7 of the trace events.
+ * Stage 9 of the trace events.
*
* Create the probe function : call even size calculation and write event data
* into the buffer.
#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */
-#undef __field
-#define __field(_type, _item) \
+#undef __field_full
+#define __field_full(_type, _item, _order, _base) \
goto __assign_##_item; \
__end_field_##_item:
-#undef __field_ext
-#define __field_ext(_type, _item, _filter_type) __field(_type, _item)
-
-#undef __array
-#define __array(_type, _item, _length) \
+#undef __array_enc_ext
+#define __array_enc_ext(_type, _item, _length, _order, _base, _encoding)\
goto __assign_##_item; \
__end_field_##_item:
-#undef __dynamic_array
-#define __dynamic_array(_type, _item, _length) \
+#undef __dynamic_array_enc_ext
+#define __dynamic_array_enc_ext(_type, _item, _length, _order, _base, _encoding)\
goto __assign_##_item##_1; \
__end_field_##_item##_1: \
goto __assign_##_item##_2; \
goto __assign_##_item; \
__end_field_##_item:
+#undef __string_from_user
+#define __string_from_user(_item, _src) \
+ __string(_item, _src)
+
/*
* Macros mapping tp_assign() to "=", tp_memcpy() to memcpy() and tp_strcpy() to
* strcpy().
__assign_##dest: \
{ \
__typeof__(__typemap.dest) __tmp = (src); \
- lib_ring_buffer_align_ctx(&ctx, __alignof__(__tmp)); \
- __chan->ops->event_write(&ctx, &__tmp, sizeof(__tmp)); \
+ lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__tmp)); \
+ __chan->ops->event_write(&__ctx, &__tmp, sizeof(__tmp));\
} \
goto __end_field_##dest;
#undef tp_memcpy
#define tp_memcpy(dest, src, len) \
__assign_##dest: \
- lib_ring_buffer_align_ctx(&ctx, __alignof__(__typemap.dest)); \
- __chan->ops->event_write(&ctx, src, len); \
+ if (0) \
+ (void) __typemap.dest; \
+ lib_ring_buffer_align_ctx(&__ctx, lttng_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, __alignof__(u32)); \
- __chan->ops->event_write(&ctx, &__tmpl, sizeof(u32)); \
+ u32 __tmpl = __dynamic_len[__dynamic_len_idx]; \
+ lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(u32)); \
+ __chan->ops->event_write(&__ctx, &__tmpl, sizeof(u32)); \
} \
goto __end_field_##dest##_1; \
__assign_##dest##_2: \
- lib_ring_buffer_align_ctx(&ctx, __alignof__(__typemap.dest)); \
- __chan->ops->event_write(&ctx, src, len); \
+ lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__typemap.dest)); \
+ __chan->ops->event_write(&__ctx, src, \
+ sizeof(__typemap.dest) * __get_dynamic_array_len(dest));\
goto __end_field_##dest##_2;
+#undef tp_memcpy_from_user
+#define tp_memcpy_from_user(dest, src, len) \
+ __assign_##dest: \
+ if (0) \
+ (void) __typemap.dest; \
+ lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__typemap.dest)); \
+ __chan->ops->event_write_from_user(&__ctx, src, len); \
+ goto __end_field_##dest;
+
+/*
+ * The string length including the final \0.
+ */
+#undef tp_copy_string_from_user
+#define tp_copy_string_from_user(dest, src) \
+ __assign_##dest: \
+ { \
+ size_t __ustrlen; \
+ \
+ if (0) \
+ (void) __typemap.dest; \
+ lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(__typemap.dest));\
+ __ustrlen = __get_dynamic_array_len(dest); \
+ if (likely(__ustrlen > 1)) { \
+ __chan->ops->event_write_from_user(&__ctx, src, \
+ __ustrlen - 1); \
+ } \
+ __chan->ops->event_memset(&__ctx, 0, 1); \
+ } \
+ goto __end_field_##dest;
#undef tp_strcpy
#define tp_strcpy(dest, src) \
tp_memcpy(dest, src, __get_dynamic_array_len(dest))
#undef TP_fast_assign
#define TP_fast_assign(args...) args
+/*
+ * For state dump, check that "session" argument (mandatory) matches the
+ * session this event belongs to. Ensures that we write state dump data only
+ * into the started session, not into all sessions.
+ */
+#ifdef TP_SESSION_CHECK
+#define _TP_SESSION_CHECK(session, csession) (session == csession)
+#else /* TP_SESSION_CHECK */
+#define _TP_SESSION_CHECK(session, csession) 1
+#endif /* TP_SESSION_CHECK */
+
#undef DECLARE_EVENT_CLASS
#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \
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 lttng_event *__event = __data; \
+ struct lttng_channel *__chan = __event->chan; \
+ 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)]; \
struct __event_typemap__##_name __typemap; \
int __ret; \
\
- if (0) \
+ if (0) { \
(void) __dynamic_len_idx; /* don't warn if unused */ \
- if (!ACCESS_ONCE(__chan->session->active)) \
+ (void) __typemap; /* don't warn if unused */ \
+ } \
+ if (!_TP_SESSION_CHECK(session, __chan->session)) \
+ return; \
+ 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, 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) \
+ return; \
+ /* Control code (field ordering) */ \
+ _tstruct \
+ __chan->ops->event_commit(&__ctx); \
+ return; \
+ /* Copy code, steered by control code */ \
+ _assign \
+}
+
+#undef DECLARE_EVENT_CLASS_NOARGS
+#define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \
+static void __event_probe__##_name(void *__data) \
+{ \
+ struct lttng_event *__event = __data; \
+ struct lttng_channel *__chan = __event->chan; \
+ struct lib_ring_buffer_ctx __ctx; \
+ size_t __event_len, __event_align; \
+ int __ret; \
+ \
+ if (!_TP_SESSION_CHECK(session, __chan->session)) \
+ return; \
+ if (unlikely(!ACCESS_ONCE(__chan->session->active))) \
+ return; \
+ if (unlikely(!ACCESS_ONCE(__chan->enabled))) \
+ return; \
+ if (unlikely(!ACCESS_ONCE(__event->enabled))) \
+ return; \
+ __event_len = 0; \
+ __event_align = 1; \
+ lib_ring_buffer_ctx_init(&__ctx, __chan->chan, __event, __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) */ \
_tstruct \
- __chan->ops->event_commit(&ctx); \
+ __chan->ops->event_commit(&__ctx); \
return; \
/* Copy code, steered by control code */ \
_assign \
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
/*
- * Stage 8 of the trace events.
+ * Stage 10 of the trace events.
*
* Register/unregister probes at module load/unload.
*/
#define module_exit_eval1(_token, _system) module_exit(_token##_system)
#define module_exit_eval(_token, _system) module_exit_eval1(_token, _system)
+#ifndef TP_MODULE_OVERRIDE
static int TP_ID(__lttng_events_init__, TRACE_SYSTEM)(void)
{
- int ret;
- int i;
-
wrapper_vmalloc_sync_all();
- ret = TP_ID(__lttng_types_init__, TRACE_SYSTEM)();
- if (ret)
- return ret;
- for (i = 0; i < ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)); i++) {
- const struct lttng_event_desc *event_desc;
-
- event_desc = &TP_ID(__event_desc___, TRACE_SYSTEM)[i];
- ret = ltt_probe_register(event_desc->name,
- event_desc->probe_callback);
- if (ret)
- goto error;
- }
- return 0;
-
-error:
- for (i--; i >= 0; i--) {
- const struct lttng_event_desc *event_desc;
-
- event_desc = &TP_ID(__event_desc___, TRACE_SYSTEM)[i];
- ltt_probe_unregister(event_desc->name);
- }
- return ret;
+ return lttng_probe_register(&TP_ID(__probe_desc___, TRACE_SYSTEM));
}
module_init_eval(__lttng_events_init__, TRACE_SYSTEM);
static void TP_ID(__lttng_events_exit__, TRACE_SYSTEM)(void)
{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)); i++) {
- const struct lttng_event_desc *event_desc;
-
- event_desc = &TP_ID(__event_desc___, TRACE_SYSTEM)[i];
- ltt_probe_unregister(event_desc->name);
- }
- TP_ID(__lttng_types_exit__, TRACE_SYSTEM)();
+ lttng_probe_unregister(&TP_ID(__probe_desc___, TRACE_SYSTEM));
}
module_exit_eval(__lttng_events_exit__, TRACE_SYSTEM);
+#endif
#undef module_init_eval
#undef module_exit_eval
#undef TP_ID1
#undef TP_ID
+
+#undef TP_PROTO
+#undef TP_ARGS
+#undef TRACE_EVENT_FLAGS
projects / lttng-modules.git / blobdiff