Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-12 02:00:52 +01:00
Code Releases Wiki Activity

fix: Foreground tasks not being cancellable

Browse Source
This commit is contained in:
WerWolv 2022-10-05 21:25:52 +02:00
parent 556895744b
commit 5ace199dc4
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libimhex/include/hex/api/task.hpp
View File

@ -108,6 +108,7 @@ namespace hex {
static std::mutex s_deferredCallsMutex;
static std::list<std::shared_ptr<Task>> s_tasks;
static std::list<std::shared_ptr<Task>> s_taskQueue;
static std::list<std::function<void()>> s_deferredCalls;
static std::mutex s_queueMutex;

19
lib/libimhex/source/api/task.cpp
View File

@ -10,7 +10,7 @@ namespace hex {
std::mutex TaskManager::s_deferredCallsMutex;
std::list<std::shared_ptr<Task>> TaskManager::s_tasks;
std::list<std::shared_ptr<Task>> TaskManager::s_tasks, TaskManager::s_taskQueue;
std::list<std::function<void()>> TaskManager::s_deferredCalls;
std::mutex TaskManager::s_queueMutex;
@ -177,13 +177,13 @@ namespace hex {
{
std::unique_lock lock(s_queueMutex);
s_jobCondVar.wait(lock, [&] {
return !s_tasks.empty() || stopToken.stop_requested();
return !s_taskQueue.empty() || stopToken.stop_requested();
});
if (stopToken.stop_requested())
break;
task = std::move(s_tasks.front());
s_tasks.pop_front();
task = std::move(s_taskQueue.front());
s_taskQueue.pop_front();
}
try {
@ -204,7 +204,10 @@ namespace hex {
TaskHolder TaskManager::createTask(std::string name, u64 maxValue, std::function<void(Task &)> function) {
std::unique_lock lock(s_queueMutex);
s_tasks.emplace_back(std::make_shared<Task>(std::move(name), maxValue, false, std::move(function)));
auto task = std::make_shared<Task>(std::move(name), maxValue, false, std::move(function));
s_tasks.emplace_back(task);
s_taskQueue.emplace_back(task);
s_jobCondVar.notify_one();
return TaskHolder(s_tasks.back());
@ -212,7 +215,11 @@ namespace hex {
TaskHolder TaskManager::createBackgroundTask(std::string name, std::function<void(Task &)> function) {
std::unique_lock lock(s_queueMutex);
s_tasks.emplace_back(std::make_shared<Task>(std::move(name), 0, true, std::move(function)));
auto task = std::make_shared<Task>(std::move(name), 0, true, std::move(function));
s_tasks.emplace_back(task);
s_taskQueue.emplace_back(task);
s_jobCondVar.notify_one();
return TaskHolder(s_tasks.back());