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

Small cleanup around task_mutex_

Browse Source
This commit is contained in:
Simon Quigley 2025-02-10 16:07:09 -06:00
parent 946235318a
commit ba5e74caef
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cpp/ci_database_objs.cpp
View File

@ -651,12 +651,11 @@ std::vector<std::shared_ptr<PackageConf>> PackageConf::get_package_confs_by_pack
} }
int PackageConf::successful_task_count() { int PackageConf::successful_task_count() {
std::lock_guard<std::mutex> lock(*task_mutex_);
int successful_count = 0; int successful_count = 0;
{
std::lock_guard<std::mutex> lock(*task_mutex_);
for (const auto& [job_status, task] : jobstatus_task_map_) { for (const auto& [job_status, task] : jobstatus_task_map_) {
if (task && task->successful && task->finish_time > 0) { if (task && task->successful && task->finish_time > 0) ++successful_count;
++successful_count;
} }
} }
return successful_count; return successful_count;
@ -667,9 +666,7 @@ int PackageConf::successful_or_pending_task_count() {
{ {
std::lock_guard<std::mutex> lock(*task_mutex_); std::lock_guard<std::mutex> lock(*task_mutex_);
for (const auto& [job_status, task] : jobstatus_task_map_) { for (const auto& [job_status, task] : jobstatus_task_map_) {
if (task && task->start_time > 0 && task->finish_time == 0) { if (task && task->start_time > 0 && task->finish_time == 0) ++pending_count;
++pending_count;
}
} }
} }
return successful_task_count() + pending_count; return successful_task_count() + pending_count;
@ -680,9 +677,7 @@ int PackageConf::successful_or_queued_task_count() {
{ {
std::lock_guard<std::mutex> lock(*task_mutex_); std::lock_guard<std::mutex> lock(*task_mutex_);
for (const auto& [job_status, task] : jobstatus_task_map_) { for (const auto& [job_status, task] : jobstatus_task_map_) {
if (task && task->queue_time > 0 && task->start_time == 0 && task->finish_time == 0) { if (task && task->queue_time > 0 && task->start_time == 0 && task->finish_time == 0) ++queued_count;
++queued_count;
}
} }
} }
return successful_task_count() + queued_count; return successful_task_count() + queued_count;