X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-debugfs-abi.h;h=2768055f29b483788545ca5b3c44949478920942;hb=77aefe99a8d5ba7360ef199ef34bc85edf34ec21;hp=195acfc2b8583887d3d7a77bad1ab62c5459109d;hpb=ab2277d6c5aacf0c9ead24599e3b5fc57302d43f;p=lttng-modules.git

diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
index 195acfc2..2768055f 100644
--- a/ltt-debugfs-abi.h
+++ b/ltt-debugfs-abi.h
@@ -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,17 +61,45 @@ struct lttng_kernel_tracer_version {
 	uint32_t sublevel;
 };
 
+enum lttng_kernel_context_type {
+	LTTNG_KERNEL_CONTEXT_PID,
+	LTTNG_KERNEL_CONTEXT_PERF_COUNTER,
+	LTTNG_KERNEL_CONTEXT_COMM,
+};
+
+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_SESSION_START		_IO(0xF6, 0x41)
-#define LTTNG_KERNEL_SESSION_STOP		_IO(0xF6, 0x42)
+#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, 0x43, struct lttng_kernel_channel)
-#define LTTNG_KERNEL_STREAM			_IO(0xF6, 0x44)
+	_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, 0x45, struct lttng_kernel_event)
-#define LTTNG_KERNEL_METADATA			\
-	_IOW(0xF6, 0x46, struct lttng_kernel_channel)
-#define LTTNG_KERNEL_TRACER_VERSION		\
-	_IOR(0xF6, 0x48, struct lttng_kernel_tracer_version)
+	_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 */