From 1b805a31720727008b32b1129a167758519fd4db Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 2 May 2022 16:04:21 +0200 Subject: New upstream version 3.2.0 --- pcp/PCPProcessList.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'pcp/PCPProcessList.c') diff --git a/pcp/PCPProcessList.c b/pcp/PCPProcessList.c index cae097f..ca82575 100644 --- a/pcp/PCPProcessList.c +++ b/pcp/PCPProcessList.c @@ -384,12 +384,12 @@ static bool PCPProcessList_updateProcesses(PCPProcessList* this, double period, continue; } - if (settings->flags & PROCESS_FLAG_IO) + if (settings->ss->flags & PROCESS_FLAG_IO) PCPProcessList_updateIO(pp, pid, offset, now); PCPProcessList_updateMemory(pp, pid, offset); - if ((settings->flags & PROCESS_FLAG_LINUX_SMAPS) && + if ((settings->ss->flags & PROCESS_FLAG_LINUX_SMAPS) && (Process_isKernelThread(proc) == false)) { if (PCPMetric_enabled(PCP_PROC_SMAPS_PSS)) PCPProcessList_updateSmaps(pp, pid, offset); @@ -408,6 +408,7 @@ static bool PCPProcessList_updateProcesses(PCPProcessList* this, double period, proc->percent_cpu = isnan(percent_cpu) ? 0.0 : CLAMP(percent_cpu, 0.0, pl->activeCPUs * 100.0); proc->percent_mem = proc->m_resident / (double)pl->totalMem * 100.0; + Process_updateCPUFieldWidths(proc->percent_cpu); PCPProcessList_updateUsername(proc, pid, offset, pl->usersTable); @@ -419,22 +420,22 @@ static bool PCPProcessList_updateProcesses(PCPProcessList* this, double period, PCPProcessList_updateCmdline(proc, pid, offset, command); } - if (settings->flags & PROCESS_FLAG_LINUX_CGROUP) + if (settings->ss->flags & PROCESS_FLAG_LINUX_CGROUP) PCPProcessList_readCGroups(pp, pid, offset); - if (settings->flags & PROCESS_FLAG_LINUX_OOM) + if (settings->ss->flags & PROCESS_FLAG_LINUX_OOM) PCPProcessList_readOomData(pp, pid, offset); - if (settings->flags & PROCESS_FLAG_LINUX_CTXT) + if (settings->ss->flags & PROCESS_FLAG_LINUX_CTXT) PCPProcessList_readCtxtData(pp, pid, offset); - if (settings->flags & PROCESS_FLAG_LINUX_SECATTR) + if (settings->ss->flags & PROCESS_FLAG_LINUX_SECATTR) PCPProcessList_readSecattrData(pp, pid, offset); - if (settings->flags & PROCESS_FLAG_CWD) + if (settings->ss->flags & PROCESS_FLAG_CWD) PCPProcessList_readCwd(pp, pid, offset); - if (settings->flags & PROCESS_FLAG_LINUX_AUTOGROUP) + if (settings->ss->flags & PROCESS_FLAG_LINUX_AUTOGROUP) PCPProcessList_readAutogroup(pp, pid, offset); if (proc->state == ZOMBIE && !proc->cmdline && command[0]) { @@ -676,16 +677,16 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) { for (int metric = PCP_PROC_PID; metric < PCP_METRIC_COUNT; metric++) PCPMetric_enable(metric, enabled); - flagged = settings->flags & PROCESS_FLAG_LINUX_CGROUP; + flagged = settings->ss->flags & PROCESS_FLAG_LINUX_CGROUP; PCPMetric_enable(PCP_PROC_CGROUPS, flagged && enabled); - flagged = settings->flags & PROCESS_FLAG_LINUX_OOM; + flagged = settings->ss->flags & PROCESS_FLAG_LINUX_OOM; PCPMetric_enable(PCP_PROC_OOMSCORE, flagged && enabled); - flagged = settings->flags & PROCESS_FLAG_LINUX_CTXT; + flagged = settings->ss->flags & PROCESS_FLAG_LINUX_CTXT; PCPMetric_enable(PCP_PROC_VCTXSW, flagged && enabled); PCPMetric_enable(PCP_PROC_NVCTXSW, flagged && enabled); - flagged = settings->flags & PROCESS_FLAG_LINUX_SECATTR; + flagged = settings->ss->flags & PROCESS_FLAG_LINUX_SECATTR; PCPMetric_enable(PCP_PROC_LABELS, flagged && enabled); - flagged = settings->flags & PROCESS_FLAG_LINUX_AUTOGROUP; + flagged = settings->ss->flags & PROCESS_FLAG_LINUX_AUTOGROUP; PCPMetric_enable(PCP_PROC_AUTOGROUP_ID, flagged && enabled); PCPMetric_enable(PCP_PROC_AUTOGROUP_NICE, flagged && enabled); -- cgit v1.2.3