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

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index 2f1864d64..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;
@@ -141,7 +141,6 @@ int kernel_create_event(struct ltt_kernel_channel *channel, struct lttng_event *
 	}
 
 	event->fd = ret;
-	event->enabled = 1;
 	/* Prevent fd duplication after execlp() */
 	ret = fcntl(event->fd, F_SETFD, FD_CLOEXEC);
 	if (ret < 0) {
@@ -161,33 +160,76 @@ error:
 }
 
 /*
- *  kernel_disable_event
+ *  kernel_enable_channel
  *
- *  Disable a kernel event for a specific channel.
+ *  Enable a kernel channel.
  */
-int kernel_disable_event(char *event_name, struct ltt_kernel_channel *channel)
+int kernel_enable_channel(struct ltt_kernel_channel *chan)
 {
 	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;
-			}
+	ret = kernctl_enable(chan->fd);
+	if (ret < 0) {
+		perror("enable chan ioctl");
+		ret = errno;
+		goto error;
+	}
 
-			iter->enabled = 0;
-			DBG("Kernel event %s disabled (fd: %d)", iter->event->name, iter->fd);
-			break;
-		}
+	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 -1;
+	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;
 }
 
 /*