From 72cb13b4aff9bc9cf22e49251bc8fd143f82538f Mon Sep 17 00:00:00 2001 From: Anton Samokhvalov Date: Thu, 10 Feb 2022 16:45:15 +0300 Subject: Restoring authorship annotation for Anton Samokhvalov . Commit 1 of 2. --- library/cpp/threading/queue/mpsc_htswap.h | 12 ++++++------ library/cpp/threading/queue/mpsc_intrusive_unordered.h | 2 +- library/cpp/threading/queue/mpsc_read_as_filled.h | 14 +++++++------- library/cpp/threading/queue/mpsc_vinfarr_obstructive.h | 8 ++++---- library/cpp/threading/queue/queue_ut.cpp | 2 +- library/cpp/threading/queue/tune.h | 16 ++++++++-------- library/cpp/threading/queue/unordered_ut.cpp | 8 ++++---- library/cpp/threading/queue/ut_helpers.h | 12 ++++++------ 8 files changed, 37 insertions(+), 37 deletions(-) (limited to 'library/cpp/threading/queue') diff --git a/library/cpp/threading/queue/mpsc_htswap.h b/library/cpp/threading/queue/mpsc_htswap.h index c42caa7ac02..420b1e88292 100644 --- a/library/cpp/threading/queue/mpsc_htswap.h +++ b/library/cpp/threading/queue/mpsc_htswap.h @@ -28,8 +28,8 @@ namespace NThreading { namespace NHTSwapPrivate { template struct TNode - : public TTuneup::TNodeBase, - public TTuneup::template TNodeLayout, T> { + : public TTuneup::TNodeBase, + public TTuneup::template TNodeLayout, T> { TNode(const T& item) { this->Next = nullptr; this->Item = item; @@ -60,7 +60,7 @@ namespace NThreading { template class THTSwapQueueImpl - : protected TTuneup::template TQueueLayout> { + : protected TTuneup::template TQueueLayout> { protected: using TTunedNode = TNode; @@ -124,9 +124,9 @@ namespace NThreading { DeclareTuneTypeParam(THTSwapNodeLayout, TNodeLayout); DeclareTuneTypeParam(THTSwapQueueLayout, TQueueLayout); - template + template class THTSwapQueue - : public NHTSwapPrivate::THTSwapQueueImpl> { + : public NHTSwapPrivate::THTSwapQueueImpl> { }; } diff --git a/library/cpp/threading/queue/mpsc_intrusive_unordered.h b/library/cpp/threading/queue/mpsc_intrusive_unordered.h index 6ac7537ae9a..97e6131dd47 100644 --- a/library/cpp/threading/queue/mpsc_intrusive_unordered.h +++ b/library/cpp/threading/queue/mpsc_intrusive_unordered.h @@ -25,7 +25,7 @@ namespace NThreading { void Push(void* node) noexcept { Push(reinterpret_cast(node)); } - + private: TIntrusiveNode* HeadForCaS = nullptr; TIntrusiveNode* HeadForSwap = nullptr; diff --git a/library/cpp/threading/queue/mpsc_read_as_filled.h b/library/cpp/threading/queue/mpsc_read_as_filled.h index be33ba5a584..621517328e3 100644 --- a/library/cpp/threading/queue/mpsc_read_as_filled.h +++ b/library/cpp/threading/queue/mpsc_read_as_filled.h @@ -132,7 +132,7 @@ namespace NThreading { TMsgBunch* volatile NextToken; /* this push can return PUSH_RESULT_BLOCKED */ - inline TPushResult Push(TMsgLink msg, ui64 slot, TAux auxiliary) { + inline TPushResult Push(TMsgLink msg, ui64 slot, TAux auxiliary) { if (Y_UNLIKELY(slot < FirstSlot)) { return PUSH_RESULT_BACKWARD; } @@ -194,7 +194,7 @@ namespace NThreading { // the object could be destroyed after this method inline void SetNextToken(TMsgBunch* next) { AtomicSet(NextToken, next); - if (Y_UNLIKELY(AtomicAdd(Token, RELEASE_SIZE) == RELEASE_SIZE)) { + if (Y_UNLIKELY(AtomicAdd(Token, RELEASE_SIZE) == RELEASE_SIZE)) { Release(this); next->DecrementToken(); } @@ -317,8 +317,8 @@ namespace NThreading { } }; - template , - template class TContainer = TDeque> + template , + template class TContainer = TDeque> class TReadBucket { public: using TAux = typename TWBucket::TUsingAux; @@ -543,7 +543,7 @@ namespace NThreading { static constexpr ui32 BUNCH_SIZE = DEFAULT_BUNCH_SIZE; using TBunchBase = TEmpty; - template + template using TContainer = TDeque; static constexpr bool DeleteItems = true; @@ -556,7 +556,7 @@ namespace NThreading { DeclareTuneContainer(TRaFQueueSkipContainer, TContainer); DeclareTuneValueParam(TRaFQueueDeleteItems, bool, DeleteItems); - template + template class TReadAsFilledQueue { private: using TTuned = TTune; @@ -565,7 +565,7 @@ namespace NThreading { using TBunchBase = typename TTuned::TBunchBase; - template + template using TContainer = typename TTuned::template TContainer; diff --git a/library/cpp/threading/queue/mpsc_vinfarr_obstructive.h b/library/cpp/threading/queue/mpsc_vinfarr_obstructive.h index 5f91f1b5a84..4c85bef6ecd 100644 --- a/library/cpp/threading/queue/mpsc_vinfarr_obstructive.h +++ b/library/cpp/threading/queue/mpsc_vinfarr_obstructive.h @@ -469,7 +469,7 @@ namespace NThreading { DeclareTuneTypeParam(TObstructiveQueueBunchBase, TBunchBase); DeclareTuneTypeParam(TObstructiveQueueAux, TAux); - template + template class TObstructiveConsumerAuxQueue { private: using TTuned = @@ -522,7 +522,7 @@ namespace NThreading { template class TObstructiveConsumerQueue - : public TObstructiveConsumerAuxQueue> { + : public TObstructiveConsumerAuxQueue> { }; -} +} diff --git a/library/cpp/threading/queue/queue_ut.cpp b/library/cpp/threading/queue/queue_ut.cpp index 80eca147da9..a55f952cbcb 100644 --- a/library/cpp/threading/queue/queue_ut.cpp +++ b/library/cpp/threading/queue/queue_ut.cpp @@ -12,7 +12,7 @@ private: UNIT_TEST(Threads2_Push1M_Threads1_Pop2M) UNIT_TEST(Threads4_Push1M_Threads1_Pop4M) UNIT_TEST(Threads8_RndPush100K_Threads8_Queues) - /* + /* UNIT_TEST(Threads24_RndPush100K_Threads24_Queues) UNIT_TEST(Threads24_RndPush100K_Threads8_Queues) UNIT_TEST(Threads24_RndPush100K_Threads4_Queues) diff --git a/library/cpp/threading/queue/tune.h b/library/cpp/threading/queue/tune.h index 50fc3dc17cd..1072342620b 100644 --- a/library/cpp/threading/queue/tune.h +++ b/library/cpp/threading/queue/tune.h @@ -96,14 +96,14 @@ }; \ } -#define DeclareTuneContainer(TParamName, InternalName) \ - template