Fix: userspace probe accessors are not const-correct

[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 7bec0c961f09475a27b754ef81ae03e43f8c1fe7..687eb0b231991b6c559b933720fa3f3af20ed004 100644 (file)
--- a/src/bin/lttng-sessiond/lttng-ust-abi.h
+++ b/src/bin/lttng-sessiond/lttng-ust-abi.h
@@ -44,8 +44,10 @@
 #define LTTNG_UST_COMM_MAGIC                   0xC57C57C5
 
 /* Version for ABI between liblttng-ust, sessiond, consumerd */
-#define LTTNG_UST_ABI_MAJOR_VERSION            6
-#define LTTNG_UST_ABI_MINOR_VERSION            1
+#define LTTNG_UST_ABI_MAJOR_VERSION            7
+#define LTTNG_UST_ABI_MINOR_VERSION            2
+
+struct lttng_ust_calibrate;
 
 enum lttng_ust_instrumentation {
        LTTNG_UST_TRACEPOINT            = 0,
@@ -179,7 +181,12 @@ struct lttng_ust_channel_attr {
        unsigned int switch_timer_interval;     /* usec */
        unsigned int read_timer_interval;       /* usec */
        enum lttng_ust_output output;           /* splice, mmap */
-       char padding[LTTNG_UST_CHANNEL_ATTR_PADDING];
+       union {
+               struct {
+                       int64_t blocking_timeout;       /* Retry timeout (usec) */
+               } s;
+               char padding[LTTNG_UST_CHANNEL_ATTR_PADDING];
+       } u;
 } LTTNG_PACKED;
 
 #define LTTNG_UST_TRACEPOINT_ITER_PADDING      16
@@ -220,21 +227,6 @@ struct lttng_ust_object_data {
        } u;
 } LTTNG_PACKED;
 
-enum lttng_ust_calibrate_type {
-       LTTNG_UST_CALIBRATE_TRACEPOINT,
-};
-
-#define LTTNG_UST_CALIBRATE_PADDING1   16
-#define LTTNG_UST_CALIBRATE_PADDING2   (LTTNG_UST_SYM_NAME_LEN + 32)
-struct lttng_ust_calibrate {
-       enum lttng_ust_calibrate_type type;     /* type (input) */
-       char padding[LTTNG_UST_CALIBRATE_PADDING1];
-
-       union {
-               char padding[LTTNG_UST_CALIBRATE_PADDING2];
-       } u;
-} LTTNG_PACKED;
-
 #define FILTER_BYTECODE_MAX_LEN                65536
 #define LTTNG_UST_FILTER_PADDING       32
 struct lttng_ust_filter_bytecode {
@@ -275,6 +267,7 @@ struct lttng_ust_event_exclusion {
        _UST_CMDW(0x51, struct lttng_ust_channel)
 #define LTTNG_UST_SESSION_START                        _UST_CMD(0x52)
 #define LTTNG_UST_SESSION_STOP                 _UST_CMD(0x53)
+#define LTTNG_UST_SESSION_STATEDUMP            _UST_CMD(0x54)
 
 /* Channel FD commands */
 #define LTTNG_UST_STREAM                       _UST_CMD(0x60)