X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=2c6d1e8c335c887118711acafaeccf488bdd8cba;hb=3295105b7e92bbfa6a21dc9c5d71ad5458540ac9;hp=32c40531d21b3e50f4d7b1851594b2ad1090ea4f;hpb=0525e9ae15d215943d8187e7f190d5a45e723085;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 32c40531d..2c6d1e8c3 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -81,7 +81,7 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
 	assert(session);
 
 	/* Allocate data structure */
-	lks = trace_kernel_create_session(session->path);
+	lks = trace_kernel_create_session();
 	if (lks == NULL) {
 		ret = -1;
 		goto error;
@@ -118,23 +118,22 @@ error:
  * kernel session.
  */
 int kernel_create_channel(struct ltt_kernel_session *session,
-		struct lttng_channel *chan, char *path)
+		struct lttng_channel *chan)
 {
 	int ret;
 	struct ltt_kernel_channel *lkc;
 
 	assert(session);
 	assert(chan);
-	assert(path);
 
 	/* Allocate kernel channel */
-	lkc = trace_kernel_create_channel(chan, path);
+	lkc = trace_kernel_create_channel(chan);
 	if (lkc == NULL) {
 		goto error;
 	}
 
-	DBG3("Kernel create channel %s in %s with attr: %d, %" PRIu64 ", %" PRIu64 ", %u, %u, %d",
-			chan->name, path, lkc->channel->attr.overwrite,
+	DBG3("Kernel create channel %s with attr: %d, %" PRIu64 ", %" PRIu64 ", %u, %u, %d",
+			chan->name, lkc->channel->attr.overwrite,
 			lkc->channel->attr.subbuf_size, lkc->channel->attr.num_subbuf,
 			lkc->channel->attr.switch_timer_interval, lkc->channel->attr.read_timer_interval,
 			lkc->channel->attr.output);
@@ -354,7 +353,7 @@ error:
 int kernel_open_metadata(struct ltt_kernel_session *session)
 {
 	int ret;
-	struct ltt_kernel_metadata *lkm;
+	struct ltt_kernel_metadata *lkm = NULL;
 
 	assert(session);
 
@@ -367,7 +366,7 @@ int kernel_open_metadata(struct ltt_kernel_session *session)
 	/* Kernel tracer metadata creation */
 	ret = kernctl_open_metadata(session->fd, &lkm->conf->attr);
 	if (ret < 0) {
-		goto error;
+		goto error_open;
 	}
 
 	lkm->fd = ret;
@@ -383,6 +382,8 @@ int kernel_open_metadata(struct ltt_kernel_session *session)
 
 	return 0;
 
+error_open:
+	trace_kernel_destroy_metadata(lkm);
 error:
 	return -1;
 }
@@ -537,6 +538,9 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
 			PERROR("fcntl session fd");
 		}
 
+		lks->tracefile_size = channel->channel->attr.tracefile_size;
+		lks->tracefile_count = channel->channel->attr.tracefile_count;
+
 		/* Add stream to channe stream list */
 		cds_list_add(&lks->list, &channel->stream_list.head);
 		channel->stream_count++;