X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-debugfs-abi.h;h=d0c2dd1aa7e4c7038e8c7d7f55b6593c570b6176;hb=9e7e489272e646b39c51e3074de800e928bb5cec;hp=74ad764da2bdf9ab4d5685c0f8fccb8bedb710ea;hpb=e0a7a7c4a6a88a60ae40baeb4f4656f58175993a;p=lttng-modules.git

diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
index 74ad764d..d0c2dd1a 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,
 };
 
 /*
@@ -24,11 +24,14 @@ enum lttng_kernel_instrumentation {
  */
 
 struct lttng_kernel_channel {
-	int overwrite;			/* 1: overwrite, 0: discard */
-	uint64_t subbuf_size;
+	int overwrite;				/* 1: overwrite, 0: discard */
+	uint64_t subbuf_size;			/* in bytes */
 	uint64_t num_subbuf;
-	unsigned int switch_timer_interval;
-	unsigned int read_timer_interval;
+	unsigned int switch_timer_interval;	/* usecs */
+	unsigned int read_timer_interval;	/* usecs */
+};
+
+struct lttng_kernel_tracepoint {
 };
 
 /*
@@ -46,13 +49,14 @@ struct lttng_kernel_function_tracer {
 };
 
 struct lttng_kernel_event {
+	char name[LTTNG_SYM_NAME_LEN];	/* event name */
 	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;
-	char name[];	/* event name */
 };
 
 struct lttng_kernel_tracer_version {
@@ -61,19 +65,23 @@ 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)
+/* 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)
 
 #endif /* _LTT_DEBUGFS_ABI_H */