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

diff --git a/ltt-sessiond/trace.h b/ltt-sessiond/trace.h
index 9cfbd84ab..f0d25c894 100644
--- a/ltt-sessiond/trace.h
+++ b/ltt-sessiond/trace.h
@@ -19,8 +19,8 @@
 #ifndef _LTT_TRACE_H
 #define _LTT_TRACE_H
 
-#include "ltt-sessiond.h"
-#include "session.h"
+#include <limits.h>
+#include <urcu/list.h>
 #include "lttng-kernel.h"
 
 /* Kernel event list */
@@ -28,24 +28,57 @@ 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 {
-	char name[NAME_MAX];
 	int fd;
+	struct lttng_kernel_event *event;
 	struct cds_list_head 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;
-	struct ltt_kernel_channel *channel;
+	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 */
@@ -63,10 +96,4 @@ struct ltt_ust_marker {
 	char *channel;
 };
 
-int get_trace_count_per_session(struct ltt_session *session);
-void get_traces_per_session(struct ltt_session *session, struct lttng_trace *traces);
-int ust_create_trace(struct command_ctx *cmd_ctx);
-int ust_start_trace(struct command_ctx *cmd_ctx);
-int ust_stop_trace(struct command_ctx *cmd_ctx);
-
 #endif /* _LTT_TRACE_H */