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 36b2f2270eef69bedd70aa570027da7f61660f22..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
@@ -19,18 +19,83 @@
 #ifndef _LTT_TRACE_H
 #define _LTT_TRACE_H
 
-#include "session.h"
+#include <limits.h>
+#include <urcu/list.h>
 
-/* LTTng trace representation */
-struct ltt_lttng_trace {
+#include <lttng/lttng.h>
+
+#include "lttng-kernel.h"
+
+/* Kernel event list */
+struct ltt_kernel_event_list {
+       struct cds_list_head head;
+};
+
+/* Channel stream list */
+struct ltt_kernel_stream_list {
+       struct cds_list_head head;
+};
+
+/* Channel list */
+struct ltt_kernel_channel_list {
+       struct cds_list_head head;
+};
+
+/* Kernel event */
+struct ltt_kernel_event {
+       int fd;
+       int enabled;
+       struct lttng_kernel_context *ctx;
+       struct lttng_kernel_event *event;
+       struct cds_list_head list;
+};
+
+/* 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;
+       struct cds_list_head list;
+};
+
+/* 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;
        struct cds_list_head list;
-       char trace_name[NAME_MAX];
-       struct cds_list_head marker_list;
+};
+
+/* Kernel session */
+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;
 };
 
 /* UST trace representation */
 struct ltt_ust_trace {
        struct cds_list_head list;
+       char name[NAME_MAX];
        int shmid;
        pid_t pid;
        struct cds_list_head markers;
@@ -42,6 +107,28 @@ struct ltt_ust_marker {
        char *channel;
 };
 
-struct ltt_ust_trace *find_session_ust_trace_by_pid(struct ltt_session *session, pid_t pid);
+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, char *path);
+struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev);
+struct ltt_kernel_metadata *trace_create_kernel_metadata(char *path);
+struct ltt_kernel_stream *trace_create_kernel_stream(void);
+
+/*
+ * Destroy functions free() the data structure and remove from linked list if
+ * it's applies.
+ */
+void trace_destroy_kernel_session(struct ltt_kernel_session *session);
+void trace_destroy_kernel_metadata(struct ltt_kernel_metadata *metadata);
+void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel);
+void trace_destroy_kernel_event(struct ltt_kernel_event *event);
+void trace_destroy_kernel_stream(struct ltt_kernel_stream *stream);
 
 #endif /* _LTT_TRACE_H */