Minor tweaks and a new deque operator
This commit is contained in:
@@ -33,11 +33,11 @@ StreamBuffer::~StreamBuffer() {
|
||||
if (owned_ && (buf_lo_ != 0)) delete buf_lo_;
|
||||
}
|
||||
|
||||
int64_t StreamBuffer::read_count() const {
|
||||
int64_t StreamBuffer::total_reads() const {
|
||||
return (read_cursor_ - buf_lo_) + pre_read_count_;
|
||||
}
|
||||
|
||||
int64_t StreamBuffer::write_count() const {
|
||||
int64_t StreamBuffer::total_writes() const {
|
||||
return (write_cursor_ - buf_lo_) + pre_read_count_;
|
||||
}
|
||||
|
||||
@@ -83,8 +83,8 @@ void StreamBuffer::make_space_slow(int64_t bytes) {
|
||||
|
||||
char *StreamBuffer::get_overwrite(int64_t size, int64_t write_count_after) {
|
||||
int64_t write_count_before = write_count_after - size;
|
||||
assert(write_count_before >= read_count());
|
||||
assert(write_count_after <= write_count());
|
||||
assert(write_count_before >= total_reads());
|
||||
assert(write_count_after <= total_writes());
|
||||
return buf_lo_ + (write_count_before - pre_read_count_);
|
||||
}
|
||||
|
||||
@@ -386,13 +386,13 @@ void StreamBuffer::verify_eof() {
|
||||
|
||||
void StreamBuffer::unread_to(int64_t rd_count) {
|
||||
assert(rd_count >= pre_read_count_);
|
||||
assert(rd_count <= read_count());
|
||||
assert(rd_count <= total_reads());
|
||||
read_cursor_ = buf_lo_ + (rd_count - pre_read_count_);
|
||||
}
|
||||
|
||||
void StreamBuffer::unwrite_to(int64_t wr_count) {
|
||||
assert(wr_count >= read_count());
|
||||
assert(wr_count <= write_count());
|
||||
assert(wr_count >= total_reads());
|
||||
assert(wr_count <= total_writes());
|
||||
write_cursor_ = buf_lo_ + (wr_count - pre_read_count_);
|
||||
}
|
||||
|
||||
@@ -514,13 +514,13 @@ LuaDefine(unittests_streambuffer, "c") {
|
||||
|
||||
// Check the write count and read count accumulator ability.
|
||||
sb11.clear();
|
||||
assert(sb11.write_count() == 0);
|
||||
assert(sb11.read_count() == 0);
|
||||
assert(sb11.total_writes() == 0);
|
||||
assert(sb11.total_reads() == 0);
|
||||
for (int i = 0; i < 10; i++) {
|
||||
assert(sb11.write_count() == i * 8);
|
||||
assert(sb11.total_writes() == i * 8);
|
||||
sb11.write_int32(i);
|
||||
sb11.write_int32(i+1000000);
|
||||
assert(sb11.read_count() == i * 8);
|
||||
assert(sb11.total_reads() == i * 8);
|
||||
assert(sb11.read_int32() == i);
|
||||
assert(sb11.read_int32() == i+1000000);
|
||||
}
|
||||
@@ -533,7 +533,7 @@ LuaDefine(unittests_streambuffer, "c") {
|
||||
for (int i = 0; i < 2; i++) {
|
||||
sb11.write_int16(12);
|
||||
sb11.write_int16(34);
|
||||
int64_t wc = sb11.write_count();
|
||||
int64_t wc = sb11.total_writes();
|
||||
sb11.write_int16(56);
|
||||
sb11.write_int16(78);
|
||||
sb11.overwrite_int16(wc, 90);
|
||||
|
||||
Reference in New Issue
Block a user