io_result is not bool convertible, and fixes

Author: vinniefalco

CMakePresets.json

@@ -1,16 +0,0 @@
-{
-    "version": 8,
-    "configurePresets": [
-        {
-            "name": "Custom configure preset",
-            "displayName": "Custom configure preset",
-            "description": "Sets Ninja generator, build and install directory",
-            "generator": "Ninja",
-            "binaryDir": "${sourceDir}/out/build/${presetName}",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Debug",
-                "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
-            }
-        }
-    ]
-}

include/boost/corosio/io_result.hpp

@@ -63,15 +63,6 @@ struct io_result<>
     /** The error code from the operation. */
     system::error_code ec;
 
-    /** Check if the operation succeeded.
-
-        @return `true` if no error occurred.
-    */
-    explicit operator bool() const noexcept
-    {
-        return !ec;
-    }
-
     /** Throw if an error occurred.
 
         @throws system::system_error if `ec` is set.
@@ -113,15 +104,6 @@ struct io_result<std::size_t>
     /** The number of bytes transferred. */
     std::size_t n = 0;
 
-    /** Check if the operation succeeded.
-
-        @return `true` if no error occurred.
-    */
-    explicit operator bool() const noexcept
-    {
-        return !ec;
-    }
-
     /** Get bytes transferred, throwing on error.
 
         @return The number of bytes transferred.
@@ -158,15 +140,6 @@ struct io_result<T>
     /** The result value. */
     T value_ = {};
 
-    /** Check if the operation succeeded.
-
-        @return `true` if no error occurred.
-    */
-    explicit operator bool() const noexcept
-    {
-        return !ec;
-    }
-
     /** Get the value, throwing on error.
 
         @return The result value.
@@ -205,15 +178,6 @@ struct io_result<T, U, Args...>
     /** The result values. */
     std::tuple<T, U, Args...> values;
 
-    /** Check if the operation succeeded.
-
-        @return `true` if no error occurred.
-    */
-    explicit operator bool() const noexcept
-    {
-        return !ec;
-    }
-
     /** Get the values, throwing on error.
 
         @return The result values as a tuple.

include/boost/corosio/tcp_server.hpp

@@ -18,7 +18,7 @@
 #include <boost/capy/task.hpp>
 #include <boost/capy/concept/io_awaitable.hpp>
 #include <boost/capy/concept/executor.hpp>
-#include <boost/capy/ex/any_executor_ref.hpp>
+#include <boost/capy/ex/any_executor.hpp>
 #include <boost/capy/ex/get_stop_token.hpp>
 #include <boost/capy/ex/run_async.hpp>
 
@@ -44,16 +44,33 @@ class BOOST_COROSIO_DECL
     struct waiter;
 
     io_context& ctx_;
-    capy::any_executor_ref dispatch_;
-    capy::any_executor_ref post_;
+    capy::any_executor ex_;
     waiter* waiters_ = nullptr;
     std::vector<acceptor> ports_;
 
+    template<capy::Executor Ex>
     struct launch_wrapper
     {
         struct promise_type
         {
-            capy::any_executor_ref d;
+            Ex ex;  // Stored directly in frame, no allocation
+
+            // For regular coroutines: first arg is the executor
+            template<class E, class... Args>
+                requires capy::Executor<std::decay_t<E>>
+            promise_type(E e, Args&&...)
+                : ex(std::move(e))
+            {
+            }
+
+            // For lambda coroutines: first arg is lambda closure, second is executor
+            template<class Closure, class E, class... Args>
+                requires (!capy::Executor<std::decay_t<Closure>> && 
+                          capy::Executor<std::decay_t<E>>)
+            promise_type(Closure&&, E e, Args&&...)
+                : ex(std::move(e))
+            {
+            }
 
             launch_wrapper get_return_object() noexcept {
                 return {std::coroutine_handle<promise_type>::from_promise(*this)};
@@ -70,21 +87,18 @@ class BOOST_COROSIO_DECL
                 struct adapter
                 {
                     std::decay_t<Awaitable> aw;
-                    capy::any_executor_ref d;
+                    Ex* ex_ptr;
 
                     bool await_ready() { return aw.await_ready(); }
                     auto await_resume() { return aw.await_resume(); }
 
                     auto await_suspend(std::coroutine_handle<promise_type> h)
                     {
-                        if constexpr (capy::IoAwaitable<
-                                std::decay_t<Awaitable>, capy::any_executor_ref>)
-                            return aw.await_suspend(h, d, std::stop_token{});
-                        else
-                            return aw.await_suspend(h);
+                        static_assert(capy::IoAwaitable<std::decay_t<Awaitable>, Ex>);
+                        return aw.await_suspend(h, *ex_ptr, std::stop_token{});
                     }
                 };
-                return adapter{std::forward<Awaitable>(a), d};
+                return adapter{std::forward<Awaitable>(a), &ex};
             }
         };
 
@@ -126,8 +140,18 @@ class BOOST_COROSIO_DECL
     public:
         push_aw(tcp_server& self, worker_base& w) noexcept;
         bool await_ready() const noexcept;
-        std::coroutine_handle<> await_suspend(std::coroutine_handle<> h) noexcept;
+
+        template<class Handle, class Ex>
+        std::coroutine_handle<> await_suspend(
+            Handle h, Ex&, std::stop_token) noexcept
+        {
+            return await_suspend_impl(h);
+        }
+
         void await_resume() noexcept;
+
+    private:
+        std::coroutine_handle<> await_suspend_impl(std::coroutine_handle<> h) noexcept;
     };
 
     class BOOST_COROSIO_DECL pop_aw
@@ -138,8 +162,17 @@ class BOOST_COROSIO_DECL
     public:
         pop_aw(tcp_server& self) noexcept;
         bool await_ready() const noexcept;
-        bool await_suspend(std::coroutine_handle<> h) noexcept;
+
+        template<class Handle, class Ex>
+        bool await_suspend(Handle h, Ex&, std::stop_token) noexcept
+        {
+            return await_suspend_impl(h);
+        }
+
         system::result<worker_base&> await_resume() noexcept;
+
+    private:
+        bool await_suspend_impl(std::coroutine_handle<> h) noexcept;
     };
 
     push_aw push(worker_base& w);
@@ -159,17 +192,9 @@ class BOOST_COROSIO_DECL
         friend class workers;
 
     public:
-        socket sock;
-
         virtual ~worker_base() = default;
         virtual void run(launcher launch) = 0;
         virtual corosio::socket& socket() = 0;
-
-    protected:
-        worker_base(capy::execution_context& ctx)
-            : sock(ctx)
-        {
-        }
     };
 
     class launcher
@@ -217,14 +242,15 @@ class BOOST_COROSIO_DECL
             } guard{srv_, w};
 
             auto wrapper =
-            [](Executor ex, tcp_server* self, capy::task<void> t, worker_base* wp)
-                -> launch_wrapper
-            {
-                (void)ex; // Prevent executor destruction while coroutine runs
-                co_await std::move(t);
-                co_await self->push(*wp);
-            }(ex, srv_, std::move(task), w);
+                [](Executor ex, tcp_server* self, capy::task<void> t, worker_base* wp)
+                    -> launch_wrapper<Executor>
+                {
+                    (void)ex; // Executor stored in promise via constructor
+                    co_await std::move(t);
+                    co_await self->push(*wp);
+                }(ex, srv_, std::move(task), w);
 
+            // Executor is now stored in promise via constructor
             ex.post(std::exchange(wrapper.h, nullptr)); // Release before post
             guard.w = nullptr; // Success - dismiss guard
         }
@@ -274,8 +300,7 @@ class BOOST_COROSIO_DECL
         io_context& ctx,
         Ex const& ex)
         : ctx_(ctx)
-        , dispatch_(ex)
-        , post_(ex)
+        , ex_(ex)
     {
     }
 

src/corosio/src/tcp_server.cpp

@@ -33,11 +33,11 @@ await_ready() const noexcept
 std::coroutine_handle<>
 tcp_server::
 push_aw::
-await_suspend(
+await_suspend_impl(
     std::coroutine_handle<> h) noexcept
 {
     // Dispatch to server's executor before touching shared state
-    return self_.dispatch_.dispatch(h);
+    return self_.ex_.dispatch(h);
 }
 
 void
@@ -50,7 +50,7 @@ await_resume() noexcept
         auto* wait = self_.waiters_;
         self_.waiters_ = wait->next;
         wait->w = &w_;
-        self_.post_.post(wait->h);
+        self_.ex_.post(wait->h);
     }
     else
     {
@@ -77,7 +77,7 @@ await_ready() const noexcept
 bool
 tcp_server::
 pop_aw::
-await_suspend(
+await_suspend_impl(
     std::coroutine_handle<> h) noexcept
 {
     wait_.h = h;
@@ -114,7 +114,7 @@ push_sync(worker_base& w) noexcept
         auto* wait = waiters_;
         waiters_ = wait->next;
         wait->w = &w;
-        post_.post(wait->h);
+        ex_.post(wait->h);
     }
     else
     {
@@ -138,7 +138,7 @@ tcp_server::do_accept(acceptor& acc)
         if(rv.has_error())
             continue;
         auto& w = rv.value();
-        auto ec = co_await acc.accept(w.socket());
+        auto [ec] = co_await acc.accept(w.socket());
         if(ec)
         {
             co_await push(w);
@@ -161,7 +161,7 @@ void
 tcp_server::start()
 {
     for(auto& t : ports_)
-        capy::run_async(post_)(do_accept(t));
+        capy::run_async(ex_)(do_accept(t));
 }
 
 } // namespace corosio

src/corosio/src/test/mocket.cpp

@@ -454,7 +454,7 @@ get_test_port() noexcept
 {
     auto port = test_port_base + (next_test_port % test_port_range);
     ++next_test_port;
-    return port;
+    return static_cast<std::uint16_t>(port);
 }
 
 } // namespace

test/unit/io_result.cpp

@@ -29,12 +29,10 @@ struct io_result_test
         // Default construction
         io_result<> r1;
         BOOST_TEST(!r1.ec);
-        BOOST_TEST(r1);
 
         // With error
         io_result<> r2{make_error_code(system::errc::invalid_argument)};
         BOOST_TEST(r2.ec);
-        BOOST_TEST(!r2);
 
         // Structured binding
         auto [ec] = r1;
@@ -54,20 +52,17 @@ struct io_result_test
         io_result<std::size_t> r1;
         BOOST_TEST(!r1.ec);
         BOOST_TEST_EQ(r1.n, 0u);
-        BOOST_TEST(r1);
 
         // With values
         io_result<std::size_t> r2{{}, 42};
         BOOST_TEST(!r2.ec);
         BOOST_TEST_EQ(r2.n, 42u);
-        BOOST_TEST(r2);
 
         // With error
         io_result<std::size_t> r3{
             make_error_code(system::errc::invalid_argument), 10};
         BOOST_TEST(r3.ec);
         BOOST_TEST_EQ(r3.n, 10u);
-        BOOST_TEST(!r3);
 
         // Structured binding
         auto [ec, n] = r2;
@@ -88,7 +83,6 @@ struct io_result_test
         io_result<std::string> r1{{}, "hello"};
         BOOST_TEST(!r1.ec);
         BOOST_TEST_EQ(r1.value_, "hello");
-        BOOST_TEST(r1);
 
         // Structured binding
         auto [ec, v] = r1;
@@ -101,7 +95,7 @@ struct io_result_test
         // With error
         io_result<std::string> r2{
             make_error_code(system::errc::invalid_argument), "error"};
-        BOOST_TEST(!r2);
+        BOOST_TEST(r2.ec);
         BOOST_TEST_THROWS(r2.value(), boost::system::system_error);
     }
 
@@ -112,7 +106,6 @@ struct io_result_test
         io_result<int, double, std::string> r1{
             {}, std::make_tuple(42, 3.14, std::string("test"))};
         BOOST_TEST(!r1.ec);
-        BOOST_TEST(r1);
 
         // Structured binding
         auto [ec, a, b, c] = r1;
@@ -131,7 +124,7 @@ struct io_result_test
         io_result<int, double> r2{
             make_error_code(system::errc::invalid_argument),
             std::make_tuple(0, 0.0)};
-        BOOST_TEST(!r2);
+        BOOST_TEST(r2.ec);
         BOOST_TEST_THROWS(r2.value(), boost::system::system_error);
     }
 

test/unit/signal_set.cpp

@@ -524,7 +524,7 @@ struct signal_set_test
                 std::raise(SIGINT);
 
                 auto result = co_await s.async_wait();
-                result_ok = static_cast<bool>(result);
+                result_ok = !result.ec;
             }());
 
         ioc.run();
@@ -545,7 +545,7 @@ struct signal_set_test
             [&]() -> capy::task<>
             {
                 auto result = co_await s.async_wait();
-                result_ok = static_cast<bool>(result);
+                result_ok = !result.ec;
                 result_ec = result.ec;
             }());