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

diff --git a/include/lttng-kernel.h b/include/lttng-kernel.h
index 1ce9fc5e4..3259bff84 100644
--- a/include/lttng-kernel.h
+++ b/include/lttng-kernel.h
@@ -26,29 +26,26 @@
 #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.
  */
+
+/* Either addr is used or symbol_name and offset. */
 struct lttng_kernel_kprobe {
 	uint64_t addr;
 
@@ -61,11 +58,10 @@ struct lttng_kernel_function_tracer {
 };
 
 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;
 	} u;