Add snapshot command to lttng UI

[lttng-tools.git] / src / bin / lttng-sessiond / kernel.c

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 95194113243dcf4dbf426e0dfaac19b192cd46ba..69665058a0e098c0b7a2bbd9dc1042d6f7b25f0a 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -81,7 +81,7 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
        assert(session);
 
        /* Allocate data structure */
-       lks = trace_kernel_create_session(session->path);
+       lks = trace_kernel_create_session();
        if (lks == NULL) {
                ret = -1;
                goto error;
@@ -110,6 +110,9 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
        return 0;
 
 error:
+       if (lks) {
+               trace_kernel_destroy_session(lks);
+       }
        return ret;
 }
 
@@ -163,6 +166,10 @@ int kernel_create_channel(struct ltt_kernel_session *session,
        return 0;
 
 error:
+       if (lkc) {
+               free(lkc->channel);
+               free(lkc);
+       }
        return -1;
 }
 
@@ -353,7 +360,7 @@ error:
 int kernel_open_metadata(struct ltt_kernel_session *session)
 {
        int ret;
-       struct ltt_kernel_metadata *lkm;
+       struct ltt_kernel_metadata *lkm = NULL;
 
        assert(session);
 
@@ -366,7 +373,7 @@ int kernel_open_metadata(struct ltt_kernel_session *session)
        /* Kernel tracer metadata creation */
        ret = kernctl_open_metadata(session->fd, &lkm->conf->attr);
        if (ret < 0) {
-               goto error;
+               goto error_open;
        }
 
        lkm->fd = ret;
@@ -382,6 +389,8 @@ int kernel_open_metadata(struct ltt_kernel_session *session)
 
        return 0;
 
+error_open:
+       trace_kernel_destroy_metadata(lkm);
 error:
        return -1;
 }
@@ -451,6 +460,8 @@ int kernel_metadata_flush_buffer(int fd)
 {
        int ret;
 
+       DBG("Kernel flushing metadata buffer on fd %d", fd);
+
        ret = kernctl_buffer_flush(fd);
        if (ret < 0) {
                ERR("Fail to flush metadata buffers %d (ret: %d)", fd, ret);