enlightenment/evisum
enlightenment
/
evisum
6
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

machine: memory use. 

In line with ActivityMonitor for usage.

Labels need sorting for/by platform. User feedback would be good.
As would users :)
This commit is contained in:
Alastair Poole 2020-06-18 20:25:50 +01:00
parent ec9773bf15
commit 0966855f5b
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/system/filesystems.c
View File

@ -215,7 +215,7 @@ file_system_in_use(const char *name)
{ {
Eina_List *disks; Eina_List *disks;
char *path; char *path;
Eina_Bool fs_mounted = EINA_FALSE; Eina_Bool mounted = EINA_FALSE;
if (!name) return EINA_FALSE; if (!name) return EINA_FALSE;
disks = disks_get(); disks = disks_get();
@ -225,13 +225,13 @@ file_system_in_use(const char *name)
if (fs) if (fs)
{ {
if (fs->type == file_system_id_by_name(name)) if (fs->type == file_system_id_by_name(name))
fs_mounted = EINA_TRUE; mounted = EINA_TRUE;
file_system_info_free(fs); file_system_info_free(fs);
} }
free(path); free(path);
} }
return fs_mounted; return mounted;
} }

5
src/bin/system/machine.c
View File

@ -610,8 +610,7 @@ swap_out:
host_statistics64(mach_port, HOST_VM_INFO, host_statistics64(mach_port, HOST_VM_INFO,
(host_info64_t)&vm_stats, &count) == KERN_SUCCESS) (host_info64_t)&vm_stats, &count) == KERN_SUCCESS)
{ {
memory->used = vm_stats.active_count + vm_stats.inactive_count memory->used = memory->total - (vm_stats.inactive_count * page_size);
+ vm_stats.wire_count * page_size;
memory->cached = vm_stats.active_count * page_size; memory->cached = vm_stats.active_count * page_size;
memory->shared = vm_stats.wire_count * page_size; memory->shared = vm_stats.wire_count * page_size;
memory->buffered = vm_stats.inactive_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_total = xsu.xsu_total;
memory->swap_used = xsu.xsu_used; memory->swap_used = xsu.xsu_used;
} }
memory->swap_total *= 1024;
memory->swap_used *= 1024;
#endif #endif
} }