X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt-debugfs-abi.h;h=d91c52d5f5d368ee1e10ccbc78d74998595ec80a;hb=17baffe29814f2508556e498ab8c41a192e76b67;hp=d7d68926960d3a51a030d5179f83a4c063ed3436;hpb=30bdb6e41d33f7ce7b4eb51f363423c1dc9fd88e;p=lttng-modules.git

diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
index d7d68926..d91c52d5 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,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 +33,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 +52,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,19 +63,47 @@ 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)
+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,
+};
+
+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 */