Skip to content

Commit beba3a4

Browse files
committed
netbsd & openbsd: Simplify CPU meter value assignment code
Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
1 parent cee7077 commit beba3a4

2 files changed

Lines changed: 4 additions & 16 deletions

File tree

netbsd/Platform.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -268,16 +268,10 @@ double Platform_setCPUValues(Meter* this, int cpu) {
268268
if (host->settings->detailedCPUTime) {
269269
v[CPU_METER_KERNEL] = cpuData->sysPeriod / total * 100.0;
270270
v[CPU_METER_IRQ] = cpuData->intrPeriod / total * 100.0;
271-
v[CPU_METER_SOFTIRQ] = 0.0;
272-
v[CPU_METER_STEAL] = 0.0;
273-
v[CPU_METER_GUEST] = 0.0;
274-
v[CPU_METER_IOWAIT] = 0.0;
275-
v[CPU_METER_FREQUENCY] = NAN;
276-
this->curItems = 8;
271+
this->curItems = 4;
277272
} else {
278273
v[CPU_METER_KERNEL] = cpuData->sysAllPeriod / total * 100.0;
279-
v[CPU_METER_IRQ] = 0.0; // No steal nor guest on NetBSD
280-
this->curItems = 4;
274+
this->curItems = 3;
281275
}
282276
totalPercent = v[CPU_METER_NICE] + v[CPU_METER_NORMAL] + v[CPU_METER_KERNEL] + v[CPU_METER_IRQ];
283277
totalPercent = CLAMP(totalPercent, 0.0, 100.0);

openbsd/Platform.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,16 +219,10 @@ double Platform_setCPUValues(Meter* this, unsigned int cpu) {
219219
if (host->settings->detailedCPUTime) {
220220
v[CPU_METER_KERNEL] = cpuData->sysPeriod / total * 100.0;
221221
v[CPU_METER_IRQ] = cpuData->intrPeriod / total * 100.0;
222-
v[CPU_METER_SOFTIRQ] = 0.0;
223-
v[CPU_METER_STEAL] = 0.0;
224-
v[CPU_METER_GUEST] = 0.0;
225-
v[CPU_METER_IOWAIT] = 0.0;
226-
v[CPU_METER_FREQUENCY] = NAN;
227-
this->curItems = 8;
222+
this->curItems = 4;
228223
} else {
229224
v[CPU_METER_KERNEL] = cpuData->sysAllPeriod / total * 100.0;
230-
v[CPU_METER_IRQ] = 0.0; // No steal nor guest on OpenBSD
231-
this->curItems = 4;
225+
this->curItems = 3;
232226
}
233227
totalPercent = v[CPU_METER_NICE] + v[CPU_METER_NORMAL] + v[CPU_METER_KERNEL] + v[CPU_METER_IRQ];
234228

0 commit comments

Comments
 (0)