X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fkernel-ctl.c;h=203c01050e82199f34128d09b9c5dd95ca6fb0a4;hp=b66f08cb3fd354d00f15a3abd85d8dfa21462371;hb=1316184615e422526ef4fae68f980443414969c1;hpb=54d01ffb43587b221dc50ec42b6070fad89bd255

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index b66f08cb3..203c01050 100644
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -122,7 +122,7 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
 		perror("fcntl session fd");
 	}
 
-	lks->kconsumer_fds_sent = 0;
+	lks->consumer_fds_sent = 0;
 	session->kernel_session = lks;
 
 	DBG("Kernel session created (fd: %d)", lks->fd);
@@ -189,15 +189,28 @@ int kernel_create_event(struct lttng_event *ev,
 
 	event = trace_kernel_create_event(ev);
 	if (event == NULL) {
+		ret = -1;
 		goto error;
 	}
 
 	ret = kernctl_create_event(channel->fd, event->event);
 	if (ret < 0) {
-		perror("create event ioctl");
+		if (errno != EEXIST) {
+			PERROR("create event ioctl");
+		}
+		ret = -errno;
 		goto free_event;
 	}
 
+	/*
+	 * LTTNG_KERNEL_SYSCALL event creation will return 0 on success. However
+	 * this FD must not be added to the event list.
+	 */
+	if (ret == 0 && event->event->instrumentation == LTTNG_KERNEL_SYSCALL) {
+		DBG2("Kernel event syscall creation success");
+		goto end;
+	}
+
 	event->fd = ret;
 	/* Prevent fd duplication after execlp() */
 	ret = fcntl(event->fd, F_SETFD, FD_CLOEXEC);
@@ -211,12 +224,13 @@ int kernel_create_event(struct lttng_event *ev,
 
 	DBG("Event %s created (fd: %d)", ev->name, event->fd);
 
+end:
 	return 0;
 
 free_event:
 	free(event);
 error:
-	return -1;
+	return ret;
 }
 
 /*