Fix: consumerd: use packet sequence number for rotation position

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

diff --git a/src/common/consumer/consumer-stream.c b/src/common/consumer/consumer-stream.c
index 32441ea2cd313327cfacf22ab47772f6fea1d39f..cdda9412ee8df2d97395a12abc3f2cdc52dd379d 100644 (file)
--- a/src/common/consumer/consumer-stream.c
+++ b/src/common/consumer/consumer-stream.c
@@ -576,7 +576,7 @@ int consumer_stream_create_output_files(struct lttng_consumer_stream *stream,
 
        ret = utils_stream_file_path(stream->chan->pathname, stream->name,
                        stream->chan->tracefile_size,
-                       stream->chan->tracefile_count, NULL,
+                       stream->tracefile_count_current, NULL,
                        stream_path, sizeof(stream_path));
        if (ret < 0) {
                goto end;
@@ -645,3 +645,13 @@ int consumer_stream_rotate_output_files(struct lttng_consumer_stream *stream)
 end:
        return ret;
 }
+
+bool consumer_stream_is_deleted(struct lttng_consumer_stream *stream)
+{
+       /*
+        * This function does not take a const stream since
+        * cds_lfht_is_node_deleted was not const before liburcu 0.12.
+        */
+       assert(stream);
+       return cds_lfht_is_node_deleted(&stream->node.node);
+}