Version 2.4.4
[lttng-modules.git] / lttng-abi.h
index 9c88b9b9db5887a57569d0265e1cb63e68d6ab81..3f2aefbea04cd1fa52909c7a7fe5b76ec047ab6f 100644 (file)
@@ -4,16 +4,28 @@
 /*
  * lttng-abi.h
  *
- * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
  * LTTng ABI header
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <linux/fs.h>
 
-#define LTTNG_SYM_NAME_LEN     256
+#define LTTNG_KERNEL_SYM_NAME_LEN      256
 
 enum lttng_kernel_instrumentation {
        LTTNG_KERNEL_TRACEPOINT = 0,
@@ -35,22 +47,23 @@ enum lttng_kernel_output {
 /*
  * LTTng DebugFS ABI structures.
  */
-
+#define LTTNG_KERNEL_CHANNEL_PADDING   LTTNG_KERNEL_SYM_NAME_LEN + 32
 struct lttng_kernel_channel {
-       int overwrite;                          /* 1: overwrite, 0: discard */
        uint64_t subbuf_size;                   /* in bytes */
        uint64_t num_subbuf;
        unsigned int switch_timer_interval;     /* usecs */
        unsigned int read_timer_interval;       /* usecs */
        enum lttng_kernel_output output;        /* splice, mmap */
-};
+       int overwrite;                          /* 1: overwrite, 0: discard */
+       char padding[LTTNG_KERNEL_CHANNEL_PADDING];
+}__attribute__((packed));
 
 struct lttng_kernel_kretprobe {
        uint64_t addr;
 
        uint64_t offset;
-       char symbol_name[LTTNG_SYM_NAME_LEN];
-};
+       char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
+}__attribute__((packed));
 
 /*
  * Either addr is used, or symbol_name and offset.
@@ -59,32 +72,37 @@ struct lttng_kernel_kprobe {
        uint64_t addr;
 
        uint64_t offset;
-       char symbol_name[LTTNG_SYM_NAME_LEN];
-};
+       char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
+}__attribute__((packed));
 
 struct lttng_kernel_function_tracer {
-       char symbol_name[LTTNG_SYM_NAME_LEN];
-};
+       char symbol_name[LTTNG_KERNEL_SYM_NAME_LEN];
+}__attribute__((packed));
 
 /*
  * For syscall tracing, name = '\0' means "enable all".
  */
+#define LTTNG_KERNEL_EVENT_PADDING1    16
+#define LTTNG_KERNEL_EVENT_PADDING2    LTTNG_KERNEL_SYM_NAME_LEN + 32
 struct lttng_kernel_event {
-       char name[LTTNG_SYM_NAME_LEN];  /* event name */
+       char name[LTTNG_KERNEL_SYM_NAME_LEN];   /* event name */
        enum lttng_kernel_instrumentation instrumentation;
+       char padding[LTTNG_KERNEL_EVENT_PADDING1];
+
        /* Per instrumentation type configuration */
        union {
                struct lttng_kernel_kretprobe kretprobe;
                struct lttng_kernel_kprobe kprobe;
                struct lttng_kernel_function_tracer ftrace;
+               char padding[LTTNG_KERNEL_EVENT_PADDING2];
        } u;
-};
+}__attribute__((packed));
 
 struct lttng_kernel_tracer_version {
-       uint32_t version;
+       uint32_t major;
+       uint32_t minor;
        uint32_t patchlevel;
-       uint32_t sublevel;
-};
+}__attribute__((packed));
 
 enum lttng_kernel_calibrate_type {
        LTTNG_KERNEL_CALIBRATE_KRETPROBE,
@@ -92,7 +110,7 @@ enum lttng_kernel_calibrate_type {
 
 struct lttng_kernel_calibrate {
        enum lttng_kernel_calibrate_type type;  /* type (input) */
-};
+}__attribute__((packed));
 
 enum lttng_kernel_context_type {
        LTTNG_KERNEL_CONTEXT_PID                = 0,
@@ -105,49 +123,95 @@ enum lttng_kernel_context_type {
        LTTNG_KERNEL_CONTEXT_VTID               = 7,
        LTTNG_KERNEL_CONTEXT_PPID               = 8,
        LTTNG_KERNEL_CONTEXT_VPPID              = 9,
+       LTTNG_KERNEL_CONTEXT_HOSTNAME           = 10,
 };
 
 struct lttng_kernel_perf_counter_ctx {
        uint32_t type;
        uint64_t config;
-       char name[LTTNG_SYM_NAME_LEN];
-};
+       char name[LTTNG_KERNEL_SYM_NAME_LEN];
+}__attribute__((packed));
 
+#define LTTNG_KERNEL_CONTEXT_PADDING1  16
+#define LTTNG_KERNEL_CONTEXT_PADDING2  LTTNG_KERNEL_SYM_NAME_LEN + 32
 struct lttng_kernel_context {
        enum lttng_kernel_context_type ctx;
+       char padding[LTTNG_KERNEL_CONTEXT_PADDING1];
+
        union {
                struct lttng_kernel_perf_counter_ctx perf_counter;
+               char padding[LTTNG_KERNEL_CONTEXT_PADDING2];
        } u;
-};
+}__attribute__((packed));
 
 /* LTTng file descriptor ioctl */
-#define LTTNG_KERNEL_SESSION                   _IO(0xF6, 0x40)
+#define LTTNG_KERNEL_SESSION                   _IO(0xF6, 0x45)
 #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)
+       _IOR(0xF6, 0x46, struct lttng_kernel_tracer_version)
+#define LTTNG_KERNEL_TRACEPOINT_LIST           _IO(0xF6, 0x47)
+#define LTTNG_KERNEL_WAIT_QUIESCENT            _IO(0xF6, 0x48)
 #define LTTNG_KERNEL_CALIBRATE                 \
-       _IOWR(0xF6, 0x44, struct lttng_kernel_calibrate)
+       _IOWR(0xF6, 0x49, struct lttng_kernel_calibrate)
 
 /* Session FD ioctl */
 #define LTTNG_KERNEL_METADATA                  \
-       _IOW(0xF6, 0x50, struct lttng_kernel_channel)
+       _IOW(0xF6, 0x54, 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)
+       _IOW(0xF6, 0x55, struct lttng_kernel_channel)
+#define LTTNG_KERNEL_SESSION_START             _IO(0xF6, 0x56)
+#define LTTNG_KERNEL_SESSION_STOP              _IO(0xF6, 0x57)
 
 /* Channel FD ioctl */
-#define LTTNG_KERNEL_STREAM                    _IO(0xF6, 0x60)
+#define LTTNG_KERNEL_STREAM                    _IO(0xF6, 0x62)
 #define LTTNG_KERNEL_EVENT                     \
-       _IOW(0xF6, 0x61, struct lttng_kernel_event)
+       _IOW(0xF6, 0x63, struct lttng_kernel_event)
 
 /* Event and Channel FD ioctl */
 #define LTTNG_KERNEL_CONTEXT                   \
-       _IOW(0xF6, 0x70, struct lttng_kernel_context)
+       _IOW(0xF6, 0x71, struct lttng_kernel_context)
 
 /* Event, Channel and Session ioctl */
-#define LTTNG_KERNEL_ENABLE                    _IO(0xF6, 0x80)
-#define LTTNG_KERNEL_DISABLE                   _IO(0xF6, 0x81)
+#define LTTNG_KERNEL_ENABLE                    _IO(0xF6, 0x82)
+#define LTTNG_KERNEL_DISABLE                   _IO(0xF6, 0x83)
+
+/* LTTng-specific ioctls for the lib ringbuffer */
+/* returns the timestamp begin of the current sub-buffer */
+#define LTTNG_RING_BUFFER_GET_TIMESTAMP_BEGIN  _IOR(0xF6, 0x20, uint64_t)
+/* returns the timestamp end of the current sub-buffer */
+#define LTTNG_RING_BUFFER_GET_TIMESTAMP_END    _IOR(0xF6, 0x21, uint64_t)
+/* returns the number of events discarded */
+#define LTTNG_RING_BUFFER_GET_EVENTS_DISCARDED _IOR(0xF6, 0x22, uint64_t)
+/* returns the packet payload size */
+#define LTTNG_RING_BUFFER_GET_CONTENT_SIZE     _IOR(0xF6, 0x23, uint64_t)
+/* returns the actual packet size */
+#define LTTNG_RING_BUFFER_GET_PACKET_SIZE      _IOR(0xF6, 0x24, uint64_t)
+/* returns the stream id */
+#define LTTNG_RING_BUFFER_GET_STREAM_ID                _IOR(0xF6, 0x25, uint64_t)
+/* returns the current timestamp */
+#define LTTNG_RING_BUFFER_GET_CURRENT_TIMESTAMP        _IOR(0xF6, 0x26, uint64_t)
+
+#ifdef CONFIG_COMPAT
+/* returns the timestamp begin of the current sub-buffer */
+#define LTTNG_RING_BUFFER_COMPAT_GET_TIMESTAMP_BEGIN \
+       LTTNG_RING_BUFFER_GET_TIMESTAMP_BEGIN
+/* returns the timestamp end of the current sub-buffer */
+#define LTTNG_RING_BUFFER_COMPAT_GET_TIMESTAMP_END \
+       LTTNG_RING_BUFFER_GET_TIMESTAMP_END
+/* returns the number of events discarded */
+#define LTTNG_RING_BUFFER_COMPAT_GET_EVENTS_DISCARDED \
+       LTTNG_RING_BUFFER_GET_EVENTS_DISCARDED
+/* returns the packet payload size */
+#define LTTNG_RING_BUFFER_COMPAT_GET_CONTENT_SIZE \
+       LTTNG_RING_BUFFER_GET_CONTENT_SIZE
+/* returns the actual packet size */
+#define LTTNG_RING_BUFFER_COMPAT_GET_PACKET_SIZE \
+       LTTNG_RING_BUFFER_GET_PACKET_SIZE
+/* returns the stream id */
+#define LTTNG_RING_BUFFER_COMPAT_GET_STREAM_ID \
+       LTTNG_RING_BUFFER_GET_STREAM_ID
+/* returns the current timestamp */
+#define LTTNG_RING_BUFFER_COMPAT_GET_CURRENT_TIMESTAMP \
+       LTTNG_RING_BUFFER_GET_CURRENT_TIMESTAMP
+#endif /* CONFIG_COMPAT */
 
 #endif /* _LTTNG_ABI_H */
This page took 0.026786 seconds and 4 git commands to generate.