Backport: relayd: replace lttng_index_file with relay_index_file

[lttng-tools.git] / src / bin / lttng-relayd / viewer-stream.h

diff --git a/src/bin/lttng-relayd/viewer-stream.h b/src/bin/lttng-relayd/viewer-stream.h
index cc46db4e2a3545cb283ddb5c3260001bcf82d320..1a390964d285321b092579dfb0bc58c7db37d662 100644 (file)
--- a/src/bin/lttng-relayd/viewer-stream.h
+++ b/src/bin/lttng-relayd/viewer-stream.h
@@ -29,6 +29,7 @@
 #include "ctf-trace.h"
 #include "lttng-viewer-abi.h"
 #include "stream.h"
+#include "index-file.h"
 
 struct relay_stream;
 
@@ -52,17 +53,22 @@ struct relay_viewer_stream {
 
        /* FD from which to read the stream data. */
        struct stream_fd *stream_fd;
-       /* FD from which to read the index data. */
-       struct stream_fd *index_fd;
+       /* index file from which to read the index data. */
+       struct relay_index_file *index_file;
 
        char *path_name;
        char *channel_name;
 
        uint64_t current_tracefile_id;
-       /* Free-running counter. */
-       uint64_t current_tracefile_seq;
 
-       uint64_t last_sent_index;
+       /*
+        * Counts the number of sent indexes. The "tag" associated
+        * with an index to send is the current index_received_seqcount,
+        * because we increment index_received_seqcount after sending
+        * each index. This index_received_seqcount counter can also be
+        * updated when catching up with the producer.
+        */
+       uint64_t index_sent_seqcount;
 
        /* Indicates if this stream has been sent to a viewer client. */
        bool sent_flag;