From 552984d116e8fca7c4a116108606564b7dae2df0 Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Wed, 31 Mar 2021 10:54:49 +0100 Subject: [PATCH] ui: tidy this later.... --- src/bin/main.c | 3 +++ src/bin/ui/ui_process_list.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bin/main.c b/src/bin/main.c index 4296fa9..2fc1b59 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -8,6 +8,7 @@ #include "evisum_config.h" #include "evisum_server.h" #include "ui/evisum_ui.h" +#include "system/filesystems.h" static Eina_Bool _shutdown_cb(void *data, int type, void *event EINA_UNUSED) @@ -55,6 +56,8 @@ _background_poller_cb(void *data, Ecore_Thread *thread) system_memory_usage_get(&memory); ui->mem_total = memory.total; ui->mem_used = memory.used; + if (file_system_in_use("ZFS")) + ui->mem_used += memory.zfs_arc_used; for (int i = 0; i < 8; i++) { diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c index 4dff7f9..5a75676 100644 --- a/src/bin/ui/ui_process_list.c +++ b/src/bin/ui/ui_process_list.c @@ -938,7 +938,7 @@ _summary_update(Win_Data *wd) elm_progressbar_value_set(wd->summary.pb_cpu, (ui->cpu_usage / 100.0) / online); elm_object_part_text_set(wd->summary.pb_cpu, "elm.text.status", - eina_slstr_printf("%1.2f %%", ui->cpu_usage)); + eina_slstr_printf("%1.0f %%", ui->cpu_usage)); eina_strbuf_reset(buf);