X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng-kernel.h;h=29731748501aee899240b27b2976f218e26b1bf3;hp=1ce9fc5e4b96157cb23896805f2ca4bf58e8afca;hb=f05b5f07dd61554a2fcdc5a09d4d80cadf478a51;hpb=9cb983500508a95363a09a5a65d2f67774c38b69

diff --git a/include/lttng-kernel.h b/include/lttng-kernel.h
index 1ce9fc5e4..297317485 100644
--- a/include/lttng-kernel.h
+++ b/include/lttng-kernel.h
@@ -26,48 +26,37 @@
 #define LTTNG_SYM_NAME_LEN  128
 
 enum lttng_kernel_instrumentation {
-	LTTNG_KERNEL_TRACEPOINTS,
-	LTTNG_KERNEL_KPROBES,
-	LTTNG_KERNEL_FUNCTION_TRACER,
+	LTTNG_KERNEL_TRACEPOINT    = 0,
+	LTTNG_KERNEL_KPROBE        = 1,
+	LTTNG_KERNEL_FUNCTION      = 2,
 };
 
 /*
- * LTTng DebugFS ABI structures.
+ * LTTng consumer mode
  */
-
-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 */
-};
-
-struct lttng_kernel_tracepoint {
+enum lttng_kernel_output {
+	LTTNG_KERNEL_SPLICE       = 0,
+	LTTNG_KERNEL_MMAP         = 1,
 };
 
 /*
- * Either addr is used, or symbol_name and offset.
+ * LTTng DebugFS ABI structures.
+ *
+ * This is the kernel ABI copied from lttng-modules tree.
  */
-struct lttng_kernel_kprobe {
-	uint64_t addr;
-
-	uint64_t offset;
-	char symbol_name[LTTNG_SYM_NAME_LEN];
-};
 
-struct lttng_kernel_function_tracer {
+/* Function tracer */
+struct lttng_kernel_function_attr {
 	char symbol_name[LTTNG_SYM_NAME_LEN];
 };
 
 struct lttng_kernel_event {
-	char name[LTTNG_SYM_NAME_LEN];  /* event name */
+	char name[LTTNG_SYM_NAME_LEN];
 	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;
+		struct lttng_kernel_kprobe_attr kprobe;
+		struct lttng_kernel_function_attr ftrace;
 	} u;
 };