diff --git a/README.md b/README.md index 3264a5b..1bac543 100644 --- a/README.md +++ b/README.md @@ -97,8 +97,9 @@ t2.join(); - `template bool try_consume(Consumer &&consumer);` - Tries to dequeue an item and pass it to a non-throwing callable as an rvalue. - Returns `true` on success and `false` if the queue is empty. + Tries to dequeue an item and invoke the consumer on it as an rvalue. + Uses `std::invoke` so the consumer can also be a pointer to a member. The + invocation must be non-throwing. Returns `true` on success and `false` if the queue is empty. - `ssize_t size();` diff --git a/include/rigtorp/MPMCQueue.h b/include/rigtorp/MPMCQueue.h index d61c96d..7444f7e 100644 --- a/include/rigtorp/MPMCQueue.h +++ b/include/rigtorp/MPMCQueue.h @@ -25,6 +25,7 @@ SOFTWARE. #include #include #include +#include #include #include #include @@ -208,9 +209,7 @@ class MPMCQueue { } template - requires requires(Consumer &&c, T &&item) { - { std::forward(c)(std::move(item)) } noexcept; - } + requires std::is_nothrow_invocable_v [[nodiscard]] bool try_consume(Consumer &&c) noexcept { auto tail = tail_.load(std::memory_order_acquire); for (;;) { @@ -218,7 +217,7 @@ class MPMCQueue { auto const t = turn(tail); if (t * 2 + 1 == slot.turn.load(std::memory_order_acquire)) { if (tail_.compare_exchange_strong(tail, tail + 1)) { - std::forward(c)(slot.move()); + std::invoke(std::forward(c), slot.move()); slot.destroy(); slot.turn.store(t * 2 + 2, std::memory_order_release); return true; diff --git a/src/MPMCQueueTest.cpp b/src/MPMCQueueTest.cpp index f5219b3..9f831bf 100644 --- a/src/MPMCQueueTest.cpp +++ b/src/MPMCQueueTest.cpp @@ -187,6 +187,23 @@ int main(int argc, char *argv[]) { assert(*v == 3); } + { + struct Item { + bool *consumed; + void consume() && noexcept { *consumed = true; } + }; + bool consumed = false; + MPMCQueue q(1); + assert(!q.try_consume(&Item::consume)); + q.emplace(&consumed); + assert(q.try_consume(&Item::consume)); + assert(consumed && q.empty()); + + q.emplace(&consumed); + assert(q.try_consume(&Item::consumed)); + assert(q.empty()); + } + // Check that pointer have same address and value after moving through queue { MPMCQueue> q(1);