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 {
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;
};
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;
};
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 {
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 {
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 */
};
#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, \
.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, { \
.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) \
.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), \
})
int (*event_reserve)(struct lttng_kernel_ring_buffer_ctx *ctx);
void (*event_commit)(struct lttng_kernel_ring_buffer_ctx *ctx);
void (*event_write)(struct lttng_kernel_ring_buffer_ctx *ctx, const void *src,
- size_t len);
+ size_t len, size_t alignment);
void (*event_write_from_user)(struct lttng_kernel_ring_buffer_ctx *ctx,
- const void *src, size_t len);
+ const void *src, size_t len, size_t alignment);
void (*event_memset)(struct lttng_kernel_ring_buffer_ctx *ctx,
int c, size_t len);
void (*event_strcpy)(struct lttng_kernel_ring_buffer_ctx *ctx, const char *src,
size_t len);
void (*event_strcpy_from_user)(struct lttng_kernel_ring_buffer_ctx *ctx,
const char __user *src, size_t len);
+ void (*event_pstrcpy_pad)(struct lttng_kernel_ring_buffer_ctx *ctx,
+ const char *src, size_t len);
+ void (*event_pstrcpy_pad_from_user)(struct lttng_kernel_ring_buffer_ctx *ctx,
+ const char __user *src, size_t len);
void (*lost_event_too_big)(struct lttng_kernel_channel_buffer *lttng_channel);
};