Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,9 @@ t2.join();

- `template <typename Consumer> 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();`

Expand Down
7 changes: 3 additions & 4 deletions include/rigtorp/MPMCQueue.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ SOFTWARE.
#include <atomic>
#include <cstddef>
#include <cstdint>
#include <functional>
#include <limits>
#include <memory>
#include <new>
Expand Down Expand Up @@ -208,17 +209,15 @@ class MPMCQueue {
}

template <typename Consumer>
requires requires(Consumer &&c, T &&item) {
{ std::forward<Consumer>(c)(std::move(item)) } noexcept;
}
requires std::is_nothrow_invocable_v<Consumer &&, T &&>
[[nodiscard]] bool try_consume(Consumer &&c) noexcept {
auto tail = tail_.load(std::memory_order_acquire);
for (;;) {
auto &slot = slots_[idx(tail)];
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<Consumer>(c)(slot.move());
std::invoke(std::forward<Consumer>(c), slot.move());
slot.destroy();
slot.turn.store(t * 2 + 2, std::memory_order_release);
return true;
Expand Down
17 changes: 17 additions & 0 deletions src/MPMCQueueTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Item> 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<std::unique_ptr<int>> q(1);
Expand Down
Loading