Skip to content

Migrate to capy post-#262 buffer API #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mvandeberg merged 1 commit into from
May 15, 2026
Merged

Migrate to capy post-#262 buffer API #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/boost/corosio/openssl_stream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <boost/corosio/detail/config.hpp>
#include <boost/corosio/tls_context.hpp>
#include <boost/corosio/tls_stream.hpp>
#include <boost/capy/buffers/buffer_array.hpp>
#include <boost/capy/detail/buffer_array.hpp>
#include <boost/capy/concept/stream.hpp>
#include <boost/capy/io/any_stream.hpp>
#include <boost/capy/io_task.hpp>
Expand Down Expand Up @@ -188,10 +188,10 @@ class BOOST_COROSIO_DECL openssl_stream final : public tls_stream

protected:
capy::io_task<std::size_t> do_read_some(
capy::mutable_buffer_array<capy::detail::max_iovec_> buffers) override;
capy::detail::mutable_buffer_array<capy::detail::max_iovec_> buffers) override;

capy::io_task<std::size_t> do_write_some(
capy::const_buffer_array<capy::detail::max_iovec_> buffers) override;
capy::detail::const_buffer_array<capy::detail::max_iovec_> buffers) override;

private:
static impl* make_impl(capy::any_stream& stream, tls_context const& ctx);
Expand Down
6 changes: 3 additions & 3 deletions include/boost/corosio/tls_stream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <boost/corosio/detail/config.hpp>
#include <boost/capy/buffers.hpp>
#include <boost/capy/buffers/buffer_array.hpp>
#include <boost/capy/detail/buffer_array.hpp>
#include <boost/capy/io/any_stream.hpp>
#include <boost/capy/io_task.hpp>

Expand Down Expand Up @@ -184,7 +184,7 @@ class BOOST_COROSIO_DECL tls_stream
@return An awaitable yielding `(error_code,std::size_t)`.
*/
virtual capy::io_task<std::size_t> do_read_some(
capy::mutable_buffer_array<capy::detail::max_iovec_> buffers) = 0;
capy::detail::mutable_buffer_array<capy::detail::max_iovec_> buffers) = 0;

/** Virtual write implementation.

Expand All @@ -196,7 +196,7 @@ class BOOST_COROSIO_DECL tls_stream
@return An awaitable yielding `(error_code,std::size_t)`.
*/
virtual capy::io_task<std::size_t> do_write_some(
capy::const_buffer_array<capy::detail::max_iovec_> buffers) = 0;
capy::detail::const_buffer_array<capy::detail::max_iovec_> buffers) = 0;
};

} // namespace boost::corosio
Expand Down
6 changes: 3 additions & 3 deletions include/boost/corosio/wolfssl_stream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <boost/corosio/detail/config.hpp>
#include <boost/corosio/tls_context.hpp>
#include <boost/corosio/tls_stream.hpp>
#include <boost/capy/buffers/buffer_array.hpp>
#include <boost/capy/detail/buffer_array.hpp>
#include <boost/capy/concept/stream.hpp>
#include <boost/capy/io/any_stream.hpp>
#include <boost/capy/io_task.hpp>
Expand Down Expand Up @@ -188,10 +188,10 @@ class BOOST_COROSIO_DECL wolfssl_stream final : public tls_stream

protected:
capy::io_task<std::size_t> do_read_some(
capy::mutable_buffer_array<capy::detail::max_iovec_> buffers) override;
capy::detail::mutable_buffer_array<capy::detail::max_iovec_> buffers) override;

capy::io_task<std::size_t> do_write_some(
capy::const_buffer_array<capy::detail::max_iovec_> buffers) override;
capy::detail::const_buffer_array<capy::detail::max_iovec_> buffers) override;

private:
static impl* make_impl(capy::any_stream& stream, tls_context const& ctx);
Expand Down
10 changes: 5 additions & 5 deletions src/openssl/src/openssl_stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <boost/corosio/openssl_stream.hpp>
#include <boost/corosio/detail/config.hpp>
#include <boost/capy/buffers/buffer_array.hpp>
#include <boost/capy/detail/buffer_array.hpp>
#include <boost/capy/ex/async_mutex.hpp>
#include <boost/capy/error.hpp>
#include <boost/capy/write.hpp>
Expand Down Expand Up @@ -408,7 +408,7 @@ struct openssl_stream::impl
}

capy::io_task<std::size_t>
do_read_some(capy::mutable_buffer_array<capy::detail::max_iovec_> buffers)
do_read_some(capy::detail::mutable_buffer_array<capy::detail::max_iovec_> buffers)
{
std::error_code ec;
std::size_t total_read = 0;
Expand Down Expand Up @@ -494,7 +494,7 @@ struct openssl_stream::impl
}

capy::io_task<std::size_t>
do_write_some(capy::const_buffer_array<capy::detail::max_iovec_> buffers)
do_write_some(capy::detail::const_buffer_array<capy::detail::max_iovec_> buffers)
{
std::error_code ec;
std::size_t total_written = 0;
Expand Down Expand Up @@ -755,14 +755,14 @@ openssl_stream::operator=(openssl_stream&& other) noexcept

capy::io_task<std::size_t>
openssl_stream::do_read_some(
capy::mutable_buffer_array<capy::detail::max_iovec_> buffers)
capy::detail::mutable_buffer_array<capy::detail::max_iovec_> buffers)
{
co_return co_await impl_->do_read_some(buffers);
}

capy::io_task<std::size_t>
openssl_stream::do_write_some(
capy::const_buffer_array<capy::detail::max_iovec_> buffers)
capy::detail::const_buffer_array<capy::detail::max_iovec_> buffers)
{
co_return co_await impl_->do_write_some(buffers);
}
Expand Down
10 changes: 5 additions & 5 deletions src/wolfssl/src/wolfssl_stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <boost/corosio/wolfssl_stream.hpp>
#include <boost/corosio/detail/config.hpp>
#include <boost/capy/buffers/buffer_array.hpp>
#include <boost/capy/detail/buffer_array.hpp>
#include <boost/capy/ex/async_mutex.hpp>
#include <boost/capy/error.hpp>
#include <boost/capy/write.hpp>
Expand Down Expand Up @@ -442,7 +442,7 @@ struct wolfssl_stream::impl
// Inner coroutines for TLS read/write operations

capy::io_task<std::size_t>
do_read_some(capy::mutable_buffer_array<capy::detail::max_iovec_> buffers)
do_read_some(capy::detail::mutable_buffer_array<capy::detail::max_iovec_> buffers)
{
std::error_code ec;
std::size_t total_read = 0;
Expand Down Expand Up @@ -570,7 +570,7 @@ struct wolfssl_stream::impl
}

capy::io_task<std::size_t>
do_write_some(capy::const_buffer_array<capy::detail::max_iovec_> buffers)
do_write_some(capy::detail::const_buffer_array<capy::detail::max_iovec_> buffers)
{
std::error_code ec;
std::size_t total_written = 0;
Expand Down Expand Up @@ -1046,14 +1046,14 @@ wolfssl_stream::operator=(wolfssl_stream&& other) noexcept

capy::io_task<std::size_t>
wolfssl_stream::do_read_some(
capy::mutable_buffer_array<capy::detail::max_iovec_> buffers)
capy::detail::mutable_buffer_array<capy::detail::max_iovec_> buffers)
{
co_return co_await impl_->do_read_some(buffers);
}

capy::io_task<std::size_t>
wolfssl_stream::do_write_some(
capy::const_buffer_array<capy::detail::max_iovec_> buffers)
capy::detail::const_buffer_array<capy::detail::max_iovec_> buffers)
{
co_return co_await impl_->do_write_some(buffers);
}
Expand Down
12 changes: 6 additions & 6 deletions test/unit/buffer_param.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// Test that header file is self-contained.
#include <boost/corosio/detail/buffer_param.hpp>

#include <boost/capy/buffers/buffer_pair.hpp>

#include <span>
#include <array>

Expand Down Expand Up @@ -62,7 +62,7 @@ struct buffer_param_test
{
char const data1[] = "Hello";
char const data2[] = "World";
capy::const_buffer_pair cbp{
std::array<capy::const_buffer, 2> cbp{
{capy::const_buffer(data1, 5), capy::const_buffer(data2, 5)}};
check_copy(cbp, {{data1, 5}, {data2, 5}});
}
Expand All @@ -71,7 +71,7 @@ struct buffer_param_test
{
char data1[] = "Hello";
char data2[] = "World";
capy::mutable_buffer_pair mbp{
std::array<capy::mutable_buffer, 2> mbp{
{capy::mutable_buffer(data1, 5), capy::mutable_buffer(data2, 5)}};
check_copy(mbp, {{data1, 5}, {data2, 5}});
}
Expand Down Expand Up @@ -162,7 +162,7 @@ struct buffer_param_test
// Buffer pair with both zero-byte buffers
char const data1[] = "Hello";
char const data2[] = "World";
capy::const_buffer_pair cbp{
std::array<capy::const_buffer, 2> cbp{
{capy::const_buffer(data1, 0), capy::const_buffer(data2, 0)}};
check_empty(cbp);
}
Expand All @@ -185,7 +185,7 @@ struct buffer_param_test
// Zero-size buffer is skipped
char const data1[] = "Hello";
char const data2[] = "World";
capy::const_buffer_pair cbp{
std::array<capy::const_buffer, 2> cbp{
{capy::const_buffer(data1, 0), capy::const_buffer(data2, 5)}};
check_copy(cbp, {{data2, 5}});
}
Expand All @@ -203,7 +203,7 @@ struct buffer_param_test
// Mutable buffer pair with zero-byte buffers
char data1[] = "Hello";
char data2[] = "World";
capy::mutable_buffer_pair mbp{
std::array<capy::mutable_buffer, 2> mbp{
{capy::mutable_buffer(data1, 0), capy::mutable_buffer(data2, 0)}};
check_empty(mbp);
}
Expand Down
Loading