Fix: (slight UI change) refuse missing -c if non-default channel exists

[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..934aaffe89f5174015a3fe4d9637eeeabbd818bc 100644 (file)
--- a/src/bin/lttng-sessiond/trace-kernel.h
+++ b/src/bin/lttng-sessiond/trace-kernel.h
@@ -46,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;
 };
@@ -70,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 */
@@ -82,8 +79,11 @@ struct ltt_kernel_metadata {
 struct ltt_kernel_stream {
        int fd;
        int state;
+       int cpu;
        /* 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,7 +94,6 @@ 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 */
@@ -109,7 +108,13 @@ struct ltt_kernel_session {
        struct consumer_output *consumer;
        struct consumer_output *tmp_consumer;
        /* Tracing session id */
-       unsigned int id;
+       uint64_t id;
+       /* Session is started and active */
+       unsigned int started;
+       /* 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;
 };
 
 /*
@@ -123,8 +128,9 @@ struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
 /*
  * 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_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);
 struct ltt_kernel_metadata *trace_kernel_create_metadata(void);
 struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,