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

LinuxProcessList: do not collect LRS per thread 

It's a memory map property, so it's process-wide and collecting it just
once should be enough.
This commit is contained in:
Denis Lisov 2021-12-17 14:29:01 +03:00 committed by BenBE
parent 5b78ad2d53
commit f782f821f7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linux/LinuxProcessList.c
View File

@ -1473,8 +1473,9 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, openat_arg_
{ {
bool prev = proc->usesDeletedLib; bool prev = proc->usesDeletedLib;
if ((ss->flags & PROCESS_FLAG_LINUX_LRS_FIX) || if (!proc->isKernelThread && !proc->isUserlandThread &&
(settings->highlightDeletedExe && !proc->procExeDeleted && !proc->isKernelThread && !proc->isUserlandThread)) { ((ss->flags & PROCESS_FLAG_LINUX_LRS_FIX) || (settings->highlightDeletedExe && !proc->procExeDeleted))) {
// 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;
@ -1487,6 +1488,7 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, openat_arg_
} else { } else {
/* Copy from process structure in threads and reset if setting got disabled */ /* Copy from process structure in threads and reset if setting got disabled */
proc->usesDeletedLib = (proc->isUserlandThread && parent) ? parent->usesDeletedLib : false; proc->usesDeletedLib = (proc->isUserlandThread && parent) ? parent->usesDeletedLib : false;
lp->m_lrs = (proc->isUserlandThread && parent) ? ((const LinuxProcess*)parent)->m_lrs : 0;
} }
proc->mergedCommand.exeChanged |= prev ^ proc->usesDeletedLib; proc->mergedCommand.exeChanged |= prev ^ proc->usesDeletedLib;