Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 08:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDK: Fix completion signature and catch completion exceptions

Browse Source
This commit is contained in:
Dennis Klein 2019-08-20 16:36:30 +02:00 committed by Dennis Klein
parent 75a3a80ac1
commit 0f50abf3d9
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fairmq/sdk/AsioAsyncOp.h
View File

@ -14,6 +14,8 @@
#include <asio/executor_work_guard.hpp> #include <asio/executor_work_guard.hpp>
#include <asio/system_executor.hpp> #include <asio/system_executor.hpp>
#include <chrono> #include <chrono>
#include <exception>
#include <fairlogger/Logger.h>
#include <fairmq/sdk/Error.h> #include <fairmq/sdk/Error.h>
#include <fairmq/sdk/Traits.h> #include <fairmq/sdk/Traits.h>
#include <functional> #include <functional>
@ -29,7 +31,7 @@ namespace sdk {
template<typename... SignatureArgTypes> template<typename... SignatureArgTypes>
struct AsioAsyncOpImplBase struct AsioAsyncOpImplBase
{ {
virtual auto Complete(std::error_code, SignatureArgTypes&&...) -> void = 0; virtual auto Complete(std::error_code, SignatureArgTypes...) -> void = 0;
virtual auto IsCompleted() const -> bool = 0; virtual auto IsCompleted() const -> bool = 0;
}; };
@ -57,7 +59,7 @@ struct AsioAsyncOpImpl : AsioAsyncOpImplBase<SignatureArgTypes...>
auto GetAlloc2() const -> Allocator2 { return asio::get_associated_allocator(fHandler, fAlloc1); } auto GetAlloc2() const -> Allocator2 { return asio::get_associated_allocator(fHandler, fAlloc1); }
auto GetEx2() const -> Executor2 { return asio::get_associated_executor(fWork2); } auto GetEx2() const -> Executor2 { return asio::get_associated_executor(fWork2); }
auto Complete(std::error_code ec, SignatureArgTypes&&... args) -> void override auto Complete(std::error_code ec, SignatureArgTypes... args) -> void override
{ {
if (IsCompleted()) { if (IsCompleted()) {
throw RuntimeError("Async operation already completed"); throw RuntimeError("Async operation already completed");
@ -65,7 +67,13 @@ struct AsioAsyncOpImpl : AsioAsyncOpImplBase<SignatureArgTypes...>
GetEx2().dispatch( GetEx2().dispatch(
[=, handler = std::move(fHandler)]() mutable { [=, handler = std::move(fHandler)]() mutable {
handler(ec, std::forward<SignatureArgTypes>(args)...); try {
handler(ec, args...);
} catch (const std::exception& e) {
LOG(error) << "Uncaught exception in AsioAsyncOp completion handler: " << e.what();
} catch (...) {
LOG(error) << "Unknown uncaught exception in AsioAsyncOp completion handler.";
}
}, },
GetAlloc2()); GetAlloc2());
@ -181,25 +189,29 @@ struct AsioAsyncOp<Executor,
auto IsCompleted() -> bool { return (fImpl == nullptr) || fImpl->IsCompleted(); } auto IsCompleted() -> bool { return (fImpl == nullptr) || fImpl->IsCompleted(); }
auto Complete(std::error_code ec, SignatureArgTypes&&... args) -> void auto Complete(std::error_code ec, SignatureArgTypes... args) -> void
{ {
if(IsCompleted()) { if(IsCompleted()) {
throw RuntimeError("Async operation already completed"); throw RuntimeError("Async operation already completed");
} }
fImpl->Complete(ec, std::forward<SignatureArgTypes>(args)...); fImpl->Complete(ec, args...);
fImpl.reset(nullptr); fImpl.reset(nullptr);
} }
auto Complete(SignatureArgTypes&&... args) -> void auto Complete(SignatureArgTypes... args) -> void
{ {
Complete(std::error_code(), std::forward<SignatureArgTypes>(args)...); Complete(std::error_code(), args...);
} }
auto Cancel(SignatureArgTypes&&... args) -> void auto Cancel(SignatureArgTypes... args) -> void
{ {
Complete(std::make_error_code(std::errc::operation_canceled), Complete(MakeErrorCode(ErrorCode::OperationCanceled), args...);
std::forward<SignatureArgTypes>(args)...); }
auto Timeout(SignatureArgTypes... args) -> void
{
Complete(MakeErrorCode(ErrorCode::OperationTimeout), args...);
} }
}; };