Add kernel sesison and channel creation support

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

diff --git a/ltt-sessiond/session.c b/ltt-sessiond/session.c
index da1ceee4ac97b10b23f2fc7597bd9f1bcb79e452..9fef73cf7ecdce33e10a7599b2a580742ecc3257 100644 (file)
--- a/ltt-sessiond/session.c
+++ b/ltt-sessiond/session.c
@@ -17,12 +17,10 @@
  */
 
 #define _GNU_SOURCE
-#include <lttng/liblttngctl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <urcu/list.h>
-#include <uuid/uuid.h>
 
 #include "lttngerr.h"
 #include "session.h"
@@ -115,7 +113,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;
                }
@@ -198,11 +196,13 @@ int create_session(char *name, uuid_t *session_id)
         * NO consumer attach to that session yet.
         */
        new_session->ust_consumer = 0;
-       new_session->lttng_consumer = 0;
+       new_session->kernel_consumer = 0;
 
        /* Init list */
        CDS_INIT_LIST_HEAD(&new_session->ust_traces);
-       CDS_INIT_LIST_HEAD(&new_session->lttng_traces);
+
+       /* Set trace list counter */
+       new_session->ust_trace_count = 0;
 
        /* Add new session to the global session list */
        add_session_list(new_session);
@@ -222,7 +222,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;
@@ -235,10 +235,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));