zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-13 04:34:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle interrupted sampling from within libpcp PDU transfers

Browse Source 
This situation can arise if pcp-htop screen is resized right
at the same time sampling from pmcd(1) is happening.  Have a
couple more goes at it before giving up entirely; once there
is no data available though we cannot proceed into accessing
the sample result data structure (segv will result) so a new
short-circuit guard is added there also.
This commit is contained in:
Nathan Scott
2021-10-05 13:20:13 +11:00
parent f75a8bc3a1
commit 8ac8542b6e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pcp/PCPProcessList.c
View File

@ -680,7 +680,8 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
PCPMetric_enable(PCP_PROC_SMAPS_SWAPPSS, smaps_flag && enabled);
struct timeval timestamp;
PCPMetric_fetch(&timestamp);
if (PCPMetric_fetch(&timestamp) != true)
return;
double sample = this->timestamp;
this->timestamp = pmtimevalToReal(&timestamp);