Rename liblttngctl.h to lttng.h

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

diff --git a/ltt-sessiond/session.c b/ltt-sessiond/session.c
index 9e93d89cef07814fffa795fdfac74ad59f2ed63d..54e19669efd9e78c48578b0207d660f2146cbce4 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"
@@ -144,6 +142,7 @@ int destroy_session(uuid_t *uuid)
 
        cds_list_for_each_entry(iter, &ltt_session_list.head, list) {
                if (uuid_compare(iter->uuid, *uuid) == 0) {
+                       DBG("Destroying session %s", iter->name);
                        del_session_list(iter);
                        free(iter);
                        found = 1;
@@ -164,6 +163,8 @@ int create_session(char *name, uuid_t *session_id)
 {
        struct ltt_session *new_session;
 
+       DBG("Creating session %s", name);
+
        new_session = find_session_by_name(name);
        if (new_session != NULL) {
                goto error;
@@ -195,11 +196,15 @@ 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);
+       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);
@@ -225,6 +230,8 @@ void get_lttng_session(struct lttng_session *lt)
        struct ltt_session *iter;
        struct lttng_session lsess;
 
+       DBG("Getting all available session");
+
        /* Iterate over session list and append data after
         * the control struct in the buffer.
         */