X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ltt-debugfs-abi.h;h=ce569444a9c9b2d7b64122d4cc685cf3a0f8debd;hb=1ec65de1d61ef4d4c6de6f9b2186167c9de1984e;hp=8dc0fde9b8c4cd59738438f41f9ec76bb4f86326;hpb=b64bc438d1c9bbcf241c598ca9f0e00d5770d784;p=deliverable%2Flttng-modules.git

diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
index 8dc0fde9..ce569444 100644
--- a/ltt-debugfs-abi.h
+++ b/ltt-debugfs-abi.h
@@ -16,9 +16,20 @@
 #define LTTNG_SYM_NAME_LEN	128
 
 enum lttng_kernel_instrumentation {
-	LTTNG_KERNEL_TRACEPOINT,
-	LTTNG_KERNEL_KPROBE,
-	LTTNG_KERNEL_FUNCTION,
+	LTTNG_KERNEL_TRACEPOINT	= 0,
+	LTTNG_KERNEL_KPROBE	= 1,
+	LTTNG_KERNEL_FUNCTION	= 2,
+	LTTNG_KERNEL_KRETPROBE	= 3,
+	LTTNG_KERNEL_NOOP	= 4,	/* not hooked */
+	LTTNG_KERNEL_SYSCALLS	= 5,
+};
+
+/*
+ * LTTng consumer mode
+ */
+enum lttng_kernel_output {
+	LTTNG_KERNEL_SPLICE	= 0,
+	LTTNG_KERNEL_MMAP	= 1,
 };
 
 /*
@@ -31,6 +42,14 @@ struct lttng_kernel_channel {
 	uint64_t num_subbuf;
 	unsigned int switch_timer_interval;	/* usecs */
 	unsigned int read_timer_interval;	/* usecs */
+	enum lttng_kernel_output output;	/* splice, mmap */
+};
+
+struct lttng_kernel_kretprobe {
+	uint64_t addr;
+
+	uint64_t offset;
+	char symbol_name[LTTNG_SYM_NAME_LEN];
 };
 
 /*
@@ -52,6 +71,7 @@ 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;
 	} u;
@@ -63,17 +83,25 @@ struct lttng_kernel_tracer_version {
 	uint32_t sublevel;
 };
 
+enum lttng_kernel_calibrate_type {
+	LTTNG_KERNEL_CALIBRATE_KRETPROBE,
+};
+
+struct lttng_kernel_calibrate {
+	enum lttng_kernel_calibrate_type type;	/* type (input) */
+};
+
 enum lttng_kernel_context_type {
-	LTTNG_KERNEL_CONTEXT_PID,
-	LTTNG_KERNEL_CONTEXT_PERF_COUNTER,
-	LTTNG_KERNEL_CONTEXT_COMM,
-	LTTNG_KERNEL_CONTEXT_PRIO,
-	LTTNG_KERNEL_CONTEXT_NICE,
-	LTTNG_KERNEL_CONTEXT_VPID,
-	LTTNG_KERNEL_CONTEXT_TID,
-	LTTNG_KERNEL_CONTEXT_VTID,
-	LTTNG_KERNEL_CONTEXT_PPID,
-	LTTNG_KERNEL_CONTEXT_VPPID,
+	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,
 };
 
 struct lttng_kernel_perf_counter_ctx {
@@ -94,6 +122,9 @@ struct lttng_kernel_context {
 #define LTTNG_KERNEL_TRACER_VERSION		\
 	_IOR(0xF6, 0x41, struct lttng_kernel_tracer_version)
 #define LTTNG_KERNEL_TRACEPOINT_LIST		_IO(0xF6, 0x42)
+#define LTTNG_KERNEL_WAIT_QUIESCENT		_IO(0xF6, 0x43)
+#define LTTNG_KERNEL_CALIBRATE			\
+	_IOWR(0xF6, 0x44, struct lttng_kernel_calibrate)
 
 /* Session FD ioctl */
 #define LTTNG_KERNEL_METADATA			\