Add disable kernel event support

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

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index db97dee205bc4f6f13b437b44b57644cf01704dd..2f1864d6495ca8092a4a2744ec5a5c301bac9686 100644 (file)
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -18,6 +18,7 @@
 
 #define _GNU_SOURCE
 #include <errno.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -54,6 +55,12 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
        }
 
        lks->fd = ret;
+       /* Prevent fd duplication after execlp() */
+       ret = fcntl(lks->fd, F_SETFD, FD_CLOEXEC);
+       if (ret < 0) {
+               perror("fcntl session fd");
+       }
+
        lks->kconsumer_fds_sent = 0;
        session->kernel_session = lks;
        session->kern_session_count++;
@@ -92,6 +99,12 @@ int kernel_create_channel(struct ltt_kernel_session *session, struct lttng_chann
 
        /* Setup the channel fd */
        lkc->fd = ret;
+       /* Prevent fd duplication after execlp() */
+       ret = fcntl(lkc->fd, F_SETFD, FD_CLOEXEC);
+       if (ret < 0) {
+               perror("fcntl session fd");
+       }
+
        /* Add channel to session */
        cds_list_add(&lkc->list, &session->channel_list.head);
        session->channel_count++;
@@ -123,14 +136,53 @@ int kernel_create_event(struct ltt_kernel_channel *channel, struct lttng_event *
 
        ret = kernctl_create_event(channel->fd, event->event);
        if (ret < 0) {
-               ERR("Unable to enable event %s for channel %s", ev->name, channel->channel->name);
-               goto error;
+               perror("create event ioctl");
+               goto free_event;
        }
 
        event->fd = ret;
+       event->enabled = 1;
+       /* Prevent fd duplication after execlp() */
+       ret = fcntl(event->fd, F_SETFD, FD_CLOEXEC);
+       if (ret < 0) {
+               perror("fcntl session fd");
+       }
+
        /* Add event to event list */
        cds_list_add(&event->list, &channel->events_list.head);
-       DBG("Event %s enabled (fd: %d)", ev->name, event->fd);
+       DBG("Event %s created (fd: %d)", ev->name, event->fd);
+
+       return 0;
+
+free_event:
+       free(event);
+error:
+       return -1;
+}
+
+/*
+ *  kernel_disable_event
+ *
+ *  Disable a kernel event for a specific channel.
+ */
+int kernel_disable_event(char *event_name, struct ltt_kernel_channel *channel)
+{
+       int ret;
+       struct ltt_kernel_event *iter;
+
+       cds_list_for_each_entry(iter, &channel->events_list.head, list) {
+               if (strcmp(iter->event->name, event_name) == 0) {
+                       ret = kernctl_disable(iter->fd);
+                       if (ret < 0) {
+                               perror("disable event ioctl");
+                               goto error;
+                       }
+
+                       iter->enabled = 0;
+                       DBG("Kernel event %s disabled (fd: %d)", iter->event->name, iter->fd);
+                       break;
+               }
+       }
 
        return 0;
 
@@ -162,6 +214,12 @@ int kernel_open_metadata(struct ltt_kernel_session *session)
        }
 
        lkm->fd = ret;
+       /* Prevent fd duplication after execlp() */
+       ret = fcntl(lkm->fd, F_SETFD, FD_CLOEXEC);
+       if (ret < 0) {
+               perror("fcntl session fd");
+       }
+
        session->metadata = lkm;
 
        DBG("Kernel metadata opened (fd: %d and path: %s)", lkm->fd, lkm->pathname);
@@ -298,6 +356,12 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
                }
 
                lks->fd = ret;
+               /* Prevent fd duplication after execlp() */
+               ret = fcntl(lks->fd, F_SETFD, FD_CLOEXEC);
+               if (ret < 0) {
+                       perror("fcntl session fd");
+               }
+
                ret = asprintf(&lks->pathname, "%s/trace_%d",
                                channel->pathname, channel->stream_count);
                if (ret < 0) {
@@ -336,6 +400,11 @@ int kernel_open_metadata_stream(struct ltt_kernel_session *session)
 
        DBG("Kernel metadata stream created (fd: %d)", ret);
        session->metadata_stream_fd = ret;
+       /* Prevent fd duplication after execlp() */
+       ret = fcntl(session->metadata_stream_fd, F_SETFD, FD_CLOEXEC);
+       if (ret < 0) {
+               perror("fcntl session fd");
+       }
 
        return 0;