X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-sessiond%2Ftrace.h;h=f0d25c89400db78de651f36850a78db95ebb1c8b;hb=9e78d6ae219789dee9c96f35f190d6166ef389c3;hp=9cbdaffd1dbb1da13f02d3ff80e6444b6b98df95;hpb=fda89c9b0a068c6d528e1ef9095476118708c181;p=lttng-tools.git

diff --git a/ltt-sessiond/trace.h b/ltt-sessiond/trace.h
index 9cbdaffd1..f0d25c894 100644
--- a/ltt-sessiond/trace.h
+++ b/ltt-sessiond/trace.h
@@ -19,16 +19,72 @@
 #ifndef _LTT_TRACE_H
 #define _LTT_TRACE_H
 
-/* LTTng trace representation */
-struct ltt_lttng_trace {
+#include <limits.h>
+#include <urcu/list.h>
+#include "lttng-kernel.h"
+
+/* Kernel event list */
+struct ltt_kernel_event_list {
+	struct cds_list_head head;
+};
+
+/* Channel stream list */
+struct ltt_kernel_stream_list {
+	struct cds_list_head head;
+};
+
+/* Channel list */
+struct ltt_kernel_channel_list {
+	struct cds_list_head head;
+};
+
+/* Kernel event */
+struct ltt_kernel_event {
+	int fd;
+	struct lttng_kernel_event *event;
 	struct cds_list_head list;
-	char trace_name[NAME_MAX];
-	struct cds_list_head marker_list;
+};
+
+/* Kernel channel */
+struct ltt_kernel_channel {
+	int fd;
+	char *pathname;
+	unsigned int stream_count;
+	struct lttng_kernel_channel *channel;
+	struct ltt_kernel_event_list events_list;
+	struct ltt_kernel_stream_list stream_list;
+	struct cds_list_head list;
+};
+
+/* Metadata */
+struct ltt_kernel_metadata {
+	int fd;
+	char *pathname;
+	struct lttng_kernel_channel *conf;
+};
+
+/* Channel stream */
+struct ltt_kernel_stream {
+	int fd;
+	char *pathname;
+	int state;
+	struct cds_list_head list;
+};
+
+/* Kernel session */
+struct ltt_kernel_session {
+	int fd;
+	int metadata_stream_fd;
+	unsigned int channel_count;
+	unsigned int stream_count_global;
+	struct ltt_kernel_metadata *metadata;
+	struct ltt_kernel_channel_list channel_list;
 };
 
 /* UST trace representation */
 struct ltt_ust_trace {
 	struct cds_list_head list;
+	char name[NAME_MAX];
 	int shmid;
 	pid_t pid;
 	struct cds_list_head markers;