relayd: rename stream prev_seq to prev_data_seq

Since there are now two "previous sequence numbers" that are
tracked, it makes sense to give them more descriptive names.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 0fd41f1a804f61c2e0582e4bb5b6118bdac831a4..9efab8a73d8e3b4932122d3d425a8d588d286e0d 100644 (file)
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -358,7 +358,7 @@ int make_viewer_streams(struct relay_session *session,
                                        }
                                } else {
                                        if (!stream->closed ||
-                                               !(((int64_t) (stream->prev_seq - stream->last_net_seq_num)) >= 0)) {
+                                               !(((int64_t) (stream->prev_data_seq - stream->last_net_seq_num)) >= 0)) {
 
                                                (*nb_total)++;
                                        }

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index f111b931c7792c3b3f627977bb7ed62e6999c1a4..92e3345bfbbb72147b163eddc2748b7d55c7c96a 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -1753,18 +1753,18 @@ int try_rotate_stream(struct relay_stream *stream)
                goto end;
        }
 
-       trace_seq = min(stream->prev_seq, stream->prev_index_seq);
-       if (stream->prev_seq == -1ULL || stream->prev_index_seq == -1ULL ||
+       trace_seq = min(stream->prev_data_seq, stream->prev_index_seq);
+       if (stream->prev_data_seq == -1ULL || stream->prev_index_seq == -1ULL ||
                        trace_seq < stream->rotate_at_seq_num) {
-               DBG("Stream %" PRIu64 " not yet ready for rotation (rotate_at_seq_num = %" PRIu64 ", prev_seq = %" PRIu64 ", prev_index_seq = %" PRIu64 ")",
+               DBG("Stream %" PRIu64 " not yet ready for rotation (rotate_at_seq_num = %" PRIu64 ", prev_data_seq = %" PRIu64 ", prev_index_seq = %" PRIu64 ")",
                                stream->stream_handle,
                                stream->rotate_at_seq_num,
-                               stream->prev_seq,
+                               stream->prev_data_seq,
                                stream->prev_index_seq);
                goto end;
-       } else if (stream->prev_seq > stream->rotate_at_seq_num) {
+       } else if (stream->prev_data_seq > stream->rotate_at_seq_num) {
                /*
-                * prev_seq is checked here since indexes and rotation
+                * prev_data_seq is checked here since indexes and rotation
                 * commands are serialized with respect to each other.
                 */
                DBG("Rotation after too much data has been written in tracefile "
@@ -1782,10 +1782,10 @@ int try_rotate_stream(struct relay_stream *stream)
                         * It could mean that we received a rotation position
                         * that is in the past.
                         */
-                       ERR("Stream %" PRIu64 " is in an inconsistent state (rotate_at_seq_num = %" PRIu64 ", prev_seq = %" PRIu64 ", prev_index_seq = %" PRIu64 ")",
+                       ERR("Stream %" PRIu64 " is in an inconsistent state (rotate_at_seq_num = %" PRIu64 ", prev_data_seq = %" PRIu64 ", prev_index_seq = %" PRIu64 ")",
                                stream->stream_handle,
                                stream->rotate_at_seq_num,
-                               stream->prev_seq,
+                               stream->prev_data_seq,
                                stream->prev_index_seq);
                        ret = -1;
                        goto end;
@@ -1991,14 +1991,14 @@ static int relay_data_pending(const struct lttcomm_relayd_hdr *recv_hdr,
                 * Ensure that both the index and stream data have been
                 * flushed up to the requested point.
                 */
-               stream_seq = min(stream->prev_seq, stream->prev_index_seq);
+               stream_seq = min(stream->prev_data_seq, stream->prev_index_seq);
        } else {
-               stream_seq = stream->prev_seq;
+               stream_seq = stream->prev_data_seq;
        }
-       DBG("Data pending for stream id %" PRIu64 ": prev_seq %" PRIu64
+       DBG("Data pending for stream id %" PRIu64 ": prev_data_seq %" PRIu64
                        ", prev_index_seq %" PRIu64
                        ", and last_seq %" PRIu64, msg.stream_id,
-                       stream->prev_seq, stream->prev_index_seq,
+                       stream->prev_data_seq, stream->prev_index_seq,
                        msg.last_net_seq_num);
 
        /* Avoid wrapping issue */
@@ -2229,9 +2229,9 @@ static int relay_end_data_pending(const struct lttcomm_relayd_hdr *recv_hdr,
                                 * Ensure that both the index and stream data have been
                                 * flushed up to the requested point.
                                 */
-                               stream_seq = min(stream->prev_seq, stream->prev_index_seq);
+                               stream_seq = min(stream->prev_data_seq, stream->prev_index_seq);
                        } else {
-                               stream_seq = stream->prev_seq;
+                               stream_seq = stream->prev_data_seq;
                        }
                        if (!stream->closed || !(((int64_t) (stream_seq - stream->last_net_seq_num)) >= 0)) {
                                is_data_inflight = 1;
@@ -3527,7 +3527,7 @@ static enum relay_connection_status relay_process_data_receive_payload(
        stream->tracefile_size_current += state->header.data_size +
                        state->header.padding_size;
 
-       if (stream->prev_seq == -1ULL) {
+       if (stream->prev_data_seq == -1ULL) {
                new_stream = true;
        }
        if (index_flushed) {
@@ -3536,7 +3536,7 @@ static enum relay_connection_status relay_process_data_receive_payload(
                stream->prev_index_seq = state->header.net_seq_num;
        }
 
-       stream->prev_seq = state->header.net_seq_num;
+       stream->prev_data_seq = state->header.net_seq_num;
 
        /*
         * Resetting the protocol state (to RECEIVE_HEADER) will trash the

diff --git a/src/bin/lttng-relayd/stream.c b/src/bin/lttng-relayd/stream.c
index 0ababf28d8d112c55b304d5a1baafb252077fe0e..ac880e7e5ddb053be06500e9604e0f45d07bf203 100644 (file)
--- a/src/bin/lttng-relayd/stream.c
+++ b/src/bin/lttng-relayd/stream.c
@@ -82,7 +82,7 @@ struct relay_stream *stream_create(struct ctf_trace *trace,
        }
 
        stream->stream_handle = stream_handle;
-       stream->prev_seq = -1ULL;
+       stream->prev_data_seq = -1ULL;
        stream->prev_index_seq = -1ULL;
        stream->last_net_seq_num = -1ULL;
        stream->ctf_stream_id = -1ULL;
@@ -377,7 +377,7 @@ void try_stream_close(struct relay_stream *stream)
        }
 
        if (stream->last_net_seq_num != -1ULL &&
-                       ((int64_t) (stream->prev_seq - stream->last_net_seq_num)) < 0
+                       ((int64_t) (stream->prev_data_seq - stream->last_net_seq_num)) < 0
                        && !session_aborted) {
                /*
                 * Don't close since we still have data pending. This

diff --git a/src/bin/lttng-relayd/stream.h b/src/bin/lttng-relayd/stream.h
index 151ae25c1ad2be5f3243bc22094c186556a61b29..ae75dacc3a061e1d77e16445f1f3d0371baf0db9 100644 (file)
--- a/src/bin/lttng-relayd/stream.h
+++ b/src/bin/lttng-relayd/stream.h
@@ -52,10 +52,12 @@ struct relay_stream {
         * inside the ctf_trace lock.
         */
        pthread_mutex_t lock;
-       uint64_t prev_seq;              /* previous data sequence number encountered. */
+       /* previous data sequence number written to disk. */
+       uint64_t prev_data_seq;
        /* previous index sequence number written to disk. */
        uint64_t prev_index_seq;
-       uint64_t last_net_seq_num;      /* seq num to encounter before closing. */
+       /* seq num to encounter before closing. */
+       uint64_t last_net_seq_num;
 
        /* FD on which to write the stream data. */
        struct stream_fd *stream_fd;