Move lttng trace data structure to trace.h

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

diff --git a/ltt-sessiond/ltt-sessiond.h b/ltt-sessiond/ltt-sessiond.h
index 491656e852b27650e53f4a2705773d1253cde13c..ab82bf8c579ed4a3621d4686975a353e9b4d87ed 100644 (file)
--- a/ltt-sessiond/ltt-sessiond.h
+++ b/ltt-sessiond/ltt-sessiond.h
@@ -27,25 +27,4 @@ extern const char default_home_dir[],
        default_ust_sock_dir[],
        default_global_apps_pipe[];
 
-/* LTTng trace representation */
-struct ltt_lttng_trace {
-       struct cds_list_head list;
-       char trace_name[NAME_MAX];
-       struct cds_list_head marker_list;
-};
-
-/* UST trace representation */
-struct ltt_ust_trace {
-       struct cds_list_head list;
-       int shmid;
-       pid_t pid;
-       struct cds_list_head markers;
-};
-
-struct ltt_ust_marker {
-       struct cds_list_head list;
-       char *name;
-       char *channel;
-};
-
 #endif /* _LTT_SESSIOND_H */

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 4e1fb1f6b5b441aa73a05f9024e4cdbe039e154d..56266db3ce429bb6074bf34af85391ce6e7b865e 100644 (file)
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -41,6 +41,7 @@
 #include "ltt-sessiond.h"
 #include "lttngerr.h"
 #include "session.h"
+#include "trace.h"
 #include "traceable-app.h"
 
 /* Const values */

diff --git a/ltt-sessiond/trace.h b/ltt-sessiond/trace.h
new file mode 100644 (file)
index 0000000..9cbdaff
--- /dev/null
+++ b/ltt-sessiond/trace.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef _LTT_TRACE_H
+#define _LTT_TRACE_H
+
+/* LTTng trace representation */
+struct ltt_lttng_trace {
+       struct cds_list_head list;
+       char trace_name[NAME_MAX];
+       struct cds_list_head marker_list;
+};
+
+/* UST trace representation */
+struct ltt_ust_trace {
+       struct cds_list_head list;
+       int shmid;
+       pid_t pid;
+       struct cds_list_head markers;
+};
+
+struct ltt_ust_marker {
+       struct cds_list_head list;
+       char *name;
+       char *channel;
+};
+
+#endif /* _LTT_TRACE_H */