Use trace.h for kernel and ust trace data struct

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index d00f7e5bc4e48266a736959d7351cd086164735a..352dabbb0edd02bab7c36d4cc4ac416a07938a66 100644 (file)
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -27,7 +27,6 @@
 #include "ltt-sessiond.h"
 #include "libkernelctl.h"
 #include "kernel-ctl.h"
-#include "trace.h"
 
 /*
  *  kernel_create_session

diff --git a/ltt-sessiond/kernel-ctl.h b/ltt-sessiond/kernel-ctl.h
index 4eb8f4e2d0e797a63333771435682c9b13d0da55..cfcf2512806e776404be7dc7ebd114c66da4d68c 100644 (file)
--- a/ltt-sessiond/kernel-ctl.h
+++ b/ltt-sessiond/kernel-ctl.h
@@ -19,8 +19,9 @@
 #ifndef _LTT_KERNEL_CTL_H
 #define _LTT_KERNEL_CTL_H
 
-#include "trace.h"
+#include "ltt-sessiond.h"
 #include "session.h"
+#include "trace.h"
 
 int kernel_create_session(struct ltt_session *session, int tracer_fd);
 int kernel_create_channel(struct ltt_kernel_session *session);

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 79e8ec12d6e9b5c9de4092474e05695d2f45ea5a..a7c6e5fbf9c44b8a1f4397b997fa6cd7c73830d4 100644 (file)
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -42,8 +42,8 @@
 #include "ltt-sessiond.h"
 #include "lttngerr.h"
 #include "kernel-ctl.h"
+#include "ust-ctl.h"
 #include "session.h"
-#include "trace.h"
 #include "traceable-app.h"
 
 /*

diff --git a/ltt-sessiond/trace.h b/ltt-sessiond/trace.h
index 2f80143fe8042ec8d22b5c97b1c80a325e10dc92..f0d25c89400db78de651f36850a78db95ebb1c8b 100644 (file)
--- a/ltt-sessiond/trace.h
+++ b/ltt-sessiond/trace.h
@@ -19,8 +19,8 @@
 #ifndef _LTT_TRACE_H
 #define _LTT_TRACE_H
 
-#include "ltt-sessiond.h"
-#include "session.h"
+#include <limits.h>
+#include <urcu/list.h>
 #include "lttng-kernel.h"
 
 /* Kernel event list */
@@ -96,10 +96,4 @@ struct ltt_ust_marker {
        char *channel;
 };
 
-int get_trace_count_per_session(struct ltt_session *session);
-void get_traces_per_session(struct ltt_session *session, struct lttng_trace *traces);
-int ust_create_trace(struct command_ctx *cmd_ctx);
-int ust_start_trace(struct command_ctx *cmd_ctx);
-int ust_stop_trace(struct command_ctx *cmd_ctx);
-
 #endif /* _LTT_TRACE_H */

diff --git a/ltt-sessiond/ust-ctl.c b/ltt-sessiond/ust-ctl.c
index 7bdf7967b20aa7ff41a5577b48e46f1d0930c13a..2ec168e939b7e24a70838958d4c0b1abb039ba2c 100644 (file)
--- a/ltt-sessiond/ust-ctl.c
+++ b/ltt-sessiond/ust-ctl.c
@@ -27,10 +27,7 @@
 
 #include "liblttsessiondcomm.h"
 #include "lttngerr.h"
-#include "ltt-sessiond.h"
-#include "session.h"
 #include "ust-ctl.h"
-#include "trace.h"
 
 /*
  *  find_session_ust_trace_by_pid

diff --git a/ltt-sessiond/ust-ctl.h b/ltt-sessiond/ust-ctl.h
index 36a3e8794c12c0c1831136470cda6519f58b94d2..72e5fb7b2d6f85f2d6e7df6269df50d1d885cea7 100644 (file)
--- a/ltt-sessiond/ust-ctl.h
+++ b/ltt-sessiond/ust-ctl.h
@@ -21,6 +21,7 @@
 
 #include "ltt-sessiond.h"
 #include "session.h"
+#include "trace.h"
 
 int get_trace_count_per_session(struct ltt_session *session);
 void get_traces_per_session(struct ltt_session *session, struct lttng_trace *traces);