X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.h;h=db91b2ed24cd57191e92a32376f0bc94e6b47482;hp=27baa6d3954bfecc1f03145909e73c5ee72dc480;hb=645328ae989e5f50a3a49c1ac34b2fee287a3d7b;hpb=601d5acf42ebdb05ff8aa19f12fd9bdad3602781

diff --git a/src/bin/lttng-sessiond/trace-kernel.h b/src/bin/lttng-sessiond/trace-kernel.h
index 27baa6d39..db91b2ed2 100644
--- a/src/bin/lttng-sessiond/trace-kernel.h
+++ b/src/bin/lttng-sessiond/trace-kernel.h
@@ -42,6 +42,11 @@ struct ltt_kernel_channel_list {
 	struct cds_list_head head;
 };
 
+struct ltt_kernel_context {
+	struct lttng_kernel_context ctx;
+	struct cds_list_head list;
+};
+
 /* Kernel event */
 struct ltt_kernel_event {
 	int fd;
@@ -56,15 +61,13 @@ struct ltt_kernel_channel {
 	int enabled;
 	unsigned int stream_count;
 	unsigned int event_count;
-	/*
-	 * TODO: need internal representation to support more than a
-	 * single context.
-	 */
-	struct lttng_kernel_context *ctx;
+	struct cds_list_head ctx_list;
 	struct lttng_channel *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 */
@@ -77,8 +80,11 @@ struct ltt_kernel_metadata {
 struct ltt_kernel_stream {
 	int fd;
 	int state;
+	int cpu;
 	/* Format is %s_%d respectively channel name and CPU number. */
 	char name[DEFAULT_STREAM_NAME_LEN];
+	uint64_t tracefile_size;
+	uint64_t tracefile_count;
 	struct cds_list_head list;
 };
 
@@ -89,7 +95,6 @@ struct ltt_kernel_session {
 	int consumer_fds_sent;
 	unsigned int channel_count;
 	unsigned int stream_count_global;
-	char *trace_path;
 	struct ltt_kernel_metadata *metadata;
 	struct ltt_kernel_channel_list channel_list;
 	/* UID/GID of the user owning the session */
@@ -104,9 +109,13 @@ 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;
+	uint64_t id;
+	/* Session is active or not meaning it has been started or stopped. */
+	unsigned int active:1;
+	/* Tell or not if the session has to output the traces. */
+	unsigned int output_traces;
+	unsigned int snapshot_mode;
+	unsigned int has_non_default_channel;
 };
 
 /*
@@ -120,12 +129,15 @@ struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
 /*
  * Create functions malloc() the data structure.
  */
-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_session *trace_kernel_create_session(void);
+struct ltt_kernel_channel *trace_kernel_create_channel(
+		struct lttng_channel *chan);
 struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev);
 struct ltt_kernel_metadata *trace_kernel_create_metadata(void);
 struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
 		unsigned int count);
+struct ltt_kernel_context *trace_kernel_create_context(
+		struct lttng_kernel_context *ctx);
 
 /*
  * Destroy functions free() the data structure and remove from linked list if
@@ -136,5 +148,6 @@ void trace_kernel_destroy_metadata(struct ltt_kernel_metadata *metadata);
 void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel);
 void trace_kernel_destroy_event(struct ltt_kernel_event *event);
 void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream);
+void trace_kernel_destroy_context(struct ltt_kernel_context *ctx);
 
 #endif /* _LTT_TRACE_KERNEL_H */