Fix: ambiguous ownership of kernel context by multiple channels

[lttng-tools.git] / src / bin / lttng-sessiond / trace-kernel.h

diff --git a/src/bin/lttng-sessiond/trace-kernel.h b/src/bin/lttng-sessiond/trace-kernel.h
index 96a3664b4158d8a78f13053bfe75ab7a83d9272b..0ac020f97d63b4d00d599ec2ee2597a8bbe44d2f 100644 (file)
--- a/src/bin/lttng-sessiond/trace-kernel.h
+++ b/src/bin/lttng-sessiond/trace-kernel.h
@@ -42,17 +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;
-       /*
-        * TODO: need internal representation to support more than a
-        * single context.
-        */
-       struct lttng_kernel_context *ctx;
+       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 */
@@ -61,15 +64,15 @@ 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;
+       bool published_to_notification_thread;
+       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;
+       bool sent_to_consumer;
 };
 
 /* Metadata */
@@ -82,8 +85,12 @@ struct ltt_kernel_metadata {
 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;
+       uint64_t tracefile_count;
        struct cds_list_head list;
 };
 
@@ -94,41 +101,50 @@ 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 */
        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 */
-       unsigned int id;
+       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;
 };
 
 /*
  * 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);
 
 /*
  * 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_event *trace_kernel_create_event(struct lttng_event *ev);
+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);
 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
@@ -139,5 +155,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 */