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

Add more defensive checks to PCP paths if sampling fails

This commit is contained in:
Nathan Scott 2021-07-07 14:00:36 +10:00
parent 93be3211ae
commit 15a71f32fe
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcp/Platform.c
View File

@ -336,6 +336,9 @@ pmAtomValue *Metric_instance(Metric metric, int inst, int offset, pmAtomValue *a
* Start it off by passing offset -1 into the routine. * Start it off by passing offset -1 into the routine.
*/ */
bool Metric_iterate(Metric metric, int* instp, int* offsetp) { bool Metric_iterate(Metric metric, int* instp, int* offsetp) {
if (!pcp->result)
return false;
pmValueSet* vset = pcp->result->vset[metric]; pmValueSet* vset = pcp->result->vset[metric];
if (!vset || vset->numval <= 0) if (!vset || vset->numval <= 0)
return false; return false;
@ -892,8 +895,12 @@ void Platform_gettime_realtime(struct timeval* tv, uint64_t* msec) {
} }
void Platform_gettime_monotonic(uint64_t* msec) { void Platform_gettime_monotonic(uint64_t* msec) {
struct timeval* tv = &pcp->result->timestamp; if (pcp->result) {
*msec = ((uint64_t)tv->tv_sec * 1000) + ((uint64_t)tv->tv_usec / 1000); struct timeval* tv = &pcp->result->timestamp;
*msec = ((uint64_t)tv->tv_sec * 1000) + ((uint64_t)tv->tv_usec / 1000);
} else {
*msec = 0;
}
} }
Hashtable* Platform_dynamicMeters(void) { Hashtable* Platform_dynamicMeters(void) {