diff options
author | Daniel Lange <DLange@git.local> | 2016-07-25 18:25:29 +0200 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2016-07-25 18:25:29 +0200 |
commit | aed86a83b9120528c2a2a5c137d443917682d4b4 (patch) | |
tree | 979855616d56f2864dedc7b88798e9831614e9ee /freebsd/Platform.c | |
parent | 6ca259100661aa0be46c8645773d32a8a6a5f312 (diff) | |
parent | 31b71b67011fa52f091df6fe536a11d6d0bfb256 (diff) | |
download | debian_htop-aed86a83b9120528c2a2a5c137d443917682d4b4.tar.gz debian_htop-aed86a83b9120528c2a2a5c137d443917682d4b4.tar.bz2 debian_htop-aed86a83b9120528c2a2a5c137d443917682d4b4.zip |
Merge tag 'upstream/2.0.2'
Upstream version 2.0.2
Diffstat (limited to 'freebsd/Platform.c')
-rw-r--r-- | freebsd/Platform.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/freebsd/Platform.c b/freebsd/Platform.c index 4185a8b..f02daa5 100644 --- a/freebsd/Platform.c +++ b/freebsd/Platform.c @@ -163,15 +163,15 @@ double Platform_setCPUValues(Meter* this, int cpu) { double percent; double* v = this->values; - v[CPU_METER_NICE] = cpuData->nicePercent * cpus; - v[CPU_METER_NORMAL] = cpuData->userPercent * cpus; + v[CPU_METER_NICE] = cpuData->nicePercent; + v[CPU_METER_NORMAL] = cpuData->userPercent; if (this->pl->settings->detailedCPUTime) { - v[CPU_METER_KERNEL] = cpuData->systemPercent * cpus; - v[CPU_METER_IRQ] = cpuData->irqPercent * cpus; + v[CPU_METER_KERNEL] = cpuData->systemPercent; + v[CPU_METER_IRQ] = cpuData->irqPercent; Meter_setItems(this, 4); percent = v[0]+v[1]+v[2]+v[3]; } else { - v[2] = cpuData->systemAllPercent * cpus; + v[2] = cpuData->systemAllPercent; Meter_setItems(this, 3); percent = v[0]+v[1]+v[2]; } |