From 9e78d6ae219789dee9c96f35f190d6166ef389c3 Mon Sep 17 00:00:00 2001
From: David Goulet <david.goulet@polymtl.ca>
Date: Thu, 26 May 2011 13:52:12 -0400
Subject: [PATCH] Use trace.h for kernel and ust trace data struct

Signed-off-by: David Goulet <david.goulet@polymtl.ca>
---
 ltt-sessiond/kernel-ctl.c |  1 -
 ltt-sessiond/kernel-ctl.h |  3 ++-
 ltt-sessiond/main.c       |  2 +-
 ltt-sessiond/trace.h      | 10 ++--------
 ltt-sessiond/ust-ctl.c    |  3 ---
 ltt-sessiond/ust-ctl.h    |  1 +
 6 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index d00f7e5bc..352dabbb0 100644
--- 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 4eb8f4e2d..cfcf25128 100644
--- 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 79e8ec12d..a7c6e5fbf 100644
--- 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 2f80143fe..f0d25c894 100644
--- 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 7bdf7967b..2ec168e93 100644
--- 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 36a3e8794..72e5fb7b2 100644
--- 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);
-- 
2.34.1