X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.h;h=8bd1ffe321b1075460ba53ef5bf3de79b69d92f9;hp=d34b83c8cb19ca7da84168db7511b5a76391964b;hb=fb5f35b688fa31b21b25f9a6a831df3e5aa243ed;hpb=173af62f4804133d4a7f45e34b6f72126f3eca5f

diff --git a/src/bin/lttng-sessiond/trace-kernel.h b/src/bin/lttng-sessiond/trace-kernel.h
index d34b83c8c..8bd1ffe32 100644
--- a/src/bin/lttng-sessiond/trace-kernel.h
+++ b/src/bin/lttng-sessiond/trace-kernel.h
@@ -22,6 +22,8 @@
 
 #include <lttng/lttng.h>
 #include <common/lttng-kernel.h>
+#include <common/lttng-kernel-old.h>
+#include <common/defaults.h>
 
 #include "consumer.h"
 
@@ -44,11 +46,6 @@ struct ltt_kernel_channel_list {
 struct ltt_kernel_event {
 	int fd;
 	int enabled;
-	/*
-	 * TODO: need internal representation to support more than a
-	 * single context.
-	 */
-	struct lttng_kernel_context *ctx;
 	struct lttng_kernel_event *event;
 	struct cds_list_head list;
 };
@@ -68,6 +65,8 @@ struct ltt_kernel_channel {
 	struct ltt_kernel_event_list events_list;
 	struct ltt_kernel_stream_list stream_list;
 	struct cds_list_head list;
+	/* Session pointer which has a reference to this object. */
+	struct ltt_kernel_session *session;
 };
 
 /* Metadata */
@@ -81,7 +80,7 @@ struct ltt_kernel_stream {
 	int fd;
 	int state;
 	/* Format is %s_%d respectively channel name and CPU number. */
-	char name[LTTNG_SYMBOL_NAME_LEN];
+	char name[DEFAULT_STREAM_NAME_LEN];
 	struct cds_list_head list;
 };
 
@@ -106,6 +105,10 @@ struct ltt_kernel_session {
 	 */
 	struct consumer_output *consumer;
 	struct consumer_output *tmp_consumer;
+	/* Tracing session id */
+	unsigned int id;
+	/* Session is started and active */
+	unsigned int started;
 };
 
 /*
@@ -122,7 +125,7 @@ struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
 struct ltt_kernel_session *trace_kernel_create_session(char *path);
 struct ltt_kernel_channel *trace_kernel_create_channel(struct lttng_channel *chan, char *path);
 struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev);
-struct ltt_kernel_metadata *trace_kernel_create_metadata(char *path);
+struct ltt_kernel_metadata *trace_kernel_create_metadata(void);
 struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
 		unsigned int count);