diff options
Diffstat (limited to 'boost/beast/core/impl/static_buffer.ipp')
| -rw-r--r-- | boost/beast/core/impl/static_buffer.ipp | 156 |
1 files changed, 60 insertions, 96 deletions
diff --git a/boost/beast/core/impl/static_buffer.ipp b/boost/beast/core/impl/static_buffer.ipp index bd498c97a1..c26ff429b8 100644 --- a/boost/beast/core/impl/static_buffer.ipp +++ b/boost/beast/core/impl/static_buffer.ipp @@ -1,5 +1,5 @@ // -// Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com) +// 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) @@ -10,6 +10,7 @@ #ifndef BOOST_BEAST_IMPL_STATIC_BUFFER_IPP #define BOOST_BEAST_IMPL_STATIC_BUFFER_IPP +#include <boost/beast/core/static_buffer.hpp> #include <boost/beast/core/detail/type_traits.hpp> #include <boost/asio/buffer.hpp> #include <boost/throw_exception.hpp> @@ -21,148 +22,111 @@ namespace boost { namespace beast { -inline static_buffer_base:: -static_buffer_base(void* p, std::size_t size) +static_buffer_base( + void* p, std::size_t size) noexcept : begin_(static_cast<char*>(p)) , capacity_(size) { } -inline +void +static_buffer_base:: +clear() noexcept +{ + in_off_ = 0; + in_size_ = 0; + out_size_ = 0; +} + auto static_buffer_base:: -data() const -> +data() const noexcept -> const_buffers_type { - using boost::asio::const_buffer; - const_buffers_type result; if(in_off_ + in_size_ <= capacity_) - { - result[0] = const_buffer{begin_ + in_off_, in_size_}; - result[1] = const_buffer{begin_, 0}; - } - else - { - result[0] = const_buffer{begin_ + in_off_, capacity_ - in_off_}; - result[1] = const_buffer{begin_, in_size_ - (capacity_ - in_off_)}; - } - return result; + return { + net::const_buffer{ + begin_ + in_off_, in_size_}, + net::const_buffer{ + begin_, 0}}; + return { + net::const_buffer{ + begin_ + in_off_, capacity_ - in_off_}, + net::const_buffer{ + begin_, in_size_ - (capacity_ - in_off_)}}; } -inline auto static_buffer_base:: -mutable_data() -> - mutable_buffers_type +data() noexcept -> + mutable_data_type { - using boost::asio::mutable_buffer; - mutable_buffers_type result; if(in_off_ + in_size_ <= capacity_) - { - result[0] = mutable_buffer{begin_ + in_off_, in_size_}; - result[1] = mutable_buffer{begin_, 0}; - } - else - { - result[0] = mutable_buffer{begin_ + in_off_, capacity_ - in_off_}; - result[1] = mutable_buffer{begin_, in_size_ - (capacity_ - in_off_)}; - } - return result; + return { + net::mutable_buffer{ + begin_ + in_off_, in_size_}, + net::mutable_buffer{ + begin_, 0}}; + return { + net::mutable_buffer{ + begin_ + in_off_, capacity_ - in_off_}, + net::mutable_buffer{ + begin_, in_size_ - (capacity_ - in_off_)}}; } -inline auto static_buffer_base:: -prepare(std::size_t size) -> +prepare(std::size_t n) -> mutable_buffers_type { - using boost::asio::mutable_buffer; - if(size > capacity_ - in_size_) + using net::mutable_buffer; + if(n > capacity_ - in_size_) BOOST_THROW_EXCEPTION(std::length_error{ - "buffer overflow"}); - out_size_ = size; - auto const out_off = (in_off_ + in_size_) % capacity_; - mutable_buffers_type result; + "static_buffer overflow"}); + out_size_ = n; + auto const out_off = + (in_off_ + in_size_) % capacity_; if(out_off + out_size_ <= capacity_ ) - { - result[0] = mutable_buffer{begin_ + out_off, out_size_}; - result[1] = mutable_buffer{begin_, 0}; - } - else - { - result[0] = mutable_buffer{begin_ + out_off, capacity_ - out_off}; - result[1] = mutable_buffer{begin_, out_size_ - (capacity_ - out_off)}; - } - return result; + return { + net::mutable_buffer{ + begin_ + out_off, out_size_}, + net::mutable_buffer{ + begin_, 0}}; + return { + net::mutable_buffer{ + begin_ + out_off, capacity_ - out_off}, + net::mutable_buffer{ + begin_, out_size_ - (capacity_ - out_off)}}; } -inline void static_buffer_base:: -commit(std::size_t size) +commit(std::size_t n) noexcept { - in_size_ += (std::min)(size, out_size_); + in_size_ += (std::min)(n, out_size_); out_size_ = 0; } -inline void static_buffer_base:: -consume(std::size_t size) +consume(std::size_t n) noexcept { - if(size < in_size_) + if(n < in_size_) { - in_off_ = (in_off_ + size) % capacity_; - in_size_ -= size; + in_off_ = (in_off_ + n) % capacity_; + in_size_ -= n; } else { // rewind the offset, so the next call to prepare // can have a longer contiguous segment. this helps - // algorithms optimized for larger buffesr. + // algorithms optimized for larger buffers. in_off_ = 0; in_size_ = 0; } } -inline -void -static_buffer_base:: -reset(void* p, std::size_t size) -{ - begin_ = static_cast<char*>(p); - capacity_ = size; - in_off_ = 0; - in_size_ = 0; - out_size_ = 0; -} - -//------------------------------------------------------------------------------ - -template<std::size_t N> -static_buffer<N>:: -static_buffer(static_buffer const& other) - : static_buffer_base(buf_, N) -{ - using boost::asio::buffer_copy; - this->commit(buffer_copy( - this->prepare(other.size()), other.data())); -} - -template<std::size_t N> -auto -static_buffer<N>:: -operator=(static_buffer const& other) -> - static_buffer<N>& -{ - using boost::asio::buffer_copy; - this->consume(this->size()); - this->commit(buffer_copy( - this->prepare(other.size()), other.data())); - return *this; -} - } // beast } // boost |