X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=9fa92f6b80d190ff1d3202e03e8d9d8e110ff4ae;hb=d3faab47a5ff8be82a1a1df16483d1666f21d3a6;hp=f9278f75d580d366122ee0e6b2a3216ca5c46895;hpb=713bdd260a9b67dcf3a8031bacbe6cf2d220c4da;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index f9278f75d..9fa92f6b8 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -1250,6 +1250,8 @@ error_rotate_channel:
 				msg.u.close_trace_chunk.close_command.value;
 		const uint64_t relayd_id =
 				msg.u.close_trace_chunk.relayd_id.value;
+		struct lttcomm_consumer_close_trace_chunk_reply reply;
+		char path[LTTNG_PATH_MAX];
 
 		ret_code = lttng_consumer_close_trace_chunk(
 				msg.u.close_trace_chunk.relayd_id.is_set ?
@@ -1260,8 +1262,18 @@ error_rotate_channel:
 				(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;
+						NULL, path);
+		reply.ret_code = ret_code;
+		reply.path_length = strlen(path) + 1;
+		ret = lttcomm_send_unix_sock(sock, &reply, sizeof(reply));
+		if (ret != sizeof(reply)) {
+			goto error_fatal;
+		}
+		ret = lttcomm_send_unix_sock(sock, path, reply.path_length);
+		if (ret != reply.path_length) {
+			goto error_fatal;
+		}
+		goto end_nosignal;
 	}
 	case LTTNG_CONSUMER_TRACE_CHUNK_EXISTS:
 	{
@@ -1315,66 +1327,62 @@ end:
 static int get_index_values(struct ctf_packet_index *index, int infd)
 {
 	int ret;
+	uint64_t packet_size, content_size, timestamp_begin, timestamp_end,
+			events_discarded, stream_id, stream_instance_id,
+			packet_seq_num;
 
-	ret = kernctl_get_timestamp_begin(infd, &index->timestamp_begin);
+	ret = kernctl_get_timestamp_begin(infd, &timestamp_begin);
 	if (ret < 0) {
 		PERROR("kernctl_get_timestamp_begin");
 		goto error;
 	}
-	index->timestamp_begin = htobe64(index->timestamp_begin);
 
-	ret = kernctl_get_timestamp_end(infd, &index->timestamp_end);
+	ret = kernctl_get_timestamp_end(infd, &timestamp_end);
 	if (ret < 0) {
 		PERROR("kernctl_get_timestamp_end");
 		goto error;
 	}
-	index->timestamp_end = htobe64(index->timestamp_end);
 
-	ret = kernctl_get_events_discarded(infd, &index->events_discarded);
+	ret = kernctl_get_events_discarded(infd, &events_discarded);
 	if (ret < 0) {
 		PERROR("kernctl_get_events_discarded");
 		goto error;
 	}
-	index->events_discarded = htobe64(index->events_discarded);
 
-	ret = kernctl_get_content_size(infd, &index->content_size);
+	ret = kernctl_get_content_size(infd, &content_size);
 	if (ret < 0) {
 		PERROR("kernctl_get_content_size");
 		goto error;
 	}
-	index->content_size = htobe64(index->content_size);
 
-	ret = kernctl_get_packet_size(infd, &index->packet_size);
+	ret = kernctl_get_packet_size(infd, &packet_size);
 	if (ret < 0) {
 		PERROR("kernctl_get_packet_size");
 		goto error;
 	}
-	index->packet_size = htobe64(index->packet_size);
 
-	ret = kernctl_get_stream_id(infd, &index->stream_id);
+	ret = kernctl_get_stream_id(infd, &stream_id);
 	if (ret < 0) {
 		PERROR("kernctl_get_stream_id");
 		goto error;
 	}
-	index->stream_id = htobe64(index->stream_id);
 
-	ret = kernctl_get_instance_id(infd, &index->stream_instance_id);
+	ret = kernctl_get_instance_id(infd, &stream_instance_id);
 	if (ret < 0) {
 		if (ret == -ENOTTY) {
 			/* Command not implemented by lttng-modules. */
-			index->stream_instance_id = -1ULL;
+			stream_instance_id = -1ULL;
 		} else {
 			PERROR("kernctl_get_instance_id");
 			goto error;
 		}
 	}
-	index->stream_instance_id = htobe64(index->stream_instance_id);
 
-	ret = kernctl_get_sequence_number(infd, &index->packet_seq_num);
+	ret = kernctl_get_sequence_number(infd, &packet_seq_num);
 	if (ret < 0) {
 		if (ret == -ENOTTY) {
 			/* Command not implemented by lttng-modules. */
-			index->packet_seq_num = -1ULL;
+			packet_seq_num = -1ULL;
 			ret = 0;
 		} else {
 			PERROR("kernctl_get_sequence_number");
@@ -1383,6 +1391,18 @@ static int get_index_values(struct ctf_packet_index *index, int infd)
 	}
 	index->packet_seq_num = htobe64(index->packet_seq_num);
 
+	*index = (typeof(*index)) {
+		.offset = index->offset,
+		.packet_size = htobe64(packet_size),
+		.content_size = htobe64(content_size),
+		.timestamp_begin = htobe64(timestamp_begin),
+		.timestamp_end = htobe64(timestamp_end),
+		.events_discarded = htobe64(events_discarded),
+		.stream_id = htobe64(stream_id),
+		.stream_instance_id = htobe64(stream_instance_id),
+		.packet_seq_num = htobe64(packet_seq_num),
+	};
+
 error:
 	return ret;
 }
@@ -1533,7 +1553,7 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 	int err, write_index = 1, rotation_ret;
 	ssize_t ret = 0;
 	int infd = stream->wait_fd;
-	struct ctf_packet_index index;
+	struct ctf_packet_index index = {};
 
 	DBG("In read_subbuffer (infd : %d)", infd);