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 f04d9e7b50e710fadf27c5e4bc5ac9a198499918..8bd1ffe321b1075460ba53ef5bf3de79b69d92f9 100644 (file)
--- a/src/bin/lttng-sessiond/trace-kernel.h
+++ b/src/bin/lttng-sessiond/trace-kernel.h
@@ -22,6 +22,8 @@
 
 #include <lttng/lttng.h>
 #include <common/lttng-kernel.h>
+#include <common/lttng-kernel-old.h>
+#include <common/defaults.h>
 
 #include "consumer.h"
 
@@ -44,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;
 };
@@ -68,6 +65,8 @@ 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 */
@@ -81,7 +80,7 @@ struct ltt_kernel_stream {
        int fd;
        int state;
        /* Format is %s_%d respectively channel name and CPU number. */
-       char name[LTTNG_SYMBOL_NAME_LEN];
+       char name[DEFAULT_STREAM_NAME_LEN];
        struct cds_list_head list;
 };
 
@@ -106,6 +105,10 @@ struct ltt_kernel_session {
         */
        struct consumer_output *consumer;
        struct consumer_output *tmp_consumer;
+       /* Tracing session id */
+       unsigned int id;
+       /* Session is started and active */
+       unsigned int started;
 };
 
 /*