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

Limit deleted library check 

Reading and parsing /proc/<pid>/maps is quite expensive.

Do not check for deleted libraries if the main binary has been deleted;
in this case the deleted binary takes precedence.

Do not check in threads.  The check is void for kernel threads and user-
land threads can just inherit the state from the main process structure.
This commit is contained in:
Christian Göttsche 2021-06-12 15:19:22 +02:00 committed by BenBE
parent 7a8a6dd828
commit 45ab05c56a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
linux/LinuxProcessList.c
View File

@ -1354,7 +1354,8 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, openat_arg_
{ {
bool prev = proc->usesDeletedLib; bool prev = proc->usesDeletedLib;
if ((lp->m_lrs == 0 && (settings->flags & PROCESS_FLAG_LINUX_LRS_FIX)) || settings->highlightDeletedExe) { if ((lp->m_lrs == 0 && (settings->flags & PROCESS_FLAG_LINUX_LRS_FIX)) ||
(settings->highlightDeletedExe && !proc->procExeDeleted && !proc->isKernelThread && !proc->isUserlandThread)) {
// 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
uint64_t passedTimeInMs = pl->realtimeMs - lp->last_mlrs_calctime; uint64_t passedTimeInMs = pl->realtimeMs - lp->last_mlrs_calctime;
@ -1365,8 +1366,8 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, openat_arg_
LinuxProcessList_readMaps(lp, procFd, settings->flags & PROCESS_FLAG_LINUX_LRS_FIX, settings->highlightDeletedExe); LinuxProcessList_readMaps(lp, procFd, settings->flags & PROCESS_FLAG_LINUX_LRS_FIX, settings->highlightDeletedExe);
} }
} else { } else {
/* reset if setting got disabled */ /* Copy from process structure in threads and reset if setting got disabled */
proc->usesDeletedLib = false; proc->usesDeletedLib = (proc->isUserlandThread && parent) ? parent->usesDeletedLib : false;
} }
proc->mergedCommand.exeChanged |= prev ^ proc->usesDeletedLib; proc->mergedCommand.exeChanged |= prev ^ proc->usesDeletedLib;