X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng-kernel.h;fp=include%2Flttng-kernel.h;h=dd28ff178763c6aea24247517a9d3e1b7ceb166e;hp=29731748501aee899240b27b2976f218e26b1bf3;hb=7d29a2477524f7ee2ee46a94e538e6141f5ecc0e;hpb=65beb5ffdbe6e17dbd0268aad3c32b02322cd9ad

diff --git a/include/lttng-kernel.h b/include/lttng-kernel.h
index 297317485..dd28ff178 100644
--- a/include/lttng-kernel.h
+++ b/include/lttng-kernel.h
@@ -25,28 +25,58 @@
 
 #define LTTNG_SYM_NAME_LEN  128
 
+/*
+ * LTTng DebugFS ABI structures.
+ *
+ * This is the kernel ABI copied from lttng-modules tree.
+ */
+
 enum lttng_kernel_instrumentation {
 	LTTNG_KERNEL_TRACEPOINT    = 0,
 	LTTNG_KERNEL_KPROBE        = 1,
 	LTTNG_KERNEL_FUNCTION      = 2,
 };
 
-/*
- * LTTng consumer mode
- */
-enum lttng_kernel_output {
-	LTTNG_KERNEL_SPLICE       = 0,
-	LTTNG_KERNEL_MMAP         = 1,
+enum lttng_kernel_context_type {
+	LTTNG_KERNEL_CONTEXT_PID            = 0,
+	LTTNG_KERNEL_CONTEXT_PERF_COUNTER   = 1,
+	LTTNG_KERNEL_CONTEXT_COMM           = 2,
+	LTTNG_KERNEL_CONTEXT_PRIO           = 3,
+	LTTNG_KERNEL_CONTEXT_NICE           = 4,
+	LTTNG_KERNEL_CONTEXT_VPID           = 5,
+	LTTNG_KERNEL_CONTEXT_TID            = 6,
+	LTTNG_KERNEL_CONTEXT_VTID           = 7,
+	LTTNG_KERNEL_CONTEXT_PPID           = 8,
+	LTTNG_KERNEL_CONTEXT_VPPID          = 9,
+};
+
+/* Perf counter attributes */
+struct lttng_kernel_perf_counter_ctx {
+	uint32_t type;
+	uint64_t config;
+	char name[LTTNG_SYMBOL_NAME_LEN];
+};
+
+/* Event/Channel context */
+struct lttng_kernel_context {
+	enum lttng_kernel_context_type ctx;
+	union {
+		struct lttng_kernel_perf_counter_ctx perf_counter;
+	} u;
 };
 
 /*
- * 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;
+
+	uint64_t offset;
+	char symbol_name[LTTNG_SYM_NAME_LEN];
+};
 
 /* Function tracer */
-struct lttng_kernel_function_attr {
+struct lttng_kernel_function {
 	char symbol_name[LTTNG_SYM_NAME_LEN];
 };
 
@@ -55,8 +85,8 @@ struct lttng_kernel_event {
 	enum lttng_kernel_instrumentation instrumentation;
 	/* Per instrumentation type configuration */
 	union {
-		struct lttng_kernel_kprobe_attr kprobe;
-		struct lttng_kernel_function_attr ftrace;
+		struct lttng_kernel_kprobe kprobe;
+		struct lttng_kernel_function ftrace;
 	} u;
 };