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

Cached memory calculations, take 2. 

Thanks to @OmegaPhil for discussion and reviewing.
This commit is contained in:
Hisham Muhammad 2015-11-29 23:55:31 -02:00
parent 5bc1f5ed04
commit a84aa2e782
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
linux/LinuxProcessList.c
View File

@ -621,7 +621,6 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char*
static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) { static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) {
unsigned long long int swapFree = 0; unsigned long long int swapFree = 0;
unsigned long long int slab = 0;
unsigned long long int shmem = 0; unsigned long long int shmem = 0;
unsigned long long int sreclaimable = 0; unsigned long long int sreclaimable = 0;
@ -651,9 +650,6 @@ static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) {
if (tryRead("SwapTotal:", &this->totalSwap)) {} if (tryRead("SwapTotal:", &this->totalSwap)) {}
else if (tryRead("SwapFree:", &swapFree)) {} else if (tryRead("SwapFree:", &swapFree)) {}
break; break;
case 'l':
if (tryRead("Slab:", &slab)) {}
break;
case 'h': case 'h':
if (tryRead("Shmem:", &shmem)) {} if (tryRead("Shmem:", &shmem)) {}
break; break;
@ -666,8 +662,8 @@ static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) {
#undef tryRead #undef tryRead
} }
this->usedMem = this->totalMem - this->freeMem + (slab - sreclaimable) + shmem; this->usedMem = this->totalMem - this->freeMem;
this->cachedMem = this->cachedMem + sreclaimable; this->cachedMem = this->cachedMem + sreclaimable - shmem;
this->usedSwap = this->totalSwap - swapFree; this->usedSwap = this->totalSwap - swapFree;
fclose(file); fclose(file);
} }