From 86571481946ce3a60a354d0072a204ed958651cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Offenh=C3=A4user?= Date: Fri, 17 Sep 2021 18:38:49 +0200 Subject: [PATCH] SystemMonitor: Make process memory statistics more human readable These are the only instances in SystemMonitor which still show memory statistics in KiB only. They will now adapt to the input size better. --- .../SystemMonitor/ProcessModel.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Userland/Applications/SystemMonitor/ProcessModel.cpp b/Userland/Applications/SystemMonitor/ProcessModel.cpp index 3a7035b163..bf07911b57 100644 --- a/Userland/Applications/SystemMonitor/ProcessModel.cpp +++ b/Userland/Applications/SystemMonitor/ProcessModel.cpp @@ -7,6 +7,7 @@ #include "ProcessModel.h" #include #include +#include #include #include #include @@ -124,11 +125,6 @@ String ProcessModel::column_name(int column) const } } -static String pretty_byte_size(size_t size) -{ - return String::formatted("{}K", size / 1024); -} - GUI::Variant ProcessModel::data(GUI::ModelIndex const& index, GUI::ModelRole role) const { VERIFY(is_within_range(index)); @@ -265,17 +261,17 @@ GUI::Variant ProcessModel::data(GUI::ModelIndex const& index, GUI::ModelRole rol case Column::Priority: return thread.current_state.priority; case Column::Virtual: - return pretty_byte_size(thread.current_state.amount_virtual); + return human_readable_size(thread.current_state.amount_virtual); case Column::Physical: - return pretty_byte_size(thread.current_state.amount_resident); + return human_readable_size(thread.current_state.amount_resident); case Column::DirtyPrivate: - return pretty_byte_size(thread.current_state.amount_dirty_private); + return human_readable_size(thread.current_state.amount_dirty_private); case Column::CleanInode: - return pretty_byte_size(thread.current_state.amount_clean_inode); + return human_readable_size(thread.current_state.amount_clean_inode); case Column::PurgeableVolatile: - return pretty_byte_size(thread.current_state.amount_purgeable_volatile); + return human_readable_size(thread.current_state.amount_purgeable_volatile); case Column::PurgeableNonvolatile: - return pretty_byte_size(thread.current_state.amount_purgeable_nonvolatile); + return human_readable_size(thread.current_state.amount_purgeable_nonvolatile); case Column::CPU: return String::formatted("{:.2}", thread.current_state.cpu_percent); case Column::Processor: