Add UST uid/gid contexts

[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 57b1d4e42ea540ff2052459c9802ce4e4e325c28..7cfb186463452e2cb7e0939a5195d35b406d3ac2 100644 (file)
--- a/src/bin/lttng-sessiond/lttng-ust-abi.h
+++ b/src/bin/lttng-sessiond/lttng-ust-abi.h
@@ -45,7 +45,9 @@
 
 /* Version for ABI between liblttng-ust, sessiond, consumerd */
 #define LTTNG_UST_ABI_MAJOR_VERSION            7
-#define LTTNG_UST_ABI_MINOR_VERSION            1
+#define LTTNG_UST_ABI_MINOR_VERSION            2
+
+struct lttng_ust_calibrate;
 
 enum lttng_ust_instrumentation {
        LTTNG_UST_TRACEPOINT            = 0,
@@ -143,6 +145,19 @@ enum lttng_ust_context_type {
        LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER   = 5,
        LTTNG_UST_CONTEXT_CPU_ID                = 6,
        LTTNG_UST_CONTEXT_APP_CONTEXT           = 7,
+       LTTNG_UST_CONTEXT_CGROUP_NS             = 8,
+       LTTNG_UST_CONTEXT_IPC_NS                = 9,
+       LTTNG_UST_CONTEXT_MNT_NS                = 10,
+       LTTNG_UST_CONTEXT_NET_NS                = 11,
+       LTTNG_UST_CONTEXT_PID_NS                = 12,
+       LTTNG_UST_CONTEXT_USER_NS               = 13,
+       LTTNG_UST_CONTEXT_UTS_NS                = 14,
+       LTTNG_UST_CONTEXT_VUID                  = 15,
+       LTTNG_UST_CONTEXT_VEUID                 = 16,
+       LTTNG_UST_CONTEXT_VSUID                 = 17,
+       LTTNG_UST_CONTEXT_VGID                  = 18,
+       LTTNG_UST_CONTEXT_VEGID                 = 19,
+       LTTNG_UST_CONTEXT_VSGID                 = 20,
 };
 
 struct lttng_ust_perf_counter_ctx {
@@ -179,7 +194,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 +240,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 {