Cleanup comments and bad indent

[lttng-tools.git] / ltt-sessiond / trace.h

diff --git a/ltt-sessiond/trace.h b/ltt-sessiond/trace.h
index 8da147230e22a928ec89b7b33f37c9a84d02cc8c..ac070908ae0cc15867d72067e2bcb92a216866f1 100644 (file)
--- a/ltt-sessiond/trace.h
+++ b/ltt-sessiond/trace.h
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,6 +45,7 @@ struct ltt_kernel_channel_list {
 struct ltt_kernel_event {
        int fd;
        int enabled;
+       struct lttng_kernel_context *ctx;
        struct lttng_kernel_event *event;
        struct cds_list_head list;
 };
@@ -52,8 +53,11 @@ struct ltt_kernel_event {
 /* Kernel channel */
 struct ltt_kernel_channel {
        int fd;
+       int enabled;
        char *pathname;
        unsigned int stream_count;
+       unsigned int event_count;
+       struct lttng_kernel_context *ctx;
        struct lttng_channel *channel;
        struct ltt_kernel_event_list events_list;
        struct ltt_kernel_stream_list stream_list;
@@ -80,8 +84,10 @@ struct ltt_kernel_session {
        int fd;
        int metadata_stream_fd;
        int kconsumer_fds_sent;
+       int consumer_fd;
        unsigned int channel_count;
        unsigned int stream_count_global;
+       char *trace_path;
        struct ltt_kernel_metadata *metadata;
        struct ltt_kernel_channel_list channel_list;
 };
@@ -101,13 +107,18 @@ struct ltt_ust_marker {
        char *channel;
 };
 
+struct ltt_kernel_event *get_kernel_event_by_name(
+               char *name, struct ltt_kernel_channel *channel);
+struct ltt_kernel_channel *get_kernel_channel_by_name(
+               char *name, struct ltt_kernel_session *session);
+
 /*
  * Create functions malloc() the data structure.
  */
 struct ltt_kernel_session *trace_create_kernel_session(void);
-struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *chan);
+struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *chan, char *path);
 struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev);
-struct ltt_kernel_metadata *trace_create_kernel_metadata(void);
+struct ltt_kernel_metadata *trace_create_kernel_metadata(char *path);
 struct ltt_kernel_stream *trace_create_kernel_stream(void);
 
 /*