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=db91b2ed24cd57191e92a32376f0bc94e6b47482;hb=8e319828707210e48a5f3e74495881594dba73e8;hpb=645328ae989e5f50a3a49c1ac34b2fee287a3d7b

diff --git a/src/bin/lttng-sessiond/trace-kernel.h b/src/bin/lttng-sessiond/trace-kernel.h
index db91b2ed2..b15341971 100644
--- a/src/bin/lttng-sessiond/trace-kernel.h
+++ b/src/bin/lttng-sessiond/trace-kernel.h
@@ -45,22 +45,30 @@ 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 */
 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;
+	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;
+	bool published_to_notification_thread;
 	struct cds_list_head ctx_list;
 	struct lttng_channel *channel;
 	struct ltt_kernel_event_list events_list;
@@ -68,11 +76,13 @@ struct ltt_kernel_channel {
 	struct cds_list_head list;
 	/* Session pointer which has a reference to this object. */
 	struct ltt_kernel_session *session;
+	bool sent_to_consumer;
 };
 
 /* Metadata */
 struct ltt_kernel_metadata {
 	int fd;
+	uint64_t key; /* Key to reference this channel with the consumer. */
 	struct lttng_channel *conf;
 };
 
@@ -81,6 +91,7 @@ struct ltt_kernel_stream {
 	int fd;
 	int state;
 	int cpu;
+	bool sent_to_consumer;
 	/* Format is %s_%d respectively channel name and CPU number. */
 	char name[DEFAULT_STREAM_NAME_LEN];
 	uint64_t tracefile_size;
@@ -100,14 +111,7 @@ struct ltt_kernel_session {
 	/* UID/GID of the user owning the session */
 	uid_t uid;
 	gid_t gid;
-	/*
-	 * Two consumer_output object are needed where one is needed for the
-	 * current output object and the second one is the temporary object used to
-	 * store URI being set by the lttng_set_consumer_uri call. Once
-	 * lttng_enable_consumer is called, the two pointers are swapped.
-	 */
 	struct consumer_output *consumer;
-	struct consumer_output *tmp_consumer;
 	/* Tracing session id */
 	uint64_t id;
 	/* Session is active or not meaning it has been started or stopped. */
@@ -122,7 +126,12 @@ struct ltt_kernel_session {
  * 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);
 
@@ -132,12 +141,16 @@ 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);
+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);
 struct ltt_kernel_context *trace_kernel_create_context(
 		struct lttng_kernel_context *ctx);
+struct ltt_kernel_context *trace_kernel_copy_context(
+		struct ltt_kernel_context *ctx);
 
 /*
  * Destroy functions free() the data structure and remove from linked list if