X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-ctl%2Fkernel-ctl.c;h=ff85b2c9b57420aeaff42adffe463309e04a5ec5;hp=caae421fc357e3718dfecaab90fda19dee87c4a0;hb=9074be22cad1e15ff91ac1147158ce93a33f29ad;hpb=159b042f34366d0fde5dcd73b4231c558922a664

diff --git a/src/common/kernel-ctl/kernel-ctl.c b/src/common/kernel-ctl/kernel-ctl.c
index caae421fc..ff85b2c9b 100644
--- a/src/common/kernel-ctl/kernel-ctl.c
+++ b/src/common/kernel-ctl/kernel-ctl.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <common/align.h>
 #include <common/macros.h>
-#include <errno.h>
+#include <common/compat/errno.h>
 #include <stdarg.h>
 #include <assert.h>
 #include <common/time.h>
@@ -22,16 +22,18 @@
 #include "kernel-ctl.h"
 #include "kernel-ioctl.h"
 
-#define LTTNG_IOCTL_CHECK(fildes, request, ...) ({	\
-	int ret = ioctl(fildes, request, ##__VA_ARGS__);\
-	assert(ret <= 0);				\
-	!ret ? 0 : -errno;				\
-})
+#define LTTNG_IOCTL_CHECK(fildes, request, ...)                         \
+	({                                                              \
+		int _ioctl_ret = ioctl(fildes, request, ##__VA_ARGS__); \
+		assert(_ioctl_ret <= 0);                                \
+		!_ioctl_ret ? 0 : -errno;                               \
+	})
 
-#define LTTNG_IOCTL_NO_CHECK(fildes, request, ...) ({	\
-	int ret = ioctl(fildes, request, ##__VA_ARGS__);\
-	ret >= 0 ? ret : -errno;			\
-})
+#define LTTNG_IOCTL_NO_CHECK(fildes, request, ...)                      \
+	({                                                              \
+		int _ioctl_ret = ioctl(fildes, request, ##__VA_ARGS__); \
+		_ioctl_ret >= 0 ? _ioctl_ret : -errno;                  \
+	})
 
 /*
  * This flag indicates which version of the kernel ABI to use. The old
@@ -418,7 +420,69 @@ int kernctl_stop_session(int fd)
 			LTTNG_KERNEL_SESSION_STOP);
 }
 
-int kernctl_filter(int fd, struct lttng_filter_bytecode *filter)
+int kernctl_create_event_notifier_group(int fd)
+{
+	return LTTNG_IOCTL_NO_CHECK(fd,
+			LTTNG_KERNEL_EVENT_NOTIFIER_GROUP_CREATE);
+}
+
+int kernctl_create_event_notifier_group_notification_fd(int group_fd)
+{
+	return LTTNG_IOCTL_NO_CHECK(group_fd,
+			LTTNG_KERNEL_EVENT_NOTIFIER_GROUP_NOTIFICATION_FD);
+}
+
+int kernctl_create_event_notifier_group_error_counter(int group_fd,
+		const struct lttng_kernel_counter_conf *error_counter_conf)
+{
+	return LTTNG_IOCTL_NO_CHECK(group_fd, LTTNG_KERNEL_COUNTER,
+			error_counter_conf);
+}
+
+int kernctl_counter_get_aggregate_value(int counter_fd,
+		struct lttng_kernel_counter_aggregate *value)
+{
+	return LTTNG_IOCTL_NO_CHECK(counter_fd, LTTNG_KERNEL_COUNTER_AGGREGATE,
+			value);
+}
+
+int kernctl_counter_clear(int counter_fd,
+		struct lttng_kernel_counter_clear *clear)
+{
+	return LTTNG_IOCTL_NO_CHECK(counter_fd, LTTNG_KERNEL_COUNTER_CLEAR,
+			clear);
+}
+
+int kernctl_create_event_notifier(int group_fd,
+		const struct lttng_kernel_event_notifier *event_notifier)
+{
+	return LTTNG_IOCTL_NO_CHECK(group_fd,
+			LTTNG_KERNEL_EVENT_NOTIFIER_CREATE, event_notifier);
+}
+
+int kernctl_capture(int fd, const struct lttng_bytecode *capture)
+{
+	int ret;
+	struct lttng_kernel_capture_bytecode *kb;
+
+	/* Translate bytecode to kernel bytecode. */
+	kb = zmalloc(sizeof(*kb) + capture->len);
+	if (!kb) {
+		ret = -ENOMEM;
+		goto end;
+	}
+
+	kb->len = capture->len;
+	kb->reloc_offset = capture->reloc_table_offset;
+	kb->seqnum = capture->seqnum;
+	memcpy(kb->data, capture->data, capture->len);
+	ret = LTTNG_IOCTL_CHECK(fd, LTTNG_KERNEL_CAPTURE, kb);
+	free(kb);
+end:
+	return ret;
+}
+
+int kernctl_filter(int fd, const struct lttng_bytecode *filter)
 {
 	struct lttng_kernel_filter_bytecode *kb;
 	uint32_t len;
@@ -510,6 +574,13 @@ int kernctl_buffer_clear(int fd)
 	return LTTNG_IOCTL_CHECK(fd, RING_BUFFER_CLEAR);
 }
 
+int kernctl_get_next_subbuf_metadata_check(int fd, bool *consistent)
+{
+	return LTTNG_IOCTL_NO_CHECK(fd,
+			RING_RING_BUFFER_GET_NEXT_SUBBUF_METADATA_CHECK,
+			consistent);
+}
+
 /* returns the version of the metadata. */
 int kernctl_get_metadata_version(int fd, uint64_t *version)
 {