X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.h;h=96a3664b4158d8a78f13053bfe75ab7a83d9272b;hb=3c14c33fe61a2011881075506e6946ca5cdf23c1;hp=bc4c0e763bfaa8c2b1694b0cebb956629ba48cfb;hpb=00e2e675d54dc726a7c8f8887c889cc8ef022003;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-kernel.h b/src/bin/lttng-sessiond/trace-kernel.h
index bc4c0e763..96a3664b4 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"
 
@@ -81,7 +83,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;
 };
 
@@ -90,7 +92,6 @@ struct ltt_kernel_session {
 	int fd;
 	int metadata_stream_fd;
 	int consumer_fds_sent;
-	int consumer_fd;
 	unsigned int channel_count;
 	unsigned int stream_count_global;
 	char *trace_path;
@@ -107,6 +108,8 @@ struct ltt_kernel_session {
 	 */
 	struct consumer_output *consumer;
 	struct consumer_output *tmp_consumer;
+	/* Tracing session id */
+	unsigned int id;
 };
 
 /*
@@ -123,7 +126,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);