Lubuntu/ci-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try minimizing duplicate locks

Browse Source
This commit is contained in:
Simon Quigley 2025-01-25 17:22:41 -06:00
parent c0ba14764a
commit 2915f73367
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cpp/task_queue.cpp
View File

@ -95,11 +95,11 @@ void TaskQueue::worker_thread() {
bool found_valid = false; bool found_valid = false;
// Iterate through the set until a valid task is found // Iterate through the set until a valid task is found
while (it != tasks_.end()) { while (it != tasks_.end()) {
std::lock_guard<std::mutex> lock(running_pkgconfs_mutex_);
std::shared_ptr<Task> it_task = *it; std::shared_ptr<Task> it_task = *it;
task_to_execute = it_task; task_to_execute = it_task;
int pkgconf_id = task_to_execute->get_parent_packageconf()->id; int pkgconf_id = task_to_execute->get_parent_packageconf()->id;
std::lock_guard<std::mutex> lock(running_pkgconfs_mutex_);
auto running_pkgconf_it = std::find_if(running_pkgconfs_.begin(), running_pkgconfs_.end(), auto running_pkgconf_it = std::find_if(running_pkgconfs_.begin(), running_pkgconfs_.end(),
[&pkgconf_id](const std::shared_ptr<PackageConf>& pkgconf) { return pkgconf->id == pkgconf_id; }); [&pkgconf_id](const std::shared_ptr<PackageConf>& pkgconf) { return pkgconf->id == pkgconf_id; });
@ -116,13 +116,16 @@ void TaskQueue::worker_thread() {
if (!found_valid) { continue; } if (!found_valid) { continue; }
} }
if (!task_to_execute || !task_to_execute->func) { if (!task_to_execute || !task_to_execute->func) continue;
continue; else {
} else { {
std::lock_guard<std::mutex> pkgconfslock(running_pkgconfs_mutex_); std::lock_guard<std::mutex> pkgconfslock(running_pkgconfs_mutex_);
running_pkgconfs_.insert(task_to_execute->get_parent_packageconf()); running_pkgconfs_.insert(task_to_execute->get_parent_packageconf());
std::lock_guard<std::mutex> tasks_lock(running_tasks_mutex_); }
running_tasks_.insert(task_to_execute); {
std::lock_guard<std::mutex> tasks_lock(running_tasks_mutex_);
running_tasks_.insert(task_to_execute);
}
} }
// Set the start time // Set the start time