Fix: add packed attribute to filter structure

[lttng-tools.git] / src / bin / lttng-sessiond / lttng-ust-abi.h

diff --git a/src/bin/lttng-sessiond/lttng-ust-abi.h b/src/bin/lttng-sessiond/lttng-ust-abi.h
index c9be4bd9d29fda9d8268a8d3531774d253f6e791..81143504e334b92783566386af4d87ec3e8a9ecc 100644 (file)
--- a/src/bin/lttng-sessiond/lttng-ust-abi.h
+++ b/src/bin/lttng-sessiond/lttng-ust-abi.h
@@ -56,9 +56,9 @@ struct lttng_ust_tracer_version {
 
 #define LTTNG_UST_CHANNEL_PADDING      LTTNG_UST_SYM_NAME_LEN + 32
 struct lttng_ust_channel {
-       int overwrite;                          /* 1: overwrite, 0: discard */
        uint64_t subbuf_size;                   /* in bytes */
        uint64_t num_subbuf;
+       int overwrite;                          /* 1: overwrite, 0: discard */
        unsigned int switch_timer_interval;     /* usecs */
        unsigned int read_timer_interval;       /* usecs */
        enum lttng_ust_output output;           /* output mode */
@@ -132,9 +132,9 @@ struct lttng_ust_context {
  */
 #define LTTNG_UST_CHANNEL_ATTR_PADDING LTTNG_UST_SYM_NAME_LEN + 32
 struct lttng_ust_channel_attr {
-       int overwrite;                          /* 1: overwrite, 0: discard */
        uint64_t subbuf_size;                   /* bytes */
        uint64_t num_subbuf;                    /* power of 2 */
+       int overwrite;                          /* 1: overwrite, 0: discard */
        unsigned int switch_timer_interval;     /* usec */
        unsigned int read_timer_interval;       /* usec */
        enum lttng_ust_output output;           /* splice, mmap */
@@ -173,9 +173,12 @@ struct lttng_ust_calibrate {
 };
 
 #define FILTER_BYTECODE_MAX_LEN                65536
+#define LTTNG_UST_FILTER_PADDING       32
 struct lttng_ust_filter_bytecode {
        uint32_t len;
        uint32_t reloc_offset;
+       uint64_t seqnum;
+       char padding[LTTNG_UST_FILTER_PADDING];
        char data[0];
 };