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

Deduplicate packages instead of packageconfs in running tasks

Browse Source
This commit is contained in:
Simon Quigley 2025-01-27 19:57:56 -06:00
parent bf2255868a
commit 809b69ae10
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cpp/task_queue.cpp
View File

@ -61,7 +61,7 @@ void TaskQueue::start() {
void TaskQueue::stop() { void TaskQueue::stop() {
{ {
std::unique_lock<std::mutex> tasks_lock(tasks_mutex_); std::unique_lock<std::mutex> tasks_lock(tasks_mutex_);
std::unique_lock<std::mutex> pkgconfs_lock(running_pkgconfs_mutex_); std::unique_lock<std::mutex> packages_lock(running_packages_mutex_);
std::unique_lock<std::mutex> running_tasks_lock(running_tasks_mutex_); std::unique_lock<std::mutex> running_tasks_lock(running_tasks_mutex_);
stop_ = true; stop_ = true;
} }
@ -100,14 +100,14 @@ void TaskQueue::worker_thread() {
task_to_execute = it_task; task_to_execute = it_task;
} }
int pkgconf_id = task_to_execute->get_parent_packageconf()->id; int package_id = task_to_execute->get_parent_packageconf()->package->id;
{ {
std::lock_guard<std::mutex> lock(running_pkgconfs_mutex_); std::lock_guard<std::mutex> lock(running_packages_mutex_);
auto running_pkgconf_it = std::find_if(running_pkgconfs_.begin(), running_pkgconfs_.end(), auto running_package_it = std::find_if(running_packages_.begin(), running_packages_.end(),
[&pkgconf_id](const std::shared_ptr<PackageConf>& pkgconf) { return pkgconf->id == pkgconf_id; }); [&package_id](const std::shared_ptr<Package>& package) { return package->id == package_id; });
if (running_pkgconf_it != running_pkgconfs_.end()) { if (running_package_it != running_packages_.end()) {
++it; // Move to the next task ++it; // Move to the next task
continue; continue;
} }
@ -124,8 +124,8 @@ void TaskQueue::worker_thread() {
if (!task_to_execute || !task_to_execute->func) continue; if (!task_to_execute || !task_to_execute->func) continue;
else { else {
{ {
std::lock_guard<std::mutex> pkgconfslock(running_pkgconfs_mutex_); std::lock_guard<std::mutex> packages_lock(running_packages_mutex_);
running_pkgconfs_.insert(task_to_execute->get_parent_packageconf()); running_packages_.insert(task_to_execute->get_parent_packageconf()->package);
} }
{ {
std::lock_guard<std::mutex> tasks_lock(running_tasks_mutex_); std::lock_guard<std::mutex> tasks_lock(running_tasks_mutex_);
@ -175,14 +175,14 @@ void TaskQueue::worker_thread() {
} }
{ {
// Remove packageconf from running_pkgconfs_ by id // Remove packageconf from running_packages_ by id
std::lock_guard<std::mutex> lock(running_pkgconfs_mutex_); std::lock_guard<std::mutex> lock(running_packages_mutex_);
int pkgconf_id = task_to_execute->get_parent_packageconf()->id; int package_id = task_to_execute->get_parent_packageconf()->package->id;
auto running_pkgconf_it = std::find_if(running_pkgconfs_.begin(), running_pkgconfs_.end(), auto running_package_it = std::find_if(running_packages_.begin(), running_packages_.end(),
[&pkgconf_id](const std::shared_ptr<PackageConf>& pkgconf) { return pkgconf->id == pkgconf_id; }); [&package_id](const std::shared_ptr<Package>& package) { return package->id == package_id; });
if (running_pkgconf_it != running_pkgconfs_.end()) { if (running_package_it != running_packages_.end()) {
running_pkgconfs_.erase(running_pkgconf_it); running_packages_.erase(running_package_it);
} }
} }

4
cpp/task_queue.h
View File

@ -45,10 +45,10 @@ private:
size_t max_concurrent_tasks_; size_t max_concurrent_tasks_;
std::set<std::shared_ptr<Task>, Task::TaskComparator> tasks_; std::set<std::shared_ptr<Task>, Task::TaskComparator> tasks_;
std::set<std::shared_ptr<Task>, Task::TaskComparator> running_tasks_; std::set<std::shared_ptr<Task>, Task::TaskComparator> running_tasks_;
std::set<std::shared_ptr<PackageConf>> running_pkgconfs_; std::set<std::shared_ptr<Package>> running_packages_;
std::queue<std::function<void()>> thread_pool_tasks_; std::queue<std::function<void()>> thread_pool_tasks_;
mutable std::mutex tasks_mutex_; mutable std::mutex tasks_mutex_;
mutable std::mutex running_pkgconfs_mutex_; mutable std::mutex running_packages_mutex_;
mutable std::mutex running_tasks_mutex_; mutable std::mutex running_tasks_mutex_;
std::condition_variable cv_; std::condition_variable cv_;
bool stop_; bool stop_;