mirror of https://github.com/xzeldon/htop.git
Merge pull request #296 from hishamhm/darwin-cpu-average
Darwin cpu average
This commit is contained in:
commit
ea8a8b2d6b
44
CPUMeter.c
44
CPUMeter.c
|
@ -18,6 +18,19 @@ in the source distribution for its full text.
|
||||||
|
|
||||||
/*{
|
/*{
|
||||||
#include "Meter.h"
|
#include "Meter.h"
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
CPU_METER_NICE = 0,
|
||||||
|
CPU_METER_NORMAL = 1,
|
||||||
|
CPU_METER_KERNEL = 2,
|
||||||
|
CPU_METER_IRQ = 3,
|
||||||
|
CPU_METER_SOFTIRQ = 4,
|
||||||
|
CPU_METER_STEAL = 5,
|
||||||
|
CPU_METER_GUEST = 6,
|
||||||
|
CPU_METER_IOWAIT = 7,
|
||||||
|
CPU_METER_ITEMCOUNT = 8, // number of entries in this enum
|
||||||
|
} CPUMeterValues;
|
||||||
|
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
int CPUMeter_attributes[] = {
|
int CPUMeter_attributes[] = {
|
||||||
|
@ -48,6 +61,7 @@ static void CPUMeter_setValues(Meter* this, char* buffer, int size) {
|
||||||
snprintf(buffer, size, "absent");
|
snprintf(buffer, size, "absent");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
memset(this->values, 0, sizeof(double) * CPU_METER_ITEMCOUNT);
|
||||||
double percent = Platform_setCPUValues(this, cpu);
|
double percent = Platform_setCPUValues(this, cpu);
|
||||||
snprintf(buffer, size, "%5.1f%%", percent);
|
snprintf(buffer, size, "%5.1f%%", percent);
|
||||||
}
|
}
|
||||||
|
@ -60,44 +74,44 @@ static void CPUMeter_display(Object* cast, RichString* out) {
|
||||||
RichString_append(out, CRT_colors[METER_TEXT], "absent");
|
RichString_append(out, CRT_colors[METER_TEXT], "absent");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
sprintf(buffer, "%5.1f%% ", this->values[1]);
|
sprintf(buffer, "%5.1f%% ", this->values[CPU_METER_NORMAL]);
|
||||||
RichString_append(out, CRT_colors[METER_TEXT], ":");
|
RichString_append(out, CRT_colors[METER_TEXT], ":");
|
||||||
RichString_append(out, CRT_colors[CPU_NORMAL], buffer);
|
RichString_append(out, CRT_colors[CPU_NORMAL], buffer);
|
||||||
if (this->pl->settings->detailedCPUTime) {
|
if (this->pl->settings->detailedCPUTime) {
|
||||||
sprintf(buffer, "%5.1f%% ", this->values[2]);
|
sprintf(buffer, "%5.1f%% ", this->values[CPU_METER_KERNEL]);
|
||||||
RichString_append(out, CRT_colors[METER_TEXT], "sy:");
|
RichString_append(out, CRT_colors[METER_TEXT], "sy:");
|
||||||
RichString_append(out, CRT_colors[CPU_KERNEL], buffer);
|
RichString_append(out, CRT_colors[CPU_KERNEL], buffer);
|
||||||
sprintf(buffer, "%5.1f%% ", this->values[0]);
|
sprintf(buffer, "%5.1f%% ", this->values[CPU_METER_NICE]);
|
||||||
RichString_append(out, CRT_colors[METER_TEXT], "ni:");
|
RichString_append(out, CRT_colors[METER_TEXT], "ni:");
|
||||||
RichString_append(out, CRT_colors[CPU_NICE_TEXT], buffer);
|
RichString_append(out, CRT_colors[CPU_NICE_TEXT], buffer);
|
||||||
sprintf(buffer, "%5.1f%% ", this->values[3]);
|
sprintf(buffer, "%5.1f%% ", this->values[CPU_METER_IRQ]);
|
||||||
RichString_append(out, CRT_colors[METER_TEXT], "hi:");
|
RichString_append(out, CRT_colors[METER_TEXT], "hi:");
|
||||||
RichString_append(out, CRT_colors[CPU_IRQ], buffer);
|
RichString_append(out, CRT_colors[CPU_IRQ], buffer);
|
||||||
sprintf(buffer, "%5.1f%% ", this->values[4]);
|
sprintf(buffer, "%5.1f%% ", this->values[CPU_METER_SOFTIRQ]);
|
||||||
RichString_append(out, CRT_colors[METER_TEXT], "si:");
|
RichString_append(out, CRT_colors[METER_TEXT], "si:");
|
||||||
RichString_append(out, CRT_colors[CPU_SOFTIRQ], buffer);
|
RichString_append(out, CRT_colors[CPU_SOFTIRQ], buffer);
|
||||||
if (this->values[5]) {
|
if (this->values[CPU_METER_STEAL]) {
|
||||||
sprintf(buffer, "%5.1f%% ", this->values[5]);
|
sprintf(buffer, "%5.1f%% ", this->values[CPU_METER_STEAL]);
|
||||||
RichString_append(out, CRT_colors[METER_TEXT], "st:");
|
RichString_append(out, CRT_colors[METER_TEXT], "st:");
|
||||||
RichString_append(out, CRT_colors[CPU_STEAL], buffer);
|
RichString_append(out, CRT_colors[CPU_STEAL], buffer);
|
||||||
}
|
}
|
||||||
if (this->values[6]) {
|
if (this->values[CPU_METER_GUEST]) {
|
||||||
sprintf(buffer, "%5.1f%% ", this->values[6]);
|
sprintf(buffer, "%5.1f%% ", this->values[CPU_METER_GUEST]);
|
||||||
RichString_append(out, CRT_colors[METER_TEXT], "gu:");
|
RichString_append(out, CRT_colors[METER_TEXT], "gu:");
|
||||||
RichString_append(out, CRT_colors[CPU_GUEST], buffer);
|
RichString_append(out, CRT_colors[CPU_GUEST], buffer);
|
||||||
}
|
}
|
||||||
sprintf(buffer, "%5.1f%% ", this->values[7]);
|
sprintf(buffer, "%5.1f%% ", this->values[CPU_METER_IOWAIT]);
|
||||||
RichString_append(out, CRT_colors[METER_TEXT], "wa:");
|
RichString_append(out, CRT_colors[METER_TEXT], "wa:");
|
||||||
RichString_append(out, CRT_colors[CPU_IOWAIT], buffer);
|
RichString_append(out, CRT_colors[CPU_IOWAIT], buffer);
|
||||||
} else {
|
} else {
|
||||||
sprintf(buffer, "%5.1f%% ", this->values[2]);
|
sprintf(buffer, "%5.1f%% ", this->values[CPU_METER_KERNEL]);
|
||||||
RichString_append(out, CRT_colors[METER_TEXT], "sys:");
|
RichString_append(out, CRT_colors[METER_TEXT], "sys:");
|
||||||
RichString_append(out, CRT_colors[CPU_KERNEL], buffer);
|
RichString_append(out, CRT_colors[CPU_KERNEL], buffer);
|
||||||
sprintf(buffer, "%5.1f%% ", this->values[0]);
|
sprintf(buffer, "%5.1f%% ", this->values[CPU_METER_NICE]);
|
||||||
RichString_append(out, CRT_colors[METER_TEXT], "low:");
|
RichString_append(out, CRT_colors[METER_TEXT], "low:");
|
||||||
RichString_append(out, CRT_colors[CPU_NICE_TEXT], buffer);
|
RichString_append(out, CRT_colors[CPU_NICE_TEXT], buffer);
|
||||||
if (this->values[3]) {
|
if (this->values[CPU_METER_IRQ]) {
|
||||||
sprintf(buffer, "%5.1f%% ", this->values[3]);
|
sprintf(buffer, "%5.1f%% ", this->values[CPU_METER_IRQ]);
|
||||||
RichString_append(out, CRT_colors[METER_TEXT], "vir:");
|
RichString_append(out, CRT_colors[METER_TEXT], "vir:");
|
||||||
RichString_append(out, CRT_colors[CPU_GUEST], buffer);
|
RichString_append(out, CRT_colors[CPU_GUEST], buffer);
|
||||||
}
|
}
|
||||||
|
@ -203,7 +217,7 @@ MeterClass CPUMeter_class = {
|
||||||
},
|
},
|
||||||
.setValues = CPUMeter_setValues,
|
.setValues = CPUMeter_setValues,
|
||||||
.defaultMode = BAR_METERMODE,
|
.defaultMode = BAR_METERMODE,
|
||||||
.maxItems = 8,
|
.maxItems = CPU_METER_ITEMCOUNT,
|
||||||
.total = 100.0,
|
.total = 100.0,
|
||||||
.attributes = CPUMeter_attributes,
|
.attributes = CPUMeter_attributes,
|
||||||
.name = "CPU",
|
.name = "CPU",
|
||||||
|
|
13
CPUMeter.h
13
CPUMeter.h
|
@ -11,6 +11,19 @@ in the source distribution for its full text.
|
||||||
|
|
||||||
#include "Meter.h"
|
#include "Meter.h"
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
CPU_METER_NICE = 0,
|
||||||
|
CPU_METER_NORMAL = 1,
|
||||||
|
CPU_METER_KERNEL = 2,
|
||||||
|
CPU_METER_IRQ = 3,
|
||||||
|
CPU_METER_SOFTIRQ = 4,
|
||||||
|
CPU_METER_STEAL = 5,
|
||||||
|
CPU_METER_GUEST = 6,
|
||||||
|
CPU_METER_IOWAIT = 7,
|
||||||
|
CPU_METER_ITEMCOUNT = 8, // number of entries in this enum
|
||||||
|
} CPUMeterValues;
|
||||||
|
|
||||||
|
|
||||||
extern int CPUMeter_attributes[];
|
extern int CPUMeter_attributes[];
|
||||||
|
|
||||||
#ifndef MIN
|
#ifndef MIN
|
||||||
|
|
|
@ -220,11 +220,11 @@ char *DarwinProcess_getCmdLine(struct kinfo_proc* k, int show_args ) {
|
||||||
/* Convert previous '\0'. */
|
/* Convert previous '\0'. */
|
||||||
*np = ' ';
|
*np = ' ';
|
||||||
}
|
}
|
||||||
/* Note location of current '\0'. */
|
/* Note location of current '\0'. */
|
||||||
np = cp;
|
np = cp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -16,6 +16,7 @@ in the source distribution for its full text.
|
||||||
#include <libproc.h>
|
#include <libproc.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <utmpx.h>
|
#include <utmpx.h>
|
||||||
|
#include <err.h>
|
||||||
|
|
||||||
/*{
|
/*{
|
||||||
#include "ProcessList.h"
|
#include "ProcessList.h"
|
||||||
|
|
|
@ -21,6 +21,7 @@ in the source distribution for its full text.
|
||||||
|
|
||||||
/*{
|
/*{
|
||||||
#include "Action.h"
|
#include "Action.h"
|
||||||
|
#include "CPUMeter.h"
|
||||||
#include "BatteryMeter.h"
|
#include "BatteryMeter.h"
|
||||||
#include "DarwinProcess.h"
|
#include "DarwinProcess.h"
|
||||||
}*/
|
}*/
|
||||||
|
@ -163,11 +164,30 @@ ProcessPidColumn Process_pidColumns[] = {
|
||||||
{ .id = 0, .label = NULL },
|
{ .id = 0, .label = NULL },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static double Platform_setCPUAverageValues(Meter* mtr) {
|
||||||
|
DarwinProcessList *dpl = (DarwinProcessList *)mtr->pl;
|
||||||
|
int cpus = dpl->super.cpuCount;
|
||||||
|
double sumNice = 0.0;
|
||||||
|
double sumNormal = 0.0;
|
||||||
|
double sumKernel = 0.0;
|
||||||
|
double sumPercent = 0.0;
|
||||||
|
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) {
|
double Platform_setCPUValues(Meter* mtr, int cpu) {
|
||||||
/* All just from CPUMeter.c */
|
|
||||||
static const int CPU_METER_NICE = 0;
|
if (cpu == 0) {
|
||||||
static const int CPU_METER_NORMAL = 1;
|
return Platform_setCPUAverageValues(mtr);
|
||||||
static const int CPU_METER_KERNEL = 2;
|
}
|
||||||
|
|
||||||
DarwinProcessList *dpl = (DarwinProcessList *)mtr->pl;
|
DarwinProcessList *dpl = (DarwinProcessList *)mtr->pl;
|
||||||
processor_cpu_load_info_t prev = &dpl->prev_load[cpu-1];
|
processor_cpu_load_info_t prev = &dpl->prev_load[cpu-1];
|
||||||
|
|
|
@ -162,15 +162,15 @@ double Platform_setCPUValues(Meter* this, int cpu) {
|
||||||
double total = (double) ( cpuData->totalPeriod == 0 ? 1 : cpuData->totalPeriod);
|
double total = (double) ( cpuData->totalPeriod == 0 ? 1 : cpuData->totalPeriod);
|
||||||
double percent;
|
double percent;
|
||||||
double* v = this->values;
|
double* v = this->values;
|
||||||
v[0] = cpuData->nicePeriod / total * 100.0;
|
v[CPU_METER_NICE] = cpuData->nicePeriod / total * 100.0;
|
||||||
v[1] = cpuData->userPeriod / total * 100.0;
|
v[CPU_METER_NORMAL] = cpuData->userPeriod / total * 100.0;
|
||||||
if (this->pl->settings->detailedCPUTime) {
|
if (this->pl->settings->detailedCPUTime) {
|
||||||
v[2] = cpuData->systemPeriod / total * 100.0;
|
v[CPU_METER_KERNEL] = cpuData->systemPeriod / total * 100.0;
|
||||||
v[3] = cpuData->irqPeriod / total * 100.0;
|
v[CPU_METER_IRQ] = cpuData->irqPeriod / total * 100.0;
|
||||||
v[4] = cpuData->softIrqPeriod / total * 100.0;
|
v[CPU_METER_SOFTIRQ] = cpuData->softIrqPeriod / total * 100.0;
|
||||||
v[5] = cpuData->stealPeriod / total * 100.0;
|
v[CPU_METER_STEAL] = cpuData->stealPeriod / total * 100.0;
|
||||||
v[6] = cpuData->guestPeriod / total * 100.0;
|
v[CPU_METER_GUEST] = cpuData->guestPeriod / total * 100.0;
|
||||||
v[7] = cpuData->ioWaitPeriod / total * 100.0;
|
v[CPU_METER_IOWAIT] = cpuData->ioWaitPeriod / total * 100.0;
|
||||||
Meter_setItems(this, 8);
|
Meter_setItems(this, 8);
|
||||||
if (this->pl->settings->accountGuestInCPUMeter) {
|
if (this->pl->settings->accountGuestInCPUMeter) {
|
||||||
percent = v[0]+v[1]+v[2]+v[3]+v[4]+v[5]+v[6];
|
percent = v[0]+v[1]+v[2]+v[3]+v[4]+v[5]+v[6];
|
||||||
|
|
Loading…
Reference in New Issue