X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=ltt-sessiond%2Fkernel-ctl.c;h=bc92ffca918cb07b524aa8b9a6865308e455761b;hb=d36b858358a8ef4e00de843379d670925f9c23b6;hp=3925c6ba5afc8e17f193dea1b497c7291a5ac52f;hpb=7b3958902a08e7d96d388614f2726ad8a6fc9df2;p=lttng-tools.git

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index 3925c6ba5..bc92ffca9 100644
--- 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,8 +136,8 @@ 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;
@@ -149,14 +149,89 @@ 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_channel
+ *
+ *  Enable a kernel channel.
+ */
+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;
+		goto error;
+	}
+
+	chan->enabled = 1;
+	DBG("Kernel channel %s enabled (fd: %d)", chan->channel->name, chan->fd);
+
+	return 0;
+
+error:
+	return ret;
+}
+
+/*
+ *  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 ret;
+}
+
+/*
+ *  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;
+
+error:
+	return ret;
+}
+
 /*
  *  kernel_open_metadata
  *