X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=61602dd103fadb279582ebe10ec3b5168997ada2;hb=65121c2141d0df9a1d6fc759904cea4bbc016331;hp=d82e07fcaacf147cf4d59d8e98119cc3adc326bf;hpb=78346e6812d33fba1eb89f27f05cc1042e166822;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index d82e07fca..61602dd10 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -240,7 +240,7 @@ int lttng_kconsumer_snapshot_channel(uint64_t key, char *path,
 				produced_pos, nb_packets_per_stream,
 				stream->max_sb_size);
 
-		while (consumed_pos < produced_pos) {
+		while ((long) (consumed_pos - produced_pos) < 0) {
 			ssize_t read_len;
 			unsigned long len, padded_len;
 
@@ -1119,66 +1119,62 @@ error_fatal:
 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");
@@ -1187,6 +1183,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;
 }