doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for grouping InsightWorker tasks

Browse Source
This commit is contained in:
Nav
2022-09-08 19:54:37 +01:00
parent 1ddff3c2a4
commit c460c9d7e1
4 changed files with 72 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/Insight/InsightWorker/InsightWorker.cpp
View File

@@ -12,49 +12,76 @@ namespace Bloom
using Bloom::Targets::TargetState;
void InsightWorker::startup() {
QObject::connect(
InsightSignals::instance(),
&InsightSignals::taskQueued,
this,
&InsightWorker::executeTasks
);
auto* insightSignals = InsightSignals::instance();
QObject::connect(insightSignals, &InsightSignals::taskQueued, this, &InsightWorker::executeTasks);
QObject::connect(insightSignals, &InsightSignals::taskProcessed, this, &InsightWorker::executeTasks);
Logger::debug("InsightWorker" + std::to_string(this->id) + " thread ready");
emit this->ready();
}
void InsightWorker::queueTask(InsightWorkerTask* task) {
static std::atomic<QueuedTaskId> lastQueuedTaskId = 0;
task->moveToThread(nullptr);
{
const auto taskQueueLock = InsightWorker::queuedTasks.acquireLock();
InsightWorker::queuedTasks.getValue().push(task);
const auto taskQueueLock = InsightWorker::queuedTasksById.acquireLock();
InsightWorker::queuedTasksById.getValue().insert(std::pair(++(lastQueuedTaskId), task));
}
emit InsightSignals::instance()->taskQueued();
}
std::optional<InsightWorkerTask*> InsightWorker::getQueuedTask() {
auto taskQueueLock = InsightWorker::queuedTasks.acquireLock();
auto& queuedTasks = InsightWorker::queuedTasks.getValue();
if (!queuedTasks.empty()) {
auto* task = queuedTasks.front();
queuedTasks.pop();
return task;
}
return std::nullopt;
}
void InsightWorker::executeTasks() {
static const auto getQueuedTask = [] () -> std::optional<InsightWorkerTask*> {
const auto taskQueueLock = InsightWorker::queuedTasksById.acquireLock();
auto& queuedTasks = InsightWorker::queuedTasksById.getValue();
if (!queuedTasks.empty()) {
const auto taskGroupsLock = InsightWorker::taskGroupsInExecution.acquireLock();
auto& taskGroupsInExecution = InsightWorker::taskGroupsInExecution.getValue();
const auto canExecuteTask = [&taskGroupsInExecution] (InsightWorkerTask* task) {
for (const auto taskGroup : task->getTaskGroups()) {
if (taskGroupsInExecution.contains(taskGroup)) {
return false;
}
}
return true;
};
for (auto [queuedTaskId, task] : queuedTasks) {
if (canExecuteTask(task)) {
const auto taskGroups = task->getTaskGroups();
taskGroupsInExecution.insert(taskGroups.begin(), taskGroups.end());
queuedTasks.erase(queuedTaskId);
return task;
}
}
}
return std::nullopt;
};
auto queuedTask = std::optional<InsightWorkerTask*>();
while ((queuedTask = InsightWorker::getQueuedTask()).has_value()) {
while ((queuedTask = getQueuedTask())) {
auto* task = queuedTask.value();
task->moveToThread(this->thread());
task->setParent(this);
task->execute(this->targetControllerConsole);
{
const auto taskGroupsLock = InsightWorker::taskGroupsInExecution.acquireLock();
auto& taskGroupsInExecution = InsightWorker::taskGroupsInExecution.getValue();
for (const auto& taskGroup : task->getTaskGroups()) {
taskGroupsInExecution.erase(taskGroup);
}
}
task->deleteLater();
}
}