diff options
author | Haavard <havardpe@yahoo-inc.com> | 2017-01-20 10:25:01 +0000 |
---|---|---|
committer | Haavard <havardpe@yahoo-inc.com> | 2017-01-20 10:25:01 +0000 |
commit | 31456388413d284f2325932fa65fe18497e13863 (patch) | |
tree | f83d326e990d07974891020b137ad9ee5faa9b7a /vbench | |
parent | 6999811bff537b554ac7084247e50655466f6345 (diff) |
simplify Input/Output APIs
Diffstat (limited to 'vbench')
27 files changed, 71 insertions, 77 deletions
diff --git a/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp b/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp index 48a8ce156f0..2135d53acba 100644 --- a/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp +++ b/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp @@ -12,14 +12,14 @@ bool endsWith(const Memory &mem, const string &str) { } void readUntil(Input &input, SimpleBuffer &buffer, const string &end) { - ByteInput in(input, 256); + ByteInput in(input); while (!endsWith(buffer.get(), end)) { int c = in.get(); if (c < 0) { return; } buffer.reserve(1).data[0] = c; - buffer.commit(1, 0); + buffer.commit(1); } } diff --git a/vbench/src/tests/app_vbench/app_vbench_test.cpp b/vbench/src/tests/app_vbench/app_vbench_test.cpp index 37b613210a0..d1285255959 100644 --- a/vbench/src/tests/app_vbench/app_vbench_test.cpp +++ b/vbench/src/tests/app_vbench/app_vbench_test.cpp @@ -12,14 +12,14 @@ bool endsWith(const Memory &mem, const string &str) { } void readUntil(Input &input, SimpleBuffer &buffer, const string &end) { - ByteInput in(input, 256); + ByteInput in(input); while (!endsWith(buffer.get(), end)) { int c = in.get(); if (c < 0) { return; } buffer.reserve(1).data[0] = c; - buffer.commit(1, 0); + buffer.commit(1); } } diff --git a/vbench/src/tests/buffered_output/buffered_output_test.cpp b/vbench/src/tests/buffered_output/buffered_output_test.cpp index 79bd490c71c..9514d619f77 100644 --- a/vbench/src/tests/buffered_output/buffered_output_test.cpp +++ b/vbench/src/tests/buffered_output/buffered_output_test.cpp @@ -14,7 +14,7 @@ TEST("buffered output") { dst.printf("%d + %d = %d\n", 2, 2, 4); } { // verify data - LineReader src(buffer, 3); + LineReader src(buffer); string str; EXPECT_TRUE(src.readLine(str)); EXPECT_EQUAL("abc", str); diff --git a/vbench/src/tests/byte_input/byte_input_test.cpp b/vbench/src/tests/byte_input/byte_input_test.cpp index 251b16449be..28bc3c7b3ad 100644 --- a/vbench/src/tests/byte_input/byte_input_test.cpp +++ b/vbench/src/tests/byte_input/byte_input_test.cpp @@ -12,7 +12,7 @@ TEST("byte input") { } EXPECT_EQUAL(8u, buffer.get().size); { - ByteInput in(buffer, 3); + ByteInput in(buffer); EXPECT_EQUAL('a', in.get()); EXPECT_EQUAL('b', in.get()); EXPECT_EQUAL('c', in.get()); @@ -20,7 +20,7 @@ TEST("byte input") { } EXPECT_EQUAL(4u, buffer.get().size); { - ByteInput in(buffer, 3); + ByteInput in(buffer); EXPECT_EQUAL('e', in.get()); EXPECT_EQUAL('f', in.get()); EXPECT_EQUAL('g', in.get()); @@ -30,7 +30,7 @@ TEST("byte input") { } EXPECT_EQUAL(0u, buffer.get().size); { - ByteInput in(buffer, 3); + ByteInput in(buffer); EXPECT_EQUAL(-1, in.get()); } EXPECT_EQUAL(0u, buffer.get().size); diff --git a/vbench/src/tests/http_client/http_client_test.cpp b/vbench/src/tests/http_client/http_client_test.cpp index ce763e09b7d..55cb899f5cb 100644 --- a/vbench/src/tests/http_client/http_client_test.cpp +++ b/vbench/src/tests/http_client/http_client_test.cpp @@ -14,14 +14,14 @@ bool endsWith(const Memory &mem, const string &str) { } void readUntil(Input &input, SimpleBuffer &buffer, const string &end) { - ByteInput in(input, 256); + ByteInput in(input); while (!endsWith(buffer.get(), end)) { int c = in.get(); if (c < 0) { return; } buffer.reserve(1).data[0] = c; - buffer.commit(1, 0); + buffer.commit(1); } } diff --git a/vbench/src/tests/http_connection/http_connection_test.cpp b/vbench/src/tests/http_connection/http_connection_test.cpp index dc03a9e7e8e..986bc18ebff 100644 --- a/vbench/src/tests/http_connection/http_connection_test.cpp +++ b/vbench/src/tests/http_connection/http_connection_test.cpp @@ -15,7 +15,7 @@ TEST("http connection") { EXPECT_FALSE(client.fresh()); EXPECT_TRUE(client.mayReuse(5.1)); server.reset(); - client.stream().obtain(1, 1); // trigger eof + client.stream().obtain(); // trigger eof EXPECT_FALSE(client.mayReuse(5.1)); } diff --git a/vbench/src/tests/http_connection_pool/http_connection_pool_test.cpp b/vbench/src/tests/http_connection_pool/http_connection_pool_test.cpp index 06f158e7b84..2cd749d0426 100644 --- a/vbench/src/tests/http_connection_pool/http_connection_pool_test.cpp +++ b/vbench/src/tests/http_connection_pool/http_connection_pool_test.cpp @@ -19,7 +19,7 @@ TEST_MT_F("http connection pool", 2, ServerSocket()) { EXPECT_TRUE(conn.get() == 0); conn = pool.getConnection(ServerSpec("localhost", f1.port())); EXPECT_TRUE(conn.get() != 0); - conn->stream().obtain(1, 1); // trigger eof + conn->stream().obtain(); // trigger eof pool.putConnection(std::move(conn)); EXPECT_TRUE(conn.get() == 0); conn = pool.getConnection(ServerSpec("localhost", f1.port())); @@ -38,7 +38,7 @@ TEST_MT_FFFF("stress http connection pool", 256, ServerSocket(), Timer(), HttpCo HttpConnection::UP conn = f3.getConnection(ServerSpec("localhost", f1.port())); EXPECT_TRUE(conn.get() != 0); if (thread_id > (num_threads / 2)) { - conn->stream().obtain(1, 1); // trigger eof + conn->stream().obtain(); // trigger eof } f3.putConnection(std::move(conn)); EXPECT_TRUE(conn.get() == 0); diff --git a/vbench/src/tests/line_reader/line_reader_test.cpp b/vbench/src/tests/line_reader/line_reader_test.cpp index 631b2ffc765..1b893a4ca15 100644 --- a/vbench/src/tests/line_reader/line_reader_test.cpp +++ b/vbench/src/tests/line_reader/line_reader_test.cpp @@ -16,7 +16,7 @@ TEST("line reader") { dst.append("zzz"); } { - LineReader src(buffer, 3); + LineReader src(buffer); string str; EXPECT_TRUE(src.readLine(str)); EXPECT_EQUAL("foo", str); diff --git a/vbench/src/tests/mapped_file_input/mapped_file_input_test.cpp b/vbench/src/tests/mapped_file_input/mapped_file_input_test.cpp index 639b91bf66b..2edbda02ec0 100644 --- a/vbench/src/tests/mapped_file_input/mapped_file_input_test.cpp +++ b/vbench/src/tests/mapped_file_input/mapped_file_input_test.cpp @@ -12,7 +12,7 @@ TEST("mapped file input") { { MappedFileInput file(TEST_PATH("file.txt")); EXPECT_TRUE(!file.tainted()); - LineReader reader(file, 3); + LineReader reader(file); string line; EXPECT_TRUE(reader.readLine(line)); EXPECT_EQUAL("file content", line); diff --git a/vbench/src/tests/simple_buffer/simple_buffer_test.cpp b/vbench/src/tests/simple_buffer/simple_buffer_test.cpp index f666438d721..f0be5766e55 100644 --- a/vbench/src/tests/simple_buffer/simple_buffer_test.cpp +++ b/vbench/src/tests/simple_buffer/simple_buffer_test.cpp @@ -16,7 +16,7 @@ TEST("simple buffer") { SimpleBuffer buf; TEST_DO(checkBuffer("", buf)); { // read from empty buffer - EXPECT_EQUAL(0u, buf.obtain(1, 1).size); + EXPECT_EQUAL(0u, buf.obtain().size); } { // write to buffer WritableMemory mem = buf.reserve(10); @@ -25,20 +25,20 @@ TEST("simple buffer") { mem.data[0] = 'a'; mem.data[1] = 'b'; mem.data[2] = 'c'; - EXPECT_EQUAL(&buf, &buf.commit(3, 0)); + EXPECT_EQUAL(&buf, &buf.commit(3)); mem = buf.reserve(0); TEST_DO(checkBuffer("abc", buf)); EXPECT_EQUAL(0u, mem.size); } - { // unaligned read across end (last byte not evicted) - Memory mem = buf.obtain(2, 1); + { // read without evicting last byte + Memory mem = buf.obtain(); TEST_DO(checkBuffer("abc", buf)); - TEST_DO(checkMemory("ab", mem)); + TEST_DO(checkMemory("abc", mem)); EXPECT_EQUAL(&buf, &buf.evict(2)); - mem = buf.obtain(2, 1); + mem = buf.obtain(); TEST_DO(checkBuffer("c", buf)); TEST_DO(checkMemory("c", mem)); - mem = buf.obtain(2, 1); + mem = buf.obtain(); TEST_DO(checkBuffer("c", buf)); TEST_DO(checkMemory("c", mem)); } @@ -47,21 +47,21 @@ TEST("simple buffer") { EXPECT_EQUAL(10u, mem.size); TEST_DO(checkBuffer("c", buf)); mem.data[0] = 'd'; - EXPECT_EQUAL(&buf, &buf.commit(1, 0)); + EXPECT_EQUAL(&buf, &buf.commit(1)); mem = buf.reserve(5); TEST_DO(checkBuffer("cd", buf)); EXPECT_EQUAL(5u, mem.size); } - { // aligned read until end - Memory mem = buf.obtain(1, 1); + { // read until end + Memory mem = buf.obtain(); TEST_DO(checkBuffer("cd", buf)); - TEST_DO(checkMemory("c", mem)); + TEST_DO(checkMemory("cd", mem)); EXPECT_EQUAL(&buf, &buf.evict(1)); - mem = buf.obtain(1, 1); + mem = buf.obtain(); TEST_DO(checkBuffer("d", buf)); TEST_DO(checkMemory("d", mem)); EXPECT_EQUAL(&buf, &buf.evict(1)); - mem = buf.obtain(1, 1); + mem = buf.obtain(); TEST_DO(checkBuffer("", buf)); TEST_DO(checkMemory("", mem)); } diff --git a/vbench/src/tests/socket/socket_test.cpp b/vbench/src/tests/socket/socket_test.cpp index 4e58465c5a8..e49a31773f3 100644 --- a/vbench/src/tests/socket/socket_test.cpp +++ b/vbench/src/tests/socket/socket_test.cpp @@ -17,7 +17,7 @@ struct Agent { out.append("\n"); } void read(const char *prefix) { - LineReader reader(*socket, 32); + LineReader reader(*socket); for (size_t lines = 0; true; ++lines) { string line; reader.readLine(line); @@ -60,7 +60,7 @@ TEST("socket") { serverThread.join(); { server.socket.reset(); - LineReader reader(*client.socket, 32); + LineReader reader(*client.socket); string line; EXPECT_FALSE(reader.readLine(line)); EXPECT_TRUE(line.empty()); diff --git a/vbench/src/vbench/core/buffered_output.h b/vbench/src/vbench/core/buffered_output.h index f274ce9f71c..80ad163869e 100644 --- a/vbench/src/vbench/core/buffered_output.h +++ b/vbench/src/vbench/core/buffered_output.h @@ -21,7 +21,7 @@ private: void ensureFree(size_t bytes) { if ((_pos + bytes) > _data.size) { - _data = _output.commit(_pos, 0).reserve(std::max(bytes, _chunkSize)); + _data = _output.commit(_pos).reserve(std::max(bytes, _chunkSize)); _pos = 0; } } @@ -29,7 +29,7 @@ private: public: BufferedOutput(Output &output, size_t chunkSize) : _output(output), _data(), _pos(), _chunkSize(chunkSize) {} - ~BufferedOutput() { _output.commit(_pos, 0); } + ~BufferedOutput() { _output.commit(_pos); } BufferedOutput &append(char c) { ensureFree(1); diff --git a/vbench/src/vbench/core/byte_input.h b/vbench/src/vbench/core/byte_input.h index 34468a2ffeb..7294c9682bb 100644 --- a/vbench/src/vbench/core/byte_input.h +++ b/vbench/src/vbench/core/byte_input.h @@ -16,17 +16,15 @@ private: Input &_input; Memory _data; size_t _pos; - size_t _chunkSize; public: /** * Wrap an Input to read one byte at a time. * * @param input the underlying Input - * @param chunkSize how much data to request from the input per transaction **/ - ByteInput(Input &input, size_t chunkSize) - : _input(input), _data(), _pos(0), _chunkSize(chunkSize) {} + ByteInput(Input &input) + : _input(input), _data(), _pos(0) {} ~ByteInput() { _input.evict(_pos); } /** @@ -38,7 +36,7 @@ public: if (_pos < _data.size) { return (_data.data[_pos++] & 0xff); } else { - _data = _input.evict(_pos).obtain(_chunkSize, 1); + _data = _input.evict(_pos).obtain(); if ((_pos = 0) < _data.size) { return (_data.data[_pos++] & 0xff); } diff --git a/vbench/src/vbench/core/input.h b/vbench/src/vbench/core/input.h index 6b767ca1997..eceb973a94a 100644 --- a/vbench/src/vbench/core/input.h +++ b/vbench/src/vbench/core/input.h @@ -14,14 +14,11 @@ namespace vbench { struct Input { /** - * Obtain more input data. You will never obtain more data than - * requested, but you may obtain less. + * Obtain more input data. * * @return the obtained input data - * @param bytes the number of bytes requested - * @param lowMark minimum bytes in byffer before refilling **/ - virtual Memory obtain(size_t bytes, size_t lowMark) = 0; + virtual Memory obtain() = 0; /** * Evict processed input data. Never evict more data than you have diff --git a/vbench/src/vbench/core/input_file_reader.h b/vbench/src/vbench/core/input_file_reader.h index de80a023719..919b188d44a 100644 --- a/vbench/src/vbench/core/input_file_reader.h +++ b/vbench/src/vbench/core/input_file_reader.h @@ -22,7 +22,7 @@ private: public: InputFileReader(const string &name) - : _file(name), _lines(_file, 4096) {} + : _file(name), _lines(_file) {} /** * Read a single line from the input file and put it into diff --git a/vbench/src/vbench/core/line_reader.cpp b/vbench/src/vbench/core/line_reader.cpp index 5bc8160ccd2..4a893a1b9fc 100644 --- a/vbench/src/vbench/core/line_reader.cpp +++ b/vbench/src/vbench/core/line_reader.cpp @@ -13,8 +13,8 @@ void stripCR(string &dst) { } } // namespace vbench::<unnamed> -LineReader::LineReader(Input &input, size_t chunkSize) - : _input(input, chunkSize) +LineReader::LineReader(Input &input) + : _input(input) { } diff --git a/vbench/src/vbench/core/line_reader.h b/vbench/src/vbench/core/line_reader.h index c26dea96db2..ba5e9e63fc7 100644 --- a/vbench/src/vbench/core/line_reader.h +++ b/vbench/src/vbench/core/line_reader.h @@ -22,9 +22,8 @@ public: * Wrap an Input to read one line at a time. * * @param input the underlying Input - * @param chunkSize how much data to request from the input per transaction **/ - LineReader(Input &input, size_t chunkSize); + LineReader(Input &input); /** * Read the next line of input. Lines are separated by '\n'. '\r' diff --git a/vbench/src/vbench/core/mapped_file_input.cpp b/vbench/src/vbench/core/mapped_file_input.cpp index c4edc619e5d..0a20b91c375 100644 --- a/vbench/src/vbench/core/mapped_file_input.cpp +++ b/vbench/src/vbench/core/mapped_file_input.cpp @@ -25,9 +25,9 @@ MappedFileInput::MappedFileInput(const string &name) } Memory -MappedFileInput::obtain(size_t bytes, size_t) +MappedFileInput::obtain() { - return Memory(_data + _pos, std::min(bytes, (_size - _pos))); + return Memory(_data + _pos, (_size - _pos)); } Input & diff --git a/vbench/src/vbench/core/mapped_file_input.h b/vbench/src/vbench/core/mapped_file_input.h index 94f0e21dbf2..197dbf55959 100644 --- a/vbench/src/vbench/core/mapped_file_input.h +++ b/vbench/src/vbench/core/mapped_file_input.h @@ -24,7 +24,7 @@ private: public: MappedFileInput(const string &name); Memory get() const { return Memory(_data, _size); } - virtual Memory obtain(size_t bytes, size_t lowMark); + virtual Memory obtain(); virtual Input &evict(size_t bytes); virtual const Taint &tainted() const { return _taint; } }; diff --git a/vbench/src/vbench/core/output.h b/vbench/src/vbench/core/output.h index 410e0f72643..6ad218c9718 100644 --- a/vbench/src/vbench/core/output.h +++ b/vbench/src/vbench/core/output.h @@ -27,9 +27,8 @@ struct Output * * @return this object, for chaining * @param bytes number of bytes to commit - * @param hiMark maximum number of unflushed bytes after commit **/ - virtual Output &commit(size_t bytes, size_t hiMark) = 0; + virtual Output &commit(size_t bytes) = 0; virtual ~Output() {} }; diff --git a/vbench/src/vbench/core/simple_buffer.cpp b/vbench/src/vbench/core/simple_buffer.cpp index 1e1d0a8e4ae..b37696b7e8a 100644 --- a/vbench/src/vbench/core/simple_buffer.cpp +++ b/vbench/src/vbench/core/simple_buffer.cpp @@ -12,9 +12,9 @@ SimpleBuffer::SimpleBuffer() } Memory -SimpleBuffer::obtain(size_t bytes, size_t) +SimpleBuffer::obtain() { - return Memory(&_data[0], std::min(bytes, _used)); + return Memory(&_data[0], _used); } Input & @@ -34,7 +34,7 @@ SimpleBuffer::reserve(size_t bytes) } Output & -SimpleBuffer::commit(size_t bytes, size_t) +SimpleBuffer::commit(size_t bytes) { assert(bytes <= (_data.size() - _used)); _used += bytes; diff --git a/vbench/src/vbench/core/simple_buffer.h b/vbench/src/vbench/core/simple_buffer.h index 173d774daf6..3cf55037917 100644 --- a/vbench/src/vbench/core/simple_buffer.h +++ b/vbench/src/vbench/core/simple_buffer.h @@ -26,10 +26,10 @@ private: public: SimpleBuffer(); Memory get() const { return Memory(&_data[0], _used); } - virtual Memory obtain(size_t bytes, size_t lowMark); + virtual Memory obtain(); virtual Input &evict(size_t bytes); virtual WritableMemory reserve(size_t bytes); - virtual Output &commit(size_t bytes, size_t hiMark); + virtual Output &commit(size_t bytes); bool operator==(const SimpleBuffer &rhs) const; }; diff --git a/vbench/src/vbench/core/socket.cpp b/vbench/src/vbench/core/socket.cpp index 265f41c3040..84975adf4ae 100644 --- a/vbench/src/vbench/core/socket.cpp +++ b/vbench/src/vbench/core/socket.cpp @@ -5,6 +5,8 @@ namespace vbench { +constexpr size_t READ_SIZE = 32768; + Socket::Socket(std::unique_ptr<FastOS_SocketInterface> socket) : _socket(std::move(socket)), _input(), @@ -38,20 +40,20 @@ Socket::~Socket() } Memory -Socket::obtain(size_t bytes, size_t lowMark) +Socket::obtain() { - if (_input.get().size < bytes && _input.get().size < lowMark && !_eof && !_taint) { - WritableMemory buf = _input.reserve(bytes - _input.get().size); + if ((_input.get().size == 0) && !_eof && !_taint) { + WritableMemory buf = _input.reserve(READ_SIZE); ssize_t res = _socket->Read(buf.data, buf.size); if (res > 0) { - _input.commit(res, 0); + _input.commit(res); } else if (res < 0) { _taint.reset("socket read error"); } else { _eof = true; } } - return _input.obtain(bytes, 1); + return _input.obtain(); } Input & @@ -68,11 +70,11 @@ Socket::reserve(size_t bytes) } Output & -Socket::commit(size_t bytes, size_t hiMark) +Socket::commit(size_t bytes) { - _output.commit(bytes, 0); - while (_output.get().size > hiMark && !_taint) { - Memory buf = _output.obtain(_output.get().size, 1); + _output.commit(bytes); + while ((_output.get().size > 0) && !_taint) { + Memory buf = _output.obtain(); ssize_t res = _socket->Write(buf.data, buf.size); if (res > 0) { _output.evict(res); diff --git a/vbench/src/vbench/core/socket.h b/vbench/src/vbench/core/socket.h index 52c27dfc618..707ea6359aa 100644 --- a/vbench/src/vbench/core/socket.h +++ b/vbench/src/vbench/core/socket.h @@ -25,10 +25,10 @@ public: Socket(const string host, int port); virtual ~Socket(); virtual bool eof() const { return _eof; } - virtual Memory obtain(size_t bytes, size_t lowMark); + virtual Memory obtain(); virtual Input &evict(size_t bytes); virtual WritableMemory reserve(size_t bytes); - virtual Output &commit(size_t bytes, size_t hiMark); + virtual Output &commit(size_t bytes); virtual const Taint &tainted() const { return _taint; } }; diff --git a/vbench/src/vbench/http/http_client.cpp b/vbench/src/vbench/http/http_client.cpp index a83ad41b41a..3503329991d 100644 --- a/vbench/src/vbench/http/http_client.cpp +++ b/vbench/src/vbench/http/http_client.cpp @@ -24,7 +24,7 @@ HttpClient::writeRequest() { bool HttpClient::readStatus() { - LineReader reader(_conn->stream(), READ_SIZE); + LineReader reader(_conn->stream()); if (reader.readLine(_line) && (splitstr(_line, "\t ", _split) >= 2)) { if (_split[0] == "HTTP/1.0") { _header.version = 0; @@ -53,7 +53,7 @@ HttpClient::readStatus() bool HttpClient::readHeaders() { - LineReader reader(_conn->stream(), READ_SIZE); + LineReader reader(_conn->stream()); while (reader.readLine(_line)) { if (_line.empty()) { return true; @@ -99,7 +99,7 @@ bool HttpClient::readContent(size_t len) { Input &input = _conn->stream(); while (len > 0) { - Memory mem = input.obtain(READ_SIZE, 1); + Memory mem = input.obtain(); mem.size = std::min(len, mem.size); if (mem.size == 0) { _handler.handleFailure(strfmt("short read: missing %zu bytes", len)); @@ -115,7 +115,7 @@ HttpClient::readContent(size_t len) { bool HttpClient::readChunkSize(bool first, size_t &size) { - LineReader reader(_conn->stream(), READ_SIZE); + LineReader reader(_conn->stream()); if (!first && (!reader.readLine(_line) || !_line.empty())) { return false; } @@ -130,7 +130,7 @@ HttpClient::readChunkSize(bool first, size_t &size) bool HttpClient::skipTrailers() { - LineReader reader(_conn->stream(), READ_SIZE); + LineReader reader(_conn->stream()); while (reader.readLine(_line)) { if (_line.empty()) { return true; @@ -164,7 +164,7 @@ HttpClient::readContent() } Input &input = _conn->stream(); for (;;) { - Memory mem = input.obtain(READ_SIZE, 1); + Memory mem = input.obtain(); if (mem.size == 0) { if (_conn->stream().tainted()) { _handler.handleFailure(strfmt("read error: '%s'", @@ -182,7 +182,7 @@ bool HttpClient::perform() { writeRequest(); - if (!_conn->fresh() && (_conn->stream().obtain(READ_SIZE, 1).size == 0)) { + if (!_conn->fresh() && (_conn->stream().obtain().size == 0)) { _conn.reset(new HttpConnection(_conn->server())); writeRequest(); } diff --git a/vbench/src/vbench/http/http_client.h b/vbench/src/vbench/http/http_client.h index b80dca2c819..7497d0c8621 100644 --- a/vbench/src/vbench/http/http_client.h +++ b/vbench/src/vbench/http/http_client.h @@ -17,7 +17,6 @@ namespace vbench { class HttpClient { private: - static const size_t READ_SIZE = 8000; static const size_t WRITE_SIZE = 2000; struct HeaderInfo { diff --git a/vbench/src/vbench/test/simple_http_result_handler.cpp b/vbench/src/vbench/test/simple_http_result_handler.cpp index a0896381f33..a09a4d30a22 100644 --- a/vbench/src/vbench/test/simple_http_result_handler.cpp +++ b/vbench/src/vbench/test/simple_http_result_handler.cpp @@ -24,7 +24,7 @@ SimpleHttpResultHandler::handleContent(const Memory &data) { WritableMemory wm = _content.reserve(data.size); memcpy(wm.data, data.data, data.size); - _content.commit(data.size, 0); + _content.commit(data.size); } void |