Backport: relayd: replace lttng_index_file with relay_index_file

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

diff --git a/src/bin/lttng-relayd/viewer-stream.c b/src/bin/lttng-relayd/viewer-stream.c
index 7c59cd05d88ea3797569e87d8d964d67aa61e562..2a580ca53f207840358970c0084c9894b7500cb9 100644 (file)
--- a/src/bin/lttng-relayd/viewer-stream.c
+++ b/src/bin/lttng-relayd/viewer-stream.c
@@ -19,11 +19,11 @@
 
 #define _LGPL_SOURCE
 #include <common/common.h>
-#include <common/index/index.h>
 #include <common/compat/string.h>
 
 #include "lttng-relayd.h"
 #include "viewer-stream.h"
+#include "index-file.h"
 
 static void viewer_stream_destroy(struct relay_viewer_stream *vstream)
 {
@@ -116,30 +116,22 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
         * the opening of the index, otherwise open it right now.
         */
        if (stream->index_received_seqcount == 0) {
-               vstream->index_fd = NULL;
+               vstream->index_file = NULL;
        } else {
-               int read_fd;
-
-               read_fd = index_open(vstream->path_name, vstream->channel_name,
+               vstream->index_file = relay_index_file_open(vstream->path_name,
+                               vstream->channel_name,
                                stream->tracefile_count,
                                vstream->current_tracefile_id);
-               if (read_fd < 0) {
-                       goto error_unlock;
-               }
-               vstream->index_fd = stream_fd_create(read_fd);
-               if (!vstream->index_fd) {
-                       if (close(read_fd)) {
-                               PERROR("close");
-                       }
+               if (!vstream->index_file) {
                        goto error_unlock;
                }
        }
 
-       if (seek_t == LTTNG_VIEWER_SEEK_LAST && vstream->index_fd) {
-               off_t lseek_ret;
+       if (seek_t == LTTNG_VIEWER_SEEK_LAST && vstream->index_file) {
+               int ret;
 
-               lseek_ret = lseek(vstream->index_fd->fd, 0, SEEK_END);
-               if (lseek_ret < 0) {
+               ret = relay_index_file_seek_end(vstream->index_file);
+               if (ret < 0) {
                        goto error_unlock;
                }
        }
@@ -151,10 +143,9 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 
        /* Globally visible after the add unique. */
        lttng_ht_node_init_u64(&vstream->stream_n, stream->stream_handle);
-       lttng_ht_add_unique_u64(viewer_streams_ht, &vstream->stream_n);
-
        pthread_mutex_init(&vstream->reflock, NULL);
        urcu_ref_init(&vstream->ref);
+       lttng_ht_add_unique_u64(viewer_streams_ht, &vstream->stream_n);
 
        return vstream;
 
@@ -192,9 +183,9 @@ static void viewer_stream_release(struct urcu_ref *ref)
                stream_fd_put(vstream->stream_fd);
                vstream->stream_fd = NULL;
        }
-       if (vstream->index_fd) {
-               stream_fd_put(vstream->index_fd);
-               vstream->index_fd = NULL;
+       if (vstream->index_file) {
+               relay_index_file_put(vstream->index_file);
+               vstream->index_file = NULL;
        }
        if (vstream->stream) {
                stream_put(vstream->stream);
@@ -305,29 +296,24 @@ int viewer_stream_rotate(struct relay_viewer_stream *vstream)
                vstream->index_sent_seqcount = seq_tail;
        }
 
-       if (vstream->index_fd) {
-               stream_fd_put(vstream->index_fd);
-               vstream->index_fd = NULL;
+       if (vstream->index_file) {
+               relay_index_file_put(vstream->index_file);
+               vstream->index_file = NULL;
        }
        if (vstream->stream_fd) {
                stream_fd_put(vstream->stream_fd);
                vstream->stream_fd = NULL;
        }
 
-       ret = index_open(vstream->path_name, vstream->channel_name,
+       vstream->index_file = relay_index_file_open(vstream->path_name,
+                       vstream->channel_name,
                        stream->tracefile_count,
                        vstream->current_tracefile_id);
-       if (ret < 0) {
+       if (!vstream->index_file) {
+               ret = -1;
                goto end;
-       }
-       vstream->index_fd = stream_fd_create(ret);
-       if (vstream->index_fd) {
-               ret = 0;
        } else {
-               if (close(ret)) {
-                       PERROR("close");
-               }
-               ret = -1;
+               ret = 0;
        }
 end:
        return ret;