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

Attempt to see if moving up the mutex will help with locking issues

Browse Source
This commit is contained in:
Simon Quigley 2025-01-25 22:26:45 -06:00
parent 345081b851
commit 6ea4665dbe
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpp/ci_logic.cpp
View File

@ -1131,10 +1131,10 @@ std::string CiLogic::queue_pull_tarball(std::vector<std::shared_ptr<PackageConf>
bool is_ghost_pull = false; bool is_ghost_pull = false;
// Attempt to find if we've seen this package->name before // Attempt to find if we've seen this package->name before
std::lock_guard<std::mutex> lock(task_assignment_mutex);
auto found_it = encountered_items.find(r->package->name); auto found_it = encountered_items.find(r->package->name);
std::shared_ptr<package_conf_item> new_item = std::make_shared<package_conf_item>(); std::shared_ptr<package_conf_item> new_item = std::make_shared<package_conf_item>();
if (found_it != encountered_items.end()) { if (found_it != encountered_items.end()) {
std::lock_guard<std::mutex> lock(task_assignment_mutex);
is_ghost_pull = true; is_ghost_pull = true;
r->assign_task(job_statuses->at("pull"), found_it->second->first_pull_task, r); r->assign_task(job_statuses->at("pull"), found_it->second->first_pull_task, r);
@ -1146,7 +1146,6 @@ std::string CiLogic::queue_pull_tarball(std::vector<std::shared_ptr<PackageConf>
continue; continue;
} }
std::shared_ptr<Task> tarball_task = std::make_shared<Task>();
task_queue->enqueue( task_queue->enqueue(
job_statuses->at("pull"), job_statuses->at("pull"),
[this, r](std::shared_ptr<Log> log) mutable { [this, r](std::shared_ptr<Log> log) mutable {