ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-09 11:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Update to Boost 1.88 (#5570)

Browse Source 
This updates Boost to 1.88, which is needed because Clio wants to move to 1.88 as that fixes several ASAN false positives around coroutine usage. In order for Clio to move to newer boost, libXRPL needs to move too. Hence the changes in this PR. A lot has changed between 1.83 and 1.88 so there are lots of changes in the diff, especially in regards to Boost.Asio and coroutines in particular.
This commit is contained in:
Alex Kremer
2025-08-27 10:34:50 +01:00
committed by GitHub
parent 808c86663c
commit 1506e65558
78 changed files with 871 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/test/jtx/impl/WSClient.cpp
View File

@@ -25,6 +25,9 @@
#include <xrpl/protocol/jss.h>
#include <xrpl/server/Port.h>
#include <boost/asio/executor_work_guard.hpp>
#include <boost/asio/io_context.hpp>
#include <boost/asio/strand.hpp>
#include <boost/beast/core/multi_buffer.hpp>
#include <boost/beast/websocket.hpp>
@@ -89,9 +92,11 @@ class WSClientImpl : public WSClient
return s;
}
boost::asio::io_service ios_;
std::optional<boost::asio::io_service::work> work_;
boost::asio::io_service::strand strand_;
boost::asio::io_context ios_;
std::optional<boost::asio::executor_work_guard<
boost::asio::io_context::executor_type>>
work_;
boost::asio::strand<boost::asio::io_context::executor_type> strand_;
std::thread thread_;
boost::asio::ip::tcp::socket stream_;
boost::beast::websocket::stream<boost::asio::ip::tcp::socket&> ws_;
@@ -114,14 +119,24 @@ class WSClientImpl : public WSClient
void
cleanup()
{
ios_.post(strand_.wrap([this] {
if (!peerClosed_)
{
ws_.async_close({}, strand_.wrap([&](error_code ec) {
stream_.cancel(ec);
}));
}
}));
boost::asio::post(
ios_, boost::asio::bind_executor(strand_, [this] {
if (!peerClosed_)
{
ws_.async_close(
{},
boost::asio::bind_executor(strand_, [&](error_code) {
try
{
stream_.cancel();
}
catch (boost::system::system_error const&)
{
// ignored
}
}));
}
}));
work_ = std::nullopt;
thread_.join();
}
@@ -132,8 +147,8 @@ public:
bool v2,
unsigned rpc_version,
std::unordered_map<std::string, std::string> const& headers = {})
: work_(ios_)
, strand_(ios_)
: work_(std::in_place, boost::asio::make_work_guard(ios_))
, strand_(boost::asio::make_strand(ios_))
, thread_([&] { ios_.run(); })
, stream_(ios_)
, ws_(stream_)
@@ -153,8 +168,12 @@ public:
"/");
ws_.async_read(
rb_,
strand_.wrap(std::bind(
&WSClientImpl::on_read_msg, this, std::placeholders::_1)));
boost::asio::bind_executor(
strand_,
std::bind(
&WSClientImpl::on_read_msg,
this,
std::placeholders::_1)));
}
catch (std::exception&)
{
@@ -284,8 +303,10 @@ private:
}
ws_.async_read(
rb_,
strand_.wrap(std::bind(
&WSClientImpl::on_read_msg, this, std::placeholders::_1)));
boost::asio::bind_executor(
strand_,
std::bind(
&WSClientImpl::on_read_msg, this, std::placeholders::_1)));
}
// Called when the read op terminates