mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 12:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: WorkerManager:: Simplify complex conditionals

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2023-07-05 17:32:11 +03:00
parent 19e1f417e3
commit 65109de488
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ui/util/worker/workermanager.cpp
View File

@ -19,9 +19,7 @@ WorkerManager::~WorkerManager()
void WorkerManager::setupWorker() void WorkerManager::setupWorker()
{ {
const int workersCount = m_workers.size(); if (!checkNewWorkerNeeded())
if (workersCount != 0 && (workersCount >= maxWorkersCount() || m_jobQueue.isEmpty()))
return; return;
WorkerObject *worker = createWorker(); // autoDelete = true WorkerObject *worker = createWorker(); // autoDelete = true
@ -30,6 +28,16 @@ void WorkerManager::setupWorker()
QThreadPool::globalInstance()->start(worker); QThreadPool::globalInstance()->start(worker);
} }
bool WorkerManager::checkNewWorkerNeeded() const
{
const int workersCount = m_workers.size();
if (workersCount == 0)
return true;
return workersCount < maxWorkersCount() && !m_jobQueue.isEmpty();
}
void WorkerManager::workerFinished(WorkerObject *worker) void WorkerManager::workerFinished(WorkerObject *worker)
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
@ -46,6 +54,14 @@ WorkerObject *WorkerManager::createWorker()
return new WorkerObject(this); return new WorkerObject(this);
} }
bool WorkerManager::mergeJob(WorkerJobPtr job)
{
if (!canMergeJobs() || m_jobQueue.isEmpty())
return false;
return m_jobQueue.last()->mergeJob(*job);
}
void WorkerManager::clear() void WorkerManager::clear()
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
@ -75,7 +91,7 @@ void WorkerManager::enqueueJob(WorkerJobPtr job)
setupWorker(); setupWorker();
if (canMergeJobs() && !m_jobQueue.isEmpty() && m_jobQueue.last()->mergeJob(*job)) if (mergeJob(job))
return; return;
m_jobQueue.enqueue(job); m_jobQueue.enqueue(job);

4
src/ui/util/worker/workermanager.h
View File

@ -39,9 +39,13 @@ protected:
virtual WorkerObject *createWorker(); virtual WorkerObject *createWorker();
virtual bool canMergeJobs() const { return false; } virtual bool canMergeJobs() const { return false; }
bool mergeJob(WorkerJobPtr job);
private: private:
void setupWorker(); void setupWorker();
bool checkNewWorkerNeeded() const;
private: private:
volatile bool m_aborted = false; volatile bool m_aborted = false;