diff options
| author | nae202 <[email protected]> | 2024-11-20 12:52:01 +0300 |
|---|---|---|
| committer | nae202 <[email protected]> | 2024-11-20 13:14:09 +0300 |
| commit | 0b9d91e900b52bccd6eabd033acbb57c4ee173fc (patch) | |
| tree | 6839ed69fbda4d5214eb418acc4554924bc64160 /util/thread | |
| parent | 878e26057d11cce46b7bc3a6c838209d4686e28b (diff) | |
Part of PR. Style
Часть большого ПР REVIEW:7264088
commit_hash:0f5b03fbbed0ac30f734943309e3ef5cd4d7a30e
Diffstat (limited to 'util/thread')
| -rw-r--r-- | util/thread/lfqueue.h | 24 | ||||
| -rw-r--r-- | util/thread/lfstack.h | 15 |
2 files changed, 26 insertions, 13 deletions
diff --git a/util/thread/lfqueue.h b/util/thread/lfqueue.h index bfe88013fc2..089f2347410 100644 --- a/util/thread/lfqueue.h +++ b/util/thread/lfqueue.h @@ -72,8 +72,9 @@ class TLockFreeQueue: public TNonCopyable { void TryToFreeAsyncMemory() { const auto keepCounter = FreeingTaskCounter.load(); TRootNode* current = FreePtr.load(std::memory_order_acquire); - if (current == nullptr) + if (current == nullptr) { return; + } if (FreememCounter.load() == 1) { // we are the last thread, try to cleanup // check if another thread have cleaned up @@ -103,8 +104,9 @@ class TLockFreeQueue: public TNonCopyable { toDelete->ToDelete.store(lst, std::memory_order_release); for (auto freePtr = FreePtr.load();;) { toDelete->NextFree.store(freePtr, std::memory_order_release); - if (FreePtr.compare_exchange_weak(freePtr, toDelete)) + if (FreePtr.compare_exchange_weak(freePtr, toDelete)) { break; + } } } void AsyncUnref(TRootNode* toDelete, TListNode* lst) { @@ -148,15 +150,17 @@ class TLockFreeQueue: public TNonCopyable { Tail->Next.store(newCopy, std::memory_order_release); newCopy = Copy; Copy = nullptr; // do not destroy prev try - if (!newTail) + if (!newTail) { newTail = Tail; // tried to invert same list + } break; } TListNode* newElem = new TListNode(ptr->Data, newCopy); newCopy = newElem; ptr = ptr->Next.load(std::memory_order_acquire); - if (!newTail) + if (!newTail) { newTail = newElem; + } } EraseList(Copy); // copy was useless Copy = newCopy; @@ -176,8 +180,9 @@ class TLockFreeQueue: public TNonCopyable { for (TListNode* node = head;; node = node->Next.load(std::memory_order_acquire)) { newRoot->IncCount(node->Data); - if (node == tail) + if (node == tail) { break; + } } if (JobQueue.compare_exchange_weak(curRoot, newRoot)) { @@ -251,8 +256,9 @@ public: } template <typename TIter> void EnqueueAll(TIter dataBegin, TIter dataEnd) { - if (dataBegin == dataEnd) + if (dataBegin == dataEnd) { return; + } TIter i = dataBegin; TListNode* node = new TListNode(*i); @@ -272,8 +278,9 @@ public: TListNode* tail = curRoot->PopQueue.load(std::memory_order_acquire); if (tail) { // has elems to pop - if (!newRoot) + if (!newRoot) { newRoot = new TRootNode; + } newRoot->PushQueue.store(curRoot->PushQueue.load(std::memory_order_acquire), std::memory_order_release); newRoot->PopQueue.store(tail->Next.load(std::memory_order_acquire), std::memory_order_release); @@ -294,8 +301,9 @@ public: return false; // no elems to pop } - if (!newRoot) + if (!newRoot) { newRoot = new TRootNode; + } newRoot->PushQueue.store(nullptr, std::memory_order_release); listInvertor.DoCopy(curRoot->PushQueue.load(std::memory_order_acquire)); newRoot->PopQueue.store(listInvertor.Copy, std::memory_order_release); diff --git a/util/thread/lfstack.h b/util/thread/lfstack.h index effde7c706d..b81c6403c9a 100644 --- a/util/thread/lfstack.h +++ b/util/thread/lfstack.h @@ -30,12 +30,14 @@ class TLockFreeStack: TNonCopyable { void TryToFreeMemory() { TNode* current = FreePtr.load(std::memory_order_acquire); - if (!current) + if (!current) { return; + } if (DequeueCount.load() == 1) { // node current is in free list, we are the last thread so try to cleanup - if (FreePtr.compare_exchange_strong(current, nullptr)) + if (FreePtr.compare_exchange_strong(current, nullptr)) { EraseList(current); + } } } void EraseList(TNode* p) { @@ -54,8 +56,9 @@ class TLockFreeStack: TNonCopyable { // act as if *this != expected even if they are equal. // When a compare-and-exchange is in a loop, the weak version will yield better // performance on some platforms. - if (Head.compare_exchange_weak(headValue, head)) + if (Head.compare_exchange_weak(headValue, head)) { break; + } } } template <class U> @@ -115,8 +118,9 @@ public: // Dequeue()s in progress, put node to free list for (TNode* freePtr = FreePtr.load(std::memory_order_acquire);;) { current->Next.store(freePtr, std::memory_order_release); - if (FreePtr.compare_exchange_weak(freePtr, current)) + if (FreePtr.compare_exchange_weak(freePtr, current)) { break; + } } } return true; @@ -151,8 +155,9 @@ public: } for (TNode* freePtr = FreePtr.load(std::memory_order_acquire);;) { currentLast->Next.store(freePtr, std::memory_order_release); - if (FreePtr.compare_exchange_weak(freePtr, current)) + if (FreePtr.compare_exchange_weak(freePtr, current)) { break; + } } } return; |
