X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-abi.h;h=8cae00e65ee4e8165ff44b8d5b444f6ee5ded8f1;hb=d6792eab0e93399a26c6bea6d337ab4df1b95374;hp=d9be99391de5b6833eecf0a736b429cb3c7e4efd;hpb=f012efa89f8ac9aa04ac60d072f766ad44d4acd0;p=lttng-ust.git

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index d9be9939..8cae00e6 100644
--- a/include/lttng/ust-abi.h
+++ b/include/lttng/ust-abi.h
@@ -43,7 +43,7 @@
 
 /* Version for ABI between liblttng-ust, sessiond, consumerd */
 #define LTTNG_UST_ABI_MAJOR_VERSION		6
-#define LTTNG_UST_ABI_MINOR_VERSION		0
+#define LTTNG_UST_ABI_MINOR_VERSION		1
 
 enum lttng_ust_instrumentation {
 	LTTNG_UST_TRACEPOINT		= 0,
@@ -139,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 {
@@ -155,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;
@@ -306,6 +313,9 @@ union ust_args {
 	struct {
 		struct lttng_ust_field_iter entry;
 	} field_list;
+	struct {
+		char *ctxname;
+	} app_context;
 };
 
 struct lttng_ust_objd_ops {