buffers changes

Author: vinniefalco

src/detail/array_of_const_buffers.cpp

@@ -38,7 +38,7 @@ consume(std::size_t n)
         auto* p = base_ + pos_;
         if(n < p->size())
         {
-            buffers::trim_front(*p, n);
+            buffers::remove_prefix(*p, n);
             return;
         }
         n -= p->size();

src/detail/buffer_utils.hpp

@@ -11,30 +11,20 @@
 #define BOOST_HTTP_PROTO_DETAIL_BUFFER_UTILS_HPP
 
 #include <boost/buffers/buffer.hpp>
-#include <boost/buffers/slice.hpp>
 #include <boost/core/span.hpp>
+#include <iterator>
 
 namespace boost {
 namespace http_proto {
 namespace detail {
 
-template<
-    typename BufferSequence,
-    typename Buffer = typename BufferSequence::value_type>
-boost::span<Buffer const>
-make_span(BufferSequence const& mbp)
-{
-    return { mbp.begin(), mbp.end() };
-}
-
 template<typename BufferSequence>
-BufferSequence
-prefix(
-    BufferSequence cbp,
-    std::size_t n)
+auto
+make_span(BufferSequence const& bs) ->
+    boost::span<typename std::iterator_traits<decltype(buffers::begin(bs))>::value_type const>
 {
-    buffers::keep_front(cbp, n);
-    return cbp;
+    return { &*buffers::begin(bs),
+        std::size_t(std::distance(buffers::begin(bs), buffers::end(bs))) };
 }
 
 } // detail

src/detail/filter.cpp

@@ -57,8 +57,8 @@ process(
             return rv;
         }
 
-        buffers::trim_front(out, rs.out_bytes);
-        buffers::trim_front(in, rs.in_bytes);
+        buffers::remove_prefix(out, rs.out_bytes);
+        buffers::remove_prefix(in, rs.in_bytes);
 
         if(buffers::size(out) == 0)
             return rv;

src/parser.cpp

@@ -12,15 +12,12 @@
 #include <boost/http_proto/error.hpp>
 #include <boost/http_proto/parser.hpp>
 
-#include "src/detail/brotli_filter_base.hpp"
-#include "src/detail/buffer_utils.hpp"
-#include "src/detail/zlib_filter_base.hpp"
-
 #include <boost/assert.hpp>
 #include <boost/buffers/circular_buffer.hpp>
 #include <boost/buffers/copy.hpp>
 #include <boost/buffers/flat_buffer.hpp>
 #include <boost/buffers/front.hpp>
+#include <boost/buffers/slice.hpp>
 #include <boost/rts/brotli/decode.hpp>
 #include <boost/rts/context.hpp>
 #include <boost/rts/zlib/error.hpp>
@@ -29,6 +26,10 @@
 #include <boost/url/grammar/error.hpp>
 #include <boost/url/grammar/hexdig_chars.hpp>
 
+#include "src/detail/brotli_filter_base.hpp"
+#include "src/detail/buffer_utils.hpp"
+#include "src/detail/zlib_filter_base.hpp"
+
 namespace boost {
 namespace http_proto {
 
@@ -1317,7 +1318,7 @@ class parser::impl
                         const std::size_t chunk_avail =
                             clamp(chunk_remain_, cb0_.size());
                         const auto chunk =
-                            detail::prefix(cb0_.data(), chunk_avail);
+                            buffers::prefix(cb0_.data(), chunk_avail);
 
                         if(body_limit_remain() < chunk_avail)
                         {
@@ -1459,7 +1460,7 @@ class parser::impl
                         payload_remain_ -= payload_avail;
                         body_total_     += payload_avail;
                         auto sink_rs = sink_->write(
-                            detail::prefix(cb0_.data(), payload_avail),
+                            buffers::prefix(cb0_.data(), payload_avail),
                             !is_complete);
                         cb0_.consume(sink_rs.bytes);
                         if(sink_rs.ec.failed())
@@ -1537,7 +1538,7 @@ class parser::impl
             case style::sink:
             {
                 auto rs = sink_->write(
-                    detail::prefix(body_buf.data(), body_avail_),
+                    buffers::prefix(body_buf.data(), body_avail_),
                     state_ == state::set_body);
                 body_buf.consume(rs.bytes);
                 body_avail_ -= rs.bytes;
@@ -1594,7 +1595,7 @@ class parser::impl
             return {};
         case state::body:
         case state::complete_in_place:
-            cbp_ = detail::prefix(
+            cbp_ = buffers::prefix(
                 (is_plain() ? cb0_ : cb1_).data(),
                 body_avail_);
             return detail::make_span(cbp_);
@@ -1730,7 +1731,7 @@ class parser::impl
 
                     return filter_->process(
                         eb_->prepare(n),
-                        detail::prefix(cb0_.data(), payload_avail),
+                        buffers::prefix(cb0_.data(), payload_avail),
                         more);
                 }
                 else // in-place and sink 
@@ -1740,7 +1741,7 @@ class parser::impl
 
                     return filter_->process(
                         detail::make_span(cb1_.prepare(n)),
-                        detail::prefix(cb0_.data(), payload_avail),
+                        buffers::prefix(cb0_.data(), payload_avail),
                         more);
                 }
             }();

src/serializer.cpp

@@ -474,7 +474,7 @@ class serializer::impl
 
                     const auto rs = filter_->process(
                         detail::make_span(out_prepare()),
-                        { tmp_, {} },
+                        {{ {tmp_}, {} }},
                         more_input_);
 
                     if(rs.ec.failed())
@@ -484,7 +484,7 @@ class serializer::impl
                         return rs.ec;
                     }
 
-                    buffers::trim_front(tmp_, rs.in_bytes);
+                    buffers::remove_prefix(tmp_, rs.in_bytes);
                     out_commit(rs.out_bytes);
 
                     if(rs.out_short)
@@ -752,7 +752,7 @@ class serializer::impl
                     auto h_len = chunk_header_len(stats.size);
                     buffers::mutable_buffer mb(
                         ws_.reserve_front(h_len), h_len);
-                    write_chunk_header({ mb, {} }, stats.size);    
+                    write_chunk_header({{ {mb}, {} }}, stats.size);    
                     prepped_.append(mb);
                 }
             }
@@ -870,9 +870,9 @@ class serializer::impl
         auto mbp = out_.prepare(out_.capacity());
         if(is_chunked_)
         {
-            buffers::trim_front(
+            buffers::remove_prefix(
                 mbp, chunk_header_len_);
-            buffers::trim_back(
+            buffers::remove_suffix(
                 mbp, crlf_and_final_chunk.size());
         }
         return mbp;

test/unit/compression.cpp

@@ -261,7 +261,7 @@ struct zlib_test
 
                 results rs;
                 auto n = buffers::copy(b, body_);
-                buffers::trim_front(body_, n);
+                buffers::remove_prefix(body_, n);
                 rs.bytes = n;
                 rs.finished = (body_.size() == 0);
                 done_ = rs.finished;
@@ -296,7 +296,7 @@ struct zlib_test
             {
                 auto mbs = stream.prepare();
                 auto n = buffers::copy(mbs, body);
-                buffers::trim_front(body, n);
+                buffers::remove_prefix(body, n);
                 stream.commit(n);
                 if(body.size() == 0)
                     stream.close();
@@ -336,7 +336,7 @@ struct zlib_test
             buf_seq.emplace_back(
                 body.data(),
                 body.size() ? buf_size : 0);
-            buffers::trim_front(body, buf_size);
+            buffers::remove_prefix(body, buf_size);
         } while(body.size() != 0);
 
         sr.start(res, buf_seq);
@@ -483,7 +483,7 @@ struct zlib_test
             if(input.size() != 0)
             {
                 auto n1 = buffers::copy(pr.prepare(), input);
-                buffers::trim_front(input, n1);
+                buffers::remove_prefix(input, n1);
                 pr.commit(n1);
             }
 
@@ -522,7 +522,7 @@ struct zlib_test
     {
         std::string rs;
         auto n1 = buffers::copy(pr.prepare(), input);
-        buffers::trim_front(input, n1);
+        buffers::remove_prefix(input, n1);
         pr.commit(n1);
         system::error_code ec;
         pr.parse(ec);
@@ -535,7 +535,7 @@ struct zlib_test
         while(ec == error::need_data)
         {
             auto n2 = buffers::copy(pr.prepare(), input);
-            buffers::trim_front(input, n2);
+            buffers::remove_prefix(input, n2);
             pr.commit(n2);
             pr.parse(ec);
             if(n2 == 0)
@@ -555,7 +555,7 @@ struct zlib_test
         buffers::const_buffer input)
     {
         auto n1 = buffers::copy(pr.prepare(), input);
-        buffers::trim_front(input, n1);
+        buffers::remove_prefix(input, n1);
         pr.commit(n1);
         system::error_code ec;
         pr.parse(ec);
@@ -596,7 +596,7 @@ struct zlib_test
         while(ec == error::need_data)
         {
             auto n2 = buffers::copy(pr.prepare(), input);
-            buffers::trim_front(input, n2);
+            buffers::remove_prefix(input, n2);
             pr.commit(n2);
             pr.parse(ec);
             if(n2 == 0)

test/unit/serializer.cpp

@@ -120,7 +120,7 @@ struct serializer_test
         // serializer::consume(), allowing tests to cover
         // state management within these functions
         std::string s;
-        buffers::keep_front(cbs, 256);
+        buffers::keep_prefix(cbs, 256);
         for( auto buf : cbs)
         {
             s.append(
@@ -411,7 +411,7 @@ struct serializer_test
             while( buf.size() > 0 )
             {
                 auto n = buffers::copy(out_buf, buf);
-                buffers::trim_front(buf, n);
+                buffers::remove_prefix(buf, n);
 
                 s.insert(
                     s.end(),

test/unit/source.cpp

@@ -47,7 +47,7 @@ struct source_test
                 return rv;
             }
             auto n = buffers::copy(b, cb_);
-            buffers::trim_front(cb_, n);
+            buffers::remove_prefix(cb_, n);
             rv.bytes += n;
             rv.finished = cb_.size() == 0;
             return rv;