X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-sessiond%2Fsession.h;h=7567d986767b185e2be046c44eb3675c949570f3;hb=4e332453e14dd64400835b60c0a93c3629e173d3;hp=11f9b9ace8986b0366e046d5787a7803fa38180c;hpb=5e16da05d15eb413f28dea441e1bc49809cddc9b;p=lttng-tools.git

diff --git a/ltt-sessiond/session.h b/ltt-sessiond/session.h
index 11f9b9ace..7567d9867 100644
--- a/ltt-sessiond/session.h
+++ b/ltt-sessiond/session.h
@@ -20,15 +20,9 @@
 #define _LTT_SESSION_H
 
 #include <lttng/lttng.h>
+#include <urcu/list.h>
 #include <uuid/uuid.h>
 
-/*
- * FIXME: create a cmd_context structure to pass this kind of
- * information around as parameter. Will facilitate multithreaded design
- * later.
- */
-extern struct ltt_session *current_session;
-
 /* Global session list */
 struct ltt_session_list {
 	struct cds_list_head head;
@@ -38,13 +32,13 @@ struct ltt_session_list {
  * to identify a tracing session for both LTTng and UST.
  */
 struct ltt_session {
-	char *name;
 	struct cds_list_head list;
+	char *name;
 	uuid_t uuid;
 	struct cds_list_head ust_traces;
-	struct cds_list_head kernel_traces;
+	struct ltt_kernel_session *kernel_session;
 	unsigned int ust_trace_count;
-	unsigned int kern_trace_count;
+	unsigned int kern_session_count;
 	pid_t ust_consumer;
 	pid_t kernel_consumer;
 };
@@ -52,7 +46,7 @@ struct ltt_session {
 /* Prototypes */
 int create_session(char *name, uuid_t *session_id);
 int destroy_session(uuid_t *uuid);
-void get_lttng_session(struct lttng_session *lt);
+void get_lttng_session(struct lttng_session *sessions);
 struct ltt_session *find_session_by_uuid(uuid_t session_id);
 struct ltt_session *find_session_by_name(char *name);
 unsigned int get_session_count(void);