simplify Input/Output APIs

11 files changed, 30 insertions, 30 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());