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

UI: WorkerManager: Wait workers finishing.

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2019-04-13 21:52:53 +05:00
parent baffe6aba5
commit b89e685212
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,10 @@ void WorkerManager::workerFinished(WorkerObject *worker)
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
m_workers.removeOne(worker); m_workers.removeOne(worker);
if (m_workers.isEmpty()) {
m_waitCondition.wakeOne();
}
} }
void WorkerManager::clear() void WorkerManager::clear()
@ -53,20 +57,19 @@ void WorkerManager::abort()
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
abortWorkers();
m_aborted = true; m_aborted = true;
m_waitCondition.wakeAll(); if (!m_workers.isEmpty()) {
} for (WorkerObject *worker : m_workers) {
worker->abort();
}
void WorkerManager::abortWorkers() m_waitCondition.wakeAll();
{
for (WorkerObject *worker : m_workers) { do {
worker->abort(); m_waitCondition.wait(&m_mutex);
} while (!m_workers.isEmpty());
} }
m_workers.clear();
} }
void WorkerManager::enqueueJob(const QString &job) void WorkerManager::enqueueJob(const QString &job)

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

@ -41,7 +41,6 @@ private:
void setupWorker(); void setupWorker();
void abort(); void abort();
void abortWorkers();
private: private:
volatile bool m_aborted; volatile bool m_aborted;

4
src/ui/util/worker/workerobject.cpp
View File

@ -19,7 +19,5 @@ void WorkerObject::run()
doJob(job); doJob(job);
} }
if (!aborted()) { manager()->workerFinished(this);
manager()->workerFinished(this);
}
} }