X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.h;h=9d50f4c79f86dd40a30f674c6cce8b5a6a35451b;hb=e8fcabef14e1e2ce8d159c68c5585931df1216b4;hp=5502e42bdb4d8304186779eae182548a10574537;hpb=27babd3a0a164f71d4dc02884ef20099ddfc6755;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-kernel.h b/src/bin/lttng-sessiond/trace-kernel.h
index 5502e42bd..9d50f4c79 100644
--- a/src/bin/lttng-sessiond/trace-kernel.h
+++ b/src/bin/lttng-sessiond/trace-kernel.h
@@ -42,12 +42,20 @@ 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;
 	int enabled;
+	enum lttng_event_type type;
 	struct lttng_kernel_event *event;
 	struct cds_list_head list;
+	char *filter_expression;
+	struct lttng_filter_bytecode *filter;
 };
 
 /* Kernel channel */
@@ -56,11 +64,7 @@ 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;
@@ -109,18 +113,24 @@ struct ltt_kernel_session {
 	struct consumer_output *tmp_consumer;
 	/* Tracing session id */
 	uint64_t id;
-	/* Session is started and active */
-	unsigned int started;
+	/* 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;
 };
 
 /*
  * Lookup functions. NULL is returned if not found.
  */
 struct ltt_kernel_event *trace_kernel_get_event_by_name(
-		char *name, struct ltt_kernel_channel *channel);
+		char *name, struct ltt_kernel_channel *channel,
+		enum lttng_event_type type);
+struct ltt_kernel_event *trace_kernel_find_event(
+		char *name, struct ltt_kernel_channel *channel,
+		enum lttng_event_type type,
+		struct lttng_filter_bytecode *filter);
 struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
 		char *name, struct ltt_kernel_session *session);
 
@@ -130,10 +140,13 @@ struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
 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_event *trace_kernel_create_event(struct lttng_event *ev,
+		char *filter_expression, struct lttng_filter_bytecode *filter);
 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
@@ -144,5 +157,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 */