Drop 'linux/uprobes.h' wrapper

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

diff --git a/include/lttng/events.h b/include/lttng/events.h
index fa3e7e90591fd05bf136d62f896bb7d821397a65..22f654be96d4a92ad5c68b80d24fcb372ad0bfc8 100644 (file)
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -16,7 +16,8 @@
 #include <linux/kref.h>
 #include <linux/uuid.h>
 #include <linux/irq_work.h>
-#include <wrapper/uprobes.h>
+#include <linux/uprobes.h>
+
 #include <lttng/cpuhotplug.h>
 #include <lttng/tracer.h>
 #include <lttng/abi.h>
@@ -75,13 +76,15 @@ struct lttng_kernel_type_integer {
        unsigned int size;              /* in bits */
        unsigned short alignment;       /* in bits */
        unsigned int signedness:1,
-               reverse_byte_order:1;
+               reverse_byte_order:1,
+               user:1;                 /* fetch from user-space */
        unsigned int base;              /* 2, 8, 10, 16, for pretty print */
 };
 
 struct lttng_kernel_type_string {
        struct lttng_kernel_type_common parent;
        enum lttng_kernel_string_encoding encoding;
+       unsigned int user:1;            /* fetch from user-space */
 };
 
 struct lttng_kernel_type_enum {
@@ -94,7 +97,7 @@ struct lttng_kernel_type_array {
        struct lttng_kernel_type_common parent;
        const struct lttng_kernel_type_common *elem_type;
        unsigned int length;                    /* Num. elems. */
-       unsigned int alignment;
+       unsigned int alignment;         /* Alignment in bytes before elements. */
        enum lttng_kernel_string_encoding encoding;
 };
 
@@ -102,7 +105,7 @@ struct lttng_kernel_type_sequence {
        struct lttng_kernel_type_common parent;
        const char *length_name;        /* Length field name. If NULL, use previous field. */
        const struct lttng_kernel_type_common *elem_type;
-       unsigned int alignment;         /* Alignment before elements. */
+       unsigned int alignment;         /* Alignment in bytes before elements. */
        enum lttng_kernel_string_encoding encoding;
 };
 
@@ -110,7 +113,7 @@ struct lttng_kernel_type_struct {
        struct lttng_kernel_type_common parent;
        unsigned int nr_fields;
        const struct lttng_kernel_event_field * const *fields;  /* Array of pointers to fields. */
-       unsigned int alignment;
+       unsigned int alignment;         /* Alignment in bits */
 };
 
 struct lttng_kernel_type_variant {
@@ -118,7 +121,7 @@ struct lttng_kernel_type_variant {
        const char *tag_name;           /* Tag field name. If NULL, use previous field. */
        const struct lttng_kernel_event_field * const *choices; /* Array of pointers to fields. */
        unsigned int nr_choices;
-       unsigned int alignment;
+       unsigned int alignment;         /* Alignment in bytes */
 };
 
 struct lttng_kernel_enum_desc {
@@ -134,7 +137,6 @@ struct lttng_kernel_event_field {
        const char *name;
        const struct lttng_kernel_type_common *type;
        unsigned int nowrite:1,         /* do not write into trace */
-                       user:1,         /* fetch from user-space */
                        nofilter:1;     /* do not consider for filter */
 };
 
@@ -142,7 +144,7 @@ struct lttng_kernel_event_field {
 #define PARAMS(args...)        args
 #endif
 
-#define lttng_kernel_static_type_integer(_size, _alignment, _signedness, _byte_order, _base)           \
+#define _lttng_kernel_static_type_integer(_size, _alignment, _signedness, _byte_order, _user, _base)   \
        ((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_integer, { \
                .parent = {                                                                             \
                        .type = lttng_kernel_type_integer,                                                      \
@@ -151,15 +153,27 @@ struct lttng_kernel_event_field {
                .alignment = (_alignment),                                                              \
                .signedness = (_signedness),                                                            \
                .reverse_byte_order = (_byte_order) != __BYTE_ORDER,                                    \
+               .user = (_user),                                                                        \
                .base = (_base),                                                                        \
        }))
 
-#define lttng_kernel_static_type_integer_from_type(_type, _byte_order, _base)                          \
-       lttng_kernel_static_type_integer(sizeof(_type) * CHAR_BIT,                                      \
+#define lttng_kernel_static_type_integer(_size, _alignment, _signedness, _byte_order, _base)           \
+       _lttng_kernel_static_type_integer(_size, _alignment, _signedness, _byte_order, 0, _base)
+
+#define lttng_kernel_static_type_user_integer(_size, _alignment, _signedness, _byte_order, _base)      \
+       _lttng_kernel_static_type_integer(_size, _alignment, _signedness, _byte_order, 1, _base)
+
+#define _lttng_kernel_static_type_integer_from_type(_type, _byte_order, _user, _base)                  \
+       _lttng_kernel_static_type_integer(sizeof(_type) * CHAR_BIT,                                     \
                        lttng_alignof(_type) * CHAR_BIT,                                                \
                        lttng_is_signed_type(_type),                                                    \
-                       _byte_order,                                                                    \
-                       _base)
+                       _byte_order, _user, _base)
+
+#define lttng_kernel_static_type_integer_from_type(_type, _byte_order, _base)                          \
+       _lttng_kernel_static_type_integer_from_type(_type, _byte_order, 0, _base)
+
+#define lttng_kernel_static_type_user_integer_from_type(_type, _byte_order, _base)                     \
+       _lttng_kernel_static_type_integer_from_type(_type, _byte_order, 1, _base)
 
 #define lttng_kernel_static_type_enum(_desc, _container_type)                                          \
        ((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_enum, { \
@@ -199,12 +213,13 @@ struct lttng_kernel_event_field {
                .elem_type = (_elem_type),                                                              \
        }))
 
-#define lttng_kernel_static_type_string(_encoding)                                                     \
+#define lttng_kernel_static_type_string(_encoding, _user)                                              \
        ((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_string, { \
                .parent = {                                                                             \
                        .type = lttng_kernel_type_string,                                               \
                },                                                                                      \
                .encoding = lttng_kernel_string_encoding_##_encoding,                                   \
+               .user = (_user),                                                                        \
        }))
 
 #define lttng_kernel_static_type_struct_init(_nr_fields, _fields, _alignment)                          \
@@ -233,12 +248,11 @@ struct lttng_kernel_event_field {
                .alignment = (_alignment),                                                              \
        }))
 
-#define lttng_kernel_static_event_field(_name, _type, _nowrite, _user, _nofilter)                      \
+#define lttng_kernel_static_event_field(_name, _type, _nowrite, _nofilter)                             \
        __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_event_field, {                               \
                .name = (_name),                                                                        \
                .type = (_type),                                                                        \
                .nowrite = (_nowrite),                                                                  \
-               .user = (_user),                                                                        \
                .nofilter = (_nofilter),                                                                \
        })