mirror of https://github.com/xzeldon/htop.git
Merge pull request #485 from Cubox-/master
Fix FreeBSD CPU bars calculation
This commit is contained in:
commit
95d1984339
|
@ -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];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue