X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=ltt-debugfs-abi.h;h=3b8e72ea9c8544b0d55165a7311ed25e7ddbb834;hb=7371f44c2c8ea6e60c0457671af008dd018c0b5f;hp=586d3a5bdc48378265e31f009ed14e85f6e4e526;hpb=a8ad3613f2e0e272487b8ec0f0ec8e3c6da689f9;p=lttng-modules.git

diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
index 586d3a5b..3b8e72ea 100644
--- a/ltt-debugfs-abi.h
+++ b/ltt-debugfs-abi.h
@@ -7,6 +7,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * LTTng debugfs ABI header
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/fs.h>
@@ -14,9 +16,18 @@
 #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 consumer mode
+ */
+enum lttng_kernel_output {
+	LTTNG_KERNEL_SPLICE	= 0,
+	LTTNG_KERNEL_MMAP	= 1,
 };
 
 /*
@@ -29,6 +40,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];
 };
 
 /*
@@ -50,6 +69,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;
@@ -62,15 +82,22 @@ struct lttng_kernel_tracer_version {
 };
 
 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_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 {
 	uint32_t type;
 	uint64_t config;
+	char name[LTTNG_SYM_NAME_LEN];
 };
 
 struct lttng_kernel_context {
@@ -85,6 +112,7 @@ 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)
 
 /* Session FD ioctl */
 #define LTTNG_KERNEL_METADATA			\
@@ -103,4 +131,8 @@ struct lttng_kernel_context {
 #define LTTNG_KERNEL_CONTEXT			\
 	_IOW(0xF6, 0x70, struct lttng_kernel_context)
 
+/* Event, Channel and Session ioctl */
+#define LTTNG_KERNEL_ENABLE			_IO(0xF6, 0x80)
+#define LTTNG_KERNEL_DISABLE			_IO(0xF6, 0x81)
+
 #endif /* _LTT_DEBUGFS_ABI_H */