Skip to content

Ruilizhenhu/fix(edition) 20250904 #14

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
HuRuilizhen merged 4 commits into from
Sep 4, 2025
Merged

Ruilizhenhu/fix(edition) 20250904 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1c6dff
fix(edition): change edition no in cmakelist and readme
HuRuilizhen Sep 4, 2025
2389f59
feat(mpsc): add mpsc thread test
HuRuilizhen Sep 4, 2025
1690b6e
fix(mpsc): add algorithm header in mpsc test
HuRuilizhen Sep 4, 2025
7e95c6d
feat(action): add build & test actions on macOS
HuRuilizhen Sep 4, 2025
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
24 changes: 20 additions & 4 deletions .github/workflows/cmake-multi-platform.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,42 @@ jobs:
#
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-latest, windows-latest, macos-latest]
build_type: [Release]
c_compiler: [gcc, clang, cl]

include:
# Windows
- os: windows-latest
c_compiler: cl
cpp_compiler: cl
- os: windows-latest
c_compiler: gcc
cpp_compiler: g++
- os: windows-latest
c_compiler: clang
cpp_compiler: clang++

# Linux
- os: ubuntu-latest
c_compiler: gcc
cpp_compiler: g++
- os: ubuntu-latest
c_compiler: clang
cpp_compiler: clang++
- os: windows-latest
c_compiler: gcc
- os: windows-latest

# macOS
- os: macos-latest
c_compiler: clang
cpp_compiler: clang++

exclude:
- os: ubuntu-latest
c_compiler: cl
- os: macos-latest
c_compiler: cl
- os: macos-latest
c_compiler: gcc

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)

project(
ring_buffer
VERSION 1.0.3
VERSION 0.1.0
LANGUAGES CXX)

set(CMAKE_CXX_STANDARD 20)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ else()
FetchContent_Declare(
ring_buffer
GIT_REPOSITORY https://github.com/HuRuilizhen/ring_buffer.git
GIT_TAG v1.0.3) # latest stable version
GIT_TAG v0.1.0) # latest stable version
FetchContent_MakeAvailable(ring_buffer)
endif()

Expand Down
55 changes: 55 additions & 0 deletions tests/mpsc_ring_buffer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

#include <gtest/gtest.h>

#include <algorithm>
#include <thread>
#include <vector>

namespace {

struct Counter {
Expand Down Expand Up @@ -78,6 +82,57 @@ TEST(MPSCRingBufferTest, WrapAround) {
EXPECT_FALSE(buffer.tryPop(value));
}

TEST(MPSCRingBufferTest, MPSC) {
constexpr int PRODUCERS = 4;
constexpr int ITEMS_PER_PRODUCER = 500;
constexpr int TOTAL_ITEMS = PRODUCERS * ITEMS_PER_PRODUCER;
constexpr int CAPACITY = 128;

RingBuffer::MPSCRingBuffer<int> buffer(CAPACITY);
std::atomic<int> produced{0};
std::atomic<int> consumed{0};

std::vector<std::thread> producer_threads;
for (int p = 0; p < PRODUCERS; ++p) {
producer_threads.emplace_back([p, &buffer, &produced]() {
for (int i = 0; i < ITEMS_PER_PRODUCER; ++i) {
int value = p * ITEMS_PER_PRODUCER + i;
while (true) {
if (buffer.tryPush(value)) {
produced.fetch_add(1, std::memory_order_relaxed);
break;
} else {
std::this_thread::yield();
}
}
}
});
}

std::vector<int> results;
results.reserve(TOTAL_ITEMS);
std::thread consumer_thread([&]() {
while (consumed.load(std::memory_order_relaxed) < TOTAL_ITEMS) {
int value;
if (buffer.tryPop(value)) {
results.push_back(value);
consumed.fetch_add(1, std::memory_order_relaxed);
} else {
std::this_thread::yield();
}
}
});

for (auto& t : producer_threads) t.join();
consumer_thread.join();

EXPECT_EQ(results.size(), static_cast<size_t>(TOTAL_ITEMS));
std::sort(results.begin(), results.end());
for (int i = 0; i < TOTAL_ITEMS; ++i) {
EXPECT_EQ(results[i], i);
}
}

TEST(MPSCRingBufferTest, EmplaceBasicType) {
int value;
RingBuffer::MPSCRingBuffer<int> buffer(2);
Expand Down
Loading