vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-07 20:10:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace Boost.Asio with standalone Asio library

Browse Source 
We had to add an even hackier hack now to get Boost.Process to
interoperate with Asio's IO contexts. This will be replaced later when
we replace Boost.Process.
This commit is contained in:
Robbert van der Helm
2022-04-10 21:29:14 +02:00
parent d9ab04ba35
commit 556b0e38f9
34 changed files with 465 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugin/host-process.cpp
+8 -8
View File
@@ -16,7 +16,7 @@
#include "host-process.h"
#include <boost/asio/read_until.hpp>
#include <asio/read_until.hpp>
#include <boost/process/env.hpp>
#include <boost/process/start_dir.hpp>
@@ -25,7 +25,7 @@
namespace bp = boost::process;
namespace fs = ghc::filesystem;
HostProcess::HostProcess(boost::asio::io_context& io_context,
HostProcess::HostProcess(asio::io_context& io_context,
Logger& logger,
const Configuration& config,
Sockets& sockets)
@@ -53,7 +53,7 @@ HostProcess::HostProcess(boost::asio::io_context& io_context,
HostProcess::~HostProcess() noexcept {}
IndividualHost::IndividualHost(boost::asio::io_context& io_context,
IndividualHost::IndividualHost(asio::io_context& io_context,
Logger& logger,
const Configuration& config,
Sockets& sockets,
@@ -115,7 +115,7 @@ void IndividualHost::terminate() {
host_.wait();
}
GroupHost::GroupHost(boost::asio::io_context& io_context,
GroupHost::GroupHost(asio::io_context& io_context,
Logger& logger,
const Configuration& config,
Sockets& sockets,
@@ -140,7 +140,7 @@ GroupHost::GroupHost(boost::asio::io_context& io_context,
plugin_info.plugin_arch_);
const auto connect = [&io_context, host_request, endpoint_base_dir,
group_socket_path]() {
boost::asio::local::stream_protocol::socket group_socket(io_context);
asio::local::stream_protocol::socket group_socket(io_context);
group_socket.connect(group_socket_path.string());
write_object(group_socket, host_request);
@@ -151,7 +151,7 @@ GroupHost::GroupHost(boost::asio::io_context& io_context,
try {
// Request an existing group host process to host our plugin
connect();
} catch (const boost::system::system_error&) {
} catch (const std::system_error&) {
// In case we could not connect to the socket, then we'll start a
// new group host process. This process is detached immediately
// because it should run independently of this yabridge instance as
@@ -178,7 +178,7 @@ GroupHost::GroupHost(boost::asio::io_context& io_context,
try {
connect();
return;
} catch (const boost::system::system_error&) {
} catch (const std::system_error&) {
// Keep trying to connect until either connection gets
// accepted or the group host crashes
}
@@ -191,7 +191,7 @@ GroupHost::GroupHost(boost::asio::io_context& io_context,
// connect once more, before concluding that we failed.
try {
connect();
} catch (const boost::system::system_error&) {
} catch (const std::system_error&) {
startup_failed_ = true;
}
});