io buffer adjustments

Author: klemens-morgenstern

Diff for: include/boost/async/io/buffers/concepts.hpp

@@ -45,8 +45,14 @@ concept const_buffer_sequence =
       {buf.end()}   -> std::same_as<typename T::const_iterator>;
 
     } &&
-    (std::same_as<typename std::iterator_traits<typename T::const_iterator>::value_type, const_buffer> ||
-     std::same_as<typename std::iterator_traits<typename T::const_iterator>::value_type, mutable_buffer>))
+    (std::same_as<std::remove_const_t<
+        typename std::iterator_traits<typename T::const_iterator>::value_type>,
+        const_buffer>
+      ||
+     std::same_as<std::remove_const_t<
+         typename std::iterator_traits<typename T::const_iterator>::value_type>,
+         mutable_buffer>)
+     )
 ;
 
 
@@ -69,7 +75,10 @@ concept mutable_buffer_sequence =
        {buf.begin()} -> std::same_as<typename T::const_iterator>;
        {buf.end()}  -> std::same_as<typename T::const_iterator>;
      } &&
-     std::same_as<typename std::iterator_traits<typename T::const_iterator>::value_type, mutable_buffer>)
+    std::same_as<
+        std::remove_const_t<typename std::iterator_traits<typename T::const_iterator>::value_type>,
+        mutable_buffer>
+    )
 ;
 
 

Diff for: include/boost/async/io/buffers/const_buffer.hpp

@@ -48,7 +48,7 @@ class const_buffer
             {ct.size()} -> std::convertible_to<std::size_t>;
           }
           && std::is_trivial_v<typename Container::value_type>)
-    const_buffer(Container & ct) : const_buffer(ct.data(), sizeof(typename Container::value_type) * ct.size()) {}
+    const_buffer(const Container & ct) : const_buffer(ct.data(), sizeof(typename Container::value_type) * ct.size()) {}
 
     /** Constructor for strings */
     template<std::size_t N>

Diff for: include/boost/async/io/buffers/mutable_buffer.hpp

@@ -59,7 +59,7 @@ class mutable_buffer
           {std::size(ct)} -> std::convertible_to<std::size_t>;
         }
         && std::is_trivial_v<typename Container::value_type>)
-    mutable_buffer(Container & ct) : mutable_buffer(std::data(ct), sizeof(typename Container::value_type) * std::size(ct)) {}
+      mutable_buffer(Container & ct) : mutable_buffer(std::data(ct), sizeof(typename Container::value_type) * std::size(ct)) {}
 
     /** Constructor for arrays */
     template<typename T, std::size_t N>

Diff for: include/boost/async/io/buffers/mutable_buffer_span.hpp

@@ -61,21 +61,7 @@ class mutable_buffer_span
           {seq.size()} -> std::same_as<std::size_t>;
         }
     mutable_buffer_span(
-        MutableBufferSequence const& bs) noexcept
-        : p_(bs.data())
-        , n_(bs.size())
-    {
-    }
-
-    template<mutable_buffer_sequence MutableBufferSequence>
-      requires requires (const MutableBufferSequence & seq)
-        {
-          {seq.data()} -> std::same_as<const mutable_buffer*>;
-          {seq.size()} -> std::same_as<std::size_t>;
-        }
-    explicit
-    mutable_buffer_span(
-        MutableBufferSequence const& bs) noexcept
+        const MutableBufferSequence & bs) noexcept
         : p_(bs.data())
         , n_(bs.size())
     {

Diff for: include/boost/async/io/steady_timer.hpp

@@ -48,7 +48,10 @@ struct steady_timer
  private:
   struct wait_op_ final : result_op<void>
   {
-    void ready(async::handler<system::error_code> h) {if (timer_->expired()) h({});}
+    void ready(async::handler<system::error_code> h) override
+    {
+      if (timer_->expired()) h({});
+    }
     BOOST_ASYNC_DECL void initiate(completion_handler<system::error_code> handler) override;
     wait_op_(steady_timer * timer) : timer_(timer) {}
    private:

Diff for: include/boost/async/io/system_timer.hpp

@@ -46,7 +46,7 @@ struct system_timer final
  private:
   struct wait_op_ : result_op<void>
   {
-    void ready(async::handler<system::error_code> h) {if (timer_->expired()) h({});}
+    void ready(async::handler<system::error_code> h) override {if (timer_->expired()) h({});}
     BOOST_ASYNC_DECL void initiate(completion_handler<system::error_code> handler) override;
 
     wait_op_(system_timer * timer) : timer_(timer) {}

Diff for: src/io/copy.cpp

@@ -20,16 +20,16 @@ copy(stream & source, stream & sink)
   char mem[chunk_size * 2];
   buffers::circular_buffer buf{mem, sizeof(mem)};
 
-  transfer_result r = co_await source.read_some(buffers::mutable_buffer_span(buf.prepare(chunk_size))),
+  transfer_result r = co_await source.read_some(buf.prepare(chunk_size)),
                   w = {};
 
   buf.commit(r.transferred);
 
   while (!r.has_error() && !w.has_error())
   {
     auto [r2, w2] = co_await join(
-        source.read_some(buffers::mutable_buffer_span(buf.prepare(chunk_size))),
-        sink.write_some(buffers::const_buffer_span(buf.data())));
+        source.read_some(buf.prepare(chunk_size)),
+        sink.write_some(buf.data()));
     buf.commit(r2.transferred);
     buf.consume(w2.transferred);
     r.transferred += r2.transferred;

Diff for: src/io/copy_n.cpp

@@ -20,15 +20,15 @@ copy_n(stream & source, stream & sink, std::size_t n)
   char mem[chunk_size * 2];
   buffers::circular_buffer buf{mem, sizeof(mem)};
 
-  transfer_result r = co_await source.read_some(buffers::mutable_buffer_span(buf.prepare(chunk_size))),
+  transfer_result r = co_await source.read_some(buf.prepare(chunk_size)),
                   w = {};
 
   buf.commit(r.transferred);
 
   while (!r.has_error() && !w.has_error() && (n > 0u))
   {
     auto [r2, w2] = co_await join(
-        source.read_some(buffers::mutable_buffer_span(buf.prepare((std::min)(chunk_size, n)))),
+        source.read_some(buf.prepare((std::min)(chunk_size, n))),
         sink.write_some(buffers::const_buffer_span(buf.data())));
     buf.commit(r2.transferred);
     n -= r2.transferred;
@@ -55,15 +55,15 @@ promise<std::pair<transfer_result, transfer_result>>
 copy_n(stream & source, stream & sink, buffers::dynamic_buffer_view buf,
        std::size_t n, std::size_t chunk_size)
 {
-  transfer_result r = co_await source.read_some(buffers::mutable_buffer_span(buf.prepare(chunk_size))),
+  transfer_result r = co_await source.read_some(buf.prepare(chunk_size)),
       w = {};
 
   buf.commit(r.transferred);
 
   while (!r.has_error() && !w.has_error())
   {
     auto [r2, w2] = co_await join(
-        source.read_some(buffers::mutable_buffer_span(buf.prepare((std::min)(chunk_size, n)))),
+        source.read_some(buf.prepare((std::min)(chunk_size, n))),
         sink.write_some(buffers::const_buffer_span(buf.data())));
     buf.commit(r2.transferred);
     buf.consume(w2.transferred);

Diff for: src/io/read_until.cpp

@@ -26,6 +26,7 @@ promise<transfer_result> read_until(stream & source, buffers::dynamic_buffer_vie
   do
   {
     auto buf = buffer.prepare((std::min)(chunk_size, buffer.max_size() - buffer.size()));
+    async::io::buffers::mutable_buffer_span cb{buf};
     auto rd = co_await source.read_some(buf);
 
     auto begin = asio::buffers_begin(buf);