Add units to debugfs abi header

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

diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
index 103e561b45f0460b8ac43bdb1acbd8f7c76d3dcc..85e689c88705928579383d4ad9ff1fd4b5f91ac3 100644 (file)
--- a/ltt-debugfs-abi.h
+++ b/ltt-debugfs-abi.h
@@ -11,9 +11,12 @@
 
 #include <linux/fs.h>
 
+#define LTTNG_SYM_NAME_LEN     128
+
 enum lttng_kernel_instrumentation {
        LTTNG_KERNEL_TRACEPOINTS,
        LTTNG_KERNEL_KPROBES,
+       LTTNG_KERNEL_FUNCTION_TRACER,
 };
 
 /*
@@ -21,26 +24,41 @@ enum lttng_kernel_instrumentation {
  */
 
 struct lttng_kernel_channel {
-       int overwrite;                  /* 1: overwrite, 0: discard */
-       u64 subbuf_size;
-       u64 num_subbuf;
-       unsigned int switch_timer_interval;
-       unsigned int read_timer_interval;
-};
-
-struct lttng_kernel_event {
-       enum lttng_kernel_instrumentation instrumentation;
-       char name[];
+       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 */
 };
 
 /*
  * Either addr is used, or symbol_name and offset.
  */
 struct lttng_kernel_kprobe {
-       u64 addr;
+       uint64_t addr;
+
+       uint64_t offset;
+       char symbol_name[LTTNG_SYM_NAME_LEN];
+};
+
+struct lttng_kernel_function_tracer {
+       char symbol_name[LTTNG_SYM_NAME_LEN];
+};
+
+struct lttng_kernel_event {
+       enum lttng_kernel_instrumentation instrumentation;
+       /* Per instrumentation type configuration */
+       union {
+               struct lttng_kernel_kprobe kprobe;
+               struct lttng_kernel_function_tracer ftrace;
+       } u;
+       char name[];    /* event name */
+};
 
-       u64 offset;
-       char symbol_name[];
+struct lttng_kernel_tracer_version {
+       uint32_t version;
+       uint32_t patchlevel;
+       uint32_t sublevel;
 };
 
 #define LTTNG_KERNEL_SESSION           _IO(0xF6, 0x40)
@@ -56,6 +74,6 @@ struct lttng_kernel_kprobe {
 #define LTTNG_KERNEL_KPROBE            \
        _IOW(0xF6, 0x47, struct lttng_kernel_kprobe)
 #define LTTNG_KERNEL_TRACER_VERSION    \
-       _IOW(0xF6, 0x48, struct lttng_kernel_tracer_version)
+       _IOR(0xF6, 0x48, struct lttng_kernel_tracer_version)
 
 #endif /* _LTT_DEBUGFS_ABI_H */