Update documentation following babeltrace UI change

[lttng-tools.git] / ltt-sessiond / trace-ust.c

diff --git a/ltt-sessiond/trace-ust.c b/ltt-sessiond/trace-ust.c
index fe007141e90c0c4d09bd9e2f481e1066c63bef50..c2978894ede66ff5ff6b80c764b8ebd54422a7aa 100644 (file)
--- a/ltt-sessiond/trace-ust.c
+++ b/ltt-sessiond/trace-ust.c
@@ -23,7 +23,6 @@
 
 #include <lttngerr.h>
 #include <lttng-share.h>
-#include <lttng-ust.h>
 
 #include "trace-ust.h"
 
@@ -123,7 +122,7 @@ struct ltt_ust_session *trace_ust_create_session(char *path, pid_t pid,
        /* Init data structure */
        lus->handle = -1;
        lus->enabled = 1;
-       lus->uconsumer_fds_sent = 0;
+       lus->consumer_fds_sent = 0;
        lus->metadata = NULL;
        lus->channels.count = 0;
        CDS_INIT_LIST_HEAD(&lus->channels.head);
@@ -190,6 +189,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
                perror("asprintf ust create channel");
                goto error;
        }
+       CDS_INIT_LIST_HEAD(&luc->stream_list.head);
 
        return luc;
 
@@ -271,7 +271,7 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
 
        lum->handle = -1;
        /* Set metadata trace path */
-       ret = asprintf(&lum->trace_path, "%s/metadata", path);
+       ret = asprintf(&lum->pathname, "%s/metadata", path);
        if (ret < 0) {
                perror("asprintf ust metadata");
                goto error;
@@ -322,8 +322,7 @@ void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata)
        DBG("[trace] Destroy ust metadata %d", metadata->handle);
 
        /* Free attributes */
-       free(metadata->trace_path);
-
+       free(metadata->pathname);
        free(metadata);
 }