From 41af31be7ffbd34518b27aad56a4f54af6a8adf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Sat, 12 Jun 2021 18:17:28 +0200 Subject: Rework CPU counting Currently htop does not support offline CPUs and hot-swapping, e.g. via echo 0 > /sys/devices/system/cpu/cpu2/online Split the current single cpuCount variable into activeCPUs and existingCPUs. Supersedes: #650 Related: #580 --- LoadAverageMeter.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'LoadAverageMeter.c') diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c index c91e6a2d..bb3b05ed 100644 --- a/LoadAverageMeter.c +++ b/LoadAverageMeter.c @@ -47,12 +47,12 @@ static void LoadAverageMeter_updateValues(Meter* this) { if (this->values[0] < 1.0) { this->curAttributes = OK_attributes; this->total = 1.0; - } else if (this->values[0] < this->pl->cpuCount) { + } else if (this->values[0] < this->pl->activeCPUs) { this->curAttributes = Medium_attributes; - this->total = this->pl->cpuCount; + this->total = this->pl->activeCPUs; } else { this->curAttributes = High_attributes; - this->total = 2 * this->pl->cpuCount; + this->total = 2 * this->pl->activeCPUs; } xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%.2f/%.2f/%.2f", this->values[0], this->values[1], this->values[2]); @@ -79,12 +79,12 @@ static void LoadMeter_updateValues(Meter* this) { if (this->values[0] < 1.0) { this->curAttributes = OK_attributes; this->total = 1.0; - } else if (this->values[0] < this->pl->cpuCount) { + } else if (this->values[0] < this->pl->activeCPUs) { this->curAttributes = Medium_attributes; - this->total = this->pl->cpuCount; + this->total = this->pl->activeCPUs; } else { this->curAttributes = High_attributes; - this->total = 2 * this->pl->cpuCount; + this->total = 2 * this->pl->activeCPUs; } xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%.2f", this->values[0]); -- cgit v1.2.3