diff options
author | kulikov <kulikov@yandex-team.ru> | 2022-02-10 16:49:34 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:49:34 +0300 |
commit | 65e5266709e7ff94b14ae128309e229de714b0df (patch) | |
tree | d4901f06e56d95f5e5d36bd1806bcc144d03bf41 /library/cpp/threading | |
parent | 0041d99876ae3dccc3f0fa8787131d85ddfd486b (diff) | |
download | ydb-65e5266709e7ff94b14ae128309e229de714b0df.tar.gz |
Restoring authorship annotation for <kulikov@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/threading')
-rw-r--r-- | library/cpp/threading/equeue/equeue.cpp | 152 | ||||
-rw-r--r-- | library/cpp/threading/equeue/equeue.h | 50 | ||||
-rw-r--r-- | library/cpp/threading/equeue/equeue_ut.cpp | 226 | ||||
-rw-r--r-- | library/cpp/threading/task_scheduler/task_scheduler.cpp | 458 | ||||
-rw-r--r-- | library/cpp/threading/task_scheduler/task_scheduler.h | 162 | ||||
-rw-r--r-- | library/cpp/threading/task_scheduler/task_scheduler_ut.cpp | 30 |
6 files changed, 539 insertions, 539 deletions
diff --git a/library/cpp/threading/equeue/equeue.cpp b/library/cpp/threading/equeue/equeue.cpp index 54a848e912a..aaec19daa67 100644 --- a/library/cpp/threading/equeue/equeue.cpp +++ b/library/cpp/threading/equeue/equeue.cpp @@ -1,80 +1,80 @@ -#include "equeue.h" - -TElasticQueue::TElasticQueue(THolder<IThreadPool> slaveQueue) - : SlaveQueue_(std::move(slaveQueue)) -{ -} - -size_t TElasticQueue::ObjectCount() const { - return (size_t)AtomicGet(ObjectCount_); -} - -bool TElasticQueue::TryIncCounter() { - if ((size_t)AtomicIncrement(GuardCount_) > MaxQueueSize_) { - AtomicDecrement(GuardCount_); - return false; - } - - return true; -} - - - -class TElasticQueue::TDecrementingWrapper: TNonCopyable, public IObjectInQueue { -public: - TDecrementingWrapper(IObjectInQueue* realObject, TElasticQueue* queue) - : RealObject_(realObject) - , Queue_(queue) - { - AtomicIncrement(Queue_->ObjectCount_); - } - +#include "equeue.h" + +TElasticQueue::TElasticQueue(THolder<IThreadPool> slaveQueue) + : SlaveQueue_(std::move(slaveQueue)) +{ +} + +size_t TElasticQueue::ObjectCount() const { + return (size_t)AtomicGet(ObjectCount_); +} + +bool TElasticQueue::TryIncCounter() { + if ((size_t)AtomicIncrement(GuardCount_) > MaxQueueSize_) { + AtomicDecrement(GuardCount_); + return false; + } + + return true; +} + + + +class TElasticQueue::TDecrementingWrapper: TNonCopyable, public IObjectInQueue { +public: + TDecrementingWrapper(IObjectInQueue* realObject, TElasticQueue* queue) + : RealObject_(realObject) + , Queue_(queue) + { + AtomicIncrement(Queue_->ObjectCount_); + } + ~TDecrementingWrapper() override { - AtomicDecrement(Queue_->ObjectCount_); - AtomicDecrement(Queue_->GuardCount_); - } -private: - void Process(void *tsr) override { - THolder<TDecrementingWrapper> self(this); - RealObject_->Process(tsr); - } -private: - IObjectInQueue* const RealObject_; - TElasticQueue* const Queue_; -}; - - - -bool TElasticQueue::Add(IObjectInQueue* obj) { - if (!TryIncCounter()) { - return false; - } - - THolder<TDecrementingWrapper> wrapper; - try { - wrapper.Reset(new TDecrementingWrapper(obj, this)); - } catch (...) { - AtomicDecrement(GuardCount_); - throw; - } - - if (SlaveQueue_->Add(wrapper.Get())) { + AtomicDecrement(Queue_->ObjectCount_); + AtomicDecrement(Queue_->GuardCount_); + } +private: + void Process(void *tsr) override { + THolder<TDecrementingWrapper> self(this); + RealObject_->Process(tsr); + } +private: + IObjectInQueue* const RealObject_; + TElasticQueue* const Queue_; +}; + + + +bool TElasticQueue::Add(IObjectInQueue* obj) { + if (!TryIncCounter()) { + return false; + } + + THolder<TDecrementingWrapper> wrapper; + try { + wrapper.Reset(new TDecrementingWrapper(obj, this)); + } catch (...) { + AtomicDecrement(GuardCount_); + throw; + } + + if (SlaveQueue_->Add(wrapper.Get())) { Y_UNUSED(wrapper.Release()); - return true; - } else { - return false; - } -} - -void TElasticQueue::Start(size_t threadCount, size_t maxQueueSize) { - MaxQueueSize_ = maxQueueSize; - SlaveQueue_->Start(threadCount, maxQueueSize); -} - + return true; + } else { + return false; + } +} + +void TElasticQueue::Start(size_t threadCount, size_t maxQueueSize) { + MaxQueueSize_ = maxQueueSize; + SlaveQueue_->Start(threadCount, maxQueueSize); +} + void TElasticQueue::Stop() noexcept { - return SlaveQueue_->Stop(); -} - + return SlaveQueue_->Stop(); +} + size_t TElasticQueue::Size() const noexcept { - return SlaveQueue_->Size(); -} + return SlaveQueue_->Size(); +} diff --git a/library/cpp/threading/equeue/equeue.h b/library/cpp/threading/equeue/equeue.h index 40dd342585e..403e993713a 100644 --- a/library/cpp/threading/equeue/equeue.h +++ b/library/cpp/threading/equeue/equeue.h @@ -1,28 +1,28 @@ -#pragma once - +#pragma once + #include <util/thread/pool.h> -#include <util/system/atomic.h> -#include <util/generic/ptr.h> - -//actual queue limit will be (maxQueueSize - numBusyThreads) or 0 +#include <util/system/atomic.h> +#include <util/generic/ptr.h> + +//actual queue limit will be (maxQueueSize - numBusyThreads) or 0 class TElasticQueue: public IThreadPool { -public: - explicit TElasticQueue(THolder<IThreadPool> slaveQueue); - - bool Add(IObjectInQueue* obj) override; - size_t Size() const noexcept override; - - void Start(size_t threadCount, size_t maxQueueSize) override; - void Stop() noexcept override; - - size_t ObjectCount() const; -private: - class TDecrementingWrapper; - - bool TryIncCounter(); -private: +public: + explicit TElasticQueue(THolder<IThreadPool> slaveQueue); + + bool Add(IObjectInQueue* obj) override; + size_t Size() const noexcept override; + + void Start(size_t threadCount, size_t maxQueueSize) override; + void Stop() noexcept override; + + size_t ObjectCount() const; +private: + class TDecrementingWrapper; + + bool TryIncCounter(); +private: THolder<IThreadPool> SlaveQueue_; - size_t MaxQueueSize_ = 0; - TAtomic ObjectCount_ = 0; - TAtomic GuardCount_ = 0; -}; + size_t MaxQueueSize_ = 0; + TAtomic ObjectCount_ = 0; + TAtomic GuardCount_ = 0; +}; diff --git a/library/cpp/threading/equeue/equeue_ut.cpp b/library/cpp/threading/equeue/equeue_ut.cpp index 9cf2aced44e..defa1a0e82f 100644 --- a/library/cpp/threading/equeue/equeue_ut.cpp +++ b/library/cpp/threading/equeue/equeue_ut.cpp @@ -1,125 +1,125 @@ -#include "equeue.h" - +#include "equeue.h" + #include <library/cpp/testing/unittest/registar.h> - -#include <util/system/event.h> -#include <util/datetime/base.h> -#include <util/generic/vector.h> - + +#include <util/system/event.h> +#include <util/datetime/base.h> +#include <util/generic/vector.h> + Y_UNIT_TEST_SUITE(TElasticQueueTest) { - const size_t MaxQueueSize = 20; - const size_t ThreadCount = 10; - const size_t N = 100000; - - static THolder<TElasticQueue> Queue; - - struct TQueueSetup { - TQueueSetup() { + const size_t MaxQueueSize = 20; + const size_t ThreadCount = 10; + const size_t N = 100000; + + static THolder<TElasticQueue> Queue; + + struct TQueueSetup { + TQueueSetup() { Queue.Reset(new TElasticQueue(MakeHolder<TSimpleThreadPool>())); - Queue->Start(ThreadCount, MaxQueueSize); - } - ~TQueueSetup() { - Queue->Stop(); - } - }; - - struct TCounters { - void Reset() { - Processed = Scheduled = Discarded = Total = 0; - } - - TAtomic Processed; - TAtomic Scheduled; - TAtomic Discarded; - TAtomic Total; - }; - static TCounters Counters; - -//fill test -- fill queue with "endless" jobs + Queue->Start(ThreadCount, MaxQueueSize); + } + ~TQueueSetup() { + Queue->Stop(); + } + }; + + struct TCounters { + void Reset() { + Processed = Scheduled = Discarded = Total = 0; + } + + TAtomic Processed; + TAtomic Scheduled; + TAtomic Discarded; + TAtomic Total; + }; + static TCounters Counters; + +//fill test -- fill queue with "endless" jobs TSystemEvent WaitEvent; Y_UNIT_TEST(FillTest) { - Counters.Reset(); - - struct TWaitJob: public IObjectInQueue { + Counters.Reset(); + + struct TWaitJob: public IObjectInQueue { void Process(void*) override { - WaitEvent.Wait(); - AtomicIncrement(Counters.Processed); - } - } job; - - struct TLocalSetup: TQueueSetup { - ~TLocalSetup() { - WaitEvent.Signal(); - } - }; - - size_t enqueued = 0; - { - TLocalSetup setup; - while (Queue->Add(&job) && enqueued < MaxQueueSize + 100) { - ++enqueued; - } - - UNIT_ASSERT_VALUES_EQUAL(enqueued, MaxQueueSize); - UNIT_ASSERT_VALUES_EQUAL(enqueued, Queue->ObjectCount()); - } - - UNIT_ASSERT_VALUES_EQUAL(0u, Queue->ObjectCount()); - UNIT_ASSERT_VALUES_EQUAL(0u, Queue->Size()); - UNIT_ASSERT_VALUES_EQUAL((size_t)Counters.Processed, enqueued); - } - - -//concurrent test -- send many jobs from different threads - struct TJob: public IObjectInQueue { + WaitEvent.Wait(); + AtomicIncrement(Counters.Processed); + } + } job; + + struct TLocalSetup: TQueueSetup { + ~TLocalSetup() { + WaitEvent.Signal(); + } + }; + + size_t enqueued = 0; + { + TLocalSetup setup; + while (Queue->Add(&job) && enqueued < MaxQueueSize + 100) { + ++enqueued; + } + + UNIT_ASSERT_VALUES_EQUAL(enqueued, MaxQueueSize); + UNIT_ASSERT_VALUES_EQUAL(enqueued, Queue->ObjectCount()); + } + + UNIT_ASSERT_VALUES_EQUAL(0u, Queue->ObjectCount()); + UNIT_ASSERT_VALUES_EQUAL(0u, Queue->Size()); + UNIT_ASSERT_VALUES_EQUAL((size_t)Counters.Processed, enqueued); + } + + +//concurrent test -- send many jobs from different threads + struct TJob: public IObjectInQueue { void Process(void*) override { - AtomicIncrement(Counters.Processed); - }; - }; - static TJob Job; - - static bool TryAdd() { - AtomicIncrement(Counters.Total); - if (Queue->Add(&Job)) { - AtomicIncrement(Counters.Scheduled); - return true; - } else { - AtomicIncrement(Counters.Discarded); - return false; - } - } - - static size_t TryCounter; - + AtomicIncrement(Counters.Processed); + }; + }; + static TJob Job; + + static bool TryAdd() { + AtomicIncrement(Counters.Total); + if (Queue->Add(&Job)) { + AtomicIncrement(Counters.Scheduled); + return true; + } else { + AtomicIncrement(Counters.Discarded); + return false; + } + } + + static size_t TryCounter; + Y_UNIT_TEST(ConcurrentTest) { - Counters.Reset(); - TryCounter = 0; - + Counters.Reset(); + TryCounter = 0; + struct TSender: public IThreadFactory::IThreadAble { void DoExecute() override { - while ((size_t)AtomicIncrement(TryCounter) <= N) { - if (!TryAdd()) { - Sleep(TDuration::MicroSeconds(50)); - } - } - } - } sender; - - { - TQueueSetup setup; - + while ((size_t)AtomicIncrement(TryCounter) <= N) { + if (!TryAdd()) { + Sleep(TDuration::MicroSeconds(50)); + } + } + } + } sender; + + { + TQueueSetup setup; + TVector< TAutoPtr<IThreadFactory::IThread> > senders; - for (size_t i = 0; i < ThreadCount; ++i) { + for (size_t i = 0; i < ThreadCount; ++i) { senders.push_back(::SystemThreadFactory()->Run(&sender)); - } - - for (size_t i = 0; i < senders.size(); ++i) { - senders[i]->Join(); - } - } - - UNIT_ASSERT_VALUES_EQUAL((size_t)Counters.Total, N); - UNIT_ASSERT_VALUES_EQUAL(Counters.Processed, Counters.Scheduled); - UNIT_ASSERT_VALUES_EQUAL(Counters.Total, Counters.Scheduled + Counters.Discarded); - } -} + } + + for (size_t i = 0; i < senders.size(); ++i) { + senders[i]->Join(); + } + } + + UNIT_ASSERT_VALUES_EQUAL((size_t)Counters.Total, N); + UNIT_ASSERT_VALUES_EQUAL(Counters.Processed, Counters.Scheduled); + UNIT_ASSERT_VALUES_EQUAL(Counters.Total, Counters.Scheduled + Counters.Discarded); + } +} diff --git a/library/cpp/threading/task_scheduler/task_scheduler.cpp b/library/cpp/threading/task_scheduler/task_scheduler.cpp index 174dde4bf75..407761eea7f 100644 --- a/library/cpp/threading/task_scheduler/task_scheduler.cpp +++ b/library/cpp/threading/task_scheduler/task_scheduler.cpp @@ -1,246 +1,246 @@ #include "task_scheduler.h" - -#include <util/system/thread.h> -#include <util/string/cast.h> + +#include <util/system/thread.h> +#include <util/string/cast.h> #include <util/stream/output.h> - -TTaskScheduler::ITask::~ITask() {} -TTaskScheduler::IRepeatedTask::~IRepeatedTask() {} - - - -class TTaskScheduler::TWorkerThread + +TTaskScheduler::ITask::~ITask() {} +TTaskScheduler::IRepeatedTask::~IRepeatedTask() {} + + + +class TTaskScheduler::TWorkerThread : public ISimpleThread -{ -public: - TWorkerThread(TTaskScheduler& state) - : Scheduler_(state) - { - } - +{ +public: + TWorkerThread(TTaskScheduler& state) + : Scheduler_(state) + { + } + TString DebugState = "?"; TString DebugId = ""; -private: +private: void* ThreadProc() noexcept override { - Scheduler_.WorkerFunc(this); - return nullptr; - } -private: - TTaskScheduler& Scheduler_; -}; - - - -TTaskScheduler::TTaskScheduler(size_t threadCount, size_t maxTaskCount) - : MaxTaskCount_(maxTaskCount) -{ - for (size_t i = 0; i < threadCount; ++i) { - Workers_.push_back(new TWorkerThread(*this)); - Workers_.back()->DebugId = ToString(i); - } -} - -TTaskScheduler::~TTaskScheduler() { - try { - Stop(); - } catch (...) { + Scheduler_.WorkerFunc(this); + return nullptr; + } +private: + TTaskScheduler& Scheduler_; +}; + + + +TTaskScheduler::TTaskScheduler(size_t threadCount, size_t maxTaskCount) + : MaxTaskCount_(maxTaskCount) +{ + for (size_t i = 0; i < threadCount; ++i) { + Workers_.push_back(new TWorkerThread(*this)); + Workers_.back()->DebugId = ToString(i); + } +} + +TTaskScheduler::~TTaskScheduler() { + try { + Stop(); + } catch (...) { Cdbg << "task scheduled destruction error: " << CurrentExceptionMessage(); - } -} - -void TTaskScheduler::Start() { - for (auto& w : Workers_) { - w->Start(); - } -} - -void TTaskScheduler::Stop() { - with_lock (Lock_) { - IsStopped_ = true; - CondVar_.BroadCast(); - } - - for (auto& w: Workers_) { - w->Join(); - } - - Workers_.clear(); - Queue_.clear(); -} - -size_t TTaskScheduler::GetTaskCount() const { - return static_cast<size_t>(AtomicGet(TaskCounter_)); -} - -namespace { - class TTaskWrapper - : public TTaskScheduler::ITask - , TNonCopyable - { - public: - TTaskWrapper(TTaskScheduler::ITaskRef task, TAtomic& counter) - : Task_(task) - , Counter_(counter) - { - AtomicIncrement(Counter_); - } - + } +} + +void TTaskScheduler::Start() { + for (auto& w : Workers_) { + w->Start(); + } +} + +void TTaskScheduler::Stop() { + with_lock (Lock_) { + IsStopped_ = true; + CondVar_.BroadCast(); + } + + for (auto& w: Workers_) { + w->Join(); + } + + Workers_.clear(); + Queue_.clear(); +} + +size_t TTaskScheduler::GetTaskCount() const { + return static_cast<size_t>(AtomicGet(TaskCounter_)); +} + +namespace { + class TTaskWrapper + : public TTaskScheduler::ITask + , TNonCopyable + { + public: + TTaskWrapper(TTaskScheduler::ITaskRef task, TAtomic& counter) + : Task_(task) + , Counter_(counter) + { + AtomicIncrement(Counter_); + } + ~TTaskWrapper() override { - AtomicDecrement(Counter_); - } - private: - TInstant Process() override { - return Task_->Process(); - } - private: - TTaskScheduler::ITaskRef Task_; - TAtomic& Counter_; - }; -} - -bool TTaskScheduler::Add(ITaskRef task, TInstant expire) { - with_lock (Lock_) { - if (!IsStopped_ && Workers_.size() > 0 && GetTaskCount() + 1 <= MaxTaskCount_) { - ITaskRef newTask = new TTaskWrapper(task, TaskCounter_); + AtomicDecrement(Counter_); + } + private: + TInstant Process() override { + return Task_->Process(); + } + private: + TTaskScheduler::ITaskRef Task_; + TAtomic& Counter_; + }; +} + +bool TTaskScheduler::Add(ITaskRef task, TInstant expire) { + with_lock (Lock_) { + if (!IsStopped_ && Workers_.size() > 0 && GetTaskCount() + 1 <= MaxTaskCount_) { + ITaskRef newTask = new TTaskWrapper(task, TaskCounter_); Queue_.insert(std::make_pair(expire, TTaskHolder(newTask))); - - if (!Queue_.begin()->second.WaitingWorker) { - CondVar_.Signal(); - } - return true; - } - } - - return false; -} - -namespace { - class TRepeatedTask - : public TTaskScheduler::ITask - { - public: - TRepeatedTask(TTaskScheduler::IRepeatedTaskRef task, TDuration period, TInstant deadline) - : Task_(task) - , Period_(period) - , Deadline_(deadline) - { - } - private: - TInstant Process() final { - Deadline_ += Period_; - if (Task_->Process()) { - return Deadline_; - } else { - return TInstant::Max(); - } - } - private: - TTaskScheduler::IRepeatedTaskRef Task_; - TDuration Period_; - TInstant Deadline_; - }; -} - -bool TTaskScheduler::Add(IRepeatedTaskRef task, TDuration period) { - const TInstant deadline = Now() + period; - ITaskRef t = new TRepeatedTask(task, period, deadline); - return Add(t, deadline); -} - - -const bool debugOutput = false; - + + if (!Queue_.begin()->second.WaitingWorker) { + CondVar_.Signal(); + } + return true; + } + } + + return false; +} + +namespace { + class TRepeatedTask + : public TTaskScheduler::ITask + { + public: + TRepeatedTask(TTaskScheduler::IRepeatedTaskRef task, TDuration period, TInstant deadline) + : Task_(task) + , Period_(period) + , Deadline_(deadline) + { + } + private: + TInstant Process() final { + Deadline_ += Period_; + if (Task_->Process()) { + return Deadline_; + } else { + return TInstant::Max(); + } + } + private: + TTaskScheduler::IRepeatedTaskRef Task_; + TDuration Period_; + TInstant Deadline_; + }; +} + +bool TTaskScheduler::Add(IRepeatedTaskRef task, TDuration period) { + const TInstant deadline = Now() + period; + ITaskRef t = new TRepeatedTask(task, period, deadline); + return Add(t, deadline); +} + + +const bool debugOutput = false; + void TTaskScheduler::ChangeDebugState(TWorkerThread* thread, const TString& state) { - if (!debugOutput) { + if (!debugOutput) { Y_UNUSED(thread); Y_UNUSED(state); - return; - } - - thread->DebugState = state; - - TStringStream ss; - ss << Now() << " " << thread->DebugId << ":\t"; - for (auto& w : Workers_) { - ss << w->DebugState << " "; - } - ss << " [" << Queue_.size() << "] [" << TaskCounter_ << "]" << Endl; + return; + } + + thread->DebugState = state; + + TStringStream ss; + ss << Now() << " " << thread->DebugId << ":\t"; + for (auto& w : Workers_) { + ss << w->DebugState << " "; + } + ss << " [" << Queue_.size() << "] [" << TaskCounter_ << "]" << Endl; Cerr << ss.Str(); -} - -bool TTaskScheduler::Wait(TWorkerThread* thread, TQueueIterator& toWait) { - ChangeDebugState(thread, "w"); - toWait->second.WaitingWorker = thread; - return !CondVar_.WaitD(Lock_, toWait->first); -} - -void TTaskScheduler::ChooseFromQueue(TQueueIterator& toWait) { - for (TQueueIterator it = Queue_.begin(); it != Queue_.end(); ++it) { - if (!it->second.WaitingWorker) { - if (toWait == Queue_.end()) { - toWait = it; - } else if (it->first < toWait->first) { - toWait->second.WaitingWorker = nullptr; - toWait = it; - } - break; - } - } -} - -void TTaskScheduler::WorkerFunc(TWorkerThread* thread) { +} + +bool TTaskScheduler::Wait(TWorkerThread* thread, TQueueIterator& toWait) { + ChangeDebugState(thread, "w"); + toWait->second.WaitingWorker = thread; + return !CondVar_.WaitD(Lock_, toWait->first); +} + +void TTaskScheduler::ChooseFromQueue(TQueueIterator& toWait) { + for (TQueueIterator it = Queue_.begin(); it != Queue_.end(); ++it) { + if (!it->second.WaitingWorker) { + if (toWait == Queue_.end()) { + toWait = it; + } else if (it->first < toWait->first) { + toWait->second.WaitingWorker = nullptr; + toWait = it; + } + break; + } + } +} + +void TTaskScheduler::WorkerFunc(TWorkerThread* thread) { TThread::SetCurrentThreadName("TaskSchedWorker"); - TQueueIterator toWait = Queue_.end(); - ITaskRef toDo; - - for (;;) { - TInstant repeat = TInstant::Max(); - - if (!!toDo) { - try { - repeat = toDo->Process(); - } catch (...) { + TQueueIterator toWait = Queue_.end(); + ITaskRef toDo; + + for (;;) { + TInstant repeat = TInstant::Max(); + + if (!!toDo) { + try { + repeat = toDo->Process(); + } catch (...) { Cdbg << "task scheduler error: " << CurrentExceptionMessage(); - } - } - - - with_lock (Lock_) { - ChangeDebugState(thread, "f"); - - if (IsStopped_) { - ChangeDebugState(thread, "s"); - return ; - } - - if (!!toDo) { - if (repeat < TInstant::Max()) { + } + } + + + with_lock (Lock_) { + ChangeDebugState(thread, "f"); + + if (IsStopped_) { + ChangeDebugState(thread, "s"); + return ; + } + + if (!!toDo) { + if (repeat < TInstant::Max()) { Queue_.insert(std::make_pair(repeat, TTaskHolder(toDo))); - } - } - - toDo = nullptr; - - ChooseFromQueue(toWait); - - if (toWait != Queue_.end()) { - if (toWait->first <= Now() || Wait(thread, toWait)) { - - toDo = toWait->second.Task; - Queue_.erase(toWait); - toWait = Queue_.end(); - - if (!Queue_.empty() && !Queue_.begin()->second.WaitingWorker && Workers_.size() > 1) { - CondVar_.Signal(); - } - - ChangeDebugState(thread, "p"); - } - } else { - ChangeDebugState(thread, "e"); - CondVar_.WaitI(Lock_); - } - } - } -} + } + } + + toDo = nullptr; + + ChooseFromQueue(toWait); + + if (toWait != Queue_.end()) { + if (toWait->first <= Now() || Wait(thread, toWait)) { + + toDo = toWait->second.Task; + Queue_.erase(toWait); + toWait = Queue_.end(); + + if (!Queue_.empty() && !Queue_.begin()->second.WaitingWorker && Workers_.size() > 1) { + CondVar_.Signal(); + } + + ChangeDebugState(thread, "p"); + } + } else { + ChangeDebugState(thread, "e"); + CondVar_.WaitI(Lock_); + } + } + } +} diff --git a/library/cpp/threading/task_scheduler/task_scheduler.h b/library/cpp/threading/task_scheduler/task_scheduler.h index df4da941a88..166946a2aa6 100644 --- a/library/cpp/threading/task_scheduler/task_scheduler.h +++ b/library/cpp/threading/task_scheduler/task_scheduler.h @@ -1,86 +1,86 @@ -#pragma once - -#include <util/generic/vector.h> -#include <util/generic/ptr.h> -#include <util/generic/map.h> - -#include <util/datetime/base.h> - -#include <util/system/condvar.h> -#include <util/system/mutex.h> - -class TTaskScheduler { -public: - class ITask; - using ITaskRef = TIntrusivePtr<ITask>; - - class IRepeatedTask; - using IRepeatedTaskRef = TIntrusivePtr<IRepeatedTask>; -public: - explicit TTaskScheduler(size_t threadCount = 1, size_t maxTaskCount = Max<size_t>()); - ~TTaskScheduler(); - - void Start(); - void Stop(); - - bool Add(ITaskRef task, TInstant expire); - bool Add(IRepeatedTaskRef task, TDuration period); - - size_t GetTaskCount() const; -private: - class TWorkerThread; - - struct TTaskHolder { - explicit TTaskHolder(ITaskRef& task) - : Task(task) - { - } - public: - ITaskRef Task; - TWorkerThread* WaitingWorker = nullptr; - }; - +#pragma once + +#include <util/generic/vector.h> +#include <util/generic/ptr.h> +#include <util/generic/map.h> + +#include <util/datetime/base.h> + +#include <util/system/condvar.h> +#include <util/system/mutex.h> + +class TTaskScheduler { +public: + class ITask; + using ITaskRef = TIntrusivePtr<ITask>; + + class IRepeatedTask; + using IRepeatedTaskRef = TIntrusivePtr<IRepeatedTask>; +public: + explicit TTaskScheduler(size_t threadCount = 1, size_t maxTaskCount = Max<size_t>()); + ~TTaskScheduler(); + + void Start(); + void Stop(); + + bool Add(ITaskRef task, TInstant expire); + bool Add(IRepeatedTaskRef task, TDuration period); + + size_t GetTaskCount() const; +private: + class TWorkerThread; + + struct TTaskHolder { + explicit TTaskHolder(ITaskRef& task) + : Task(task) + { + } + public: + ITaskRef Task; + TWorkerThread* WaitingWorker = nullptr; + }; + using TQueueType = TMultiMap<TInstant, TTaskHolder>; using TQueueIterator = TQueueType::iterator; -private: +private: void ChangeDebugState(TWorkerThread* thread, const TString& state); - void ChooseFromQueue(TQueueIterator& toWait); - bool Wait(TWorkerThread* thread, TQueueIterator& toWait); - - void WorkerFunc(TWorkerThread* thread); -private: - bool IsStopped_ = false; - - TAtomic TaskCounter_ = 0; + void ChooseFromQueue(TQueueIterator& toWait); + bool Wait(TWorkerThread* thread, TQueueIterator& toWait); + + void WorkerFunc(TWorkerThread* thread); +private: + bool IsStopped_ = false; + + TAtomic TaskCounter_ = 0; TQueueType Queue_; - - TCondVar CondVar_; - TMutex Lock_; - + + TCondVar CondVar_; + TMutex Lock_; + TVector<TAutoPtr<TWorkerThread>> Workers_; - - const size_t MaxTaskCount_; -}; - -class TTaskScheduler::ITask - : public TAtomicRefCount<ITask> -{ -public: - virtual ~ITask(); - - virtual TInstant Process() {//returns time to repeat this task - return TInstant::Max(); - } -}; - -class TTaskScheduler::IRepeatedTask - : public TAtomicRefCount<IRepeatedTask> -{ -public: - virtual ~IRepeatedTask(); - - virtual bool Process() {//returns if to repeat task again - return false; - } -}; - + + const size_t MaxTaskCount_; +}; + +class TTaskScheduler::ITask + : public TAtomicRefCount<ITask> +{ +public: + virtual ~ITask(); + + virtual TInstant Process() {//returns time to repeat this task + return TInstant::Max(); + } +}; + +class TTaskScheduler::IRepeatedTask + : public TAtomicRefCount<IRepeatedTask> +{ +public: + virtual ~IRepeatedTask(); + + virtual bool Process() {//returns if to repeat task again + return false; + } +}; + diff --git a/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp b/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp index 3b5203194a3..cb2daa718ba 100644 --- a/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp +++ b/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp @@ -2,7 +2,7 @@ #include <library/cpp/testing/unittest/registar.h> #include <util/stream/output.h> -#include <util/system/atomic.h> +#include <util/system/atomic.h> #include <util/generic/vector.h> #include "task_scheduler.h" @@ -12,13 +12,13 @@ class TTaskSchedulerTest: public TTestBase { UNIT_TEST(Test); UNIT_TEST_SUITE_END(); - class TCheckTask: public TTaskScheduler::IRepeatedTask { + class TCheckTask: public TTaskScheduler::IRepeatedTask { public: TCheckTask(const TDuration& delay) : Start_(Now()) , Delay_(delay) { - AtomicIncrement(ScheduledTaskCounter_); + AtomicIncrement(ScheduledTaskCounter_); } ~TCheckTask() override { @@ -28,28 +28,28 @@ class TTaskSchedulerTest: public TTestBase { const TDuration delay = Now() - Start_; if (delay < Delay_) { - AtomicIncrement(BadTimeoutCounter_); + AtomicIncrement(BadTimeoutCounter_); } - AtomicIncrement(ExecutedTaskCounter_); + AtomicIncrement(ExecutedTaskCounter_); return false; } static bool AllTaskExecuted() { - return AtomicGet(ScheduledTaskCounter_) == AtomicGet(ExecutedTaskCounter_); + return AtomicGet(ScheduledTaskCounter_) == AtomicGet(ExecutedTaskCounter_); } static size_t BadTimeoutCount() { - return AtomicGet(BadTimeoutCounter_); + return AtomicGet(BadTimeoutCounter_); } private: TInstant Start_; TDuration Delay_; - static TAtomic BadTimeoutCounter_; - static TAtomic ScheduledTaskCounter_; - static TAtomic ExecutedTaskCounter_; + static TAtomic BadTimeoutCounter_; + static TAtomic ScheduledTaskCounter_; + static TAtomic ExecutedTaskCounter_; }; public: @@ -72,15 +72,15 @@ class TTaskSchedulerTest: public TTestBase { void ScheduleCheckTask(size_t delay) { TDuration d = TDuration::MicroSeconds(delay); - Scheduler_.Add(new TCheckTask(d), d); + Scheduler_.Add(new TCheckTask(d), d); } private: - TTaskScheduler Scheduler_; + TTaskScheduler Scheduler_; }; -TAtomic TTaskSchedulerTest::TCheckTask::BadTimeoutCounter_ = 0; -TAtomic TTaskSchedulerTest::TCheckTask::ScheduledTaskCounter_ = 0; -TAtomic TTaskSchedulerTest::TCheckTask::ExecutedTaskCounter_ = 0; +TAtomic TTaskSchedulerTest::TCheckTask::BadTimeoutCounter_ = 0; +TAtomic TTaskSchedulerTest::TCheckTask::ScheduledTaskCounter_ = 0; +TAtomic TTaskSchedulerTest::TCheckTask::ExecutedTaskCounter_ = 0; UNIT_TEST_SUITE_REGISTRATION(TTaskSchedulerTest); |