netstar pushed a commit to branch master. http://git.enlightenment.org/apps/evisum.git/commit/?id=0966855f5bbd171d332d4f1c4070828b3a11c313
commit 0966855f5bbd171d332d4f1c4070828b3a11c313 Author: Alastair Poole <[email protected]> Date: Thu Jun 18 20:25:50 2020 +0100 machine: memory use. In line with ActivityMonitor for usage. Labels need sorting for/by platform. User feedback would be good. As would users :) --- src/bin/system/filesystems.c | 6 +++--- src/bin/system/machine.c | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/bin/system/filesystems.c b/src/bin/system/filesystems.c index e289131..b7856a2 100644 --- a/src/bin/system/filesystems.c +++ b/src/bin/system/filesystems.c @@ -215,7 +215,7 @@ file_system_in_use(const char *name) { Eina_List *disks; char *path; - Eina_Bool fs_mounted = EINA_FALSE; + Eina_Bool mounted = EINA_FALSE; if (!name) return EINA_FALSE; disks = disks_get(); @@ -225,13 +225,13 @@ file_system_in_use(const char *name) if (fs) { if (fs->type == file_system_id_by_name(name)) - fs_mounted = EINA_TRUE; + mounted = EINA_TRUE; file_system_info_free(fs); } free(path); } - return fs_mounted; + return mounted; } diff --git a/src/bin/system/machine.c b/src/bin/system/machine.c index b704f10..54ee47d 100644 --- a/src/bin/system/machine.c +++ b/src/bin/system/machine.c @@ -610,8 +610,7 @@ swap_out: host_statistics64(mach_port, HOST_VM_INFO, (host_info64_t)&vm_stats, &count) == KERN_SUCCESS) { - memory->used = vm_stats.active_count + vm_stats.inactive_count - + vm_stats.wire_count * page_size; + memory->used = memory->total - (vm_stats.inactive_count * page_size); memory->cached = vm_stats.active_count * page_size; memory->shared = vm_stats.wire_count * page_size; memory->buffered = vm_stats.inactive_count * page_size; @@ -623,8 +622,6 @@ swap_out: memory->swap_total = xsu.xsu_total; memory->swap_used = xsu.xsu_used; } - memory->swap_total *= 1024; - memory->swap_used *= 1024; #endif } --
