Skip to content
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

Jump to bottom

FIX: lockfree MPMC queue should not fail to pop/push when queue is not empty/full #504

Merged
merged 2 commits into from
Jun 8, 2024
Merged

FIX: lockfree MPMC queue should not fail to pop/push when queue is not empty/full #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a14f2a3
FIX: lockfree MPMC queue should not fail to pop/push when queue is no…
Coldwings Jun 6, 2024
d577845
Old CI image not able to access repo, change to preset image
Coldwings Jun 6, 2024
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
36 changes: 18 additions & 18 deletions .github/workflows/ci.linux.arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: [self-hosted, Linux, ARM64]

container:
image: dokken/centos-stream-8:sha-40294ce
image: ghcr.io/coldwings/photon-ut-base:latest
options: --cpus 4

steps:
Expand All @@ -23,14 +23,14 @@ jobs:

- uses: actions/checkout@v3

- name: Install Dependencies
run: |
dnf install -y git gcc-c++ cmake 'dnf-command(config-manager)'
dnf install -y gcc-toolset-9-gcc-c++
dnf install -y openssl-devel libcurl-devel libaio-devel
dnf install -y epel-release
dnf config-manager --set-enabled powertools
dnf install -y gtest-devel gmock-devel gflags-devel fuse-devel libgsasl-devel e2fsprogs-devel
# - name: Install Dependencies
# run: |
# dnf install -y git gcc-c++ cmake 'dnf-command(config-manager)'
# dnf install -y gcc-toolset-9-gcc-c++
# dnf install -y openssl-devel libcurl-devel libaio-devel
# dnf install -y epel-release
# dnf config-manager --set-enabled powertools
# dnf install -y gtest-devel gmock-devel gflags-devel fuse-devel libgsasl-devel e2fsprogs-devel

- name: Build
run: |
Expand All @@ -51,7 +51,7 @@ jobs:
runs-on: [self-hosted, Linux, ARM64]

container:
image: dokken/centos-stream-8:sha-40294ce
image: ghcr.io/coldwings/photon-ut-base:latest
options: --cpus 4

steps:
Expand All @@ -63,14 +63,14 @@ jobs:

- uses: actions/checkout@v3

- name: Install Dependencies
run: |
dnf install -y git gcc-c++ cmake 'dnf-command(config-manager)'
dnf install -y gcc-toolset-9-gcc-c++
dnf install -y openssl-devel libcurl-devel libaio-devel
dnf install -y epel-release
dnf config-manager --set-enabled powertools
dnf install -y gtest-devel gmock-devel gflags-devel fuse-devel libgsasl-devel e2fsprogs-devel
# - name: Install Dependencies
# run: |
# dnf install -y git gcc-c++ cmake 'dnf-command(config-manager)'
# dnf install -y gcc-toolset-9-gcc-c++
# dnf install -y openssl-devel libcurl-devel libaio-devel
# dnf install -y epel-release
# dnf config-manager --set-enabled powertools
# dnf install -y gtest-devel gmock-devel gflags-devel fuse-devel libgsasl-devel e2fsprogs-devel

- name: Build
run: |
Expand Down
52 changes: 26 additions & 26 deletions .github/workflows/ci.linux.x86.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: [self-hosted, Linux, X64]

container:
image: dokken/centos-stream-8:sha-40294ce
image: ghcr.io/coldwings/photon-ut-base:latest
options: --cpus 4

steps:
Expand All @@ -23,14 +23,14 @@ jobs:

- uses: actions/checkout@v3

- name: Install Dependencies
run: |
dnf install -y git gcc-c++ cmake 'dnf-command(config-manager)'
dnf install -y gcc-toolset-9-gcc-c++
dnf install -y openssl-devel libcurl-devel libaio-devel
dnf install -y epel-release
dnf config-manager --set-enabled powertools
dnf install -y gtest-devel gmock-devel gflags-devel fuse-devel libgsasl-devel e2fsprogs-devel
# - name: Install Dependencies
# run: |
# dnf install -y git gcc-c++ cmake 'dnf-command(config-manager)'
# dnf install -y gcc-toolset-9-gcc-c++
# dnf install -y openssl-devel libcurl-devel libaio-devel
# dnf install -y epel-release
# dnf config-manager --set-enabled powertools
# dnf install -y gtest-devel gmock-devel gflags-devel fuse-devel libgsasl-devel e2fsprogs-devel

- name: Build
run: |
Expand All @@ -51,7 +51,7 @@ jobs:
runs-on: [self-hosted, Linux, X64]

container:
image: dokken/centos-stream-8:sha-40294ce
image: ghcr.io/coldwings/photon-ut-base:latest
options: --cpus 4

steps:
Expand All @@ -63,14 +63,14 @@ jobs:

- uses: actions/checkout@v3

- name: Install Dependencies
run: |
dnf install -y git gcc-c++ cmake 'dnf-command(config-manager)'
dnf install -y gcc-toolset-9-gcc-c++
dnf install -y openssl-devel libcurl-devel libaio-devel
dnf install -y epel-release
dnf config-manager --set-enabled powertools
dnf install -y gtest-devel gmock-devel gflags-devel fuse-devel libgsasl-devel e2fsprogs-devel
# - name: Install Dependencies
# run: |
# dnf install -y git gcc-c++ cmake 'dnf-command(config-manager)'
# dnf install -y gcc-toolset-9-gcc-c++
# dnf install -y openssl-devel libcurl-devel libaio-devel
# dnf install -y epel-release
# dnf config-manager --set-enabled powertools
# dnf install -y gtest-devel gmock-devel gflags-devel fuse-devel libgsasl-devel e2fsprogs-devel

- name: Build
run: |
Expand All @@ -91,7 +91,7 @@ jobs:
runs-on: [self-hosted, Linux, X64]

container:
image: dokken/centos-stream-8:sha-40294ce
image: ghcr.io/coldwings/photon-ut-base:latest
# In order to run io_uring, the docker daemon should add --default-ulimit memlock=-1:-1
options: --cpus 4

Expand All @@ -104,13 +104,13 @@ jobs:

- uses: actions/checkout@v3

- name: Install Dependencies
run: |
dnf install -y git gcc-c++ cmake
dnf install -y gcc-toolset-9-gcc-c++
dnf install -y openssl-devel libcurl-devel
dnf install -y epel-release
dnf install -y fuse-devel libgsasl-devel e2fsprogs-devel
# - name: Install Dependencies
# run: |
# dnf install -y git gcc-c++ cmake
# dnf install -y gcc-toolset-9-gcc-c++
# dnf install -y openssl-devel libcurl-devel
# dnf install -y epel-release
# dnf install -y fuse-devel libgsasl-devel e2fsprogs-devel

- name: Build
run: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.macos.arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ on:

jobs:
macOS-clang-debug:
runs-on: [self-hosted, macOS, ARM64]
runs-on: macos-14

steps:
# - uses: szenius/set-timezone@v1.2
# with:
# timezoneLinux: "Asia/Shanghai"
# timezoneMacos: "Asia/Shanghai"
# timezoneWindows: "China Standard Time"
- uses: szenius/set-timezone@v1.2
with:
timezoneLinux: "Asia/Shanghai"
timezoneMacos: "Asia/Shanghai"
timezoneWindows: "China Standard Time"

- uses: actions/checkout@v3

Expand Down
28 changes: 8 additions & 20 deletions common/lockfree_queue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ class LockfreeMPMCRingQueue : public LockfreeRingQueueBase<T, N> {
using Base::empty;
using Base::full;

bool push_weak(const T& x) {
bool push(const T& x) {
auto t = tail.load(std::memory_order_acquire);
for (;;) {
auto& slot = slots[idx(t)];
Expand All @@ -192,15 +192,16 @@ class LockfreeMPMCRingQueue : public LockfreeRingQueueBase<T, N> {
}
} else {
auto const prevTail = t;
auto h = head.load(std::memory_order_acquire);
t = tail.load(std::memory_order_acquire);
if (t == prevTail) {
if (t == prevTail && Base::check_full(h, t)) {
return false;
}
}
}
}

bool pop_weak(T& x) {
bool pop(T& x) {
auto h = head.load(std::memory_order_acquire);
for (;;) {
auto& slot = slots[idx(h)];
Expand All @@ -213,28 +214,15 @@ class LockfreeMPMCRingQueue : public LockfreeRingQueueBase<T, N> {
}
} else {
auto const prevHead = h;
auto t = tail.load(std::memory_order_acquire);
h = head.load(std::memory_order_acquire);
if (h == prevHead) {
if (h == prevHead && Base::check_empty(h, t)) {
return false;
}
}
}
}

bool push(const T& x) {
do {
if (push_weak(x)) return true;
} while (!full());
return false;
}

bool pop(T& x) {
do {
if (pop_weak(x)) return true;
} while (!empty());
return false;
}

template <typename Pause = ThreadPause>
void send(const T& x) {
static_assert(std::is_base_of<PauseBase, Pause>::value,
Expand Down Expand Up @@ -536,8 +524,8 @@ namespace common {
* and load balancing.
* Watch out that `recv` should run in photon environment (because it has to)
* use photon semaphore to be notified that new item has sended. `send` could
* running in photon or std::thread environment (needs to set template `Pause` as
* `ThreadPause`).
* running in photon or std::thread environment (needs to set template `Pause`
* as `ThreadPause`).
*
* @tparam QueueType shoulde be one of LockfreeMPMCRingQueue,
* LockfreeBatchMPMCRingQueue, or LockfreeSPSCRingQueue, with their own template
Expand Down
Loading