Packet headers and alignment

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

diff --git a/ltt-events.h b/ltt-events.h
index 3bacac785a2acd007f0a8c3bf5c06471100d7165..5b5dcb50ba14db062314dcfdb67d2aed85d0384e 100644 (file)
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -10,6 +10,7 @@
  */
 
 #include <linux/list.h>
+#include <linux/uuid.h>
 #include "ltt-debugfs-abi.h"
 
 struct ltt_channel;
@@ -46,7 +47,7 @@ struct lttng_enum_entry {
            .u.basic.integer =                                  \
                {                                               \
                  .size = sizeof(_type),                        \
-                 .alignment = __alignof__(_type),              \
+                 .alignment = ltt_alignof(_type) * CHAR_BIT,   \
                  .signedness = is_signed_type(_type),          \
                  .reverse_byte_order = _byte_order != __BYTE_ORDER,    \
                },                                              \
@@ -171,6 +172,7 @@ struct ltt_session {
        struct list_head events;        /* Event list head */
        struct list_head list;          /* Session list */
        unsigned int free_chan_id;      /* Next chan ID to allocate */
+       uuid_le uuid;                   /* Trace session unique ID */
        int metadata_dumped:1;
 };