From ba5e74caef960fb588fe3b178b81409a870bec31 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Mon, 10 Feb 2025 16:07:09 -0600 Subject: [PATCH] Small cleanup around task_mutex_ --- cpp/ci_database_objs.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/cpp/ci_database_objs.cpp b/cpp/ci_database_objs.cpp index 0fcc8d3..6d81351 100644 --- a/cpp/ci_database_objs.cpp +++ b/cpp/ci_database_objs.cpp @@ -651,12 +651,11 @@ std::vector> PackageConf::get_package_confs_by_pack } int PackageConf::successful_task_count() { - std::lock_guard lock(*task_mutex_); - int successful_count = 0; - for (const auto& [job_status, task] : jobstatus_task_map_) { - if (task && task->successful && task->finish_time > 0) { - ++successful_count; + { + std::lock_guard lock(*task_mutex_); + for (const auto& [job_status, task] : jobstatus_task_map_) { + if (task && task->successful && task->finish_time > 0) ++successful_count; } } return successful_count; @@ -667,9 +666,7 @@ int PackageConf::successful_or_pending_task_count() { { std::lock_guard lock(*task_mutex_); for (const auto& [job_status, task] : jobstatus_task_map_) { - if (task && task->start_time > 0 && task->finish_time == 0) { - ++pending_count; - } + if (task && task->start_time > 0 && task->finish_time == 0) ++pending_count; } } return successful_task_count() + pending_count; @@ -680,9 +677,7 @@ int PackageConf::successful_or_queued_task_count() { { std::lock_guard lock(*task_mutex_); for (const auto& [job_status, task] : jobstatus_task_map_) { - if (task && task->queue_time > 0 && task->start_time == 0 && task->finish_time == 0) { - ++queued_count; - } + if (task && task->queue_time > 0 && task->start_time == 0 && task->finish_time == 0) ++queued_count; } } return successful_task_count() + queued_count;