X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fabi.h;h=5f0a3aa52a8ee992b0f5242a3e9412be4b923006;hb=21f58fb7e62071dae3ddf13817631749bcab4e00;hp=9141d4e5cbe99c4915757794eef379d9587b159e;hpb=b6c846f1812fad319db7c05fcae9d3f50a79763b;p=lttng-modules.git

diff --git a/include/lttng/abi.h b/include/lttng/abi.h
index 9141d4e5..5f0a3aa5 100644
--- a/include/lttng/abi.h
+++ b/include/lttng/abi.h
@@ -118,11 +118,12 @@ struct lttng_kernel_syscall {
 /*
  * For syscall tracing, name = "*" means "enable all".
  */
-#define LTTNG_KERNEL_EVENT_PADDING1	16
+#define LTTNG_KERNEL_EVENT_PADDING1	8
 #define LTTNG_KERNEL_EVENT_PADDING2	LTTNG_KERNEL_SYM_NAME_LEN + 32
 struct lttng_kernel_event {
 	char name[LTTNG_KERNEL_SYM_NAME_LEN];	/* event name */
 	uint32_t instrumentation;		/* enum lttng_kernel_instrumentation */
+	uint64_t token;				/* User-provided token */
 	char padding[LTTNG_KERNEL_EVENT_PADDING1];
 
 	/* Per instrumentation type configuration */
@@ -136,6 +137,13 @@ struct lttng_kernel_event {
 	} u;
 } __attribute__((packed));
 
+#define LTTNG_KERNEL_EVENT_NOTIFIER_PADDING1	16
+struct lttng_kernel_event_notifier {
+	struct lttng_kernel_event event;
+
+	char padding[LTTNG_KERNEL_EVENT_NOTIFIER_PADDING1];
+} __attribute__((packed));
+
 struct lttng_kernel_tracer_version {
 	uint32_t major;
 	uint32_t minor;
@@ -263,6 +271,7 @@ struct lttng_kernel_tracker_args {
 #define LTTNG_KERNEL_SYSCALL_LIST		_IO(0xF6, 0x4A)
 #define LTTNG_KERNEL_TRACER_ABI_VERSION		\
 	_IOR(0xF6, 0x4B, struct lttng_kernel_tracer_abi_version)
+#define LTTNG_KERNEL_EVENT_NOTIFIER_GROUP_CREATE    _IO(0xF6, 0x4C)
 
 /* Session FD ioctl */
 /* lttng/abi-old.h reserve 0x50, 0x51, 0x52, and 0x53. */
@@ -305,12 +314,12 @@ struct lttng_kernel_tracker_args {
 #define LTTNG_KERNEL_CONTEXT			\
 	_IOW(0xF6, 0x71, struct lttng_kernel_context)
 
-/* Event, Channel and Session ioctl */
+/* Event, Event notifier, Channel and Session ioctl */
 /* lttng/abi-old.h reserve 0x80 and 0x81. */
 #define LTTNG_KERNEL_ENABLE			_IO(0xF6, 0x82)
 #define LTTNG_KERNEL_DISABLE			_IO(0xF6, 0x83)
 
-/* Event FD ioctl */
+/* Event and Event notifier FD ioctl */
 #define LTTNG_KERNEL_FILTER			_IO(0xF6, 0x90)
 #define LTTNG_KERNEL_ADD_CALLSITE		_IO(0xF6, 0x91)
 
@@ -322,6 +331,12 @@ struct lttng_kernel_tracker_args {
 #define LTTNG_KERNEL_SESSION_UNTRACK_ID		\
 	_IOR(0xF6, 0xA2, struct lttng_kernel_tracker_args)
 
+/* Event notifier group file descriptor ioctl */
+#define LTTNG_KERNEL_EVENT_NOTIFIER_CREATE \
+	_IOW(0xF6, 0xB0, struct lttng_kernel_event_notifier)
+#define LTTNG_KERNEL_EVENT_NOTIFIER_GROUP_NOTIFICATION_FD \
+	_IO(0xF6, 0xB1)
+
 /*
  * LTTng-specific ioctls for the lib ringbuffer.
  *