X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fkernel-ctl.c;h=b66f08cb3fd354d00f15a3abd85d8dfa21462371;hp=6247ce6bdd69ccd78162e1f422a490de1fb12030;hb=54d01ffb43587b221dc50ec42b6070fad89bd255;hpb=1e307fab325060d9db4e989c0fdc3cddf46f50f6

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index 6247ce6bd..b66f08cb3 100644
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -102,7 +102,7 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
 	struct ltt_kernel_session *lks;
 
 	/* Allocate data structure */
-	lks = trace_create_kernel_session();
+	lks = trace_kernel_create_session(session->path);
 	if (lks == NULL) {
 		ret = -1;
 		goto error;
@@ -144,7 +144,7 @@ int kernel_create_channel(struct ltt_kernel_session *session,
 	struct ltt_kernel_channel *lkc;
 
 	/* Allocate kernel channel */
-	lkc = trace_create_kernel_channel(chan, path);
+	lkc = trace_kernel_create_channel(chan, path);
 	if (lkc == NULL) {
 		goto error;
 	}
@@ -187,7 +187,7 @@ int kernel_create_event(struct lttng_event *ev,
 	int ret;
 	struct ltt_kernel_event *event;
 
-	event = trace_create_kernel_event(ev);
+	event = trace_kernel_create_event(ev);
 	if (event == NULL) {
 		goto error;
 	}
@@ -250,9 +250,8 @@ 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;
+	if (ret < 0 && errno != EEXIST) {
+		perror("Enable kernel chan");
 		goto error;
 	}
 
@@ -273,11 +272,8 @@ int kernel_enable_event(struct ltt_kernel_event *event)
 	int ret;
 
 	ret = kernctl_enable(event->fd);
-	if (ret < 0) {
-		perror("enable event ioctl");
-		if (errno == EEXIST) {
-			ret = -EEXIST;
-		}
+	if (ret < 0 && errno != EEXIST) {
+		perror("enable kernel event");
 		goto error;
 	}
 
@@ -298,8 +294,8 @@ int kernel_disable_event(struct ltt_kernel_event *event)
 	int ret;
 
 	ret = kernctl_disable(event->fd);
-	if (ret < 0) {
-		perror("disable event ioctl");
+	if (ret < 0 && errno != EEXIST) {
+		perror("disable kernel event");
 		goto error;
 	}
 
@@ -322,7 +318,7 @@ int kernel_open_metadata(struct ltt_kernel_session *session, char *path)
 	struct ltt_kernel_metadata *lkm;
 
 	/* Allocate kernel metadata */
-	lkm = trace_create_kernel_metadata(path);
+	lkm = trace_kernel_create_metadata(path);
 	if (lkm == NULL) {
 		goto error;
 	}
@@ -474,7 +470,7 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
 	struct ltt_kernel_stream *lks;
 
 	while ((ret = kernctl_create_stream(channel->fd)) > 0) {
-		lks = trace_create_kernel_stream();
+		lks = trace_kernel_create_stream();
 		if (lks == NULL) {
 			close(ret);
 			goto error;