X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=385af875a2d9b69aeeff6c58f5dcf8017338e16d;hb=6151a90fe7fa3dea52c57771df9083e56de7a60b;hp=9d75d3f09cfc9ada6f30503a6c7ddfe306366809;hpb=ffe600149a7608221985751e1bf293234bf2545c;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 9d75d3f09..385af875a 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -128,11 +128,13 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			goto end_nosignal;
 		}
 
-		DBG("consumer_add_channel %d", msg.u.channel.channel_key);
+		DBG("consumer_add_channel %" PRIu64, msg.u.channel.channel_key);
 		new_channel = consumer_allocate_channel(msg.u.channel.channel_key,
 				msg.u.channel.session_id, msg.u.channel.pathname,
 				msg.u.channel.name, msg.u.channel.uid, msg.u.channel.gid,
-				msg.u.channel.relayd_id, msg.u.channel.output);
+				msg.u.channel.relayd_id, msg.u.channel.output,
+				msg.u.channel.tracefile_size,
+				msg.u.channel.tracefile_count);
 		if (new_channel == NULL) {
 			lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_OUTFD_ERROR);
 			goto end_nosignal;
@@ -153,12 +155,12 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		if (ctx->on_recv_channel != NULL) {
 			ret = ctx->on_recv_channel(new_channel);
 			if (ret == 0) {
-				consumer_add_channel(new_channel);
+				consumer_add_channel(new_channel, ctx);
 			} else if (ret < 0) {
 				goto end_nosignal;
 			}
 		} else {
-			consumer_add_channel(new_channel);
+			consumer_add_channel(new_channel, ctx);
 		}
 		goto end_nosignal;
 	}
@@ -180,7 +182,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			 * We could not find the channel. Can happen if cpu hotplug
 			 * happens while tearing down.
 			 */
-			ERR("Unable to find channel key %d", msg.u.stream.channel_key);
+			ERR("Unable to find channel key %" PRIu64, msg.u.stream.channel_key);
 			ret_code = LTTNG_ERR_KERN_CHAN_NOT_FOUND;
 		}
 
@@ -265,8 +267,8 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				consumer_del_stream(new_stream, NULL);
 				goto end_nosignal;
 			}
-		} else if (new_stream->net_seq_idx != -1) {
-			ERR("Network sequence index %d unknown. Not adding stream.",
+		} else if (new_stream->net_seq_idx != (uint64_t) -1ULL) {
+			ERR("Network sequence index %" PRIu64 " unknown. Not adding stream.",
 					new_stream->net_seq_idx);
 			consumer_del_stream(new_stream, NULL);
 			goto end_nosignal;
@@ -464,8 +466,8 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		 * network streaming or the full padding (len) size when we are _not_
 		 * streaming.
 		 */
-		if ((ret != subbuf_size && stream->net_seq_idx != -1) ||
-				(ret != len && stream->net_seq_idx == -1)) {
+		if ((ret != subbuf_size && stream->net_seq_idx != (uint64_t) -1ULL) ||
+				(ret != len && stream->net_seq_idx == (uint64_t) -1ULL)) {
 			/*
 			 * Display the error but continue processing to try to release the
 			 * subbuffer
@@ -501,28 +503,15 @@ end:
 int lttng_kconsumer_on_recv_stream(struct lttng_consumer_stream *stream)
 {
 	int ret;
-	char full_path[PATH_MAX];
 
 	assert(stream);
 
-	ret = snprintf(full_path, sizeof(full_path), "%s/%s",
-			stream->chan->pathname, stream->name);
+	ret = lttng_create_output_file(stream);
 	if (ret < 0) {
-		PERROR("snprintf on_recv_stream");
+		ERR("Creating output file");
 		goto error;
 	}
 
-	/* Opening the tracefile in write mode */
-	if (stream->net_seq_idx == -1) {
-		ret = run_as_open(full_path, O_WRONLY | O_CREAT | O_TRUNC,
-				S_IRWXU|S_IRWXG|S_IRWXO, stream->uid, stream->gid);
-		if (ret < 0) {
-			PERROR("open kernel stream path %s", full_path);
-			goto error;
-		}
-		stream->out_fd = ret;
-	}
-
 	if (stream->output == LTTNG_EVENT_MMAP) {
 		/* get the len of the mmap region */
 		unsigned long mmap_len;