X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-debugfs-abi.h;h=586d3a5bdc48378265e31f009ed14e85f6e4e526;hb=a8ad3613f2e0e272487b8ec0f0ec8e3c6da689f9;hp=12592c8f417188adb5d2428b166bd93be802c4ac;hpb=f1c5825c5caee9efaabf4a77f487e474f291597d;p=lttng-modules.git

diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
index 12592c8f..586d3a5b 100644
--- a/ltt-debugfs-abi.h
+++ b/ltt-debugfs-abi.h
@@ -14,9 +14,9 @@
 #define LTTNG_SYM_NAME_LEN	128
 
 enum lttng_kernel_instrumentation {
-	LTTNG_KERNEL_TRACEPOINTS,
-	LTTNG_KERNEL_KPROBES,
-	LTTNG_KERNEL_FUNCTION_TRACER,
+	LTTNG_KERNEL_TRACEPOINT,
+	LTTNG_KERNEL_KPROBE,
+	LTTNG_KERNEL_FUNCTION,
 };
 
 /*
@@ -31,9 +31,6 @@ struct lttng_kernel_channel {
 	unsigned int read_timer_interval;	/* usecs */
 };
 
-struct lttng_kernel_tracepoint {
-};
-
 /*
  * Either addr is used, or symbol_name and offset.
  */
@@ -53,7 +50,6 @@ struct lttng_kernel_event {
 	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;
@@ -65,21 +61,46 @@ struct lttng_kernel_tracer_version {
 	uint32_t sublevel;
 };
 
-#define LTTNG_KERNEL_SESSION		_IO(0xF6, 0x40)
-#define LTTNG_KERNEL_SESSION_START	_IO(0xF6, 0x41)
-#define LTTNG_KERNEL_SESSION_STOP	_IO(0xF6, 0x42)
-#define LTTNG_KERNEL_CHANNEL		\
-	_IOW(0xF6, 0x43, struct lttng_kernel_channel)
-#define LTTNG_KERNEL_STREAM		_IO(0xF6, 0x44)
-#define LTTNG_KERNEL_EVENT		\
-	_IOW(0xF6, 0x45, struct lttng_kernel_event)
-#define LTTNG_KERNEL_METADATA		\
-	_IOW(0xF6, 0x46, struct lttng_kernel_channel)
-#define LTTNG_KERNEL_KPROBE		\
-	_IOW(0xF6, 0x47, struct lttng_kernel_kprobe)
-#define LTTNG_KERNEL_TRACER_VERSION	\
-	_IOR(0xF6, 0x48, struct lttng_kernel_tracer_version)
-#define LTTNG_KERNEL_FUNCTION_TRACER	\
-	_IOW(0xF6, 0x49, struct lttng_kernel_function_tracer)
+enum lttng_kernel_context_type {
+	LTTNG_KERNEL_CONTEXT_PID,
+	LTTNG_KERNEL_CONTEXT_PERF_COUNTER,
+	LTTNG_KERNEL_CONTEXT_COMM,
+	LTTNG_KERNEL_CONTEXT_PRIO,
+};
+
+struct lttng_kernel_perf_counter_ctx {
+	uint32_t type;
+	uint64_t config;
+};
+
+struct lttng_kernel_context {
+	enum lttng_kernel_context_type ctx;
+	union {
+		struct lttng_kernel_perf_counter_ctx perf_counter;
+	} u;
+};
+
+/* LTTng file descriptor ioctl */
+#define LTTNG_KERNEL_SESSION			_IO(0xF6, 0x40)
+#define LTTNG_KERNEL_TRACER_VERSION		\
+	_IOR(0xF6, 0x41, struct lttng_kernel_tracer_version)
+#define LTTNG_KERNEL_TRACEPOINT_LIST		_IO(0xF6, 0x42)
+
+/* Session FD ioctl */
+#define LTTNG_KERNEL_METADATA			\
+	_IOW(0xF6, 0x50, struct lttng_kernel_channel)
+#define LTTNG_KERNEL_CHANNEL			\
+	_IOW(0xF6, 0x51, struct lttng_kernel_channel)
+#define LTTNG_KERNEL_SESSION_START		_IO(0xF6, 0x52)
+#define LTTNG_KERNEL_SESSION_STOP		_IO(0xF6, 0x53)
+
+/* Channel FD ioctl */
+#define LTTNG_KERNEL_STREAM			_IO(0xF6, 0x60)
+#define LTTNG_KERNEL_EVENT			\
+	_IOW(0xF6, 0x61, struct lttng_kernel_event)
+
+/* Event and Channel FD ioctl */
+#define LTTNG_KERNEL_CONTEXT			\
+	_IOW(0xF6, 0x70, struct lttng_kernel_context)
 
 #endif /* _LTT_DEBUGFS_ABI_H */