Fix: relayd vs consumerd compatibility

[lttng-tools.git] / src / common / kernel-consumer / kernel-consumer.c

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 68dcc02309a452c756838c6947ecdf0e6a76957b..d03ff701533fdab938082a1d551efdeff4140428 100644 (file)
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -62,7 +62,6 @@ int lttng_kconsumer_take_snapshot(struct lttng_consumer_stream *stream)
        ret = kernctl_snapshot(infd);
        if (ret != 0) {
                PERROR("Getting sub-buffer snapshot.");
-               ret = -errno;
        }
 
        return ret;
@@ -82,7 +81,6 @@ int lttng_kconsumer_get_produced_snapshot(struct lttng_consumer_stream *stream,
        ret = kernctl_snapshot_get_produced(infd, pos);
        if (ret != 0) {
                PERROR("kernctl_snapshot_get_produced");
-               ret = -errno;
        }
 
        return ret;
@@ -102,7 +100,6 @@ int lttng_kconsumer_get_consumed_snapshot(struct lttng_consumer_stream *stream,
        ret = kernctl_snapshot_get_consumed(infd, pos);
        if (ret != 0) {
                PERROR("kernctl_snapshot_get_consumed");
-               ret = -errno;
        }
 
        return ret;
@@ -190,7 +187,6 @@ int lttng_kconsumer_snapshot_channel(uint64_t key, char *path,
                ret = kernctl_buffer_flush(stream->wait_fd);
                if (ret < 0) {
                        ERR("Failed to flush kernel stream");
-                       ret = -errno;
                        goto end_unlock;
                }
 
@@ -217,7 +213,6 @@ int lttng_kconsumer_snapshot_channel(uint64_t key, char *path,
                                        &stream->max_sb_size);
                        if (ret < 0) {
                                ERR("Getting kernel max_sb_size");
-                               ret = -errno;
                                goto end_unlock;
                        }
                }
@@ -237,9 +232,8 @@ int lttng_kconsumer_snapshot_channel(uint64_t key, char *path,
 
                        ret = kernctl_get_subbuf(stream->wait_fd, &consumed_pos);
                        if (ret < 0) {
-                               if (errno != EAGAIN) {
+                               if (ret != -EAGAIN) {
                                        PERROR("kernctl_get_subbuf snapshot");
-                                       ret = -errno;
                                        goto end_unlock;
                                }
                                DBG("Kernel consumer get subbuf failed. Skipping it.");
@@ -259,14 +253,12 @@ int lttng_kconsumer_snapshot_channel(uint64_t key, char *path,
                        ret = kernctl_get_subbuf_size(stream->wait_fd, &len);
                        if (ret < 0) {
                                ERR("Snapshot kernctl_get_subbuf_size");
-                               ret = -errno;
                                goto error_put_subbuf;
                        }
 
                        ret = kernctl_get_padded_subbuf_size(stream->wait_fd, &padded_len);
                        if (ret < 0) {
                                ERR("Snapshot kernctl_get_padded_subbuf_size");
-                               ret = -errno;
                                goto error_put_subbuf;
                        }
 
@@ -292,7 +284,6 @@ int lttng_kconsumer_snapshot_channel(uint64_t key, char *path,
                        ret = kernctl_put_subbuf(stream->wait_fd);
                        if (ret < 0) {
                                ERR("Snapshot kernctl_put_subbuf");
-                               ret = -errno;
                                goto end_unlock;
                        }
                        consumed_pos += stream->max_sb_size;
@@ -331,7 +322,6 @@ int lttng_kconsumer_snapshot_channel(uint64_t key, char *path,
 error_put_subbuf:
        ret = kernctl_put_subbuf(stream->wait_fd);
        if (ret < 0) {
-               ret = -errno;
                ERR("Snapshot kernctl_put_subbuf error path");
        }
 end_unlock:
@@ -1095,15 +1085,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);
 
@@ -1133,7 +1135,7 @@ int lttng_kconsumer_sync_metadata(struct lttng_consumer_stream *metadata)
 
        ret = kernctl_snapshot(metadata->wait_fd);
        if (ret < 0) {
-               if (errno != EAGAIN) {
+               if (ret != -EAGAIN) {
                        ERR("Sync metadata, taking kernel snapshot failed.");
                        goto end;
                }
@@ -1155,8 +1157,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 +1223,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;
        }
@@ -1258,7 +1274,7 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
                 */
                DBG("Reserving sub buffer failed (everything is normal, "
                                "it is due to concurrency)");
-               ret = -errno;
+               ret = err;
                goto end;
        }
 
@@ -1268,16 +1284,16 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
                PERROR("Getting sub-buffer len failed.");
                err = kernctl_put_subbuf(infd);
                if (err != 0) {
-                       if (errno == EFAULT) {
+                       if (err == -EFAULT) {
                                PERROR("Error in unreserving sub buffer\n");
-                       } else if (errno == EIO) {
+                       } else if (err == -EIO) {
                                /* Should never happen with newer LTTng versions */
                                PERROR("Reader has been pushed by the writer, last sub-buffer corrupted.");
                        }
-                       ret = -errno;
+                       ret = err;
                        goto end;
                }
-               ret = -errno;
+               ret = err;
                goto end;
        }
 
@@ -1286,13 +1302,13 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
                if (ret < 0) {
                        err = kernctl_put_subbuf(infd);
                        if (err != 0) {
-                               if (errno == EFAULT) {
+                               if (err == -EFAULT) {
                                        PERROR("Error in unreserving sub buffer\n");
-                               } else if (errno == EIO) {
+                               } else if (err == -EIO) {
                                        /* Should never happen with newer LTTng versions */
                                        PERROR("Reader has been pushed by the writer, last sub-buffer corrupted.");
                                }
-                               ret = -errno;
+                               ret = err;
                                goto end;
                        }
                        goto end;
@@ -1343,16 +1359,16 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
                        PERROR("Getting sub-buffer len failed.");
                        err = kernctl_put_subbuf(infd);
                        if (err != 0) {
-                               if (errno == EFAULT) {
+                               if (err == -EFAULT) {
                                        PERROR("Error in unreserving sub buffer\n");
-                               } else if (errno == EIO) {
+                               } else if (err == -EIO) {
                                        /* Should never happen with newer LTTng versions */
                                        PERROR("Reader has been pushed by the writer, last sub-buffer corrupted.");
                                }
-                               ret = -errno;
+                               ret = err;
                                goto end;
                        }
-                       ret = -errno;
+                       ret = err;
                        goto end;
                }
 
@@ -1389,13 +1405,13 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 
        err = kernctl_put_next_subbuf(infd);
        if (err != 0) {
-               if (errno == EFAULT) {
+               if (err == -EFAULT) {
                        PERROR("Error in unreserving sub buffer\n");
-               } else if (errno == EIO) {
+               } else if (err == -EIO) {
                        /* Should never happen with newer LTTng versions */
                        PERROR("Reader has been pushed by the writer, last sub-buffer corrupted.");
                }
-               ret = -errno;
+               ret = err;
                goto end;
        }
 
@@ -1459,14 +1475,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;
                }
        }
 
@@ -1477,7 +1496,6 @@ int lttng_kconsumer_on_recv_stream(struct lttng_consumer_stream *stream)
                ret = kernctl_get_mmap_len(stream->wait_fd, &mmap_len);
                if (ret != 0) {
                        PERROR("kernctl_get_mmap_len");
-                       ret = -errno;
                        goto error_close_fd;
                }
                stream->mmap_len = (size_t) mmap_len;