From 1c1fc67f75d168d7127b0c05d3d3de3a4295f15f Mon Sep 17 00:00:00 2001 From: Tim Ledbetter Date: Wed, 10 Jan 2024 19:24:19 +0000 Subject: [PATCH] SystemMonitor: Prefer range-based for loop when updating ProcessModel --- .../Applications/SystemMonitor/ProcessModel.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Userland/Applications/SystemMonitor/ProcessModel.cpp b/Userland/Applications/SystemMonitor/ProcessModel.cpp index ea2dc96b69..5735f07899 100644 --- a/Userland/Applications/SystemMonitor/ProcessModel.cpp +++ b/Userland/Applications/SystemMonitor/ProcessModel.cpp @@ -447,22 +447,22 @@ void ProcessModel::update() return; } - auto all_processes = Core::ProcessStatisticsReader::get_all(*m_process_statistics_file, true); + auto all_processes_or_error = Core::ProcessStatisticsReader::get_all(*m_process_statistics_file, true); auto previous_tid_count = m_threads.size(); HashTable live_tids; u64 total_time_scheduled_diff = 0; - if (!all_processes.is_error()) { + if (!all_processes_or_error.is_error()) { + auto all_processes = all_processes_or_error.value(); if (m_has_total_scheduled_time) - total_time_scheduled_diff = all_processes.value().total_time_scheduled - m_total_time_scheduled; + total_time_scheduled_diff = all_processes.total_time_scheduled - m_total_time_scheduled; - m_total_time_scheduled = all_processes.value().total_time_scheduled; - m_total_time_scheduled_kernel = all_processes.value().total_time_scheduled_kernel; + m_total_time_scheduled = all_processes.total_time_scheduled; + m_total_time_scheduled_kernel = all_processes.total_time_scheduled_kernel; m_has_total_scheduled_time = true; - for (size_t i = 0; i < all_processes.value().processes.size(); ++i) { - auto const& process = all_processes.value().processes[i]; + for (auto const& process : all_processes.processes) { NonnullOwnPtr* process_state = nullptr; for (size_t i = 0; i < m_processes.size(); ++i) { auto* other_process = &m_processes[i]; @@ -607,7 +607,7 @@ void ProcessModel::update() on_cpu_info_change(m_cpus); if (on_state_update) - on_state_update(!all_processes.is_error() ? all_processes.value().processes.size() : 0, m_threads.size()); + on_state_update(!all_processes_or_error.is_error() ? all_processes_or_error.value().processes.size() : 0, m_threads.size()); // FIXME: This is a rather hackish way of invalidating indices. // It would be good if GUI::Model had a way to orchestrate removal/insertion while preserving indices.