Minor fixes to header files

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

diff --git a/ltt-sessiond/session.h b/ltt-sessiond/session.h
index 837b9062d35a80d364a7d3ee7b6492ecf073400e..fb271ea623997a28ac05a4a077e210802e3aa310 100644 (file)
--- a/ltt-sessiond/session.h
+++ b/ltt-sessiond/session.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,9 +19,12 @@
 #ifndef _LTT_SESSION_H
 #define _LTT_SESSION_H
 
-//#include <lttng/lttng.h>
+#include <pthread.h>
 #include <urcu/list.h>
 
+#include "trace-kernel.h"
+#include "trace-ust.h"
+
 /*
  * Tracing session list
  *
@@ -56,8 +59,7 @@ struct ltt_session {
        char *name;
        char *path;
        struct ltt_kernel_session *kernel_session;
-       struct cds_list_head ust_traces;
-       unsigned int ust_trace_count;
+       struct ltt_ust_session_list ust_session_list;
        /*
         * Protect any read/write on this session data structure. This lock must be
         * acquired *before* using any public functions declared below. Use