X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.h;h=b1534197136ddfe735f63a5a7404b4b460f35182;hp=0ac020f97d63b4d00d599ec2ee2597a8bbe44d2f;hb=8e319828707210e48a5f3e74495881594dba73e8;hpb=df3c77c8dbbd102718f7149b075ba026d70a9e27

diff --git a/src/bin/lttng-sessiond/trace-kernel.h b/src/bin/lttng-sessiond/trace-kernel.h
index 0ac020f97..b15341971 100644
--- a/src/bin/lttng-sessiond/trace-kernel.h
+++ b/src/bin/lttng-sessiond/trace-kernel.h
@@ -45,6 +45,8 @@ struct ltt_kernel_channel_list {
 struct ltt_kernel_context {
 	struct lttng_kernel_context ctx;
 	struct cds_list_head list;
+	/* Indicates whether or not the context is in a list. */
+	bool in_list;
 };
 
 /* Kernel event */
@@ -56,11 +58,13 @@ struct ltt_kernel_event {
 	struct cds_list_head list;
 	char *filter_expression;
 	struct lttng_filter_bytecode *filter;
+	struct lttng_userspace_probe_location *userspace_probe_location;
 };
 
 /* Kernel channel */
 struct ltt_kernel_channel {
 	int fd;
+	uint64_t key; /* Key to reference this channel with the consumer. */
 	int enabled;
 	unsigned int stream_count;
 	unsigned int event_count;
@@ -78,6 +82,7 @@ struct ltt_kernel_channel {
 /* Metadata */
 struct ltt_kernel_metadata {
 	int fd;
+	uint64_t key; /* Key to reference this channel with the consumer. */
 	struct lttng_channel *conf;
 };
 
@@ -136,8 +141,9 @@ 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,
-		char *filter_expression, struct lttng_filter_bytecode *filter);
+enum lttng_error_code trace_kernel_create_event(struct lttng_event *ev,
+		char *filter_expression, struct lttng_filter_bytecode *filter,
+		struct ltt_kernel_event **kernel_event);
 struct ltt_kernel_metadata *trace_kernel_create_metadata(void);
 struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
 		unsigned int count);