X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-abi.h;h=232a9b90069c7af844a3e88b16d5128e37aa4a15;hb=c7ea8487b97b4552a9fcf214a45e104c5f771c85;hp=df61cde57c5c0005bb6e72c7d2ccdcbea4d19c2d;hpb=ff0f57289ff0e6be25424081fabbbfc0e3b1b565;p=lttng-ust.git

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index df61cde5..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		4
+#define LTTNG_UST_ABI_MAJOR_VERSION		6
 #define LTTNG_UST_ABI_MINOR_VERSION		0
 
 enum lttng_ust_instrumentation {
@@ -137,8 +137,17 @@ enum lttng_ust_context_type {
 	LTTNG_UST_CONTEXT_VPID			= 1,
 	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 {
@@ -146,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;
@@ -227,6 +237,13 @@ struct lttng_ust_filter_bytecode {
 	char data[0];
 } LTTNG_PACKED;
 
+#define LTTNG_UST_EXCLUSION_PADDING	32
+struct lttng_ust_event_exclusion {
+	uint32_t count;
+	char padding[LTTNG_UST_EXCLUSION_PADDING];
+	char names[LTTNG_UST_SYM_NAME_LEN][0];
+} LTTNG_PACKED;
+
 #define _UST_CMD(minor)				(minor)
 #define _UST_CMDR(minor, type)			(minor)
 #define _UST_CMDW(minor, type)			(minor)
@@ -272,6 +289,7 @@ struct lttng_ust_filter_bytecode {
 
 /* Event FD commands */
 #define LTTNG_UST_FILTER			_UST_CMD(0xA0)
+#define LTTNG_UST_EXCLUSION			_UST_CMD(0xA1)
 
 #define LTTNG_UST_ROOT_HANDLE	0