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

Revert "Fix FreeBSD CPU% calculation" 

This reverts commit f554f08fa9.
This commit is contained in:
Andy Pilate 2016-04-28 21:42:18 +02:00
parent 306c5443ae
commit 5776cb56b4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
freebsd/Platform.c
View File

@ -163,15 +163,15 @@ double Platform_setCPUValues(Meter* this, int cpu) {
double percent; double percent;
double* v = this->values; double* v = this->values;
v[CPU_METER_NICE] = cpuData->nicePercent * cpus; v[CPU_METER_NICE] = cpuData->nicePercent;
v[CPU_METER_NORMAL] = cpuData->userPercent * cpus; v[CPU_METER_NORMAL] = cpuData->userPercent;
if (this->pl->settings->detailedCPUTime) { if (this->pl->settings->detailedCPUTime) {
v[CPU_METER_KERNEL] = cpuData->systemPercent * cpus; v[CPU_METER_KERNEL] = cpuData->systemPercent;
v[CPU_METER_IRQ] = cpuData->irqPercent * cpus; v[CPU_METER_IRQ] = cpuData->irqPercent;
Meter_setItems(this, 4); Meter_setItems(this, 4);
percent = v[0]+v[1]+v[2]+v[3]; percent = v[0]+v[1]+v[2]+v[3];
} else { } else {
v[2] = cpuData->systemAllPercent * cpus; v[2] = cpuData->systemAllPercent;
Meter_setItems(this, 3); Meter_setItems(this, 3);
percent = v[0]+v[1]+v[2]; percent = v[0]+v[1]+v[2];
} }