X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=43a5d366348d98a1037ec4a9bef3024b0ba6a5e2;hb=8dbd7d838dc2276e5a25057c76c2e219e1d2661b;hp=b1cc03e860a0e9b10d34a5e8f528f3fcb4d90ae5;hpb=fae1e3cc12dd199269c581b683630d077e0ba266;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index b1cc03e86..43a5d3663 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -118,7 +118,6 @@ int lttng_kconsumer_snapshot_channel(uint64_t key, char *path,
 		struct lttng_consumer_local_data *ctx)
 {
 	int ret;
-	unsigned long consumed_pos, produced_pos;
 	struct lttng_consumer_channel *channel;
 	struct lttng_consumer_stream *stream;
 
@@ -143,6 +142,7 @@ int lttng_kconsumer_snapshot_channel(uint64_t key, char *path,
 	cds_list_for_each_entry(stream, &channel->streams.head, send_node) {
 		/* Are we at a position _before_ the first available packet ? */
 		bool before_first_packet = true;
+		unsigned long consumed_pos, produced_pos;
 
 		health_code_update();
 
@@ -1095,15 +1095,27 @@ static int get_index_values(struct ctf_packet_index *index, int infd)
 
 	ret = kernctl_get_instance_id(infd, &index->stream_instance_id);
 	if (ret < 0) {
-		PERROR("kernctl_get_instance_id");
-		goto error;
+		if (ret == -ENOTTY) {
+			/* Command not implemented by lttng-modules. */
+			index->stream_instance_id = -1ULL;
+			ret = 0;
+		} 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);
 	if (ret < 0) {
-		PERROR("kernctl_get_sequence_number");
-		goto error;
+		if (ret == -ENOTTY) {
+			/* Command not implemented by lttng-modules. */
+			index->packet_seq_num = -1ULL;
+			ret = 0;
+		} else {
+			PERROR("kernctl_get_sequence_number");
+			goto error;
+		}
 	}
 	index->packet_seq_num = htobe64(index->packet_seq_num);
 
@@ -1155,8 +1167,14 @@ int update_stream_stats(struct lttng_consumer_stream *stream)
 
 	ret = kernctl_get_sequence_number(stream->wait_fd, &seq);
 	if (ret < 0) {
-		PERROR("kernctl_get_sequence_number");
-		goto end;
+		if (ret == -ENOTTY) {
+			/* Command not implemented by lttng-modules. */
+			seq = -1ULL;
+			ret = 0;
+		} else {
+			PERROR("kernctl_get_sequence_number");
+			goto end;
+		}
 	}
 
 	/*
@@ -1215,6 +1233,14 @@ int metadata_stream_check_version(int infd, struct lttng_consumer_stream *stream
 
 	ret = kernctl_get_metadata_version(infd, &cur_version);
 	if (ret < 0) {
+		if (ret == -ENOTTY) {
+			/*
+			 * LTTng-modules does not implement this
+			 * command.
+			 */
+			ret = 0;
+			goto end;
+		}
 		ERR("Failed to get the metadata version");
 		goto end;
 	}
@@ -1459,14 +1485,17 @@ int lttng_kconsumer_on_recv_stream(struct lttng_consumer_stream *stream)
 		stream->tracefile_size_current = 0;
 
 		if (!stream->metadata_flag) {
-			ret = index_create_file(stream->chan->pathname,
+			struct lttng_index_file *index_file;
+
+			index_file = lttng_index_file_create(stream->chan->pathname,
 					stream->name, stream->uid, stream->gid,
 					stream->chan->tracefile_size,
-					stream->tracefile_count_current);
-			if (ret < 0) {
+					stream->tracefile_count_current,
+					CTF_INDEX_MAJOR, CTF_INDEX_MINOR);
+			if (!index_file) {
 				goto error;
 			}
-			stream->index_fd = ret;
+			stream->index_file = index_file;
 		}
 	}