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

Randomly refresh M_LRS calculation, but latest after 2s

This commit is contained in:
Benny Baumann 2020-11-26 19:59:00 +01:00 committed by BenBE
parent 08d6e25301
commit 2c27f1d9ab
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
linux/LinuxProcessList.c
View File

@ -623,7 +623,7 @@ static uint64_t LinuxProcessList_calcLibSize(const char* dirname, const char* na
return total_size / CRT_pageSize; return total_size / CRT_pageSize;
} }
static bool LinuxProcessList_readStatmFile(LinuxProcess* process, const char* dirname, const char* name, bool performLookup) { static bool LinuxProcessList_readStatmFile(LinuxProcess* process, const char* dirname, const char* name, bool performLookup, unsigned long long now) {
char filename[MAX_NAME + 1]; char filename[MAX_NAME + 1];
xSnprintf(filename, sizeof(filename), "%s/%s/statm", dirname, name); xSnprintf(filename, sizeof(filename), "%s/%s/statm", dirname, name);
FILE* statmfile = fopen(filename, "r"); FILE* statmfile = fopen(filename, "r");
@ -646,13 +646,12 @@ static bool LinuxProcessList_readStatmFile(LinuxProcess* process, const char* di
process->m_lrs = tmp_m_lrs; process->m_lrs = tmp_m_lrs;
} else if (performLookup) { } else if (performLookup) {
// Check if we really should recalculate the M_LRS value for this process // Check if we really should recalculate the M_LRS value for this process
struct timeval tv; uint64_t passedTimeInMs = now - process->last_mlrs_calctime;
gettimeofday(&tv, NULL);
uint64_t timeInMilliSeconds = (uint64_t)tv.tv_sec * 1000ULL + (uint64_t)tv.tv_usec / 1000ULL;
uint64_t passedTimeInMs = timeInMilliSeconds - process->last_mlrs_calctime;
if(passedTimeInMs > 5000) { uint64_t recheck = ((uint64_t)rand()) % 2048;
process->last_mlrs_calctime = timeInMilliSeconds;
if(passedTimeInMs > 2000 || passedTimeInMs > recheck) {
process->last_mlrs_calctime = now;
process->m_lrs = LinuxProcessList_calcLibSize(dirname, name); process->m_lrs = LinuxProcessList_calcLibSize(dirname, name);
} }
} else { } else {
@ -1358,7 +1357,7 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char*
if (settings->flags & PROCESS_FLAG_IO) if (settings->flags & PROCESS_FLAG_IO)
LinuxProcessList_readIoFile(lp, dirname, name, now); LinuxProcessList_readIoFile(lp, dirname, name, now);
if (!LinuxProcessList_readStatmFile(lp, dirname, name, !!(settings->flags & PROCESS_FLAG_LINUX_LRS_FIX))) if (!LinuxProcessList_readStatmFile(lp, dirname, name, !!(settings->flags & PROCESS_FLAG_LINUX_LRS_FIX), now))
goto errorReadingProcess; goto errorReadingProcess;
if ((settings->flags & PROCESS_FLAG_LINUX_SMAPS) && !Process_isKernelThread(proc)) { if ((settings->flags & PROCESS_FLAG_LINUX_SMAPS) && !Process_isKernelThread(proc)) {