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>
}
} else {
if (!stream->closed ||
}
} 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)) {
- 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) {
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->stream_handle,
stream->rotate_at_seq_num,
stream->prev_index_seq);
goto end;
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 "
* commands are serialized with respect to each other.
*/
DBG("Rotation after too much data has been written in tracefile "
* It could mean that we received a rotation position
* that is in the past.
*/
* 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->stream_handle,
stream->rotate_at_seq_num,
stream->prev_index_seq);
ret = -1;
goto end;
stream->prev_index_seq);
ret = -1;
goto end;
* Ensure that both the index and stream data have been
* flushed up to the requested point.
*/
* 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);
- 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,
", 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 */
msg.last_net_seq_num);
/* Avoid wrapping issue */
* Ensure that both the index and stream data have been
* flushed up to the requested point.
*/
* 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);
- 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;
}
if (!stream->closed || !(((int64_t) (stream_seq - stream->last_net_seq_num)) >= 0)) {
is_data_inflight = 1;
stream->tracefile_size_current += state->header.data_size +
state->header.padding_size;
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) {
new_stream = true;
}
if (index_flushed) {
stream->prev_index_seq = state->header.net_seq_num;
}
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
/*
* Resetting the protocol state (to RECEIVE_HEADER) will trash the
}
stream->stream_handle = stream_handle;
}
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;
stream->prev_index_seq = -1ULL;
stream->last_net_seq_num = -1ULL;
stream->ctf_stream_id = -1ULL;
}
if (stream->last_net_seq_num != -1ULL &&
}
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
&& !session_aborted) {
/*
* Don't close since we still have data pending. This
* inside the ctf_trace lock.
*/
pthread_mutex_t lock;
* 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;
/* 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;
/* FD on which to write the stream data. */
struct stream_fd *stream_fd;