From b2d3112addcc8da422f08708db29435b45d85afa Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Thu, 23 Jul 2015 00:53:29 +0200 Subject: [PATCH] Rename queued_data_last_starting_point to queued_data_last_starting_point_index, since otherwise it sounds like a number of bytes. --- stream.cpp | 16 ++++++++-------- stream.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/stream.cpp b/stream.cpp index df13193..7f4bce8 100644 --- a/stream.cpp +++ b/stream.cpp @@ -28,7 +28,7 @@ Stream::Stream(const string &url, size_t backlog_size, size_t prebuffering_bytes bytes_received(0), last_suitable_starting_point(-1), pacing_rate(~0U), - queued_data_last_starting_point(-1) + queued_data_last_starting_point_index(-1) { if (data_fd == -1) { exit(1); @@ -54,7 +54,7 @@ Stream::Stream(const StreamProto &serialized, int data_fd) prebuffering_bytes(serialized.prebuffering_bytes()), bytes_received(serialized.bytes_received()), pacing_rate(~0U), - queued_data_last_starting_point(-1) + queued_data_last_starting_point_index(-1) { if (data_fd == -1) { exit(1); @@ -208,7 +208,7 @@ void Stream::add_data_deferred(const char *data, size_t bytes, StreamStartSuitab assert(suitable_for_stream_start == SUITABLE_FOR_STREAM_START || suitable_for_stream_start == NOT_SUITABLE_FOR_STREAM_START); if (suitable_for_stream_start == SUITABLE_FOR_STREAM_START) { - queued_data_last_starting_point = queued_data.size(); + queued_data_last_starting_point_index = queued_data.size(); } if (encoding == Stream::STREAM_ENCODING_METACUBE) { @@ -246,7 +246,7 @@ void Stream::add_data_deferred(const char *data, size_t bytes, StreamStartSuitab void Stream::process_queued_data() { std::vector queued_data_copy; - int queued_data_last_starting_point_copy = -1; + int queued_data_last_starting_point_index_copy = -1; // Hold the lock for as short as possible, since add_data_raw() can possibly // write to disk, which might disturb the input thread. @@ -257,15 +257,15 @@ void Stream::process_queued_data() } swap(queued_data, queued_data_copy); - swap(queued_data_last_starting_point, queued_data_last_starting_point_copy); + swap(queued_data_last_starting_point_index, queued_data_last_starting_point_index_copy); } // Update the last suitable starting point for the stream, // if the queued data contains such a starting point. - assert(queued_data_last_starting_point_copy < ssize_t(queued_data_copy.size())); - if (queued_data_last_starting_point_copy >= 0) { + assert(queued_data_last_starting_point_index_copy < ssize_t(queued_data_copy.size())); + if (queued_data_last_starting_point_index_copy >= 0) { last_suitable_starting_point = bytes_received; - for (int i = 0; i < queued_data_last_starting_point_copy; ++i) { + for (int i = 0; i < queued_data_last_starting_point_index_copy; ++i) { last_suitable_starting_point += queued_data_copy[i].iov_len; } } diff --git a/stream.h b/stream.h index 4947c3f..3a9474a 100644 --- a/stream.h +++ b/stream.h @@ -97,7 +97,7 @@ struct Stream { // Index of the last element in queued_data that is suitable to start streaming at. // -1 if none. Protected by . - int queued_data_last_starting_point; + int queued_data_last_starting_point_index; // Put client to sleep, since there is no more data for it; we will on // longer listen on POLLOUT until we get more data. Also, it will be put -- 2.39.2