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
#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.
#undef __field
#define __field(_type, _item) \
- { .name = #_item, .type = { .atype = atype_integer, .name = #_type} },
+ { \
+ .name = #_item, \
+ .type = __type_integer(_type, __BYTE_ORDER, 10, none),\
+ },
#undef __field_ext
#define __field_ext(_type, _item, _filter_type) __field(_type, _item)
-#undef __array
-#define __array(_type, _item, _length) \
+#undef __field_network
+#define __field_network(_type, _item) \
+ { \
+ .name = #_item, \
+ .type = __type_integer(_type, __BIG_ENDIAN, 10, none),\
+ },
+
+#undef __array_enc
+#define __array_enc(_type, _item, _length, _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, __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 = { \
+ .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, __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) \
{ \
- .name = #_item, \
- .type = { \
+ .name = #_item, \
+ .type = \
+ { \
.atype = atype_string, \
- .name = NULL, \
- .u.string.encoding = lttng_encode_UTF8, \
+ .u.basic.string.encoding = lttng_encode_UTF8, \
}, \
},
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
+#undef __type_integer
+
/*
- * Stage 1.1 of the trace events.
+ * Stage 3 of the trace events.
*
* Create probe callback prototypes.
*/
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
/*
- * Stage 2 of the trace events.
+ * Stage 4 of the trace events.
*
* Create an array of events.
*/
#undef TP_ID1
#undef TP_ID
+
/*
- * Stage 3 of the trace events.
+ * Stage 5 of the trace events.
*
- * Create seq file metadata output.
+ * Create a toplevel descriptor for the whole probe.
*/
#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;
-}
-
-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)];
-
- if (desc > &TP_ID(__event_desc___, TRACE_SYSTEM)
- [ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)) - 1])
- return NULL;
- return (void *) desc;
-}
-
-static void TP_ID(__lttng_seq_stop__, TRACE_SYSTEM)(struct seq_file *m,
- void *p)
-{
-}
-
-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;
-}
-
-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 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));
-}
-
-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,
+/* non-const because list head will be modified when registered. */
+static 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)),
};
-static struct dentry *TP_ID(__lttng_types_dentry__, TRACE_SYSTEM);
-
-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;
-}
-
-static void TP_ID(__lttng_types_exit__, TRACE_SYSTEM)(void)
-{
- debugfs_remove(TP_ID(__lttng_types_dentry__, 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.
*/
#undef __field
#define __field(_type, _item) \
- __event_len += lib_ring_buffer_align(__event_len, __alignof__(_type)); \
+ __event_len += lib_ring_buffer_align(__event_len, ltt_alignof(_type)); \
__event_len += sizeof(_type);
#undef __field_ext
#undef __array
#define __array(_type, _item, _length) \
- __event_len += lib_ring_buffer_align(__event_len, __alignof__(_type)); \
+ __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, __alignof__(u32)); \
+ __event_len += lib_ring_buffer_align(__event_len, ltt_alignof(u32)); \
__event_len += sizeof(u32); \
- __event_len += lib_ring_buffer_align(__event_len, __alignof__(_type)); \
+ __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;
#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.
*/
#undef __field
#define __field(_type, _item) \
- __event_align = max_t(size_t, __event_align, __alignof__(_type));
+ __event_align = max_t(size_t, __event_align, ltt_alignof(_type));
#undef __field_ext
#define __field_ext(_type, _item, _filter_type) __field(_type, _item)
#undef __array
#define __array(_type, _item, _length) \
- __event_align = max_t(size_t, __event_align, __alignof__(_type));
+ __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, __alignof__(u32)); \
- __event_align = max_t(size_t, __event_align, __alignof__(_type));
+ __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)
/*
- * 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.
#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;
/*
- * 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.
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; \
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; \
__assign_##dest: \
{ \
__typeof__(__typemap.dest) __tmp = (src); \
- lib_ring_buffer_align_ctx(&ctx, __alignof__(__tmp)); \
+ lib_ring_buffer_align_ctx(&ctx, ltt_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)); \
+ if (0) \
+ (void) __typemap.dest; \
+ lib_ring_buffer_align_ctx(&ctx, ltt_alignof(__typemap.dest)); \
__chan->ops->event_write(&ctx, src, len); \
goto __end_field_##dest;
__assign_##dest##_1: \
{ \
u32 __tmpl = (len); \
- lib_ring_buffer_align_ctx(&ctx, __alignof__(u32)); \
+ 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, __alignof__(__typemap.dest)); \
+ lib_ring_buffer_align_ctx(&ctx, ltt_alignof(__typemap.dest)); \
__chan->ops->event_write(&ctx, src, len); \
goto __end_field_##dest##_2;
__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) */ \
#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.
*/
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 ltt_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)();
+ ltt_probe_unregister(&TP_ID(__probe_desc___, TRACE_SYSTEM));
}
module_exit_eval(__lttng_events_exit__, TRACE_SYSTEM);
projects / lttng-modules.git / blobdiff