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

Rename to buffer_bytes

Browse Source
This commit is contained in:
Vinnie Falco committed 2019-03-05 11:09:53 -08:00
1 parent 6ccdcdf51d
commit 9f2b0ce1db
62 files changed
+206 -258
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/boost/beast/websocket/impl/accept.hpp
+2 -2
View File
@@ -271,7 +271,7 @@ public:
error_code ec;
auto const mb =
beast::detail::dynamic_buffer_prepare(
impl.rd_buf, buffer_size(buffers),
impl.rd_buf, buffer_bytes(buffers),
ec, error::buffer_overflow);
if(! ec)
impl.rd_buf.commit(
@@ -433,7 +433,7 @@ do_accept(
impl_->reset();
auto const mb =
beast::detail::dynamic_buffer_prepare(
impl_->rd_buf, buffer_size(buffers), ec,
impl_->rd_buf, buffer_bytes(buffers), ec,
error::buffer_overflow);
if(ec)
return;
include/boost/beast/websocket/impl/read.hpp
+12 -12
View File
@@ -211,7 +211,7 @@ public:
auto const b = buffers_prefix(
clamp(impl.rd_fh.len),
impl.rd_buf.data());
auto const len = buffer_size(b);
auto const len = buffer_bytes(b);
BOOST_ASSERT(len == impl.rd_fh.len);
ping_data payload;
detail::read_ping(payload, b);
@@ -278,7 +278,7 @@ public:
}
auto const cb = buffers_prefix(clamp(
impl.rd_fh.len), impl.rd_buf.data());
auto const len = buffer_size(cb);
auto const len = buffer_bytes(cb);
BOOST_ASSERT(len == impl.rd_fh.len);
ping_data payload;
detail::read_ping(payload, cb);
@@ -303,7 +303,7 @@ public:
}
auto const cb = buffers_prefix(clamp(
impl.rd_fh.len), impl.rd_buf.data());
auto const len = buffer_size(cb);
auto const len = buffer_bytes(cb);
BOOST_ASSERT(len == impl.rd_fh.len);
BOOST_ASSERT(! impl.rd_close);
impl.rd_close = true;
@@ -350,7 +350,7 @@ public:
{
if(impl.rd_buf.size() == 0 && impl.rd_buf.max_size() >
(std::min)(clamp(impl.rd_remain),
buffer_size(cb_)))
buffer_bytes(cb_)))
{
// Fill the read buffer first, otherwise we
// get fewer bytes at the cost of one I/O.
@@ -397,8 +397,8 @@ public:
{
// Read into caller's buffer
BOOST_ASSERT(impl.rd_remain > 0);
BOOST_ASSERT(buffer_size(cb_) > 0);
BOOST_ASSERT(buffer_size(buffers_prefix(
BOOST_ASSERT(buffer_bytes(cb_) > 0);
BOOST_ASSERT(buffer_bytes(buffers_prefix(
clamp(impl.rd_remain), cb_)) > 0);
BOOST_ASIO_CORO_YIELD
impl.stream().async_read_some(buffers_prefix(
@@ -435,7 +435,7 @@ public:
// Read compressed message frame payload:
// inflate even if rd_fh_.len == 0, otherwise we
// never emit the end-of-stream deflate block.
while(buffer_size(cb_) > 0)
while(buffer_bytes(cb_) > 0)
{
if( impl.rd_remain > 0 &&
impl.rd_buf.size() == 0 &&
@@ -976,7 +976,7 @@ loop:
// Get control frame payload
auto const b = buffers_prefix(
clamp(impl.rd_fh.len), impl.rd_buf.data());
auto const len = buffer_size(b);
auto const len = buffer_bytes(b);
BOOST_ASSERT(len == impl.rd_fh.len);
// Clear this otherwise the next
@@ -1059,7 +1059,7 @@ loop:
{
if(impl.rd_buf.size() == 0 && impl.rd_buf.max_size() >
(std::min)(clamp(impl.rd_remain),
buffer_size(buffers)))
buffer_bytes(buffers)))
{
// Fill the read buffer first, otherwise we
// get fewer bytes at the cost of one I/O.
@@ -1103,8 +1103,8 @@ loop:
{
// Read into caller's buffer
BOOST_ASSERT(impl.rd_remain > 0);
BOOST_ASSERT(buffer_size(buffers) > 0);
BOOST_ASSERT(buffer_size(buffers_prefix(
BOOST_ASSERT(buffer_bytes(buffers) > 0);
BOOST_ASSERT(buffer_bytes(buffers_prefix(
clamp(impl.rd_remain), buffers)) > 0);
auto const bytes_transferred =
impl.stream().read_some(buffers_prefix(
@@ -1144,7 +1144,7 @@ loop:
//
bool did_read = false;
buffers_suffix<MutableBufferSequence> cb(buffers);
while(buffer_size(cb) > 0)
while(buffer_bytes(cb) > 0)
{
zlib::z_params zs;
{
include/boost/beast/websocket/impl/stream.hpp
+2 -2
View File
@@ -279,7 +279,7 @@ secure_prng(bool value)
template<class NextLayer, bool deflateSupported>
void
stream<NextLayer, deflateSupported>::
write_buffer_size(std::size_t amount)
write_buffer_bytes(std::size_t amount)
{
if(amount < 8)
BOOST_THROW_EXCEPTION(std::invalid_argument{
@@ -290,7 +290,7 @@ write_buffer_size(std::size_t amount)
template<class NextLayer, bool deflateSupported>
std::size_t
stream<NextLayer, deflateSupported>::
write_buffer_size() const
write_buffer_bytes() const
{
return impl_->wr_buf_opt;
}
include/boost/beast/websocket/impl/stream_impl.hpp
+7 -7
View File
@@ -645,7 +645,7 @@ parse_fh(
DynamicBuffer& b,
error_code& ec)
{
if(buffer_size(b.data()) < 2)
if(buffer_bytes(b.data()) < 2)
{
// need more bytes
ec = {};
@@ -670,7 +670,7 @@ parse_fh(
fh.mask = (tmp[1] & 0x80) != 0;
if(fh.mask)
need += 4;
if(buffer_size(cb) < need)
if(buffer_bytes(cb) < need)
{
// need more bytes
ec = {};
@@ -757,7 +757,7 @@ parse_fh(
return false;
}
if(detail::is_control(fh.op) &&
buffer_size(cb) < need + fh.len)
buffer_bytes(cb) < need + fh.len)
{
// Make the entire control frame payload
// get read in before we return `true`
@@ -768,7 +768,7 @@ parse_fh(
case 126:
{
std::uint8_t tmp[2];
BOOST_ASSERT(buffer_size(cb) >= sizeof(tmp));
BOOST_ASSERT(buffer_bytes(cb) >= sizeof(tmp));
cb.consume(net::buffer_copy(net::buffer(tmp), cb));
fh.len = detail::big_uint16_to_native(&tmp[0]);
if(fh.len < 126)
@@ -782,7 +782,7 @@ parse_fh(
case 127:
{
std::uint8_t tmp[8];
BOOST_ASSERT(buffer_size(cb) >= sizeof(tmp));
BOOST_ASSERT(buffer_bytes(cb) >= sizeof(tmp));
cb.consume(net::buffer_copy(net::buffer(tmp), cb));
fh.len = detail::big_uint64_to_native(&tmp[0]);
if(fh.len < 65536)
@@ -797,7 +797,7 @@ parse_fh(
if(fh.mask)
{
std::uint8_t tmp[4];
BOOST_ASSERT(buffer_size(cb) >= sizeof(tmp));
BOOST_ASSERT(buffer_bytes(cb) >= sizeof(tmp));
cb.consume(net::buffer_copy(net::buffer(tmp), cb));
fh.key = detail::little_uint32_to_native(&tmp[0]);
detail::prepare_key(rd_key, fh.key);
@@ -837,7 +837,7 @@ parse_fh(
rd_cont = ! fh.fin;
rd_remain = fh.len;
}
b.consume(b.size() - buffer_size(cb));
b.consume(b.size() - buffer_bytes(cb));
ec = {};
return true;
}
include/boost/beast/websocket/impl/write.hpp
+9 -9
View File
@@ -114,7 +114,7 @@ public:
else
{
BOOST_ASSERT(impl.wr_buf_size != 0);
remain_ = buffer_size(cb_);
remain_ = buffer_bytes(cb_);
if(remain_ > impl.wr_buf_size)
how_ = do_nomask_frag;
else
@@ -130,7 +130,7 @@ public:
else
{
BOOST_ASSERT(impl.wr_buf_size != 0);
remain_ = buffer_size(cb_);
remain_ = buffer_bytes(cb_);
if(remain_ > impl.wr_buf_size)
how_ = do_mask_frag;
else
@@ -186,7 +186,7 @@ operator()(
{
// send a single frame
fh_.fin = fin_;
fh_.len = buffer_size(cb_);
fh_.len = buffer_bytes(cb_);
impl.wr_fb.clear();
detail::write<flat_static_buffer_base>(
impl.wr_fb, fh_);
@@ -252,7 +252,7 @@ operator()(
if(how_ == do_mask_nofrag)
{
// send a single frame using multiple writes
remain_ = beast::buffer_size(cb_);
remain_ = beast::buffer_bytes(cb_);
fh_.fin = fin_;
fh_.len = remain_;
fh_.key = impl.create_mask();
@@ -362,13 +362,13 @@ operator()(
more_ = impl.deflate(b, cb_, fin_, in_, ec);
if(impl.check_stop_now(ec))
goto upcall;
n = buffer_size(b);
n = buffer_bytes(b);
if(n == 0)
{
// The input was consumed, but there is
// no output due to compression latency.
BOOST_ASSERT(! fin_);
BOOST_ASSERT(buffer_size(cb_) == 0);
BOOST_ASSERT(buffer_bytes(cb_) == 0);
goto upcall;
}
if(fh_.mask)
@@ -517,7 +517,7 @@ write_some(bool fin,
fh.op = impl.wr_cont ?
detail::opcode::cont : impl.wr_opcode;
fh.mask = impl.role == role_type::client;
auto remain = buffer_size(buffers);
auto remain = buffer_bytes(buffers);
if(impl.wr_compress)
{
@@ -531,14 +531,14 @@ write_some(bool fin,
b, cb, fin, bytes_transferred, ec);
if(impl.check_stop_now(ec))
return bytes_transferred;
auto const n = buffer_size(b);
auto const n = buffer_bytes(b);
if(n == 0)
{
// The input was consumed, but there
// is no output due to compression
// latency.
BOOST_ASSERT(! fin);
BOOST_ASSERT(buffer_size(cb) == 0);
BOOST_ASSERT(buffer_bytes(cb) == 0);
fh.fin = false;
break;
}