X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=9742ea0844d79d5b64a1e9888d7b8bb54217c332;hb=247e3c78adeea366e1348bde0c4fa581f3f52a1a;hp=ae909517fb31f84ba35c2afd9ddfc809c4e13693;hpb=e5148e25a481691b3278cd85a6ff25c1e25e4d2e;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index ae909517f..9742ea084 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -231,15 +231,6 @@ static int lttng_kconsumer_snapshot_channel(
 			goto end_unlock;
 		}
 
-		if (stream->max_sb_size == 0) {
-			ret = kernctl_get_max_subbuf_size(stream->wait_fd,
-					&stream->max_sb_size);
-			if (ret < 0) {
-				ERR("Getting kernel max_sb_size");
-				goto end_unlock;
-			}
-		}
-
 		consumed_pos = consumer_get_consume_start_pos(consumed_pos,
 				produced_pos, nb_packets_per_stream,
 				stream->max_sb_size);
@@ -668,6 +659,14 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
 		new_stream->chan = channel;
 		new_stream->wait_fd = fd;
+		ret = kernctl_get_max_subbuf_size(new_stream->wait_fd,
+				&new_stream->max_sb_size);
+		if (ret < 0) {
+			pthread_mutex_unlock(&channel->lock);
+			ERR("Failed to get kernel maximal subbuffer size");
+			goto end_nosignal;
+		}
+
 		consumer_stream_update_channel_attributes(new_stream,
 				channel);
 		switch (channel->output) {
@@ -1167,8 +1166,8 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	case LTTNG_CONSUMER_CREATE_TRACE_CHUNK:
 	{
 		const struct lttng_credentials credentials = {
-			.uid = msg.u.create_trace_chunk.credentials.uid,
-			.gid = msg.u.create_trace_chunk.credentials.gid,
+			.uid = msg.u.create_trace_chunk.credentials.value.uid,
+			.gid = msg.u.create_trace_chunk.credentials.value.gid,
 		};
 		const bool is_local_trace =
 				!msg.u.create_trace_chunk.relayd_id.is_set;
@@ -1221,9 +1220,12 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				!is_local_trace ? &relayd_id : NULL,
 				msg.u.create_trace_chunk.session_id,
 				msg.u.create_trace_chunk.chunk_id,
-				(time_t) msg.u.create_trace_chunk.creation_timestamp,
+				(time_t) msg.u.create_trace_chunk
+						.creation_timestamp,
 				chunk_override_name,
-				&credentials,
+				msg.u.create_trace_chunk.credentials.is_set ?
+						&credentials :
+						NULL,
 				chunk_directory_handle.is_set ?
 						&chunk_directory_handle.value :
 						NULL);
@@ -1236,15 +1238,21 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	}
 	case LTTNG_CONSUMER_CLOSE_TRACE_CHUNK:
 	{
+		enum lttng_trace_chunk_command_type close_command =
+				msg.u.close_trace_chunk.close_command.value;
 		const uint64_t relayd_id =
 				msg.u.close_trace_chunk.relayd_id.value;
 
 		ret_code = lttng_consumer_close_trace_chunk(
 				msg.u.close_trace_chunk.relayd_id.is_set ?
-						&relayd_id : NULL,
+						&relayd_id :
+						NULL,
 				msg.u.close_trace_chunk.session_id,
 				msg.u.close_trace_chunk.chunk_id,
-				(time_t) msg.u.close_trace_chunk.close_timestamp);
+				(time_t) msg.u.close_trace_chunk.close_timestamp,
+				msg.u.close_trace_chunk.close_command.is_set ?
+						&close_command :
+						NULL);
 		goto end_msg_sessiond;
 	}
 	case LTTNG_CONSUMER_TRACE_CHUNK_EXISTS: