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

General cleanup around task locking for a pkgconf

Browse Source
main
Simon Quigley 2 weeks ago
parent 64ffc1b9e4
commit 20a701641a
3 changed files with 67 additions and 27 deletions
Show Stats Download Patch File Download Diff File

80
cpp/ci_database_objs.cpp
Unescape View File

@ -678,34 +678,57 @@ int PackageConf::successful_task_count() {
return successful_count;
}
int PackageConf::total_task_count() {
std::lock_guard<std::mutex> lock(*task_mutex_);
int PackageConf::successful_or_pending_task_count() {
int pending_count = 0;
{
std::lock_guard<std::mutex> lock(*task_mutex_);
for (const auto& [job_status, task] : jobstatus_task_map_) {
if (task && task->start_time > 0 && task->finish_time == 0) {
++pending_count;
}
}
}
return successful_task_count() + pending_count;
}
int successful_count = 0;
for (const auto& [job_status, task] : jobstatus_task_map_) if (task) ++successful_count;
return successful_count;
int PackageConf::successful_or_queued_task_count() {
int queued_count = 0;
{
std::lock_guard<std::mutex> 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;
}
}
}
return successful_task_count() + queued_count;
}
std::shared_ptr<Task> PackageConf::get_task_by_jobstatus(std::shared_ptr<JobStatus> jobstatus) {
if (!jobstatus) {
throw std::invalid_argument("jobstatus is null");
int PackageConf::total_task_count() {
int total_count = 0;
{
std::lock_guard<std::mutex> lock(*task_mutex_);
for (const auto& [job_status, task] : jobstatus_task_map_) if (task) ++total_count;
}
return total_count;
}
std::lock_guard<std::mutex> lock(*task_mutex_);
std::shared_ptr<Task> PackageConf::get_task_by_jobstatus(std::shared_ptr<JobStatus> jobstatus) {
if (!jobstatus) throw std::invalid_argument("jobstatus is null");
// Search for the JobStatus in the map
auto it = jobstatus_task_map_.find(jobstatus);
if (it != jobstatus_task_map_.end()) {
return it->second;
{
std::lock_guard<std::mutex> lock(*task_mutex_);
auto it = jobstatus_task_map_.find(jobstatus);
if (it != jobstatus_task_map_.end()) {
return it->second;
}
}
return nullptr;
}
void PackageConf::assign_task(std::shared_ptr<JobStatus> jobstatus, std::shared_ptr<Task> task_ptr, std::weak_ptr<PackageConf> packageconf_ptr) {
if (!jobstatus || !task_ptr) {
throw std::invalid_argument("jobstatus or task_ptr is null");
}
if (!jobstatus || !task_ptr) throw std::invalid_argument("jobstatus or task_ptr is null");
std::lock_guard<std::mutex> lock(*task_mutex_);
task_ptr->parent_packageconf = task_ptr->parent_packageconf.lock() ? task_ptr->parent_packageconf : packageconf_ptr;
@ -876,20 +899,23 @@ bool PackageConf::can_check_source_upload() {
std::int64_t upload_timestamp = 0;
std::int64_t source_check_timestamp = 0;
std::set<std::string> valid_successful_statuses = {"pull", "tarball", "source_build", "upload"};
for (auto &kv : jobstatus_task_map_) {
auto &jobstatus = kv.first;
auto &task_ptr = kv.second;
{
std::lock_guard<std::mutex> lock(*task_mutex_);
for (auto &kv : jobstatus_task_map_) {
auto &jobstatus = kv.first;
auto &task_ptr = kv.second;
if (valid_successful_statuses.contains(jobstatus->name)) _successful_task_count--;
if (valid_successful_statuses.contains(jobstatus->name)) _successful_task_count--;
if (jobstatus->name == "upload" && task_ptr && task_ptr->successful) {
upload_timestamp = task_ptr->finish_time;
continue;
}
if (jobstatus->name == "upload" && task_ptr && task_ptr->successful) {
upload_timestamp = task_ptr->finish_time;
continue;
}
if (jobstatus->name == "source_check" && task_ptr && !task_ptr->successful) {
source_check_timestamp = task_ptr->finish_time;
continue;
if (jobstatus->name == "source_check" && task_ptr && !task_ptr->successful) {
source_check_timestamp = task_ptr->finish_time;
continue;
}
}
}
bool all_req_tasks_present = _successful_task_count == 0;

2
cpp/ci_database_objs.h
Unescape View File

@ -162,6 +162,8 @@ public:
const std::string& package_name);
void assign_task(std::shared_ptr<JobStatus> jobstatus, std::shared_ptr<Task> task_ptr, std::weak_ptr<PackageConf> packageconf_ptr);
int successful_task_count();
int successful_or_pending_task_count();
int successful_or_queued_task_count();
int total_task_count();
std::shared_ptr<Task> get_task_by_jobstatus(std::shared_ptr<JobStatus> jobstatus);
bool set_package_confs();

12
cpp/ci_logic.cpp
Unescape View File

@ -1140,10 +1140,22 @@ std::vector<std::shared_ptr<PackageConf>> CiLogic::get_config(const std::string
} else if (sort_by == "build_status") {
int a_successful_task_count = a->successful_task_count();
int b_successful_task_count = b->successful_task_count();
int a_successful_or_pending_task_count = a->successful_or_pending_task_count();
int b_successful_or_pending_task_count = b->successful_or_pending_task_count();
int a_successful_or_queued_task_count = a->successful_or_queued_task_count();
int b_successful_or_queued_task_count = b->successful_or_queued_task_count();
if (a_successful_task_count != b_successful_task_count) {
return (order == "asc")
? (a_successful_task_count < b_successful_task_count)
: (a_successful_task_count > b_successful_task_count);
} else if (a_successful_or_pending_task_count != b_successful_or_pending_task_count) {
return (order == "asc")
? (a_successful_or_pending_task_count < b_successful_or_pending_task_count)
: (a_successful_or_pending_task_count > b_successful_or_pending_task_count);
} else if (a_successful_or_queued_task_count != b_successful_or_queued_task_count) {
return (order == "asc")
? (a_successful_or_queued_task_count < b_successful_or_queued_task_count)
: (a_successful_or_queued_task_count > b_successful_or_queued_task_count);
} else {
return (order == "asc")
? (a->total_task_count() < b->total_task_count())

Write Preview
Loading…
Cancel
Save