Add enable kernel event using the enable ioctl

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

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index 3925c6ba5afc8e17f193dea1b497c7291a5ac52f..16b85bdb5bcb5b6793450b0f2794023541fa2466 100644 (file)
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -124,7 +124,7 @@ error:
  *  Create a kernel event, enable it to the kernel tracer and add it to the
  *  channel event list of the kernel session.
  */
-int kernel_create_event(struct ltt_kernel_channel *channel, struct lttng_event *ev)
+int kernel_create_event(struct lttng_event *ev, struct ltt_kernel_channel *channel)
 {
        int ret;
        struct ltt_kernel_event *event;
@@ -136,11 +136,12 @@ 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) {
@@ -149,7 +150,57 @@ int kernel_create_event(struct ltt_kernel_channel *channel, struct lttng_event *
 
        /* 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_enable_event
+ *
+ *  Enable a kernel event.
+ */
+int kernel_enable_event(struct ltt_kernel_event *event)
+{
+       int ret;
+
+       ret = kernctl_enable(event->fd);
+       if (ret < 0) {
+               perror("enable event ioctl");
+               goto error;
+       }
+
+       event->enabled = 1;
+       DBG("Kernel event %s enabled (fd: %d)", event->event->name, event->fd);
+
+       return 0;
+
+error:
+       return -1;
+}
+
+/*
+ *  kernel_disable_event
+ *
+ *  Disable a kernel event.
+ */
+int kernel_disable_event(struct ltt_kernel_event *event)
+{
+       int ret;
+
+       ret = kernctl_disable(event->fd);
+       if (ret < 0) {
+               perror("disable event ioctl");
+               goto error;
+       }
+
+       event->enabled = 0;
+       DBG("Kernel event %s disabled (fd: %d)", event->event->name, event->fd);
 
        return 0;