feedc0de/boost_beast
1
0
Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Rename to flat_buffer, basic_flat_buffer (API Change):

Browse Source 
These classes are renamed:

* flat_streambuf to flat_buffer
* basic_flat_streambuf to basic_flat_buffer
This commit is contained in:
Vinnie Falco
2017-07-20 08:12:16 -07:00
parent 24fd254690
commit 6e47e9a0ac
14 changed files with 167 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Jamfile
+1 -1
View File
@@ -25,7 +25,7 @@ unit-test core-tests :
core/consuming_buffers.cpp
core/dynabuf_readstream.cpp
core/error.cpp
core/flat_streambuf.cpp
core/flat_buffer.cpp
core/handler_alloc.cpp
core/handler_concepts.cpp
core/handler_ptr.cpp
test/core/CMakeLists.txt
+1 -1
View File
@@ -18,7 +18,7 @@ add_executable (core-tests
consuming_buffers.cpp
dynabuf_readstream.cpp
error.cpp
flat_streambuf.cpp
flat_buffer.cpp
handler_alloc.cpp
handler_concepts.cpp
handler_ptr.cpp
test/core/flat_streambuf.cpp → test/core/flat_buffer.cpp
+77 -77
View File
@@ -6,7 +6,7 @@
//
// Test that header file is self-contained.
#include <beast/core/flat_streambuf.hpp>
#include <beast/core/flat_buffer.hpp>
#include "buffer_test.hpp"
#include <beast/core/ostream.hpp>
@@ -17,10 +17,10 @@
namespace beast {
static_assert(is_DynamicBuffer<flat_streambuf>::value,
static_assert(is_DynamicBuffer<flat_buffer>::value,
"DynamicBuffer requirements not met");
class flat_streambuf_test : public beast::unit_test::suite
class flat_buffer_test : public beast::unit_test::suite
{
public:
template<class ConstBufferSequence>
@@ -35,8 +35,8 @@ public:
template<class Alloc1, class Alloc2>
static
bool
eq(basic_flat_streambuf<Alloc1> const& sb1,
basic_flat_streambuf<Alloc2> const& sb2)
eq(basic_flat_buffer<Alloc1> const& sb1,
basic_flat_buffer<Alloc2> const& sb2)
{
return to_string(sb1.data()) == to_string(sb2.data());
}
@@ -50,13 +50,13 @@ public:
Equal, Assign, Move, Swap, Select>;
{
using boost::asio::buffer_size;
basic_flat_streambuf<allocator> b1{10};
basic_flat_buffer<allocator> b1{10};
BEAST_EXPECT(b1.size() == 0);
BEAST_EXPECT(b1.capacity() == 0);
BEAST_EXPECT(b1.max_size() == 10);
b1.prepare(1);
b1.commit(1);
basic_flat_streambuf<allocator> b2{std::move(b1)};
basic_flat_buffer<allocator> b2{std::move(b1)};
BEAST_EXPECT(b1.capacity() == 0);
BEAST_EXPECT(b1.max_size() == 10);
BEAST_EXPECT(b2.size() == 1);
@@ -65,29 +65,29 @@ public:
BEAST_EXPECT(buffer_size(b1.prepare(1)) == 1);
}
{
basic_flat_streambuf<allocator> b1{10};
basic_flat_streambuf<allocator> b2{std::move(b1), allocator{}};
basic_flat_buffer<allocator> b1{10};
basic_flat_buffer<allocator> b2{std::move(b1), allocator{}};
}
{
basic_flat_streambuf<allocator> b1{10};
basic_flat_streambuf<allocator> b2{b1};
basic_flat_buffer<allocator> b1{10};
basic_flat_buffer<allocator> b2{b1};
}
{
basic_flat_streambuf<allocator> b1{10};
basic_flat_streambuf<allocator> b2{b1, allocator{}};
basic_flat_buffer<allocator> b1{10};
basic_flat_buffer<allocator> b2{b1, allocator{}};
}
{
flat_streambuf b1{10};
flat_buffer b1{10};
b1.prepare(1);
b1.commit(1);
basic_flat_streambuf<allocator> b2{b1};
basic_flat_buffer<allocator> b2{b1};
BEAST_EXPECT(b2.size() == 1);
}
{
basic_flat_streambuf<allocator> b1{10};
basic_flat_buffer<allocator> b1{10};
}
{
basic_flat_streambuf<allocator> b1{allocator{}, 10};
basic_flat_buffer<allocator> b1{allocator{}, 10};
}
}
@@ -136,14 +136,14 @@ public:
//
{
flat_streambuf b{10};
flat_buffer b{10};
b.prepare(1);
b.commit(1);
b.reserve(2);
BEAST_EXPECT(b.size() == 1);
}
{
flat_streambuf b{10};
flat_buffer b{10};
try
{
b.reserve(11);
@@ -162,35 +162,35 @@ public:
using boost::asio::buffer;
using boost::asio::buffer_copy;
{
flat_streambuf fb{10};
BEAST_EXPECT(fb.max_size() == 10);
flat_buffer b{10};
BEAST_EXPECT(b.max_size() == 10);
}
{
flat_streambuf fb{1024};
BEAST_EXPECT(fb.max_size() == 1024);
flat_buffer b{1024};
BEAST_EXPECT(b.max_size() == 1024);
}
std::string const s = "Hello, world!";
for(std::size_t i = 1; i < s.size() - 1; ++i)
{
flat_streambuf fb{1024};
fb.commit(buffer_copy(
fb.prepare(i), buffer(s)));
fb.commit(buffer_copy(
fb.prepare(s.size() - i),
flat_buffer b{1024};
b.commit(buffer_copy(
b.prepare(i), buffer(s)));
b.commit(buffer_copy(
b.prepare(s.size() - i),
buffer(s.data() + i, s.size() - i)));
BEAST_EXPECT(to_string(fb.data()) == s);
BEAST_EXPECT(to_string(b.data()) == s);
{
flat_streambuf fb2{fb};
BEAST_EXPECT(eq(fb2, fb));
flat_streambuf fb3{std::move(fb2)};
BEAST_EXPECT(eq(fb3, fb));
BEAST_EXPECT(! eq(fb2, fb3));
BEAST_EXPECT(fb2.size() == 0);
flat_buffer b2{b};
BEAST_EXPECT(eq(b2, b));
flat_buffer b3{std::move(b2)};
BEAST_EXPECT(eq(b3, b));
BEAST_EXPECT(! eq(b2, b3));
BEAST_EXPECT(b2.size() == 0);
}
using alloc_type = std::allocator<double>;
using type =
basic_flat_streambuf<alloc_type>;
basic_flat_buffer<alloc_type>;
alloc_type alloc;
{
type fba{alloc, 1};
@@ -201,18 +201,18 @@ public:
BEAST_EXPECT(fba.max_size() == 1024);
}
{
type fb2{fb};
BEAST_EXPECT(eq(fb2, fb));
type fb2{b};
BEAST_EXPECT(eq(fb2, b));
type fb3{std::move(fb2)};
BEAST_EXPECT(eq(fb3, fb));
BEAST_EXPECT(eq(fb3, b));
BEAST_EXPECT(! eq(fb2, fb3));
BEAST_EXPECT(fb2.size() == 0);
}
{
type fb2{fb, alloc};
BEAST_EXPECT(eq(fb2, fb));
type fb2{b, alloc};
BEAST_EXPECT(eq(fb2, b));
type fb3{std::move(fb2), alloc};
BEAST_EXPECT(eq(fb3, fb));
BEAST_EXPECT(eq(fb3, b));
BEAST_EXPECT(! eq(fb2, fb3));
BEAST_EXPECT(fb2.size() == 0);
}
@@ -224,57 +224,57 @@ public:
{
using boost::asio::buffer_size;
flat_streambuf fb{100};
BEAST_EXPECT(fb.size() == 0);
BEAST_EXPECT(fb.capacity() == 0);
flat_buffer b{100};
BEAST_EXPECT(b.size() == 0);
BEAST_EXPECT(b.capacity() == 0);
BEAST_EXPECT(buffer_size(fb.prepare(100)) == 100);
BEAST_EXPECT(fb.size() == 0);
BEAST_EXPECT(fb.capacity() > 0);
BEAST_EXPECT(buffer_size(b.prepare(100)) == 100);
BEAST_EXPECT(b.size() == 0);
BEAST_EXPECT(b.capacity() > 0);
fb.commit(20);
BEAST_EXPECT(fb.size() == 20);
BEAST_EXPECT(fb.capacity() == 100);
b.commit(20);
BEAST_EXPECT(b.size() == 20);
BEAST_EXPECT(b.capacity() == 100);
fb.consume(5);
BEAST_EXPECT(fb.size() == 15);
BEAST_EXPECT(fb.capacity() == 100);
b.consume(5);
BEAST_EXPECT(b.size() == 15);
BEAST_EXPECT(b.capacity() == 100);
fb.prepare(80);
fb.commit(80);
BEAST_EXPECT(fb.size() == 95);
BEAST_EXPECT(fb.capacity() == 100);
b.prepare(80);
b.commit(80);
BEAST_EXPECT(b.size() == 95);
BEAST_EXPECT(b.capacity() == 100);
fb.shrink_to_fit();
BEAST_EXPECT(fb.size() == 95);
BEAST_EXPECT(fb.capacity() == 95);
b.shrink_to_fit();
BEAST_EXPECT(b.size() == 95);
BEAST_EXPECT(b.capacity() == 95);
}
void
testPrepare()
{
flat_streambuf fb{100};
fb.prepare(20);
BEAST_EXPECT(fb.capacity() == 100);
fb.commit(10);
BEAST_EXPECT(fb.capacity() == 100);
fb.consume(4);
BEAST_EXPECT(fb.capacity() == 100);
fb.prepare(14);
BEAST_EXPECT(fb.size() == 6);
BEAST_EXPECT(fb.capacity() == 100);
fb.consume(10);
BEAST_EXPECT(fb.size() == 0);
BEAST_EXPECT(fb.capacity() == 100);
flat_buffer b{100};
b.prepare(20);
BEAST_EXPECT(b.capacity() == 100);
b.commit(10);
BEAST_EXPECT(b.capacity() == 100);
b.consume(4);
BEAST_EXPECT(b.capacity() == 100);
b.prepare(14);
BEAST_EXPECT(b.size() == 6);
BEAST_EXPECT(b.capacity() == 100);
b.consume(10);
BEAST_EXPECT(b.size() == 0);
BEAST_EXPECT(b.capacity() == 100);
}
void
testMax()
{
flat_streambuf fb{1};
flat_buffer b{1};
try
{
fb.prepare(2);
b.prepare(2);
fail("", __FILE__, __LINE__);
}
catch(std::length_error const&)
@@ -296,6 +296,6 @@ public:
}
};
BEAST_DEFINE_TESTSUITE(flat_streambuf,core,beast);
BEAST_DEFINE_TESTSUITE(flat_buffer,core,beast);
} // beast
test/http/design.cpp
+15 -15
View File
@@ -5,7 +5,7 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
#include <beast/core/flat_streambuf.hpp>
#include <beast/core/flat_buffer.hpp>
#include <beast/core/prepare_buffers.hpp>
#include <beast/http/chunk_encode.hpp>
#include <beast/http/read.hpp>
@@ -104,7 +104,7 @@ public:
"*"
};
message<true, direct_body, fields> m;
flat_streambuf b{1024};
flat_buffer b{1024};
read(is, b, m);
BEAST_EXPECT(m.body == "*");
}
@@ -117,7 +117,7 @@ public:
"*"
};
message<false, direct_body, fields> m;
flat_streambuf b{20};
flat_buffer b{20};
read(is, b, m);
BEAST_EXPECT(m.body == "*");
}
@@ -133,7 +133,7 @@ public:
"0\r\n\r\n"
};
message<true, direct_body, fields> m;
flat_streambuf b{100};
flat_buffer b{100};
read(is, b, m);
BEAST_EXPECT(m.body == "*");
}
@@ -201,7 +201,7 @@ public:
"*"
};
message<true, indirect_body, fields> m;
flat_streambuf b{1024};
flat_buffer b{1024};
read(is, b, m);
BEAST_EXPECT(m.body == "*");
}
@@ -214,7 +214,7 @@ public:
"*"
};
message<false, indirect_body, fields> m;
flat_streambuf b{20};
flat_buffer b{20};
read(is, b, m);
BEAST_EXPECT(m.body == "*");
}
@@ -231,7 +231,7 @@ public:
"0\r\n\r\n"
};
message<true, indirect_body, fields> m;
flat_streambuf b{1024};
flat_buffer b{1024};
read(is, b, m);
BEAST_EXPECT(m.body == "*");
}
@@ -253,7 +253,7 @@ public:
"*****"
};
header_parser<true, fields> p;
flat_streambuf b{38};
flat_buffer b{38};
auto const bytes_used =
read_some(is, b, p);
b.consume(bytes_used);
@@ -272,7 +272,7 @@ public:
"*****"
};
header_parser<false, fields> p;
flat_streambuf b{20};
flat_buffer b{20};
auto const bytes_used =
read_some(is, b, p);
b.consume(bytes_used);
@@ -303,7 +303,7 @@ public:
};
header_parser<true, fields> p;
flat_streambuf b{128};
flat_buffer b{128};
auto const bytes_used =
read_some(is, b, p);
b.consume(bytes_used);
@@ -335,7 +335,7 @@ public:
DynamicBuffer& b,
SyncReadStream& in)
{
flat_streambuf buffer{4096}; // 4K limit
flat_buffer buffer{4096}; // 4K limit
header_parser<isRequest, fields> parser;
error_code ec;
do
@@ -397,7 +397,7 @@ public:
3 // max_read
};
test::string_ostream os{ios_};
flat_streambuf b{16};
flat_buffer b{16};
relay<true>(os, b, is);
}
@@ -410,7 +410,7 @@ public:
3 // max_read
};
test::string_ostream os{ios_};
flat_streambuf b{16};
flat_buffer b{16};
relay<false>(os, b, is);
}
@@ -427,7 +427,7 @@ public:
2 // max_read
};
test::string_ostream os{ios_};
flat_streambuf b{16};
flat_buffer b{16};
relay<true>(os, b, is);
}
}
@@ -444,7 +444,7 @@ public:
void
doFixedRead(SyncReadStream& stream, BodyCallback const& cb)
{
flat_streambuf buffer{4096}; // 4K limit
flat_buffer buffer{4096}; // 4K limit
header_parser<isRequest, fields> parser;
std::size_t bytes_used;
bytes_used = read_some(stream, buffer, parser);
test/http/header_parser.cpp
+3 -3
View File
@@ -8,7 +8,7 @@
// Test that header file is self-contained.
#include <beast/http/header_parser.hpp>
#include <beast/core/flat_streambuf.hpp>
#include <beast/core/flat_buffer.hpp>
#include <beast/http/read.hpp>
#include <beast/unit_test/suite.hpp>
#include <beast/test/string_istream.hpp>
@@ -31,7 +31,7 @@ public:
"User-Agent: test\r\n"
"\r\n"
};
flat_streambuf db{1024};
flat_buffer db{1024};
header_parser<true, fields> p;
read_some(is, db, p);
BEAST_EXPECT(p.is_complete());
@@ -44,7 +44,7 @@ public:
"\r\n"
"*"
};
flat_streambuf db{1024};
flat_buffer db{1024};
header_parser<true, fields> p;
read_some(is, db, p);
BEAST_EXPECT(! p.is_complete());
test/http/message_parser.cpp
+3 -3
View File
@@ -14,7 +14,7 @@
#include <beast/test/string_istream.hpp>
#include <beast/test/string_ostream.hpp>
#include <beast/test/yield_to.hpp>
#include <beast/core/flat_streambuf.hpp>
#include <beast/core/flat_buffer.hpp>
#include <beast/core/multi_buffer.hpp>
#include <beast/http/header_parser.hpp>
#include <beast/http/read.hpp>
@@ -39,7 +39,7 @@ public:
#if 0
multi_buffer dynabuf;
#else
flat_streambuf dynabuf{1024};
flat_buffer dynabuf{1024};
#endif
message<isRequest, string_body, fields> m;
read(ss, dynabuf, m, ec);
@@ -124,7 +124,7 @@ public:
"Content-Length: 1\r\n"
"\r\n"
"*"};
flat_streambuf b{1024};
flat_buffer b{1024};
message_parser<true, string_body, fields> p;
read(is, b, p, ec);
auto const& m = p.get();