up mm

Author: k-morozov

src/components/sync/queue_spinlock.h

@@ -42,7 +42,7 @@ class QueueSpinLock final {
 
 private:
     void Acquire(Guard* guard) {
-        auto ancestor = tail_.exchange(guard, std::memory_order_acquire);
+        auto ancestor = tail_.exchange(guard/*, std::memory_order_acquire*/);
         if (ancestor == nullptr) {
             guard->SetOwner();
             return;

src/fiber/awaiter/wait_group_awaiter.h

@@ -7,6 +7,7 @@
 #include <mutex>
 
 #include <components/intrusive/list.h>
+#include <components/sync/queue_spinlock.h>
 #include <fiber/awaiter/awaiter.h>
 
 namespace NFibers {
@@ -15,23 +16,23 @@ template <class W>
 class WaitGroupWaiter : public IAwaiter,
                         public NComponents::Node<WaitGroupWaiter<W>> {
 public:
-    using Guard = std::unique_lock<typename W::Spinlock>;
+    using Guard = NSync::QueueSpinLock::Guard;
 
-    WaitGroupWaiter(W* wg, Guard guard) : wg(wg), guard(std::move(guard)){};
+    WaitGroupWaiter(W* wg, Guard& guard) : wg(wg), guard(guard){};
 
     void AwaitSuspend(StoppedFiber fiber) override {
         assert(fiber.IsValid());
 
         stopped_fiber = fiber;
         wg->Park(this);
-        guard.release()->unlock();
+        guard.Release();
     }
 
     void Schedule() { stopped_fiber.Schedule(); }
 
 private:
     W* wg;
-    Guard guard;
+    Guard& guard;
     StoppedFiber stopped_fiber;
 };
 

src/fiber/sync/wait_group.cpp

@@ -38,7 +38,7 @@ void WaitGroup::Done() {
 void WaitGroup::Wait() {
     Waiter::Guard guard(spinlock_);
     if (counter_ > 0) {
-        Waiter wg_waiter(this, std::move(guard));
+        Waiter wg_waiter(this, guard);
         Suspend(&wg_waiter);
     }
 }

src/fiber/sync/wait_group.h

@@ -8,12 +8,13 @@
 
 #include <components/intrusive/list.h>
 #include <components/sync/spinLock.h>
+#include <components/sync/queue_spinlock.h>
 #include <fiber/awaiter/wait_group_awaiter.h>
 
 namespace NFibers {
 
 class WaitGroup {
-    using Spinlock = NSync::SpinLock;
+    using Spinlock = NSync::QueueSpinLock;
     using Waiter = WaitGroupWaiter<WaitGroup>;
 
     friend Waiter;