Cleanup: events.h: add alignment comments and fix whitespace

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

diff --git a/include/lttng/events.h b/include/lttng/events.h
index 0f6b5ab9d4e2b09e8e2742dc3fab9d4ffe3b4b0b..d25f4282dde15f79bd8e77202773307763fc6c1a 100644 (file)
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -94,7 +94,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 +102,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 +110,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 +118,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 {
@@ -383,15 +383,19 @@ struct lttng_kernel_channel_buffer_ops {
        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);
 };