Fix: relayd and sessiond: dispatch thread exit is shared across threads

[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 1aad5263e0b8ae63a75c2a9b9fb0c3a3d4db5906..484ea304e7398057da92ea872a814a0326d1f5b8 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -25,6 +25,7 @@
 
 #include <common/common.h>
 #include <common/kernel-ctl/kernel-ctl.h>
+#include <common/sessiond-comm/sessiond-comm.h>
 
 #include "kernel.h"
 #include "kern-modules.h"
@@ -168,8 +169,7 @@ int kernel_create_channel(struct ltt_kernel_session *session,
        cds_list_add(&lkc->list, &session->channel_list.head);
        session->channel_count++;
 
-       DBG("Kernel channel %s created (fd: %d and path: %s)",
-                       lkc->channel->name, lkc->fd, lkc->pathname);
+       DBG("Kernel channel %s created (fd: %d)", lkc->channel->name, lkc->fd);
 
        return 0;
 
@@ -195,7 +195,13 @@ int kernel_create_event(struct lttng_event *ev,
 
        ret = kernctl_create_event(channel->fd, event->event);
        if (ret < 0) {
-               if (errno != EEXIST) {
+               switch (errno) {
+               case EEXIST:
+                       break;
+               case ENOSYS:
+                       WARN("Event type not implemented");
+                       break;
+               default:
                        PERROR("create event ioctl");
                }
                ret = -errno;
@@ -290,8 +296,15 @@ int kernel_enable_event(struct ltt_kernel_event *event)
        int ret;
 
        ret = kernctl_enable(event->fd);
-       if (ret < 0 && errno != EEXIST) {
-               PERROR("enable kernel event");
+       if (ret < 0) {
+               switch (errno) {
+               case EEXIST:
+                       ret = LTTCOMM_KERN_EVENT_EXIST;
+                       break;
+               default:
+                       PERROR("enable kernel event");
+                       break;
+               }
                goto error;
        }
 
@@ -312,8 +325,15 @@ int kernel_disable_event(struct ltt_kernel_event *event)
        int ret;
 
        ret = kernctl_disable(event->fd);
-       if (ret < 0 && errno != EEXIST) {
-               PERROR("disable kernel event");
+       if (ret < 0) {
+               switch (errno) {
+               case EEXIST:
+                       ret = LTTCOMM_KERN_EVENT_EXIST;
+                       break;
+               default:
+                       PERROR("disable kernel event");
+                       break;
+               }
                goto error;
        }
 
@@ -356,7 +376,7 @@ int kernel_open_metadata(struct ltt_kernel_session *session, char *path)
 
        session->metadata = lkm;
 
-       DBG("Kernel metadata opened (fd: %d and path: %s)", lkm->fd, lkm->pathname);
+       DBG("Kernel metadata opened (fd: %d)", lkm->fd);
 
        return 0;
 
@@ -427,7 +447,7 @@ int kernel_metadata_flush_buffer(int fd)
 
        ret = kernctl_buffer_flush(fd);
        if (ret < 0) {
-               ERR("Fail to flush metadata buffers %d (ret: %d", fd, ret);
+               ERR("Fail to flush metadata buffers %d (ret: %d)", fd, ret);
        }
 
        return 0;
@@ -484,11 +504,11 @@ error:
  */
 int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
 {
-       int ret;
+       int ret, count = 0;
        struct ltt_kernel_stream *lks;
 
        while ((ret = kernctl_create_stream(channel->fd)) >= 0) {
-               lks = trace_kernel_create_stream();
+               lks = trace_kernel_create_stream(channel->channel->name, count);
                if (lks == NULL) {
                        ret = close(ret);
                        if (ret) {
@@ -504,19 +524,15 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
                        PERROR("fcntl session fd");
                }
 
-               ret = asprintf(&lks->pathname, "%s/%s_%d",
-                               channel->pathname, channel->channel->name, channel->stream_count);
-               if (ret < 0) {
-                       PERROR("asprintf kernel create stream");
-                       goto error;
-               }
-
                /* Add stream to channe stream list */
                cds_list_add(&lks->list, &channel->stream_list.head);
                channel->stream_count++;
 
-               DBG("Kernel stream %d created (fd: %d, state: %d, path: %s)",
-                               channel->stream_count, lks->fd, lks->state, lks->pathname);
+               /* Increment counter which represent CPU number. */
+               count++;
+
+               DBG("Kernel stream %s created (fd: %d, state: %d)", lks->name, lks->fd,
+                               lks->state);
        }
 
        return channel->stream_count;