X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Flttng-kernel.h;h=9eb207bb2fd4e255cf88bccc8de61f27ce99deec;hb=8f0d098bc0b14f00c4d6ea3f48809626fa1c416f;hp=6fa4e3925e562726c3ec184405ea4df4ff693398;hpb=f3ed775ef4842019b396f06095b053c3a70bc3c8;p=lttng-tools.git

diff --git a/include/lttng-kernel.h b/include/lttng-kernel.h
index 6fa4e3925..9eb207bb2 100644
--- a/include/lttng-kernel.h
+++ b/include/lttng-kernel.h
@@ -5,8 +5,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,19 +25,57 @@
 
 #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.
  */
 
-/* Either addr is used or symbol_name and offset. */
+enum lttng_kernel_instrumentation {
+	LTTNG_KERNEL_TRACEPOINT    = 0,
+	LTTNG_KERNEL_KPROBE        = 1,
+	LTTNG_KERNEL_FUNCTION      = 2,
+	LTTNG_KERNEL_KRETPROBE     = 3,
+};
+
+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;
+};
+
+struct lttng_kernel_kretprobe {
+	uint64_t addr;
+
+	uint64_t offset;
+	char symbol_name[LTTNG_SYM_NAME_LEN];
+};
+
+/*
+ * Either addr is used, or symbol_name and offset.
+ */
 struct lttng_kernel_kprobe {
 	uint64_t addr;
 
@@ -45,7 +83,8 @@ struct lttng_kernel_kprobe {
 	char symbol_name[LTTNG_SYM_NAME_LEN];
 };
 
-struct lttng_kernel_function_tracer {
+/* Function tracer */
+struct lttng_kernel_function {
 	char symbol_name[LTTNG_SYM_NAME_LEN];
 };
 
@@ -54,8 +93,9 @@ struct lttng_kernel_event {
 	enum lttng_kernel_instrumentation instrumentation;
 	/* Per instrumentation type configuration */
 	union {
+		struct lttng_kernel_kretprobe kretprobe;
 		struct lttng_kernel_kprobe kprobe;
-		struct lttng_kernel_function_tracer ftrace;
+		struct lttng_kernel_function ftrace;
 	} u;
 };