X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Ftrace.h;h=ac070908ae0cc15867d72067e2bcb92a216866f1;hp=493a23636847a65fe3b1c06cedee5057ee1179a9;hb=050349bbb362ea993533591532643022efeab864;hpb=d36b858358a8ef4e00de843379d670925f9c23b6

diff --git a/ltt-sessiond/trace.h b/ltt-sessiond/trace.h
index 493a23636..ac070908a 100644
--- a/ltt-sessiond/trace.h
+++ b/ltt-sessiond/trace.h
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,6 +45,7 @@ struct ltt_kernel_channel_list {
 struct ltt_kernel_event {
 	int fd;
 	int enabled;
+	struct lttng_kernel_context *ctx;
 	struct lttng_kernel_event *event;
 	struct cds_list_head list;
 };
@@ -55,6 +56,8 @@ struct ltt_kernel_channel {
 	int enabled;
 	char *pathname;
 	unsigned int stream_count;
+	unsigned int event_count;
+	struct lttng_kernel_context *ctx;
 	struct lttng_channel *channel;
 	struct ltt_kernel_event_list events_list;
 	struct ltt_kernel_stream_list stream_list;
@@ -81,8 +84,10 @@ struct ltt_kernel_session {
 	int fd;
 	int metadata_stream_fd;
 	int kconsumer_fds_sent;
+	int consumer_fd;
 	unsigned int channel_count;
 	unsigned int stream_count_global;
+	char *trace_path;
 	struct ltt_kernel_metadata *metadata;
 	struct ltt_kernel_channel_list channel_list;
 };
@@ -102,9 +107,6 @@ struct ltt_ust_marker {
 	char *channel;
 };
 
-/*
- * Get functions.
- */
 struct ltt_kernel_event *get_kernel_event_by_name(
 		char *name, struct ltt_kernel_channel *channel);
 struct ltt_kernel_channel *get_kernel_channel_by_name(
@@ -114,9 +116,9 @@ struct ltt_kernel_channel *get_kernel_channel_by_name(
  * Create functions malloc() the data structure.
  */
 struct ltt_kernel_session *trace_create_kernel_session(void);
-struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *chan);
+struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *chan, char *path);
 struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev);
-struct ltt_kernel_metadata *trace_create_kernel_metadata(void);
+struct ltt_kernel_metadata *trace_create_kernel_metadata(char *path);
 struct ltt_kernel_stream *trace_create_kernel_stream(void);
 
 /*