Update lttng ABI

[lttng-modules.git] / ltt-debugfs-abi.h

diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
index 85e689c88705928579383d4ad9ff1fd4b5f91ac3..c6edce3167b4116673cb8ddf937f7507b2dc5f02 100644 (file)
--- a/ltt-debugfs-abi.h
+++ b/ltt-debugfs-abi.h
@@ -14,9 +14,9 @@
 #define LTTNG_SYM_NAME_LEN     128
 
 enum lttng_kernel_instrumentation {
-       LTTNG_KERNEL_TRACEPOINTS,
-       LTTNG_KERNEL_KPROBES,
-       LTTNG_KERNEL_FUNCTION_TRACER,
+       LTTNG_KERNEL_TRACEPOINT,
+       LTTNG_KERNEL_KPROBE,
+       LTTNG_KERNEL_FUNCTION,
 };
 
 /*
@@ -31,6 +31,9 @@ struct lttng_kernel_channel {
        unsigned int read_timer_interval;       /* usecs */
 };
 
+struct lttng_kernel_tracepoint {
+};
+
 /*
  * Either addr is used, or symbol_name and offset.
  */
@@ -46,13 +49,14 @@ struct lttng_kernel_function_tracer {
 };
 
 struct lttng_kernel_event {
+       char name[LTTNG_SYM_NAME_LEN];  /* event name */
        enum lttng_kernel_instrumentation instrumentation;
        /* Per instrumentation type configuration */
        union {
+               struct lttng_kernel_tracepoint tracepoint;
                struct lttng_kernel_kprobe kprobe;
                struct lttng_kernel_function_tracer ftrace;
        } u;
-       char name[];    /* event name */
 };
 
 struct lttng_kernel_tracer_version {
@@ -61,19 +65,22 @@ struct lttng_kernel_tracer_version {
        uint32_t sublevel;
 };
 
-#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)
+/* LTTng file descriptor ioctl */
+#define LTTNG_KERNEL_SESSION                   _IO(0xF6, 0x40)
+#define LTTNG_KERNEL_TRACER_VERSION            \
+       _IOR(0xF6, 0x41, struct lttng_kernel_tracer_version)
+
+/* 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_DEBUGFS_ABI_H */