X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-abi.h;h=232a9b90069c7af844a3e88b16d5128e37aa4a15;hb=382cbd153bc0240b75d1bece7564c900599534b4;hp=0287466b5746a4aa7a673ff8f2e3180334158f8b;hpb=86e0c24e4922a0be6dd1909b83400521ada5b713;p=lttng-ust.git

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index 0287466b..232a9b90 100644
--- a/include/lttng/ust-abi.h
+++ b/include/lttng/ust-abi.h
@@ -42,7 +42,7 @@
 #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_MAJOR_VERSION		6
 #define LTTNG_UST_ABI_MINOR_VERSION		0
 
 enum lttng_ust_instrumentation {
@@ -138,8 +138,16 @@ enum lttng_ust_context_type {
 	LTTNG_UST_CONTEXT_PTHREAD_ID		= 2,
 	LTTNG_UST_CONTEXT_PROCNAME		= 3,
 	LTTNG_UST_CONTEXT_IP			= 4,
+	LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER	= 5,
+	LTTNG_UST_CONTEXT_CPU_ID		= 6,
 };
 
+struct lttng_ust_perf_counter_ctx {
+	uint32_t type;
+	uint64_t config;
+	char name[LTTNG_UST_SYM_NAME_LEN];
+} LTTNG_PACKED;
+
 #define LTTNG_UST_CONTEXT_PADDING1	16
 #define LTTNG_UST_CONTEXT_PADDING2	(LTTNG_UST_SYM_NAME_LEN + 32)
 struct lttng_ust_context {
@@ -147,6 +155,7 @@ struct lttng_ust_context {
 	char padding[LTTNG_UST_CONTEXT_PADDING1];
 
 	union {
+		struct lttng_ust_perf_counter_ctx perf_counter;
 		char padding[LTTNG_UST_CONTEXT_PADDING2];
 	} u;
 } LTTNG_PACKED;