X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-ctl%2Fkernel-ctl.c;h=ff85b2c9b57420aeaff42adffe463309e04a5ec5;hb=5ff449ff970b67e444b4b402c3901270cf6424e1;hp=94e22ff0691170ad5db2f856b4bd512cd9f7e9d7;hpb=bbd6675c857ad9bf95e59446476cab19d1f6736e;p=lttng-tools.git

diff --git a/src/common/kernel-ctl/kernel-ctl.c b/src/common/kernel-ctl/kernel-ctl.c
index 94e22ff06..ff85b2c9b 100644
--- a/src/common/kernel-ctl/kernel-ctl.c
+++ b/src/common/kernel-ctl/kernel-ctl.c
@@ -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_NO_CHECK(fildes, request, ...) ({	\
-	int ret = ioctl(fildes, request, ##__VA_ARGS__);\
-	ret >= 0 ? ret : -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 _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
@@ -430,6 +432,27 @@ int kernctl_create_event_notifier_group_notification_fd(int 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)
 {