zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix memory statistics display on FreeBSD/powerpc 

Use the appropriate types when calling sysctl().

Currently, `unsigned long long int` is used for all sizes and on
FreeBSD/powerpc this causes all sysctl() calls in scanMemoryInfo()
to fail as they are actually of different sizes on powerpc, where
(sizeof(unsigned long long int), sizeof(u_long)) == (8, 4)
vs (8, 8) on amd64.  This results in bogus memory sizes being
reported by htop.

Signed-off-by: Tobias Kortkamp <tobik@FreeBSD.org>
This commit is contained in:
Tobias Kortkamp 2018-12-24 13:51:01 +01:00
parent b7b4200f85
commit ecfd6f685e
No known key found for this signature in database
GPG Key ID: A4F09FB73CC51F61
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
freebsd/FreeBSDProcessList.c
View File

@ -296,31 +296,46 @@ static inline void FreeBSDProcessList_scanMemoryInfo(ProcessList* pl) {
// //
// htop_used = active + (wired - arc) // htop_used = active + (wired - arc)
// htop_cache = buffers + cache + arc // htop_cache = buffers + cache + arc
size_t len = sizeof(pl->totalMem); u_long totalMem;
u_int memActive, memWire, cachedMem;
long buffersMem;
uint64_t memZfsArc;
size_t len;
//disabled for now, as it is always smaller than phycal amount of memory... //disabled for now, as it is always smaller than phycal amount of memory...
//...to avoid "where is my memory?" questions //...to avoid "where is my memory?" questions
//sysctl(MIB_vm_stats_vm_v_page_count, 4, &(pl->totalMem), &len, NULL, 0); //sysctl(MIB_vm_stats_vm_v_page_count, 4, &(pl->totalMem), &len, NULL, 0);
//pl->totalMem *= pageSizeKb; //pl->totalMem *= pageSizeKb;
sysctl(MIB_hw_physmem, 2, &(pl->totalMem), &len, NULL, 0); len = sizeof(totalMem);
pl->totalMem /= 1024; sysctl(MIB_hw_physmem, 2, &(totalMem), &len, NULL, 0);
totalMem /= 1024;
pl->totalMem = totalMem;
sysctl(MIB_vm_stats_vm_v_active_count, 4, &(fpl->memActive), &len, NULL, 0); len = sizeof(memActive);
fpl->memActive *= pageSizeKb; sysctl(MIB_vm_stats_vm_v_active_count, 4, &(memActive), &len, NULL, 0);
memActive *= pageSizeKb;
fpl->memActive = memActive;
sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(fpl->memWire), &len, NULL, 0); len = sizeof(memWire);
fpl->memWire *= pageSizeKb; sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(memWire), &len, NULL, 0);
memWire *= pageSizeKb;
fpl->memWire = memWire;
sysctl(MIB_vfs_bufspace, 2, &(pl->buffersMem), &len, NULL, 0); len = sizeof(buffersMem);
pl->buffersMem /= 1024; sysctl(MIB_vfs_bufspace, 2, &(buffersMem), &len, NULL, 0);
buffersMem /= 1024;
pl->buffersMem = buffersMem;
sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(pl->cachedMem), &len, NULL, 0); len = sizeof(cachedMem);
pl->cachedMem *= pageSizeKb; sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(cachedMem), &len, NULL, 0);
cachedMem *= pageSizeKb;
pl->cachedMem = cachedMem;
if (fpl->zfsArcEnabled) { if (fpl->zfsArcEnabled) {
len = sizeof(fpl->memZfsArc); len = sizeof(memZfsArc);
sysctl(MIB_kstat_zfs_misc_arcstats_size, 5, &(fpl->memZfsArc), &len , NULL, 0); sysctl(MIB_kstat_zfs_misc_arcstats_size, 5, &(memZfsArc), &len , NULL, 0);
fpl->memZfsArc /= 1024; memZfsArc /= 1024;
fpl->memZfsArc = memZfsArc;
fpl->memWire -= fpl->memZfsArc; fpl->memWire -= fpl->memZfsArc;
pl->cachedMem += fpl->memZfsArc; pl->cachedMem += fpl->memZfsArc;
// maybe when we learn how to make custom memory meter // maybe when we learn how to make custom memory meter