X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-sessiond%2Fsession.c;h=5764b71dc61ed4ecfb1f350989a7f9b51df77c14;hb=9e78d6ae219789dee9c96f35f190d6166ef389c3;hp=54e19669efd9e78c48578b0207d660f2146cbce4;hpb=5b97ec606d485e091cf2c2bc06b79f05d18212aa;p=lttng-tools.git

diff --git a/ltt-sessiond/session.c b/ltt-sessiond/session.c
index 54e19669e..5764b71dc 100644
--- a/ltt-sessiond/session.c
+++ b/ltt-sessiond/session.c
@@ -33,10 +33,20 @@ static void add_session_list(struct ltt_session *ls);
 static void del_session_list(struct ltt_session *ls);
 
 /* Init session's list */
-static struct ltt_session_list ltt_session_list = {
+struct ltt_session_list ltt_session_list = {
 	.head = CDS_LIST_HEAD_INIT(ltt_session_list.head),
 };
 
+/*
+ *  get_session_list
+ *
+ *  Return a pointer to the session list.
+ */
+struct ltt_session_list *get_session_list(void)
+{
+	return &ltt_session_list;
+}
+
 /*
  *  get_session_count
  *
@@ -113,7 +123,7 @@ struct ltt_session *find_session_by_name(char *name)
 	struct ltt_session *iter;
 
 	cds_list_for_each_entry(iter, &ltt_session_list.head, list) {
-		if (strncmp(iter->name, name, strlen(iter->name)) == 0) {
+		if (strncmp(iter->name, name, strlen(name)) == 0) {
 			found = 1;
 			break;
 		}
@@ -200,11 +210,9 @@ int create_session(char *name, uuid_t *session_id)
 
 	/* Init list */
 	CDS_INIT_LIST_HEAD(&new_session->ust_traces);
-	CDS_INIT_LIST_HEAD(&new_session->kernel_traces);
 
 	/* Set trace list counter */
 	new_session->ust_trace_count = 0;
-	new_session->kern_trace_count = 0;
 
 	/* Add new session to the global session list */
 	add_session_list(new_session);
@@ -224,7 +232,7 @@ error_mem:
  *  Iterate over the global session list and
  *  fill the lttng_session array.
  */
-void get_lttng_session(struct lttng_session *lt)
+void get_lttng_session(struct lttng_session *sessions)
 {
 	int i = 0;
 	struct ltt_session *iter;
@@ -237,10 +245,10 @@ void get_lttng_session(struct lttng_session *lt)
 	 */
 	cds_list_for_each_entry(iter, &ltt_session_list.head, list) {
 		/* Copy name and uuid */
-		uuid_unparse(iter->uuid, lsess.uuid);
+		uuid_copy(lsess.uuid, iter->uuid);
 		strncpy(lsess.name, iter->name, sizeof(lsess.name));
 		lsess.name[sizeof(lsess.name) - 1] = '\0';
-		memcpy(&lt[i], &lsess, sizeof(lsess));
+		memcpy(&sessions[i], &lsess, sizeof(lsess));
 		i++;
 		/* Reset struct for next pass */
 		memset(&lsess, 0, sizeof(lsess));