zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-12 20:24:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Calculate CPU averages on Darwin (See #295).

Browse Source
This commit is contained in:
Hisham Muhammad
2015-10-23 13:46:21 -02:00
parent 9c146393a3
commit 71190654bc
5 changed files with 76 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
darwin/Platform.c
View File

@ -21,6 +21,7 @@ in the source distribution for its full text.
/*{
#include "Action.h"
#include "CPUMeter.h"
#include "BatteryMeter.h"
#include "DarwinProcess.h"
}*/
@ -163,11 +164,27 @@ ProcessPidColumn Process_pidColumns[] = {
{ .id = 0, .label = NULL },
};
static double Platform_setCPUAverageValues(Meter* mtr) {
DarwinProcessList *dpl = (DarwinProcessList *)mtr->pl;
int cpus = dpl->super.cpuCount;
double sumNice, sumNormal, sumKernel, sumPercent;
for (int i = 1; i <= cpus; i++) {
sumPercent += Platform_setCPUValues(mtr, i);
sumNice += mtr->values[CPU_METER_NICE];
sumNormal += mtr->values[CPU_METER_NORMAL];
sumKernel += mtr->values[CPU_METER_KERNEL];
}
mtr->values[CPU_METER_NICE] = sumNice / cpus;
mtr->values[CPU_METER_NORMAL] = sumNormal / cpus;
mtr->values[CPU_METER_KERNEL] = sumKernel / cpus;
return sumPercent / cpus;
}
double Platform_setCPUValues(Meter* mtr, int cpu) {
/* All just from CPUMeter.c */
static const int CPU_METER_NICE = 0;
static const int CPU_METER_NORMAL = 1;
static const int CPU_METER_KERNEL = 2;
if (cpu == 0) {
return Platform_setCPUAverageValues(mtr);
}
DarwinProcessList *dpl = (DarwinProcessList *)mtr->pl;
processor_cpu_load_info_t prev = &dpl->prev_load[cpu-1];