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
2019-03-05 11:09:53 -08:00
parent 6ccdcdf51d
commit 9f2b0ce1db
62 changed files with 206 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/beast/_experimental/http/impl/icy_stream.hpp
+1 -1
View File
@@ -45,7 +45,7 @@ buffer_shift(MutableBuffers const& out, ConstBuffers const& in)
auto out_pos = net::buffer_sequence_end(out);
auto const in_begin = net::buffer_sequence_begin(in);
auto const out_begin = net::buffer_sequence_begin(out);
BOOST_ASSERT(buffer_size(in) == buffer_size(out));
BOOST_ASSERT(buffer_bytes(in) == buffer_bytes(out));
if(in_pos == in_begin || out_pos == out_begin)
return;
net::const_buffer cb{*--in_pos};
include/boost/beast/_experimental/test/impl/stream.hpp
+7 -7
View File
@@ -109,7 +109,7 @@ class stream::read_op : public stream::read_op_base
b_, sp->b.data(), sp->read_max);
sp->b.consume(bytes_transferred);
}
else if (buffer_size(b_) > 0)
else if (buffer_bytes(b_) > 0)
{
ec = net::error::eof;
}
@@ -177,7 +177,7 @@ struct stream::run_read_op
std::move(h),
in,
buffers)},
buffer_size(buffers));
buffer_bytes(buffers));
}
};
@@ -217,7 +217,7 @@ struct stream::run_write_op
return upcall(ec, n);
// A request to write 0 bytes to a stream is a no-op.
if(buffer_size(buffers) == 0)
if(buffer_bytes(buffers) == 0)
return upcall(ec, n);
// connection closed
@@ -227,7 +227,7 @@ struct stream::run_write_op
// copy buffers
n = std::min<std::size_t>(
buffer_size(buffers), in_->write_max);
buffer_bytes(buffers), in_->write_max);
{
std::lock_guard<std::mutex> lock(out->m);
n = net::buffer_copy(out->b.prepare(n), buffers);
@@ -273,7 +273,7 @@ read_some(MutableBufferSequence const& buffers,
return 0;
// A request to read 0 bytes from a stream is a no-op.
if(buffer_size(buffers) == 0)
if(buffer_bytes(buffers) == 0)
{
ec = {};
return 0;
@@ -357,7 +357,7 @@ write_some(
return 0;
// A request to write 0 bytes to a stream is a no-op.
if(buffer_size(buffers) == 0)
if(buffer_bytes(buffers) == 0)
{
ec = {};
return 0;
@@ -373,7 +373,7 @@ write_some(
// copy buffers
auto n = std::min<std::size_t>(
buffer_size(buffers), in_->write_max);
buffer_bytes(buffers), in_->write_max);
{
std::lock_guard<std::mutex> lock(out->m);
n = net::buffer_copy(out->b.prepare(n), buffers);
include/boost/beast/_experimental/test/impl/stream.ipp
+2 -2
View File
@@ -99,7 +99,7 @@ void stream::initiate_read(
}
// A request to read 0 bytes from a stream is a no-op.
if(buf_size == 0 || buffer_size(in_->b.data()) > 0)
if(buf_size == 0 || buffer_bytes(in_->b.data()) > 0)
{
lock.unlock();
(*op)(ec);
@@ -273,7 +273,7 @@ stream::
str() const
{
auto const bs = in_->b.data();
if(buffer_size(bs) == 0)
if(buffer_bytes(bs) == 0)
return {};
auto const b = beast::buffers_front(bs);
return {static_cast<char const*>(b.data()), b.size()};
include/boost/beast/core/buffer_size.hpp
-16
View File
@@ -1,16 +0,0 @@
//
// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
// Official repository: https://github.com/boostorg/beast
//
#ifndef BOOST_BEAST_BUFFER_SIZE_HPP
#define BOOST_BEAST_BUFFER_SIZE_HPP
#include <boost/beast/core/detail/config.hpp>
#include <boost/beast/core/buffer_traits.hpp>
#endif
include/boost/beast/core/buffer_traits.hpp
+4 -4
View File
@@ -143,11 +143,11 @@ using buffers_iterator_type =
This function is designed as an easier-to-use replacement for
`net::buffer_size`. It recognizes customization points found through
argument-dependent lookup. The call `beast::buffer_size(b)` is
argument-dependent lookup. The call `beast::buffer_bytes(b)` is
equivalent to performing:
@code
using namespace net;
buffer_size(b);
buffer_bytes(b);
@endcode
In addition this handles types which are convertible to
`net::const_buffer`; these are not handled by `net::buffer_size`.
@@ -162,9 +162,9 @@ using buffers_iterator_type =
#if BOOST_BEAST_DOXYGEN
template<class Buffers>
void
buffer_size(Buffers const& buffers);
buffer_bytes(Buffers const& buffers);
#else
BOOST_BEAST_INLINE_VARIABLE(buffer_size, detail::buffer_size_impl)
BOOST_BEAST_INLINE_VARIABLE(buffer_bytes, detail::buffer_bytes_impl)
#endif
} // beast
include/boost/beast/core/buffers_prefix.hpp
+1 -1
View File
@@ -129,7 +129,7 @@ public:
#if ! BOOST_BEAST_DOXYGEN
std::size_t
buffer_size_impl() const noexcept
buffer_bytes_impl() const noexcept
{
return size_;
}
include/boost/beast/core/buffers_suffix.hpp
+1 -1
View File
@@ -44,7 +44,7 @@ namespace beast {
void send(SyncWriteStream& stream, ConstBufferSequence const& buffers)
{
buffers_suffix<ConstBufferSequence> bs{buffers};
while(buffer_size(bs) > 0)
while(buffer_bytes(bs) > 0)
bs.consume(stream.write_some(bs));
}
@endcode
include/boost/beast/core/buffers_to_string.hpp
+1 -1
View File
@@ -49,7 +49,7 @@ buffers_to_string(ConstBufferSequence const& buffers)
net::is_const_buffer_sequence<ConstBufferSequence>::value,
"ConstBufferSequence type requirements not met");
std::string result;
result.reserve(buffer_size(buffers));
result.reserve(buffer_bytes(buffers));
for(auto const buffer : buffers_range_ref(buffers))
result.append(static_cast<char const*>(
buffer.data()), buffer.size());
include/boost/beast/core/detail/buffer_traits.hpp
+9 -39
View File
@@ -46,65 +46,35 @@ struct buffers_iterator_type_helper<
#endif
template<class T, class = void>
struct has_buffer_size_impl : std::false_type
struct buffer_bytes_impl
{
};
template<class T>
struct has_buffer_size_impl<T, boost::void_t<
decltype(std::declval<std::size_t&>() =
std::declval<T const&>().buffer_size_impl())>>
: std::true_type
{
};
struct buffer_size_impl
{
template<
class B,
class = typename std::enable_if<
std::is_convertible<
B, net::const_buffer>::value>::type>
std::size_t
operator()(B const& b) const
operator()(net::const_buffer b) const noexcept
{
return net::const_buffer(b).size();
}
template<
class B,
class = typename std::enable_if<
! std::is_convertible<
B, net::const_buffer>::value>::type,
class = typename std::enable_if<
net::is_const_buffer_sequence<B>::value &&
! has_buffer_size_impl<B>::value>::type>
std::size_t
operator()(B const& b) const
operator()(net::mutable_buffer b) const noexcept
{
using net::buffer_size;
return buffer_size(b);
return net::mutable_buffer(b).size();
}
template<
class B,
class = typename std::enable_if<
! std::is_convertible<B, net::const_buffer>::value>::type,
class = typename std::enable_if<
net::is_const_buffer_sequence<B>::value>::type,
class = typename std::enable_if<
has_buffer_size_impl<B>::value>::type>
net::is_const_buffer_sequence<B>::value>::type>
std::size_t
operator()(B const& b) const
operator()(B const& b) const noexcept
{
return b.buffer_size_impl();
using net::buffer_size;
return buffer_size(b);
}
};
/** Return `true` if a buffer sequence is empty
This is sometimes faster than using @ref buffer_size
This is sometimes faster than using @ref buffer_bytes
*/
template<class ConstBufferSequence>
bool
include/boost/beast/core/detail/flat_stream.hpp
+2 -2
View File
@@ -46,14 +46,14 @@ public:
auto last = net::buffer_sequence_end(buffers);
if(first != last)
{
result.size = buffer_size(*first);
result.size = buffer_bytes(*first);
if(result.size < limit)
{
auto it = first;
auto prev = first;
while(++it != last)
{
auto const n = buffer_size(*it);
auto const n = buffer_bytes(*it);
if(result.size + n > limit)
break;
result.size += n;
include/boost/beast/core/impl/buffers_adaptor.hpp
+7 -7
View File
@@ -401,7 +401,7 @@ buffers_adaptor(MutableBufferSequence const& bs)
, max_size_(
[&bs]
{
return buffer_size(bs);
return buffer_bytes(bs);
}())
{
}
@@ -418,7 +418,7 @@ buffers_adaptor(
, max_size_(
[&]
{
return buffer_size(bs_);
return buffer_bytes(bs_);
}())
{
}
@@ -501,14 +501,14 @@ prepare(std::size_t n) ->
end_ = out_;
if(end_ != net::buffer_sequence_end(bs_))
{
auto size = buffer_size(*end_) - out_pos_;
auto size = buffer_bytes(*end_) - out_pos_;
if(n > size)
{
n -= size;
while(++end_ !=
net::buffer_sequence_end(bs_))
{
size = buffer_size(*end_);
size = buffer_bytes(*end_);
if(n < size)
{
out_end_ = n;
@@ -544,7 +544,7 @@ commit(std::size_t n) noexcept
while(out_ != last)
{
auto const avail =
buffer_size(*out_) - out_pos_;
buffer_bytes(*out_) - out_pos_;
if(n < avail)
{
out_pos_ += n;
@@ -561,7 +561,7 @@ commit(std::size_t n) noexcept
n, out_end_ - out_pos_);
out_pos_ += n;
in_size_ += n;
if(out_pos_ == buffer_size(*out_))
if(out_pos_ == buffer_bytes(*out_))
{
++out_;
out_pos_ = 0;
@@ -577,7 +577,7 @@ consume(std::size_t n) noexcept
while(begin_ != out_)
{
auto const avail =
buffer_size(*begin_) - in_pos_;
buffer_bytes(*begin_) - in_pos_;
if(n < avail)
{
in_size_ -= n;
include/boost/beast/core/impl/buffers_prefix.hpp
+1 -13
View File
@@ -150,7 +150,7 @@ setup(std::size_t size)
auto const last = bs_.end();
while(end_ != last)
{
auto const len = buffer_size(*end_++);
auto const len = buffer_bytes(*end_++);
if(len >= size)
{
size_ += size;
@@ -282,12 +282,6 @@ public:
std::forward<Args>(args)...))
{
}
std::size_t
buffer_size_impl() const noexcept
{
return this->size();
}
};
//------------------------------------------------------------------------------
@@ -324,12 +318,6 @@ public:
std::forward<Args>(args)...))
{
}
std::size_t
buffer_size_impl() const noexcept
{
return this->size();
}
};
} // beast
include/boost/beast/core/impl/buffers_suffix.hpp
+1 -1
View File
@@ -208,7 +208,7 @@ consume(std::size_t amount)
for(;amount > 0 && begin_ != end; ++begin_)
{
auto const len =
buffer_size(*begin_) - skip_;
buffer_bytes(*begin_) - skip_;
if(amount < len)
{
skip_ += amount;
include/boost/beast/core/impl/multi_buffer.hpp
+2 -2
View File
@@ -196,7 +196,7 @@ public:
const_iterator end() const noexcept;
std::size_t
buffer_size() const noexcept
buffer_bytes() const noexcept
{
return b_->size();
}
@@ -1242,7 +1242,7 @@ basic_multi_buffer<Allocator>::
debug_check() const
{
#ifndef NDEBUG
BOOST_ASSERT(buffer_size(data()) == in_size_);
BOOST_ASSERT(buffer_bytes(data()) == in_size_);
if(list_.empty())
{
BOOST_ASSERT(in_pos_ == 0);
include/boost/beast/core/make_printable.hpp
+1 -1
View File
@@ -75,7 +75,7 @@ operator<<(std::ostream& os,
print (ConstBufferSequence const& buffers)
{
std::cout <<
"Buffer size: " << buffer_size(buffers) << " bytes\n"
"Buffer size: " << buffer_bytes(buffers) << " bytes\n"
"Buffer data: '" << make_printable(buffers) << "'\n";
}
@endcode
include/boost/beast/http/basic_dynamic_body.hpp
+1 -1
View File
@@ -88,7 +88,7 @@ struct basic_dynamic_body
put(ConstBufferSequence const& buffers,
error_code& ec)
{
auto const n = buffer_size(buffers);
auto const n = buffer_bytes(buffers);
if(body_.size() > body_.max_size() - n)
{
ec = error::buffer_overflow;
include/boost/beast/http/buffer_body.hpp
+1 -1
View File
@@ -133,7 +133,7 @@ struct buffer_body
body_.data = static_cast<char*>(
body_.data) + bytes_transferred;
body_.size -= bytes_transferred;
if(bytes_transferred == buffer_size(buffers))
if(bytes_transferred == buffer_bytes(buffers))
ec = {};
else
ec = error::need_buffer;
include/boost/beast/http/impl/basic_parser.hpp
+1 -1
View File
@@ -40,7 +40,7 @@ put(ConstBufferSequence const& buffers,
// single buffer
return put(net::const_buffer(*p), ec);
}
auto const size = buffer_size(buffers);
auto const size = buffer_bytes(buffers);
if(size <= max_stack_buffer)
return put_from_stack(size, buffers, ec);
if(size > buf_len_)
include/boost/beast/http/impl/chunk_encode.hpp
+4 -4
View File
@@ -90,7 +90,7 @@ template<class ConstBufferSequence>
chunk_body<ConstBufferSequence>::
chunk_body(ConstBufferSequence const& buffers)
: view_(
buffer_size(buffers),
buffer_bytes(buffers),
net::const_buffer{nullptr, 0},
chunk_crlf{},
buffers,
@@ -104,7 +104,7 @@ chunk_body(
ConstBufferSequence const& buffers,
string_view extensions)
: view_(
buffer_size(buffers),
buffer_bytes(buffers),
net::const_buffer{
extensions.data(), extensions.size()},
chunk_crlf{},
@@ -123,7 +123,7 @@ chunk_body(
typename std::decay<ChunkExtensions>::type>>(
std::forward<ChunkExtensions>(extensions)))
, view_(
buffer_size(buffers),
buffer_bytes(buffers),
exts_->str(),
chunk_crlf{},
buffers,
@@ -142,7 +142,7 @@ chunk_body(
typename std::decay<ChunkExtensions>::type>>(allocator,
std::forward<ChunkExtensions>(extensions)))
, view_(
buffer_size(buffers),
buffer_bytes(buffers),
exts_->str(),
chunk_crlf{},
buffers,
include/boost/beast/http/impl/serializer.hpp
+22 -22
View File
@@ -165,7 +165,7 @@ next(error_code& ec, Visit&& visit)
v_.template emplace<7>(
boost::in_place_init,
fwr_->get(),
buffer_size(result->first),
buffer_bytes(result->first),
net::const_buffer{nullptr, 0},
chunk_crlf{},
result->first,
@@ -178,7 +178,7 @@ next(error_code& ec, Visit&& visit)
v_.template emplace<4>(
boost::in_place_init,
fwr_->get(),
buffer_size(result->first),
buffer_bytes(result->first),
net::const_buffer{nullptr, 0},
chunk_crlf{},
result->first,
@@ -217,7 +217,7 @@ next(error_code& ec, Visit&& visit)
// do it all in one buffer
v_.template emplace<6>(
boost::in_place_init,
buffer_size(result->first),
buffer_bytes(result->first),
net::const_buffer{nullptr, 0},
chunk_crlf{},
result->first,
@@ -229,7 +229,7 @@ next(error_code& ec, Visit&& visit)
}
v_.template emplace<5>(
boost::in_place_init,
buffer_size(result->first),
buffer_bytes(result->first),
net::const_buffer{nullptr, 0},
chunk_crlf{},
result->first,
@@ -293,9 +293,9 @@ consume(std::size_t n)
{
case do_header:
BOOST_ASSERT(
n <= buffer_size(v_.template get<2>()));
n <= buffer_bytes(v_.template get<2>()));
v_.template get<2>().consume(n);
if(buffer_size(v_.template get<2>()) > 0)
if(buffer_bytes(v_.template get<2>()) > 0)
break;
header_done_ = true;
v_.reset();
@@ -306,9 +306,9 @@ consume(std::size_t n)
case do_header_only:
BOOST_ASSERT(
n <= buffer_size(v_.template get<1>()));
n <= buffer_bytes(v_.template get<1>()));
v_.template get<1>().consume(n);
if(buffer_size(v_.template get<1>()) > 0)
if(buffer_bytes(v_.template get<1>()) > 0)
break;
fwr_ = boost::none;
header_done_ = true;
@@ -320,9 +320,9 @@ consume(std::size_t n)
case do_body + 2:
{
BOOST_ASSERT(
n <= buffer_size(v_.template get<3>()));
n <= buffer_bytes(v_.template get<3>()));
v_.template get<3>().consume(n);
if(buffer_size(v_.template get<3>()) > 0)
if(buffer_bytes(v_.template get<3>()) > 0)
break;
v_.reset();
if(! more_)
@@ -335,9 +335,9 @@ consume(std::size_t n)
case do_header_c:
BOOST_ASSERT(
n <= buffer_size(v_.template get<4>()));
n <= buffer_bytes(v_.template get<4>()));
v_.template get<4>().consume(n);
if(buffer_size(v_.template get<4>()) > 0)
if(buffer_bytes(v_.template get<4>()) > 0)
break;
header_done_ = true;
v_.reset();
@@ -350,9 +350,9 @@ consume(std::size_t n)
case do_header_only_c:
{
BOOST_ASSERT(
n <= buffer_size(v_.template get<1>()));
n <= buffer_bytes(v_.template get<1>()));
v_.template get<1>().consume(n);
if(buffer_size(v_.template get<1>()) > 0)
if(buffer_bytes(v_.template get<1>()) > 0)
break;
fwr_ = boost::none;
header_done_ = true;
@@ -367,9 +367,9 @@ consume(std::size_t n)
case do_body_c + 2:
BOOST_ASSERT(
n <= buffer_size(v_.template get<5>()));
n <= buffer_bytes(v_.template get<5>()));
v_.template get<5>().consume(n);
if(buffer_size(v_.template get<5>()) > 0)
if(buffer_bytes(v_.template get<5>()) > 0)
break;
v_.reset();
if(more_)
@@ -381,9 +381,9 @@ consume(std::size_t n)
case do_body_final_c:
{
BOOST_ASSERT(
n <= buffer_size(v_.template get<6>()));
n <= buffer_bytes(v_.template get<6>()));
v_.template get<6>().consume(n);
if(buffer_size(v_.template get<6>()) > 0)
if(buffer_bytes(v_.template get<6>()) > 0)
break;
v_.reset();
s_ = do_complete;
@@ -393,9 +393,9 @@ consume(std::size_t n)
case do_all_c:
{
BOOST_ASSERT(
n <= buffer_size(v_.template get<7>()));
n <= buffer_bytes(v_.template get<7>()));
v_.template get<7>().consume(n);
if(buffer_size(v_.template get<7>()) > 0)
if(buffer_bytes(v_.template get<7>()) > 0)
break;
header_done_ = true;
v_.reset();
@@ -404,9 +404,9 @@ consume(std::size_t n)
}
case do_final_c + 1:
BOOST_ASSERT(buffer_size(v_.template get<8>()));
BOOST_ASSERT(buffer_bytes(v_.template get<8>()));
v_.template get<8>().consume(n);
if(buffer_size(v_.template get<8>()) > 0)
if(buffer_bytes(v_.template get<8>()) > 0)
break;
v_.reset();
goto go_complete;
include/boost/beast/http/span_body.hpp
+1 -1
View File
@@ -96,7 +96,7 @@ public:
put(ConstBufferSequence const& buffers,
error_code& ec)
{
auto const n = buffer_size(buffers);
auto const n = buffer_bytes(buffers);
auto const len = body_.size();
if(n > len)
{
include/boost/beast/http/string_body.hpp
+1 -1
View File
@@ -110,7 +110,7 @@ public:
put(ConstBufferSequence const& buffers,
error_code& ec)
{
auto const extra = buffer_size(buffers);
auto const extra = buffer_bytes(buffers);
auto const size = body_.size();
if (extra > body_.max_size() - size)
{
include/boost/beast/http/vector_body.hpp
+1 -1
View File
@@ -104,7 +104,7 @@ public:
put(ConstBufferSequence const& buffers,
error_code& ec)
{
auto const n = buffer_size(buffers);
auto const n = buffer_bytes(buffers);
auto const len = body_.size();
if (n > body_.max_size() - len)
{
include/boost/beast/websocket/detail/frame.hpp
+3 -3
View File
@@ -238,8 +238,8 @@ template<class Buffers>
void
read_ping(ping_data& data, Buffers const& bs)
{
BOOST_ASSERT(buffer_size(bs) <= data.max_size());
data.resize(buffer_size(bs));
BOOST_ASSERT(buffer_bytes(bs) <= data.max_size());
data.resize(buffer_bytes(bs));
net::buffer_copy(net::mutable_buffer{
data.data(), data.size()}, bs);
}
@@ -255,7 +255,7 @@ read_close(
error_code& ec)
{
using namespace boost::endian;
auto n = buffer_size(bs);
auto n = buffer_bytes(bs);
BOOST_ASSERT(n <= 125);
if(n == 0)
{
include/boost/beast/websocket/detail/impl_base.hpp
+1 -1
View File
@@ -121,7 +121,7 @@ struct impl_base<true>
cb.consume(zs.total_in);
if(zs.avail_out > 0 && fin)
{
auto const remain = buffer_size(cb);
auto const remain = buffer_bytes(cb);
if(remain == 0)
{
// Inspired by Mark Adler
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;
}
include/boost/beast/websocket/stream.hpp
+3 -3
View File
@@ -546,17 +546,17 @@ public:
@par Example
Setting the write buffer size.
@code
ws.write_buffer_size(8192);
ws.write_buffer_bytes(8192);
@endcode
@param amount The size of the write buffer in bytes.
*/
void
write_buffer_size(std::size_t amount);
write_buffer_bytes(std::size_t amount);
/// Returns the size of the write buffer.
std::size_t
write_buffer_size() const;
write_buffer_bytes() const;
/** Set the text message write option.