X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-abi.h;h=302e6a36b80cb441cca42d7a3d6a297f3fd099ea;hb=d8d2416dab454962b90222ba46c82cdce0c666a4;hp=379e02315ad687fa643a677f4c050f1a6deb960a;hpb=710b8ee36eec50c00e72cb61e146357130e1d94c;p=lttng-ust.git

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index 379e0231..302e6a36 100644
--- a/include/lttng/ust-abi.h
+++ b/include/lttng/ust-abi.h
@@ -30,6 +30,10 @@
 #include <stdint.h>
 #include <lttng/ust-compiler.h>
 
+#ifndef LTTNG_PACKED
+#error "LTTNG_PACKED should be defined"
+#endif
+
 #ifndef __ust_stringify
 #define __ust_stringify1(x)	#x
 #define __ust_stringify(x)	__ust_stringify1(x)
@@ -42,8 +46,9 @@
 #define LTTNG_UST_COMM_MAGIC			0xC57C57C5
 
 /* Version for ABI between liblttng-ust, sessiond, consumerd */
-#define LTTNG_UST_ABI_MAJOR_VERSION		6
-#define LTTNG_UST_ABI_MINOR_VERSION		1
+#define LTTNG_UST_ABI_MAJOR_VERSION			9
+#define LTTNG_UST_ABI_MAJOR_VERSION_OLDEST_COMPATIBLE	8
+#define LTTNG_UST_ABI_MINOR_VERSION		0
 
 enum lttng_ust_instrumentation {
 	LTTNG_UST_TRACEPOINT		= 0,
@@ -98,7 +103,7 @@ struct lttng_ust_stream {
 	 */
 } LTTNG_PACKED;
 
-#define LTTNG_UST_EVENT_PADDING1	16
+#define LTTNG_UST_EVENT_PADDING1	8
 #define LTTNG_UST_EVENT_PADDING2	(LTTNG_UST_SYM_NAME_LEN + 32)
 struct lttng_ust_event {
 	enum lttng_ust_instrumentation instrumentation;
@@ -106,6 +111,7 @@ struct lttng_ust_event {
 
 	enum lttng_ust_loglevel_type loglevel_type;
 	int loglevel;	/* value, -1: all */
+	uint64_t token;				/* User-provided token */
 	char padding[LTTNG_UST_EVENT_PADDING1];
 
 	/* Per instrumentation type configuration */
@@ -114,6 +120,18 @@ struct lttng_ust_event {
 	} u;
 } LTTNG_PACKED;
 
+#define LTTNG_UST_EVENT_NOTIFIER_PADDING1	16
+struct lttng_ust_event_notifier {
+	struct lttng_ust_event event;
+	char padding[LTTNG_UST_EVENT_NOTIFIER_PADDING1];
+} LTTNG_PACKED;
+
+#define LTTNG_EVENT_NOTIFIER_NOTIFICATION_PADDING 32
+struct lttng_ust_event_notifier_notification {
+	uint64_t token;
+	char padding[LTTNG_EVENT_NOTIFIER_NOTIFICATION_PADDING];
+} LTTNG_PACKED;
+
 enum lttng_ust_field_type {
 	LTTNG_UST_FIELD_OTHER			= 0,
 	LTTNG_UST_FIELD_INTEGER			= 1,
@@ -141,6 +159,20 @@ 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,
+	LTTNG_UST_CONTEXT_TIME_NS		= 21,
 };
 
 struct lttng_ust_perf_counter_ctx {
@@ -177,7 +209,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;	/* Blocking timeout (usec) */
+		} s;
+		char padding[LTTNG_UST_CHANNEL_ATTR_PADDING];
+	} u;
 } LTTNG_PACKED;
 
 #define LTTNG_UST_TRACEPOINT_ITER_PADDING	16
@@ -193,6 +230,8 @@ enum lttng_ust_object_type {
 	LTTNG_UST_OBJECT_TYPE_STREAM = 1,
 	LTTNG_UST_OBJECT_TYPE_EVENT = 2,
 	LTTNG_UST_OBJECT_TYPE_CONTEXT = 3,
+	LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER_GROUP = 4,
+	LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER = 5,
 };
 
 #define LTTNG_UST_OBJECT_DATA_PADDING1	32
@@ -267,6 +306,7 @@ struct lttng_ust_event_exclusion {
 #define LTTNG_UST_WAIT_QUIESCENT		_UST_CMD(0x43)
 #define LTTNG_UST_REGISTER_DONE			_UST_CMD(0x44)
 #define LTTNG_UST_TRACEPOINT_FIELD_LIST		_UST_CMD(0x45)
+#define LTTNG_UST_EVENT_NOTIFIER_GROUP_CREATE	_UST_CMD(0x46)
 
 /* Session FD commands */
 #define LTTNG_UST_CHANNEL			\
@@ -298,6 +338,10 @@ struct lttng_ust_event_exclusion {
 #define LTTNG_UST_FILTER			_UST_CMD(0xA0)
 #define LTTNG_UST_EXCLUSION			_UST_CMD(0xA1)
 
+/* Event notifier group commands */
+#define LTTNG_UST_EVENT_NOTIFIER_CREATE		\
+	_UST_CMDW(0xB0, struct lttng_ust_event_notifier)
+
 #define LTTNG_UST_ROOT_HANDLE	0
 
 struct lttng_ust_obj;
@@ -317,6 +361,9 @@ union ust_args {
 	struct {
 		char *ctxname;
 	} app_context;
+	struct {
+		int event_notifier_notif_fd;
+	} event_notifier_handle;
 };
 
 struct lttng_ust_objd_ops {