Merge pull request #514 from lihuiba/manual_pr_0.7_main

Manual pr 0.7 main
alibaba · Jun 15, 2024 · 255a806 · 255a806
2 parents d857c26 + 2d34542
commit 255a806
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 deletions.
diff --git a/.github/workflows/ci.linux.x86-64.yml b/.github/workflows/ci.linux.x86-64.yml
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/coldwings/photon-ut-base:latest
-      options: --cpus 4
+      options: --cpus 4 --privileged
     steps:
       - uses: szenius/set-timezone@v1.2
         with:
@@ -89,7 +89,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/coldwings/photon-ut-base:latest
-      options: --cpus 4
+      options: --cpus 4 --privileged
     steps:
       - uses: szenius/set-timezone@v1.2
         with:
@@ -132,7 +132,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/coldwings/photon-ut-base:latest
-      options: --cpus 4
+      options: --cpus 4 --privileged
     steps:
       - uses: szenius/set-timezone@v1.2
         with:
@@ -175,7 +175,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/coldwings/photon-ut-base:latest
-      options: --cpus 4
+      options: --cpus 4 --privileged
     steps:
       - uses: szenius/set-timezone@v1.2
         with:
@@ -218,7 +218,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/coldwings/photon-ut-base:latest
-      options: --cpus 4
+      options: --cpus 4 --privileged
     steps:
       - uses: szenius/set-timezone@v1.2
         with:

diff --git a/common/lockfree_queue.h b/common/lockfree_queue.h
@@ -181,7 +181,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)];
@@ -194,15 +194,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)];
@@ -215,28 +216,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,
@@ -538,8 +526,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

diff --git a/examples/sync-primitive/sync-primitive.cpp b/examples/sync-primitive/sync-primitive.cpp
@@ -109,7 +109,7 @@ int main() {
             while (true) {
                 func_1us();
                 Message* m;
-                bool ok = ring.pop_weak(m);
+                bool ok = ring.pop(m);
                 if (!ok)
                     continue;
                 m->start = std::chrono::steady_clock::now();