Add internal kernel channel destroy function

[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 5a8bcdbd4418c496ab3aa72fcb931c179814d71f..8bd1ffe321b1075460ba53ef5bf3de79b69d92f9 100644 (file)
--- a/src/bin/lttng-sessiond/trace-kernel.h
+++ b/src/bin/lttng-sessiond/trace-kernel.h
@@ -18,11 +18,14 @@
 #ifndef _LTT_TRACE_KERNEL_H
 #define _LTT_TRACE_KERNEL_H
 
-#include <limits.h>
 #include <urcu/list.h>
 
 #include <lttng/lttng.h>
 #include <common/lttng-kernel.h>
+#include <common/lttng-kernel-old.h>
+#include <common/defaults.h>
+
+#include "consumer.h"
 
 /* Kernel event list */
 struct ltt_kernel_event_list {
@@ -43,11 +46,6 @@ struct ltt_kernel_channel_list {
 struct ltt_kernel_event {
        int fd;
        int enabled;
-       /*
-        * TODO: need internal representation to support more than a
-        * single context.
-        */
-       struct lttng_kernel_context *ctx;
        struct lttng_kernel_event *event;
        struct cds_list_head list;
 };
@@ -56,7 +54,6 @@ struct ltt_kernel_event {
 struct ltt_kernel_channel {
        int fd;
        int enabled;
-       char *pathname;
        unsigned int stream_count;
        unsigned int event_count;
        /*
@@ -68,20 +65,22 @@ struct ltt_kernel_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 */
 struct ltt_kernel_metadata {
        int fd;
-       char *pathname;
        struct lttng_channel *conf;
 };
 
 /* Channel stream */
 struct ltt_kernel_stream {
        int fd;
-       char *pathname;
        int state;
+       /* Format is %s_%d respectively channel name and CPU number. */
+       char name[DEFAULT_STREAM_NAME_LEN];
        struct cds_list_head list;
 };
 
@@ -90,7 +89,6 @@ struct ltt_kernel_session {
        int fd;
        int metadata_stream_fd;
        int consumer_fds_sent;
-       int consumer_fd;
        unsigned int channel_count;
        unsigned int stream_count_global;
        char *trace_path;
@@ -99,6 +97,18 @@ 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 */
+       unsigned int id;
+       /* Session is started and active */
+       unsigned int started;
 };
 
 /*
@@ -115,8 +125,9 @@ struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
 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_metadata *trace_kernel_create_metadata(char *path);
-struct ltt_kernel_stream *trace_kernel_create_stream(void);
+struct ltt_kernel_metadata *trace_kernel_create_metadata(void);
+struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
+               unsigned int count);
 
 /*
  * Destroy functions free() the data structure and remove from linked list if