Don't report back error on syscalls fail for -a -k

[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 b1ff2ec48d10f58e57fd9be0abcb11810a064ef0..39006ab2f37b508107fb468a427debb7d82bb566 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"
@@ -195,7 +196,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 +297,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 +326,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;
        }
 
@@ -582,24 +603,35 @@ ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
         */
        nbmem = KERNEL_EVENT_INIT_LIST_SIZE;
        elist = zmalloc(sizeof(struct lttng_event) * nbmem);
+       if (elist == NULL) {
+               PERROR("alloc list events");
+               count = -ENOMEM;
+               goto end;
+       }
 
        while ((size = fscanf(fp, "event { name = %m[^;]; };%n\n", &event, &pos)) == 1) {
                if (count >= nbmem) {
+                       struct lttng_event *new_elist;
+
                        DBG("Reallocating event list from %zu to %zu bytes", nbmem,
                                        nbmem * 2);
                        /* Double the size */
                        nbmem <<= 1;
-                       elist = realloc(elist, nbmem * sizeof(struct lttng_event));
-                       if (elist == NULL) {
+                       new_elist = realloc(elist, nbmem * sizeof(struct lttng_event));
+                       if (new_elist == NULL) {
                                PERROR("realloc list events");
+                               free(event);
+                               free(elist);
                                count = -ENOMEM;
                                goto end;
                        }
+                       elist = new_elist;
                }
                strncpy(elist[count].name, event, LTTNG_SYMBOL_NAME_LEN);
                elist[count].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
                elist[count].enabled = -1;
                count++;
+               free(event);
        }
 
        *events = elist;