tests and more

CMakePresets.json

@@ -0,0 +1,10 @@
+{
+  "version": 6,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 25,
+    "patch": 0
+  },
+  "configurePresets": [],
+  "buildPresets": []
+}

include/boost/corosio/acceptor.hpp

@@ -27,6 +27,7 @@
 #include <concepts>
 #include <coroutine>
 #include <cstddef>
+#include <memory>
 #include <stop_token>
 #include <type_traits>
 
@@ -275,7 +276,6 @@ class BOOST_COROSIO_DECL acceptor : public io_object
     };
 
 private:
-
     inline acceptor_impl& get() const noexcept
     {
         return *static_cast<acceptor_impl*>(impl_);

include/boost/corosio/io_stream.hpp

@@ -217,6 +217,19 @@ class BOOST_COROSIO_DECL io_stream : public io_object
             std::size_t*) = 0;
     };
 
+    /** Returns the underlying implementation.
+
+        This accessor is provided for testing and advanced use cases
+        that need direct access to the implementation object.
+
+        @return Pointer to the io_stream_impl, or nullptr if not set.
+    */
+    io_stream_impl*
+    get_impl() const noexcept
+    {
+        return static_cast<io_stream_impl*>(impl_);
+    }
+
 protected:
     explicit
     io_stream(

include/boost/corosio/read.hpp

@@ -76,24 +76,21 @@ namespace corosio {
         error or EOF occurs), whereas `read_some()` may return
         after reading any amount of data.
 */
-template<capy::MutableBufferSequence MutableBufferSequence>
+template<capy::MutableBufferSequence MB>
 capy::task<io_result<std::size_t>>
-read(io_stream& ios, MutableBufferSequence const& buffers)
+read(io_stream& ios, MB const& bs)
 {
-    consuming_buffers<MutableBufferSequence> consuming(buffers);
-    std::size_t const total_size = capy::buffer_size(buffers);
+    consuming_buffers<MB> consuming(bs);
+    std::size_t const total_size = capy::buffer_size(bs);
     std::size_t total_read = 0;
 
     while (total_read < total_size)
     {
         auto [ec, n] = co_await ios.read_some(consuming);
-
         if (ec)
             co_return {ec, total_read};
-
         if (n == 0)
             co_return {make_error_code(capy::error::eof), total_read};
-
         consuming.consume(n);
         total_read += n;
     }

include/boost/corosio/socket.hpp

@@ -27,6 +27,7 @@
 #include <concepts>
 #include <coroutine>
 #include <cstddef>
+#include <memory>
 #include <stop_token>
 #include <type_traits>
 

include/boost/corosio/test/socket_pair.hpp

@@ -0,0 +1,42 @@
+//
+// Copyright (c) 2025 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/cppalliance/corosio
+//
+
+#ifndef BOOST_COROSIO_TEST_SOCKET_PAIR_HPP
+#define BOOST_COROSIO_TEST_SOCKET_PAIR_HPP
+
+#include <boost/corosio/detail/config.hpp>
+#include <boost/corosio/socket.hpp>
+
+#include <utility>
+
+namespace boost {
+namespace corosio {
+
+class io_context;
+
+namespace test {
+
+/** Create a connected pair of sockets.
+
+    Creates two sockets connected via loopback TCP sockets.
+    Data written to one socket can be read from the other.
+
+    @param ioc The io_context for the sockets.
+
+    @return A pair of connected sockets.
+*/
+BOOST_COROSIO_DECL
+std::pair<socket, socket>
+make_socket_pair(io_context& ioc);
+
+} // namespace test
+} // namespace corosio
+} // namespace boost
+
+#endif

include/boost/corosio/tls/openssl_stream.hpp

@@ -46,17 +46,7 @@ namespace corosio {
 class BOOST_COROSIO_DECL openssl_stream : public tls_stream
 {
 public:
-    /** Construct an OpenSSL stream with default context.
-
-        The underlying stream must remain valid for the lifetime of
-        this openssl_stream object.
-
-        @param stream Reference to the underlying stream to wrap.
-    */
-    explicit
-    openssl_stream( io_stream& stream );
-
-    /** Construct an OpenSSL stream with TLS context.
+    /** Construct an OpenSSL stream.
 
         The underlying stream must remain valid for the lifetime of
         this openssl_stream object. The context's configuration is
@@ -67,9 +57,6 @@ class BOOST_COROSIO_DECL openssl_stream : public tls_stream
         @param ctx The TLS context containing configuration.
     */
     openssl_stream( io_stream& stream, tls::context ctx );
-
-private:
-    void construct( tls::context ctx );
 };
 
 } // namespace corosio

include/boost/corosio/tls/wolfssl_stream.hpp

@@ -48,17 +48,7 @@ class BOOST_COROSIO_DECL
     wolfssl_stream : public tls_stream
 {
 public:
-    /** Construct a WolfSSL stream with default context.
-
-        The underlying stream must remain valid for the lifetime of
-        this wolfssl_stream object.
-
-        @param stream Reference to the underlying stream to wrap.
-    */
-    explicit
-    wolfssl_stream(io_stream& stream);
-
-    /** Construct a WolfSSL stream with TLS context.
+    /** Construct a WolfSSL stream.
 
         The underlying stream must remain valid for the lifetime of
         this wolfssl_stream object. The context's configuration is
@@ -69,9 +59,6 @@ class BOOST_COROSIO_DECL
         @param ctx The TLS context containing configuration.
     */
     wolfssl_stream(io_stream& stream, tls::context ctx);
-
-private:
-    void construct(tls::context ctx);
 };
 
 } // namespace corosio

src/corosio/src/acceptor.cpp

@@ -56,13 +56,18 @@ listen(endpoint ep, int backlog)
         close();
 
     auto& svc = ctx_->use_service<acceptor_service>();
-    auto& impl = svc.create_acceptor_impl();
-    impl_ = &impl;
+    auto& wrapper = svc.create_acceptor_impl();
+    impl_ = &wrapper;
 
-    system::error_code ec = svc.open_acceptor(impl, ep, backlog);
+#if defined(BOOST_COROSIO_BACKEND_IOCP)
+    system::error_code ec = svc.open_acceptor(
+        *wrapper.get_internal(), ep, backlog);
+#elif defined(BOOST_COROSIO_BACKEND_EPOLL)
+    system::error_code ec = svc.open_acceptor(wrapper, ep, backlog);
+#endif
     if (ec)
     {
-        impl.release();
+        wrapper.release();
         impl_ = nullptr;
         detail::throw_system_error(ec, "acceptor::listen");
     }
@@ -75,7 +80,8 @@ close()
     if (!impl_)
         return;
 
-    impl_->release();
+    auto* wrapper = static_cast<acceptor_impl_type*>(impl_);
+    wrapper->release();
     impl_ = nullptr;
 }
 
@@ -84,7 +90,11 @@ acceptor::
 cancel()
 {
     assert(impl_ != nullptr);
+#if defined(BOOST_COROSIO_BACKEND_IOCP)
+    static_cast<acceptor_impl_type*>(impl_)->get_internal()->cancel();
+#elif defined(BOOST_COROSIO_BACKEND_EPOLL)
     static_cast<acceptor_impl_type*>(impl_)->cancel();
+#endif
 }
 
 } // namespace corosio

src/corosio/src/detail/epoll/op.hpp

@@ -22,6 +22,7 @@
 #include <boost/capy/error.hpp>
 #include <boost/system/error_code.hpp>
 
+#include "src/detail/make_err.hpp"
 #include "src/detail/scheduler_op.hpp"
 
 #include <unistd.h>
@@ -62,7 +63,7 @@ struct epoll_op : scheduler_op
 
     int fd = -1;
     std::uint32_t events = 0;
-    int error = 0;
+    int errn = 0;
     std::size_t bytes_transferred = 0;
 
     std::atomic<bool> cancelled{false};
@@ -77,7 +78,7 @@ struct epoll_op : scheduler_op
     {
         fd = -1;
         events = 0;
-        error = 0;
+        errn = 0;
         bytes_transferred = 0;
         cancelled.store(false, std::memory_order_relaxed);
     }
@@ -89,13 +90,13 @@ struct epoll_op : scheduler_op
         if (ec_out)
         {
             if (cancelled.load(std::memory_order_acquire))
-                *ec_out = make_error_code(system::errc::operation_canceled);
-            else if (error != 0)
-                *ec_out = system::error_code(error, system::system_category());
+                *ec_out = capy::error::canceled;
+            else if (errn != 0)
+                *ec_out = make_err(errn);
             else if (is_read_operation() && bytes_transferred == 0)
             {
                 // EOF: 0 bytes transferred with no error indicates end of stream
-                *ec_out = make_error_code(capy::error::eof);
+                *ec_out = capy::error::eof;
             }
         }
 
@@ -128,7 +129,7 @@ struct epoll_op : scheduler_op
 
     void complete(int err, std::size_t bytes) noexcept
     {
-        error = err;
+        errn = err;
         bytes_transferred = bytes;
     }
 
@@ -170,12 +171,20 @@ struct epoll_read_op : epoll_op
     iovec iovecs[max_buffers];
     int iovec_count = 0;
 
-    bool is_read_operation() const noexcept override { return true; }
+    // True when 0 bytes is due to empty buffer, not EOF
+    bool empty_buffer_read = false;
+
+    // EOF only applies when we actually tried to read something
+    bool is_read_operation() const noexcept override
+    {
+        return !empty_buffer_read;
+    }
 
     void reset() noexcept
     {
         epoll_op::reset();
         iovec_count = 0;
+        empty_buffer_read = false;
     }
 
     void perform_io() noexcept override
@@ -259,14 +268,14 @@ struct epoll_accept_op : epoll_op
     {
         stop_cb.reset();
 
-        bool success = (error == 0 && !cancelled.load(std::memory_order_acquire));
+        bool success = (errn == 0 && !cancelled.load(std::memory_order_acquire));
 
         if (ec_out)
         {
             if (cancelled.load(std::memory_order_acquire))
-                *ec_out = make_error_code(system::errc::operation_canceled);
-            else if (error != 0)
-                *ec_out = system::error_code(error, system::system_category());
+                *ec_out = capy::error::canceled;
+            else if (errn != 0)
+                *ec_out = make_err(errn);
         }
 
         if (success && accepted_fd >= 0 && peer_impl)