Add ctf_enum_auto() for autoincrementing enumeration values

[lttng-ust.git] / include / lttng / ust-abi.h

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index 797a06b6e5e33d1e94552bdb9dffdf4fd0ac9df2..6e8f8d7be3691a7f8d5592ab84667011b498e946 100644 (file)
--- a/include/lttng/ust-abi.h
+++ b/include/lttng/ust-abi.h
@@ -42,8 +42,8 @@
 #define LTTNG_UST_COMM_MAGIC                   0xC57C57C5
 
 /* Version for ABI between liblttng-ust, sessiond, consumerd */
-#define LTTNG_UST_ABI_MAJOR_VERSION            5
-#define LTTNG_UST_ABI_MINOR_VERSION            0
+#define LTTNG_UST_ABI_MAJOR_VERSION            7
+#define LTTNG_UST_ABI_MINOR_VERSION            1
 
 enum lttng_ust_instrumentation {
        LTTNG_UST_TRACEPOINT            = 0,
@@ -98,7 +98,7 @@ struct lttng_ust_stream {
         */
 } LTTNG_PACKED;
 
-#define LTTNG_UST_EVENT_PADDING1       15
+#define LTTNG_UST_EVENT_PADDING1       16
 #define LTTNG_UST_EVENT_PADDING2       (LTTNG_UST_SYM_NAME_LEN + 32)
 struct lttng_ust_event {
        enum lttng_ust_instrumentation instrumentation;
@@ -106,7 +106,6 @@ struct lttng_ust_event {
 
        enum lttng_ust_loglevel_type loglevel_type;
        int loglevel;   /* value, -1: all */
-       char disabled;
        char padding[LTTNG_UST_EVENT_PADDING1];
 
        /* Per instrumentation type configuration */
@@ -140,6 +139,8 @@ enum lttng_ust_context_type {
        LTTNG_UST_CONTEXT_PROCNAME              = 3,
        LTTNG_UST_CONTEXT_IP                    = 4,
        LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER   = 5,
+       LTTNG_UST_CONTEXT_CPU_ID                = 6,
+       LTTNG_UST_CONTEXT_APP_CONTEXT           = 7,
 };
 
 struct lttng_ust_perf_counter_ctx {
@@ -156,6 +157,11 @@ struct lttng_ust_context {
 
        union {
                struct lttng_ust_perf_counter_ctx perf_counter;
+               struct {
+                       /* Includes trailing '\0'. */
+                       uint32_t provider_name_len;
+                       uint32_t ctx_name_len;
+               } app_ctx;
                char padding[LTTNG_UST_CONTEXT_PADDING2];
        } u;
 } LTTNG_PACKED;
@@ -267,6 +273,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)
@@ -307,6 +314,9 @@ union ust_args {
        struct {
                struct lttng_ust_field_iter entry;
        } field_list;
+       struct {
+               char *ctxname;
+       } app_context;
 };
 
 struct lttng_ust_objd_ops {