X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng-kernel.h;h=6fa4e3925e562726c3ec184405ea4df4ff693398;hp=142de0706ef670bdbcd7680961333adcb2da37d5;hb=7d452e122923ade6f4dc7a6e21bef105851d79e3;hpb=9bda164defe0c7ef5857d4ef59cc3b464f5a5404

diff --git a/include/lttng-kernel.h b/include/lttng-kernel.h
index 142de0706..6fa4e3925 100644
--- a/include/lttng-kernel.h
+++ b/include/lttng-kernel.h
@@ -23,24 +23,46 @@
 
 #include "lttng-share.h"
 
+#define LTTNG_SYM_NAME_LEN  128
+
+enum lttng_kernel_instrumentation {
+	LTTNG_KERNEL_TRACEPOINTS,
+	LTTNG_KERNEL_KPROBES,
+	LTTNG_KERNEL_FUNCTION,
+};
+
 /*
  * LTTng DebugFS ABI structures.
+ *
+ * This is the kernel ABI copied from lttng-modules tree.
  */
-enum lttng_instrum_type {
-	INSTRUM_TRACEPOINTS,
+
+/* Either addr is used or symbol_name and offset. */
+struct lttng_kernel_kprobe {
+	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_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 {
+	char name[LTTNG_SYM_NAME_LEN];
+	enum lttng_kernel_instrumentation instrumentation;
+	/* Per instrumentation type configuration */
+	union {
+		struct lttng_kernel_kprobe kprobe;
+		struct lttng_kernel_function_tracer ftrace;
+	} u;
 };
 
-struct lttng_event {
-	enum lttng_instrum_type itype;
-	char name[];
+struct lttng_kernel_tracer_version {
+	uint32_t version;
+	uint32_t patchlevel;
+	uint32_t sublevel;
 };
 
 #endif /* _LTTNG_KERNEL_H */