mirror of
https://github.com/trapexit/mergerfs.git
synced 2026-10-26 19:01:56 -04:00
enqueue_unbounded bypasses the semaphore so control messages (poison pills, thread removal tasks) can never block on a full queue. But wait_dequeue always signals a slot after consuming, so each unbounded item that gets dequeued inflated the semaphore by +1, permanently raising the effective max queue depth. Fix by calling tryWait() in enqueue_unbounded before enqueueing. When the queue has room (common case), this consumes a slot and the dequeue-side signal restores balance perfectly. When the queue is genuinely full (tryWait fails), the item still enqueues but temporarily exceeds max_depth by one until consumed - a transient overshoot bounded by control messages in flight. A CAS-based approach that absorbed extra signals on the dequeue side was also considered but rejected: it can starve blocked bounded producers by swallowing the signal they are waiting for. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
190 lines
5 KiB
C++
190 lines
5 KiB
C++
/*
|
|
ISC License
|
|
|
|
Copyright (c) 2026, Antonio SJ Musumeci <trapexit@spawn.link>
|
|
|
|
Permission to use, copy, modify, and/or distribute this software for any
|
|
purpose with or without fee is hereby granted, provided that the above
|
|
copyright notice and this permission notice appear in all copies.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "moodycamel/blockingconcurrentqueue.h"
|
|
#include "moodycamel/lightweightsemaphore.h"
|
|
|
|
#include <cstdint>
|
|
|
|
|
|
// Wraps an unbounded BlockingConcurrentQueue with a semaphore to enforce
|
|
// a maximum queue depth. The semaphore tracks available slots:
|
|
// - Producers wait (decrement) before enqueuing, blocking when full.
|
|
// - Consumers signal (increment) after dequeuing, freeing a slot.
|
|
// This co-locates the invariant so the pairing cannot drift apart.
|
|
//
|
|
// enqueue_unbounded bypasses the semaphore for control messages that must
|
|
// never block. Each such item that is later dequeued via wait_dequeue
|
|
// causes a +1 semaphore inflation, slightly raising the effective max
|
|
// depth. This is bounded by the number of control messages in flight
|
|
// (thread removals, shutdown pills) and is acceptable for correctness.
|
|
template<typename T, typename Traits = moodycamel::ConcurrentQueueDefaultTraits>
|
|
class BoundedQueue
|
|
{
|
|
public:
|
|
using PToken = moodycamel::ProducerToken;
|
|
using CToken = moodycamel::ConsumerToken;
|
|
|
|
private:
|
|
using Queue = moodycamel::BlockingConcurrentQueue<T,Traits>;
|
|
|
|
Queue _queue;
|
|
moodycamel::LightweightSemaphore _slots;
|
|
std::size_t const _max_depth;
|
|
|
|
public:
|
|
explicit
|
|
BoundedQueue(std::size_t max_depth_)
|
|
: _queue(),
|
|
_slots(max_depth_),
|
|
_max_depth(max_depth_)
|
|
{
|
|
}
|
|
|
|
BoundedQueue(const BoundedQueue&) = delete;
|
|
BoundedQueue& operator=(const BoundedQueue&) = delete;
|
|
BoundedQueue(BoundedQueue&&) = delete;
|
|
BoundedQueue& operator=(BoundedQueue&&) = delete;
|
|
|
|
// -- Blocking enqueue (waits indefinitely for a slot) -------------------
|
|
|
|
template<typename U>
|
|
void
|
|
enqueue(U &&item_)
|
|
{
|
|
_slots.wait();
|
|
_queue.enqueue(std::forward<U>(item_));
|
|
}
|
|
|
|
template<typename U>
|
|
void
|
|
enqueue(PToken &ptok_, U &&item_)
|
|
{
|
|
_slots.wait();
|
|
_queue.enqueue(ptok_, std::forward<U>(item_));
|
|
}
|
|
|
|
// -- Non-blocking enqueue (fails immediately if full) -------------------
|
|
|
|
template<typename U>
|
|
bool
|
|
try_enqueue(U &&item_)
|
|
{
|
|
if(!_slots.tryWait())
|
|
return false;
|
|
_queue.enqueue(std::forward<U>(item_));
|
|
return true;
|
|
}
|
|
|
|
template<typename U>
|
|
bool
|
|
try_enqueue(PToken &ptok_, U &&item_)
|
|
{
|
|
if(!_slots.tryWait())
|
|
return false;
|
|
_queue.enqueue(ptok_, std::forward<U>(item_));
|
|
return true;
|
|
}
|
|
|
|
// -- Timed enqueue (waits up to timeout_usecs_ for a slot) --------------
|
|
|
|
template<typename U>
|
|
bool
|
|
try_enqueue_for(std::int64_t timeout_usecs_, U &&item_)
|
|
{
|
|
if(!_slots.wait(timeout_usecs_))
|
|
return false;
|
|
_queue.enqueue(std::forward<U>(item_));
|
|
return true;
|
|
}
|
|
|
|
template<typename U>
|
|
bool
|
|
try_enqueue_for(PToken &ptok_, std::int64_t timeout_usecs_, U &&item_)
|
|
{
|
|
if(!_slots.wait(timeout_usecs_))
|
|
return false;
|
|
_queue.enqueue(ptok_, std::forward<U>(item_));
|
|
return true;
|
|
}
|
|
|
|
// -- Unbounded enqueue (bypasses backpressure) --------------------------
|
|
// Used for internal control messages (e.g. thread exit signals) that
|
|
// must not be blocked by a full queue.
|
|
|
|
template<typename U>
|
|
void
|
|
enqueue_unbounded(U &&item_)
|
|
{
|
|
// Try to consume a slot so the dequeue-side signal stays balanced.
|
|
// If the queue is full (tryWait fails), enqueue anyway - the item
|
|
// will temporarily exceed max_depth by one until it is consumed.
|
|
_slots.tryWait();
|
|
_queue.enqueue(std::forward<U>(item_));
|
|
}
|
|
|
|
// -- Blocking dequeue (signals a slot after consuming) ------------------
|
|
|
|
void
|
|
wait_dequeue(CToken &ctok_, T &item_)
|
|
{
|
|
_queue.wait_dequeue(ctok_, item_);
|
|
_slots.signal();
|
|
}
|
|
|
|
// -- Timed dequeue (waits up to timeout, signals slot if successful) -----
|
|
|
|
bool
|
|
try_wait_dequeue_for(CToken &ctok_, T &item_, std::int64_t timeout_usecs_)
|
|
{
|
|
if(!_queue.wait_dequeue_timed(ctok_, item_, timeout_usecs_))
|
|
return false;
|
|
_slots.signal();
|
|
return true;
|
|
}
|
|
|
|
// -- Introspection -------------------------------------------------------
|
|
|
|
std::size_t
|
|
max_depth() const
|
|
{
|
|
return _max_depth;
|
|
}
|
|
|
|
std::size_t
|
|
size_approx() const
|
|
{
|
|
return _queue.size_approx();
|
|
}
|
|
|
|
// -- Token creation -----------------------------------------------------
|
|
|
|
PToken
|
|
make_ptoken()
|
|
{
|
|
return PToken(_queue);
|
|
}
|
|
|
|
CToken
|
|
make_ctoken()
|
|
{
|
|
return CToken(_queue);
|
|
}
|
|
};
|