Libkernctl sync ioctl values

Updated ioctl values, add kernel tracepoint_list and tracer_version

Signed-off-by: Julien Desfossez <julien.desfossez@polymtl.ca>

diff --git a/libkernelctl/kernel-ioctl.h b/libkernelctl/kernel-ioctl.h
index 5e2358c8d5242adf43ce98234f502e989e00dc59..0db8383b088f240b398deea3cef9ee75249b2d05 100644 (file)
--- a/libkernelctl/kernel-ioctl.h
+++ b/libkernelctl/kernel-ioctl.h
@@ -47,18 +47,21 @@
 #define RING_BUFFER_GET_MMAP_READ_OFFSET    _IOR(0xF6, 0x0B, unsigned long)
 
 #define LTTNG_KERNEL_SESSION        _IO(0xF6, 0x40)
-#define LTTNG_KERNEL_SESSION_START  _IO(0xF6, 0x41)
-#define LTTNG_KERNEL_SESSION_STOP   _IO(0xF6, 0x42)
-#define LTTNG_KERNEL_CHANNEL        \
-           _IOW(0xF6, 0x43, struct lttng_kernel_channel)
-#define LTTNG_KERNEL_STREAM     _IO(0xF6, 0x44)
-#define LTTNG_KERNEL_EVENT      \
-           _IOW(0xF6, 0x45, struct lttng_kernel_event)
-#define LTTNG_KERNEL_METADATA       \
-           _IOW(0xF6, 0x46, struct lttng_kernel_channel)
-#define LTTNG_KERNEL_KPROBE     \
-           _IOW(0xF6, 0x47, struct lttng_kernel_kprobe)
-#define LTTNG_KERNEL_TRACER_VERSION \
-           _IOR(0xF6, 0x48, struct lttng_kernel_tracer_version)
+#define LTTNG_KERNEL_TRACER_VERSION     \
+           _IOR(0xF6, 0x41, struct lttng_kernel_tracer_version)
+#define LTTNG_KERNEL_TRACEPOINT_LIST        _IO(0xF6, 0x42)
+
+/* Session FD ioctl */
+#define LTTNG_KERNEL_METADATA           \
+           _IOW(0xF6, 0x50, struct lttng_kernel_channel)
+#define LTTNG_KERNEL_CHANNEL            \
+           _IOW(0xF6, 0x51, struct lttng_kernel_channel)
+#define LTTNG_KERNEL_SESSION_START      _IO(0xF6, 0x52)
+#define LTTNG_KERNEL_SESSION_STOP       _IO(0xF6, 0x53)
+
+/* Channel FD ioctl */
+#define LTTNG_KERNEL_STREAM         _IO(0xF6, 0x60)
+#define LTTNG_KERNEL_EVENT          \
+           _IOW(0xF6, 0x61, struct lttng_kernel_event)
 
 #endif /* _LTT_KERNEL_IOCTL_H */

diff --git a/libkernelctl/libkernelctl.c b/libkernelctl/libkernelctl.c
index c06f579698619716c478a4a8df1aaaf51afe232c..cfac1fa5c80ce32faa603315e2e5afa0a7142ca1 100644 (file)
--- a/libkernelctl/libkernelctl.c
+++ b/libkernelctl/libkernelctl.c
@@ -131,3 +131,12 @@ int kernctl_stop_session(int fd)
        return ioctl(fd, LTTNG_KERNEL_SESSION_STOP);
 }
 
+int kernctl_tracepoint_list(int fd)
+{
+       return ioctl(fd, LTTNG_KERNEL_TRACEPOINT_LIST);
+}
+
+int kernctl_tracer_version(int fd, struct lttng_kernel_tracer_version *v)
+{
+       return ioctl(fd, LTTNG_KERNEL_TRACER_VERSION, v);
+}

diff --git a/libkernelctl/libkernelctl.h b/libkernelctl/libkernelctl.h
index 34be7a5d3546142b167cfbc8e4048b20e5cd69d3..938c079dce979965dc2f25566537e6c44f437206 100644 (file)
--- a/libkernelctl/libkernelctl.h
+++ b/libkernelctl/libkernelctl.h
@@ -41,5 +41,7 @@ int kernctl_snapshot_get_consumed(int fd, unsigned long *len);
 int kernctl_snapshot_get_produced(int fd, unsigned long *len);
 int kernctl_start_session(int fd);
 int kernctl_stop_session(int fd);
+int kernctl_tracepoint_list(int fd);
+int kernctl_tracer_version(int fd, struct lttng_kernel_tracer_version *v);
 
 #endif /* _LTT_LIBKERNELCTL_H */