Fix multiple error handling for UST tracing

[lttng-tools.git] / libkernelctl / kernel-ioctl.h

diff --git a/libkernelctl/kernel-ioctl.h b/libkernelctl/kernel-ioctl.h
index bed6f593449f2e1d34e80f5cc17fd2af36c076ec..408535d431a7578702cc4544f38f69dada71ae78 100644 (file)
--- a/libkernelctl/kernel-ioctl.h
+++ b/libkernelctl/kernel-ioctl.h
@@ -4,8 +4,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,39 +21,61 @@
 #define _LTT_KERNEL_IOCTL_H
 
 /* Get a snapshot of the current ring buffer producer and consumer positions */
-#define RING_BUFFER_SNAPSHOT            _IO(0xF6, 0x00)
+#define RING_BUFFER_SNAPSHOT                _IO(0xF6, 0x00)
 /* Get the consumer position (iteration start) */
 #define RING_BUFFER_SNAPSHOT_GET_CONSUMED   _IOR(0xF6, 0x01, unsigned long)
 /* Get the producer position (iteration end) */
 #define RING_BUFFER_SNAPSHOT_GET_PRODUCED   _IOR(0xF6, 0x02, unsigned long)
 /* Get exclusive read access to the specified sub-buffer position */
-#define RING_BUFFER_GET_SUBBUF          _IOW(0xF6, 0x03, unsigned long)
+#define RING_BUFFER_GET_SUBBUF              _IOW(0xF6, 0x03, unsigned long)
 /* Release exclusive sub-buffer access */
-#define RING_BUFFER_PUT_SUBBUF          _IO(0xF6, 0x04)
+#define RING_BUFFER_PUT_SUBBUF              _IO(0xF6, 0x04)
 
 /* Get exclusive read access to the next sub-buffer that can be read. */
-#define RING_BUFFER_GET_NEXT_SUBBUF     _IO(0xF6, 0x05)
+#define RING_BUFFER_GET_NEXT_SUBBUF         _IO(0xF6, 0x05)
 /* Release exclusive sub-buffer access, move consumer forward. */
-#define RING_BUFFER_PUT_NEXT_SUBBUF     _IO(0xF6, 0x06)
+#define RING_BUFFER_PUT_NEXT_SUBBUF         _IO(0xF6, 0x06)
 /* returns the size of the current sub-buffer, without padding (for mmap). */
-#define RING_BUFFER_GET_SUBBUF_SIZE     _IOR(0xF6, 0x07, unsigned long)
+#define RING_BUFFER_GET_SUBBUF_SIZE         _IOR(0xF6, 0x07, unsigned long)
 /* returns the size of the current sub-buffer, with padding (for splice). */
 #define RING_BUFFER_GET_PADDED_SUBBUF_SIZE  _IOR(0xF6, 0x08, unsigned long)
 /* returns the maximum size for sub-buffers. */
 #define RING_BUFFER_GET_MAX_SUBBUF_SIZE     _IOR(0xF6, 0x09, unsigned long)
 /* returns the length to mmap. */
-#define RING_BUFFER_GET_MMAP_LEN        _IOR(0xF6, 0x0A, unsigned long)
+#define RING_BUFFER_GET_MMAP_LEN            _IOR(0xF6, 0x0A, unsigned long)
 /* returns the offset of the subbuffer belonging to the mmap reader. */
 #define RING_BUFFER_GET_MMAP_READ_OFFSET    _IOR(0xF6, 0x0B, unsigned long)
+/* flush the current sub-buffer */
+#define RING_BUFFER_FLUSH                   _IO(0xF6, 0x0C)
 
-/* Create session LTTNG_SESSION */
-#define KERNEL_IO_CREATE_SESSION       _IO(0xF6, 0x40)
-#define KERNEL_IO_SESSION_START _IO(0xF6, 0x41)
-#define KERNEL_IO_SESSION_STOP  _IO(0xF6, 0x42)
+/* LTTng file descriptor ioctl */
+#define LTTNG_KERNEL_SESSION                _IO(0xF6, 0x40)
+#define LTTNG_KERNEL_TRACER_VERSION         \
+               _IOR(0xF6, 0x41, struct lttng_kernel_tracer_version)
+#define LTTNG_KERNEL_TRACEPOINT_LIST        _IO(0xF6, 0x42)
+#define LTTNG_KERNEL_WAIT_QUIESCENT         _IO(0xF6, 0x43)
+#define LTTNG_KERNEL_CALIBRATE                 \
+       _IOWR(0xF6, 0x44, struct lttng_kernel_calibrate)
 
-/* Create channel LTTNG_CHANNEL */
-#define KERNEL_IO_CREATE_CHANNEL       _IOW(0xF6, 0x43, struct lttng_channel)
-#define KERNEL_IO_CREATE_STREAM        _IO(0xF6, 0x44)
-#define KERNEL_IO_CREATE_EVENT     _IOW(0xF6, 0x45, struct lttng_event)
+/* Session FD ioctl */
+#define LTTNG_KERNEL_METADATA               \
+               _IOW(0xF6, 0x50, struct lttng_channel_attr)
+#define LTTNG_KERNEL_CHANNEL                \
+               _IOW(0xF6, 0x51, struct lttng_channel_attr)
+#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)
+
+/* Event and Channel FD ioctl */
+#define LTTNG_KERNEL_CONTEXT                \
+               _IOW(0xF6, 0x70, struct lttng_kernel_context)
+
+/* Event, Channel and Session ioctl */
+#define LTTNG_KERNEL_ENABLE                 _IO(0xF6, 0x80)
+#define LTTNG_KERNEL_DISABLE                _IO(0xF6, 0x81)
 
 #endif /* _LTT_KERNEL_IOCTL_H */