Tidying
This commit is contained in:
@@ -54,7 +54,7 @@ namespace Bloom
|
|||||||
auto& taskGroupsInExecution = InsightWorker::taskGroupsInExecution.getValue();
|
auto& taskGroupsInExecution = InsightWorker::taskGroupsInExecution.getValue();
|
||||||
|
|
||||||
const auto canExecuteTask = [&taskGroupsInExecution] (const QSharedPointer<InsightWorkerTask>& task) {
|
const auto canExecuteTask = [&taskGroupsInExecution] (const QSharedPointer<InsightWorkerTask>& task) {
|
||||||
for (const auto taskGroup : task->getTaskGroups()) {
|
for (const auto taskGroup : task->taskGroups()) {
|
||||||
if (taskGroupsInExecution.contains(taskGroup)) {
|
if (taskGroupsInExecution.contains(taskGroup)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -65,7 +65,7 @@ namespace Bloom
|
|||||||
|
|
||||||
for (auto [queuedTaskId, task] : queuedTasks) {
|
for (auto [queuedTaskId, task] : queuedTasks) {
|
||||||
if (canExecuteTask(task)) {
|
if (canExecuteTask(task)) {
|
||||||
const auto taskGroups = task->getTaskGroups();
|
const auto taskGroups = task->taskGroups();
|
||||||
taskGroupsInExecution.insert(taskGroups.begin(), taskGroups.end());
|
taskGroupsInExecution.insert(taskGroups.begin(), taskGroups.end());
|
||||||
queuedTasks.erase(queuedTaskId);
|
queuedTasks.erase(queuedTaskId);
|
||||||
return task;
|
return task;
|
||||||
@@ -87,7 +87,7 @@ namespace Bloom
|
|||||||
const auto taskGroupsLock = InsightWorker::taskGroupsInExecution.acquireLock();
|
const auto taskGroupsLock = InsightWorker::taskGroupsInExecution.acquireLock();
|
||||||
auto& taskGroupsInExecution = InsightWorker::taskGroupsInExecution.getValue();
|
auto& taskGroupsInExecution = InsightWorker::taskGroupsInExecution.getValue();
|
||||||
|
|
||||||
for (const auto& taskGroup : task->getTaskGroups()) {
|
for (const auto& taskGroup : task->taskGroups()) {
|
||||||
taskGroupsInExecution.erase(taskGroup);
|
taskGroupsInExecution.erase(taskGroup);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ namespace Bloom
|
|||||||
const std::optional<Targets::TargetMemoryBuffer>& data
|
const std::optional<Targets::TargetMemoryBuffer>& data
|
||||||
);
|
);
|
||||||
|
|
||||||
TaskGroups getTaskGroups() const override {
|
TaskGroups taskGroups() const override {
|
||||||
return TaskGroups({
|
return TaskGroups({
|
||||||
TaskGroup::USES_TARGET_CONTROLLER,
|
TaskGroup::USES_TARGET_CONTROLLER,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ namespace Bloom
|
|||||||
const Widgets::HexViewerSharedState& hexViewerState
|
const Widgets::HexViewerSharedState& hexViewerState
|
||||||
);
|
);
|
||||||
|
|
||||||
TaskGroups getTaskGroups() const override {
|
TaskGroups taskGroups() const override {
|
||||||
return TaskGroups();
|
return TaskGroups();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace Bloom
|
|||||||
public:
|
public:
|
||||||
GetTargetDescriptor() = default;
|
GetTargetDescriptor() = default;
|
||||||
|
|
||||||
TaskGroups getTaskGroups() const override {
|
TaskGroups taskGroups() const override {
|
||||||
return TaskGroups({
|
return TaskGroups({
|
||||||
TaskGroup::USES_TARGET_CONTROLLER,
|
TaskGroup::USES_TARGET_CONTROLLER,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace Bloom
|
|||||||
public:
|
public:
|
||||||
GetTargetState() = default;
|
GetTargetState() = default;
|
||||||
|
|
||||||
TaskGroups getTaskGroups() const override {
|
TaskGroups taskGroups() const override {
|
||||||
return TaskGroups({
|
return TaskGroups({
|
||||||
TaskGroup::USES_TARGET_CONTROLLER,
|
TaskGroup::USES_TARGET_CONTROLLER,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ namespace Bloom
|
|||||||
|
|
||||||
InsightWorkerTask();
|
InsightWorkerTask();
|
||||||
|
|
||||||
virtual TaskGroups getTaskGroups() const {
|
virtual TaskGroups taskGroups() const {
|
||||||
return TaskGroups();
|
return TaskGroups();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace Bloom
|
|||||||
public:
|
public:
|
||||||
ReadProgramCounter() = default;
|
ReadProgramCounter() = default;
|
||||||
|
|
||||||
TaskGroups getTaskGroups() const override {
|
TaskGroups taskGroups() const override {
|
||||||
return TaskGroups({
|
return TaskGroups({
|
||||||
TaskGroup::USES_TARGET_CONTROLLER,
|
TaskGroup::USES_TARGET_CONTROLLER,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace Bloom
|
|||||||
public:
|
public:
|
||||||
ReadStackPointer() = default;
|
ReadStackPointer() = default;
|
||||||
|
|
||||||
TaskGroups getTaskGroups() const override {
|
TaskGroups taskGroups() const override {
|
||||||
return TaskGroups({
|
return TaskGroups({
|
||||||
TaskGroup::USES_TARGET_CONTROLLER,
|
TaskGroup::USES_TARGET_CONTROLLER,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ namespace Bloom
|
|||||||
, excludedAddressRanges(excludedAddressRanges)
|
, excludedAddressRanges(excludedAddressRanges)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
TaskGroups getTaskGroups() const override {
|
TaskGroups taskGroups() const override {
|
||||||
return TaskGroups({
|
return TaskGroups({
|
||||||
TaskGroup::USES_TARGET_CONTROLLER,
|
TaskGroup::USES_TARGET_CONTROLLER,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ namespace Bloom
|
|||||||
: descriptors(descriptors)
|
: descriptors(descriptors)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
TaskGroups getTaskGroups() const override {
|
TaskGroups taskGroups() const override {
|
||||||
return TaskGroups({
|
return TaskGroups({
|
||||||
TaskGroup::USES_TARGET_CONTROLLER,
|
TaskGroup::USES_TARGET_CONTROLLER,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace Bloom
|
|||||||
: variantId(variantId)
|
: variantId(variantId)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
TaskGroups getTaskGroups() const override {
|
TaskGroups taskGroups() const override {
|
||||||
return TaskGroups({
|
return TaskGroups({
|
||||||
TaskGroup::USES_TARGET_CONTROLLER,
|
TaskGroup::USES_TARGET_CONTROLLER,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace Bloom
|
|||||||
, pinState(pinState)
|
, pinState(pinState)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
TaskGroups getTaskGroups() const override {
|
TaskGroups taskGroups() const override {
|
||||||
return TaskGroups({
|
return TaskGroups({
|
||||||
TaskGroup::USES_TARGET_CONTROLLER,
|
TaskGroup::USES_TARGET_CONTROLLER,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ namespace Bloom
|
|||||||
: targetRegister(targetRegister)
|
: targetRegister(targetRegister)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
TaskGroups getTaskGroups() const override {
|
TaskGroups taskGroups() const override {
|
||||||
return TaskGroups({
|
return TaskGroups({
|
||||||
TaskGroup::USES_TARGET_CONTROLLER,
|
TaskGroup::USES_TARGET_CONTROLLER,
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user