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 b417cb07759c4f30795b9240508b31e2148ffd77..69665058a0e098c0b7a2bbd9dc1042d6f7b25f0a 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -40,6 +40,9 @@ int kernel_add_channel_context(struct ltt_kernel_channel *chan,
 {
        int ret;
 
+       assert(chan);
+       assert(ctx);
+
        DBG("Adding context to channel %s", chan->channel->name);
        ret = kernctl_add_context(chan->fd, ctx);
        if (ret < 0) {
@@ -75,8 +78,10 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
        int ret;
        struct ltt_kernel_session *lks;
 
+       assert(session);
+
        /* Allocate data structure */
-       lks = trace_kernel_create_session(session->path);
+       lks = trace_kernel_create_session();
        if (lks == NULL) {
                ret = -1;
                goto error;
@@ -105,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;
 }
 
@@ -113,19 +121,22 @@ error:
  * kernel session.
  */
 int kernel_create_channel(struct ltt_kernel_session *session,
-               struct lttng_channel *chan, char *path)
+               struct lttng_channel *chan)
 {
        int ret;
        struct ltt_kernel_channel *lkc;
 
+       assert(session);
+       assert(chan);
+
        /* Allocate kernel channel */
-       lkc = trace_kernel_create_channel(chan, path);
+       lkc = trace_kernel_create_channel(chan);
        if (lkc == NULL) {
                goto error;
        }
 
-       DBG3("Kernel create channel %s in %s with attr: %d, %" PRIu64 ", %" PRIu64 ", %u, %u, %d",
-                       chan->name, path, lkc->channel->attr.overwrite,
+       DBG3("Kernel create channel %s with attr: %d, %" PRIu64 ", %" PRIu64 ", %u, %u, %d",
+                       chan->name, lkc->channel->attr.overwrite,
                        lkc->channel->attr.subbuf_size, lkc->channel->attr.num_subbuf,
                        lkc->channel->attr.switch_timer_interval, lkc->channel->attr.read_timer_interval,
                        lkc->channel->attr.output);
@@ -155,6 +166,10 @@ int kernel_create_channel(struct ltt_kernel_session *session,
        return 0;
 
 error:
+       if (lkc) {
+               free(lkc->channel);
+               free(lkc);
+       }
        return -1;
 }
 
@@ -168,6 +183,9 @@ int kernel_create_event(struct lttng_event *ev,
        int ret;
        struct ltt_kernel_event *event;
 
+       assert(ev);
+       assert(channel);
+
        event = trace_kernel_create_event(ev);
        if (event == NULL) {
                ret = -1;
@@ -231,6 +249,8 @@ int kernel_disable_channel(struct ltt_kernel_channel *chan)
 {
        int ret;
 
+       assert(chan);
+
        ret = kernctl_disable(chan->fd);
        if (ret < 0) {
                PERROR("disable chan ioctl");
@@ -254,6 +274,8 @@ int kernel_enable_channel(struct ltt_kernel_channel *chan)
 {
        int ret;
 
+       assert(chan);
+
        ret = kernctl_enable(chan->fd);
        if (ret < 0 && errno != EEXIST) {
                PERROR("Enable kernel chan");
@@ -276,6 +298,8 @@ int kernel_enable_event(struct ltt_kernel_event *event)
 {
        int ret;
 
+       assert(event);
+
        ret = kernctl_enable(event->fd);
        if (ret < 0) {
                switch (errno) {
@@ -305,6 +329,8 @@ int kernel_disable_event(struct ltt_kernel_event *event)
 {
        int ret;
 
+       assert(event);
+
        ret = kernctl_disable(event->fd);
        if (ret < 0) {
                switch (errno) {
@@ -334,7 +360,9 @@ 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);
 
        /* Allocate kernel metadata */
        lkm = trace_kernel_create_metadata();
@@ -345,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;
@@ -361,6 +389,8 @@ int kernel_open_metadata(struct ltt_kernel_session *session)
 
        return 0;
 
+error_open:
+       trace_kernel_destroy_metadata(lkm);
 error:
        return -1;
 }
@@ -372,6 +402,8 @@ int kernel_start_session(struct ltt_kernel_session *session)
 {
        int ret;
 
+       assert(session);
+
        ret = kernctl_start_session(session->fd);
        if (ret < 0) {
                PERROR("ioctl start session");
@@ -409,6 +441,8 @@ int kernel_calibrate(int fd, struct lttng_kernel_calibrate *calibrate)
 {
        int ret;
 
+       assert(calibrate);
+
        ret = kernctl_calibrate(fd, calibrate);
        if (ret < 0) {
                PERROR("calibrate ioctl");
@@ -426,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);
@@ -442,6 +478,8 @@ int kernel_flush_buffer(struct ltt_kernel_channel *channel)
        int ret;
        struct ltt_kernel_stream *stream;
 
+       assert(channel);
+
        DBG("Flush buffer for channel %s", channel->channel->name);
 
        cds_list_for_each_entry(stream, &channel->stream_list.head, list) {
@@ -464,6 +502,8 @@ int kernel_stop_session(struct ltt_kernel_session *session)
 {
        int ret;
 
+       assert(session);
+
        ret = kernctl_stop_session(session->fd);
        if (ret < 0) {
                goto error;
@@ -488,6 +528,8 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
        int ret, count = 0;
        struct ltt_kernel_stream *lks;
 
+       assert(channel);
+
        while ((ret = kernctl_create_stream(channel->fd)) >= 0) {
                lks = trace_kernel_create_stream(channel->channel->name, count);
                if (lks == NULL) {
@@ -505,6 +547,9 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
                        PERROR("fcntl session fd");
                }
 
+               lks->tracefile_size = channel->channel->attr.tracefile_size;
+               lks->tracefile_count = channel->channel->attr.tracefile_count;
+
                /* Add stream to channe stream list */
                cds_list_add(&lks->list, &channel->stream_list.head);
                channel->stream_count++;
@@ -529,6 +574,8 @@ int kernel_open_metadata_stream(struct ltt_kernel_session *session)
 {
        int ret;
 
+       assert(session);
+
        ret = kernctl_create_stream(session->metadata->fd);
        if (ret < 0) {
                PERROR("kernel create metadata stream");
@@ -560,6 +607,8 @@ ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
        FILE *fp;
        struct lttng_event *elist;
 
+       assert(events);
+
        fd = kernctl_tracepoint_list(tracer_fd);
        if (fd < 0) {
                PERROR("kernel tracepoint list");