right release lock

Author: k-morozov

src/components/async_mutex/async_mutex.cpp

@@ -19,7 +19,7 @@ AsyncMutexCoroImpl& AsyncMutex::lock() {
 }
 
 AsyncMutex::~AsyncMutex() {
-    assert(event.waiters.empty());
+//    assert(mutex_impl.waiters.empty());
 }
 
 void AsyncMutex::unlock() {

src/components/async_mutex/async_mutex_coro_impl.cpp

@@ -58,7 +58,8 @@ void AsyncMutexCoroImpl::ParkAwaiter(MutexAwaiter* awaiter) {
 }
 
 MutexAwaiter AsyncMutexCoroImpl::operator co_await() {
-    return MutexAwaiter{*this, spinlock};
+    MutexAwaiter::LockGuard guard(spinlock);
+    return MutexAwaiter{*this, std::move(guard)};
 }
 
 }  // namespace NComponents

src/components/async_mutex/async_mutex_coro_impl.h

@@ -17,11 +17,13 @@
 
 namespace NComponents {
 
-struct AsyncMutexCoroImpl final {
+class AsyncMutexCoroImpl final {
     mutable NSync::SpinLock spinlock;
     bool lock_flag{};
     std::list<MutexAwaiter> waiters;
 
+public:
+
     AsyncMutexCoroImpl() = default;
 
     bool TryLock();

src/components/async_mutex/mutex_awaiter.cpp

@@ -13,15 +13,17 @@
 
 namespace NComponents {
 
-MutexAwaiter::MutexAwaiter(AsyncMutexCoroImpl& event, NSync::SpinLock& guard)
-    : event(event), guard(guard) {
-    guard.lock();
+MutexAwaiter::MutexAwaiter(AsyncMutexCoroImpl& event, LockGuard&& guard)
+    : event(event), guard(std::move(guard)) {
     std::osyncstream(std::cout) << *this << " create with guard." << std::endl;
 }
 
 MutexAwaiter::MutexAwaiter(MutexAwaiter&& o) noexcept
-    : event(o.event), guard(o.guard), coro(o.coro) {
+    : event(o.event), coro(o.coro) {
     o.coro = nullptr;
+    if (o.guard.owns_lock()) {
+        guard = MutexAwaiter::LockGuard(*o.guard.release(), std::adopt_lock);
+    }
 }
 
 MutexAwaiter::~MutexAwaiter() {
@@ -58,9 +60,7 @@ void MutexAwaiter::await_suspend(std::coroutine_handle<> coro_) noexcept {
 
 void MutexAwaiter::await_resume() const noexcept {
     std::osyncstream(std::cout)
-        << *this
-        << "[await_resume] call and just resume, status flag=" << event.IsSet()
-        << std::endl;
+        << *this << "[await_resume] call and just resume." << std::endl;
 }
 
 std::ostream& operator<<(std::ostream& stream, const MutexAwaiter& /*w*/) {

src/components/async_mutex/mutex_awaiter.h

@@ -12,16 +12,13 @@
 
 namespace NComponents {
 
-struct AsyncMutexCoroImpl;
-using LockGuard = std::unique_lock<NSync::SpinLock>;
+class AsyncMutexCoroImpl;
 
 class MutexAwaiter final {
-    AsyncMutexCoroImpl& event;
-    NSync::SpinLock& guard;
-    std::coroutine_handle<> coro{};
-
 public:
-    MutexAwaiter(AsyncMutexCoroImpl& event, NSync::SpinLock& guard);
+    using LockGuard = std::unique_lock<NSync::SpinLock>;
+
+    MutexAwaiter(AsyncMutexCoroImpl& event, LockGuard&& guard);
     MutexAwaiter(MutexAwaiter&& o) noexcept;
 
     ~MutexAwaiter();
@@ -33,6 +30,11 @@ class MutexAwaiter final {
     bool await_ready() const;
     void await_suspend(std::coroutine_handle<>) noexcept;
     void await_resume() const noexcept;
+
+private:
+    AsyncMutexCoroImpl& event;
+    mutable LockGuard guard;
+    std::coroutine_handle<> coro{};
 };
 
 std::ostream& operator<<(std::ostream& stream, const MutexAwaiter& w);

src/components/async_mutex/resumable_no_own.h

@@ -12,7 +12,7 @@
 
 namespace NComponents {
 
-struct AsyncMutexCoroImpl;
+class AsyncMutexCoroImpl;
 
 struct ResumableNoOwn {
     struct promise_type {