Fix enable syscall and bad value of poll set size

[lttng-tools.git] / ltt-sessiond / kernel-ctl.c

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index 6247ce6bdd69ccd78162e1f422a490de1fb12030..e486fa10ada0002e8e2f7437ce677a0f24475ba6 100644 (file)
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -102,7 +102,7 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
        struct ltt_kernel_session *lks;
 
        /* Allocate data structure */
-       lks = trace_create_kernel_session();
+       lks = trace_kernel_create_session(session->path);
        if (lks == NULL) {
                ret = -1;
                goto error;
@@ -144,7 +144,7 @@ int kernel_create_channel(struct ltt_kernel_session *session,
        struct ltt_kernel_channel *lkc;
 
        /* Allocate kernel channel */
-       lkc = trace_create_kernel_channel(chan, path);
+       lkc = trace_kernel_create_channel(chan, path);
        if (lkc == NULL) {
                goto error;
        }
@@ -187,17 +187,26 @@ int kernel_create_event(struct lttng_event *ev,
        int ret;
        struct ltt_kernel_event *event;
 
-       event = trace_create_kernel_event(ev);
+       event = trace_kernel_create_event(ev);
        if (event == NULL) {
                goto error;
        }
 
        ret = kernctl_create_event(channel->fd, event->event);
        if (ret < 0) {
-               perror("create event ioctl");
+               PERROR("create event ioctl");
                goto free_event;
        }
 
+       /*
+        * LTTNG_KERNEL_SYSCALL event creation will return 0 on success. However
+        * this FD must not be added to the event list.
+        */
+       if (ret == 0 && event->event->instrumentation == LTTNG_KERNEL_SYSCALL) {
+               DBG2("Kernel event syscall creation success");
+               goto end;
+       }
+
        event->fd = ret;
        /* Prevent fd duplication after execlp() */
        ret = fcntl(event->fd, F_SETFD, FD_CLOEXEC);
@@ -211,6 +220,7 @@ int kernel_create_event(struct lttng_event *ev,
 
        DBG("Event %s created (fd: %d)", ev->name, event->fd);
 
+end:
        return 0;
 
 free_event:
@@ -250,9 +260,8 @@ int kernel_enable_channel(struct ltt_kernel_channel *chan)
        int ret;
 
        ret = kernctl_enable(chan->fd);
-       if (ret < 0) {
-               perror("enable chan ioctl");
-               ret = errno;
+       if (ret < 0 && errno != EEXIST) {
+               perror("Enable kernel chan");
                goto error;
        }
 
@@ -273,11 +282,8 @@ int kernel_enable_event(struct ltt_kernel_event *event)
        int ret;
 
        ret = kernctl_enable(event->fd);
-       if (ret < 0) {
-               perror("enable event ioctl");
-               if (errno == EEXIST) {
-                       ret = -EEXIST;
-               }
+       if (ret < 0 && errno != EEXIST) {
+               perror("enable kernel event");
                goto error;
        }
 
@@ -298,8 +304,8 @@ int kernel_disable_event(struct ltt_kernel_event *event)
        int ret;
 
        ret = kernctl_disable(event->fd);
-       if (ret < 0) {
-               perror("disable event ioctl");
+       if (ret < 0 && errno != EEXIST) {
+               perror("disable kernel event");
                goto error;
        }
 
@@ -322,7 +328,7 @@ int kernel_open_metadata(struct ltt_kernel_session *session, char *path)
        struct ltt_kernel_metadata *lkm;
 
        /* Allocate kernel metadata */
-       lkm = trace_create_kernel_metadata(path);
+       lkm = trace_kernel_create_metadata(path);
        if (lkm == NULL) {
                goto error;
        }
@@ -474,7 +480,7 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
        struct ltt_kernel_stream *lks;
 
        while ((ret = kernctl_create_stream(channel->fd)) > 0) {
-               lks = trace_create_kernel_stream();
+               lks = trace_kernel_create_stream();
                if (lks == NULL) {
                        close(ret);
                        goto error;