jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sysinfo: Fix interger overflow on BSD. 

This commits D4810
This commit is contained in:
Al 'netstar' Poole 2017-04-27 15:18:19 -05:00 committed by Stephen 'Okra' Houston
parent b302f1047c
commit 89feae2b86
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/sysinfo/memusage/memusage_sysctl.c
View File

@ -28,12 +28,10 @@ _sysctlfromname(const char *name, void *mib, int depth, size_t *len)
}
#endif
#if defined(__OpenBSD__)
void _memsize_bytes_to_kb(unsigned long *bytes)
{
*bytes = (unsigned int) *bytes >> 10;
}
#endif
void _memusage_sysctl_getusage(unsigned long *mem_total,
unsigned long *mem_used,
@ -70,19 +68,23 @@ void _memusage_sysctl_getusage(unsigned long *mem_total,
inactive_pages = _sysctlfromname("vm.stats.vm.v_inactive_count", mib, 4, &len);
if (inactive_pages < 0) return;
*mem_used = (total_pages - free_pages - inactive_pages) * page_size >> 10;
*mem_used = (total_pages - free_pages - inactive_pages) * page_size;
_memsize_bytes_to_kb(mem_used);
result = _sysctlfromname("vfs.bufspace", mib, 2, &len);
if (result < 0) return;
*mem_buffers = (result / 1024);
*mem_buffers = (result);
_memsize_bytes_to_kb(mem_buffers);
result = _sysctlfromname("vm.stats.vm.v_active_count", mib, 4, &len);
if (result < 0) return;
*mem_cached = ((result * page_size) / 1024);
*mem_cached = (result * page_size);
_memsize_bytes_to_kb(mem_cached);
result = _sysctlfromname("vm.stats.vm.v_cache_count", mib, 4, &len);
if (result < 0) return;
*mem_shared = (result * page_size) / 1024;
*mem_shared = (result * page_size);
_memsize_bytes_to_kb(mem_shared);
result = _sysctlfromname("vm.swap_total", mib, 2, &len);
if (result < 0) return;