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

Add new display option to also show CPU frequency in CPU meters.

Browse Source 
The option is only implemented on Linux. On other platforms, and on Linuxes
that do not expose the relevant sysfs file, the frequency will be 0.

The "CPU average" meter does not show a frequency, only
the individual per-CPU meters.
This commit is contained in:
Arnavion
2019-08-09 21:34:48 -07:00
parent 402e46bb82
commit 4b0600d8f8
6 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CPUMeter.c
View File

@ -28,7 +28,8 @@ typedef enum {
CPU_METER_STEAL = 5,
CPU_METER_GUEST = 6,
CPU_METER_IOWAIT = 7,
CPU_METER_ITEMCOUNT = 8, // number of entries in this enum
CPU_METER_FREQUENCY = 8,
CPU_METER_ITEMCOUNT = 9, // number of entries in this enum
} CPUMeterValues;
}*/
@ -63,7 +64,22 @@ static void CPUMeter_updateValues(Meter* this, char* buffer, int size) {
}
memset(this->values, 0, sizeof(double) * CPU_METER_ITEMCOUNT);
double percent = Platform_setCPUValues(this, cpu);
xSnprintf(buffer, size, "%5.1f%%", percent);
if (cpu != 0 && this->pl->settings->showCPUFrequency) {
/* Initial frequency is in KHz. Divide it by 1024 till it's less than 1024, and emit unit accordingly */
double cpuFrequency = this->values[CPU_METER_FREQUENCY];
char unit = 'K';
if (cpuFrequency > 1024) {
cpuFrequency /= 1024;
unit = 'M';
}
if (cpuFrequency > 1024) {
cpuFrequency /= 1024;
unit = 'G';
}
xSnprintf(buffer, size, "%5.1f%% %.1f%cHz", percent, cpuFrequency, unit);
} else {
xSnprintf(buffer, size, "%5.1f%%", percent);
}
}
static void CPUMeter_display(Object* cast, RichString* out) {