Skip to content

Make SCMP and MCSP FIFO and more performant. #33

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,82 @@ struct MultiConsumerTypeTraits
};
};

struct MultiProducerForSingleConsumerTypeTraits
{
template <typename BaseType>
struct Behavior : BaseType
{
private:
CacheAlignedAndPaddedObject<std::atomic_size_t> end{std::size_t(0)};

public:
using ElementType = typename BaseType::ElementType;

template <typename... Args>
bool push(Args &&... args)
{
if (BaseType::push_task_count.fetch_sub(1, std::memory_order_acquire) <= std::int64_t(0))
{
BaseType::push_task_count.fetch_add(1, std::memory_order_relaxed);
return false;
}

const std::size_t element_index = end.fetch_add(1, std::memory_order_acquire) & BaseType::COUNT_MASK;
auto &element = BaseType::elements[element_index];

element.value_ptr = new (&element.storage) ElementType(std::forward<Args>(args)...);
element.state.store(ElementState::READY_FOR_POP, std::memory_order_release);
BaseType::pop_task_count.fetch_add(1, std::memory_order_release);
return true;
}
};

template <typename BaseType, typename = Private::CountInt64CompatibilityCheck<BaseType::COUNT>>
struct SharedState : BaseType
{
protected:
CacheAlignedAndPaddedObject<std::atomic<std::int64_t>> push_task_count{static_cast<std::int64_t>(BaseType::COUNT)};
};
};

struct MultiConsumerForSingleProducerTypeTraits
{
template <typename BaseType>
struct Behavior : BaseType
{
private:
CacheAlignedAndPaddedObject<std::atomic_size_t> begin{std::size_t(0)};

public:
using ElementType = typename BaseType::ElementType;

OptionalType<ElementType> pop()
{
if (BaseType::pop_task_count.fetch_sub(1, std::memory_order_acquire) <= std::int64_t(0))
{
BaseType::pop_task_count.fetch_add(1, std::memory_order_relaxed);
return OptionalType<ElementType>{};
}

const std::size_t element_index = begin.fetch_add(1, std::memory_order_acquire) & BaseType::COUNT_MASK;
auto &element = BaseType::elements[element_index];

OptionalType<ElementType> result{std::move(*element.value_ptr)};
element.value_ptr->~ElementType();

element.state.store(ElementState::READY_FOR_PUSH, std::memory_order_release);
return result;
}
};

template <typename BaseType, typename = Private::CountInt64CompatibilityCheck<BaseType::COUNT>>
struct SharedState : BaseType
{
protected:
CacheAlignedAndPaddedObject<std::atomic<std::int64_t>> pop_task_count{std::int64_t{0}};
};
};

struct SingleProducerTypeTraits
{
template <typename BaseType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace WaitFreeRingBufferUtilities
template <typename T, std::size_t Count>
struct RingBuffer<T,
AccessRequirements::SINGLE_CONSUMER | AccessRequirements::MULTI_PRODUCER,
Count> : Details::RingBufferTypeConstructor<Details::MultiProducerTypeTraits,
Count> : Details::RingBufferTypeConstructor<Details::MultiProducerForSingleConsumerTypeTraits,
Details::SingleConsumerTypeTraits,
T, Count>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ template <typename T, std::size_t Count>
struct RingBuffer<T,
AccessRequirements::MULTI_CONSUMER | AccessRequirements::SINGLE_PRODUCER,
Count> : Details::RingBufferTypeConstructor<Details::SingleProducerTypeTraits,
Details::MultiConsumerTypeTraits,
Details::MultiConsumerForSingleProducerTypeTraits,
T, Count>
{
};
Expand Down