Skip to content

🐛 Fix handler short-circuiting #608

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
merged 1 commit into from
Aug 30, 2024
Merged

🐛 Fix handler short-circuiting #608

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: 4 additions & 2 deletions include/msg/handler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ struct handler : handler_interface<BaseMsg, ExtraCallbackArgs...> {

auto handle(BaseMsg const &msg,
ExtraCallbackArgs... args) const -> bool final {
bool const found_valid_callback = stdx::any_of(
[&](auto &callback) { return callback.handle(msg, args...); },
auto const found_valid_callback = stdx::apply(
[&](auto &...cbs) -> bool {
return (0u | ... | cbs.handle(msg, args...));
},
callbacks);
if (!found_valid_callback) {
CIB_ERROR("None of the registered callbacks claimed this message:");
Expand Down
21 changes: 20 additions & 1 deletion test/msg/handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ TEST_CASE("log mismatch when no match", "[handler]") {

TEST_CASE("match and dispatch only one callback", "[handler]") {
auto callback1 = msg::callback<"cb1", msg_defn>(
id_match<0x80>, [&](msg::const_view<msg_defn>) { CHECK(false); });
id_match<0x80>, [](msg::const_view<msg_defn>) { CHECK(false); });
auto callback2 = msg::callback<"cb2", msg_defn>(
id_match<0x44>, [](msg::const_view<msg_defn>) { dispatched = true; });
auto const msg = std::array{0x4400ba11u, 0x0042d00du};
Expand All @@ -107,6 +107,25 @@ TEST_CASE("match and dispatch only one callback", "[handler]") {
CHECK(dispatched);
}

TEST_CASE("dispatch all callbacks that match", "[handler]") {
int count{};

auto callback1 = msg::callback<"cb1", msg_defn>(
id_match<0x80>, [](msg::const_view<msg_defn>) { CHECK(false); });
auto callback2 = msg::callback<"cb2", msg_defn>(
id_match<0x44>, [&](msg::const_view<msg_defn>) { ++count; });
auto callback3 = msg::callback<"cb3", msg_defn>(
id_match<0x44>, [&](msg::const_view<msg_defn>) { ++count; });
auto const msg = std::array{0x4400ba11u, 0x0042d00du};

auto callbacks = stdx::make_tuple(callback1, callback2, callback3);
static auto handler =
msg::handler<decltype(callbacks), decltype(msg)>{callbacks};

CHECK(handler.handle(msg));
CHECK(count == 2);
}

namespace {
template <typename T>
using uint8_view =
Expand Down