Merge branch 'patch-1' of https://github.com/ginggs/htop-1 into ginggs-patch-1

This commit is contained in:
Daniel Lange 2020-08-22 15:35:55 +10:00 committed by Nathan Scott
commit 45062b26d6
1 changed files with 0 additions and 11 deletions

View File

@ -325,17 +325,6 @@ static inline void FreeBSDProcessList_scanMemoryInfo(ProcessList* pl) {
cachedMem *= pageSizeKb; cachedMem *= pageSizeKb;
pl->cachedMem = cachedMem; pl->cachedMem = cachedMem;
if (fpl->zfsArcEnabled) {
len = sizeof(memZfsArc);
sysctl(MIB_kstat_zfs_misc_arcstats_size, 5, &(memZfsArc), &len , NULL, 0);
memZfsArc /= 1024;
fpl->memZfsArc = memZfsArc;
fpl->memWire -= fpl->memZfsArc;
pl->cachedMem += fpl->memZfsArc;
// maybe when we learn how to make custom memory meter
// we could do custom arc breakdown?
}
if (fpl->zfs.enabled) { if (fpl->zfs.enabled) {
fpl->memWire -= fpl->zfs.size; fpl->memWire -= fpl->zfs.size;
pl->cachedMem += fpl->zfs.size; pl->cachedMem += fpl->zfs.size;