zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cpufreq' of hadfl/htop for Solaris / OmniOS support

This commit is contained in:
Daniel Lange 2020-12-25 12:18:01 +01:00
parent a0b899f29d 495f2292dc
commit debeac49cd
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solaris/Platform.c
View File

@ -205,7 +205,7 @@ double Platform_setCPUValues(Meter* this, int cpu) {
percent = isnan(percent) ? 0.0 : CLAMP(percent, 0.0, 100.0); percent = isnan(percent) ? 0.0 : CLAMP(percent, 0.0, 100.0);
v[CPU_METER_FREQUENCY] = NAN; v[CPU_METER_FREQUENCY] = cpuData->frequency;
v[CPU_METER_TEMPERATURE] = NAN; v[CPU_METER_TEMPERATURE] = NAN;
return percent; return percent;

38
solaris/SolarisProcessList.c
View File

@ -72,11 +72,11 @@ static inline void SolarisProcessList_scanCPUTime(ProcessList* pl) {
const SolarisProcessList* spl = (SolarisProcessList*) pl; const SolarisProcessList* spl = (SolarisProcessList*) pl;
int cpus = pl->cpuCount; int cpus = pl->cpuCount;
kstat_t* cpuinfo = NULL; kstat_t* cpuinfo = NULL;
int kchain = 0;
kstat_named_t* idletime = NULL; kstat_named_t* idletime = NULL;
kstat_named_t* intrtime = NULL; kstat_named_t* intrtime = NULL;
kstat_named_t* krnltime = NULL; kstat_named_t* krnltime = NULL;
kstat_named_t* usertime = NULL; kstat_named_t* usertime = NULL;
kstat_named_t* cpu_freq = NULL;
double idlebuf = 0; double idlebuf = 0;
double intrbuf = 0; double intrbuf = 0;
double krnlbuf = 0; double krnlbuf = 0;
@ -94,21 +94,31 @@ static inline void SolarisProcessList_scanCPUTime(ProcessList* pl) {
// Calculate per-CPU statistics first // Calculate per-CPU statistics first
for (int i = 0; i < cpus; i++) { for (int i = 0; i < cpus; i++) {
if (spl->kd != NULL) { if (spl->kd != NULL) {
cpuinfo = kstat_lookup(spl->kd, "cpu", i, "sys"); if ((cpuinfo = kstat_lookup(spl->kd, "cpu", i, "sys")) != NULL) {
} if (kstat_read(spl->kd, cpuinfo, NULL) != -1) {
if (cpuinfo != NULL) { idletime = kstat_data_lookup(cpuinfo, "cpu_nsec_idle");
kchain = kstat_read(spl->kd, cpuinfo, NULL); intrtime = kstat_data_lookup(cpuinfo, "cpu_nsec_intr");
} krnltime = kstat_data_lookup(cpuinfo, "cpu_nsec_kernel");
if (kchain != -1 ) { usertime = kstat_data_lookup(cpuinfo, "cpu_nsec_user");
idletime = kstat_data_lookup(cpuinfo, "cpu_nsec_idle"); }
intrtime = kstat_data_lookup(cpuinfo, "cpu_nsec_intr"); }
krnltime = kstat_data_lookup(cpuinfo, "cpu_nsec_kernel");
usertime = kstat_data_lookup(cpuinfo, "cpu_nsec_user");
} }
assert( (idletime != NULL) && (intrtime != NULL) assert( (idletime != NULL) && (intrtime != NULL)
&& (krnltime != NULL) && (usertime != NULL) ); && (krnltime != NULL) && (usertime != NULL) );
if (pl->settings->showCPUFrequency) {
if (spl->kd != NULL) {
if ((cpuinfo = kstat_lookup(spl->kd, "cpu_info", i, NULL)) != NULL) {
if (kstat_read(spl->kd, cpuinfo, NULL) != -1) {
cpu_freq = kstat_data_lookup(cpuinfo, "current_clock_Hz");
}
}
}
assert( cpu_freq != NULL );
}
CPUData* cpuData = &(spl->cpus[i + arrskip]); CPUData* cpuData = &(spl->cpus[i + arrskip]);
uint64_t totaltime = (idletime->value.ui64 - cpuData->lidle) uint64_t totaltime = (idletime->value.ui64 - cpuData->lidle)
@ -128,6 +138,8 @@ static inline void SolarisProcessList_scanCPUTime(ProcessList* pl) {
cpuData->lkrnl = krnltime->value.ui64; cpuData->lkrnl = krnltime->value.ui64;
cpuData->lintr = intrtime->value.ui64; cpuData->lintr = intrtime->value.ui64;
cpuData->lidle = idletime->value.ui64; cpuData->lidle = idletime->value.ui64;
// Add frequency in MHz
cpuData->frequency = pl->settings->showCPUFrequency ? (double)cpu_freq->value.ui64 / 1E6 : NAN;
// Accumulate the current percentages into buffers for later average calculation // Accumulate the current percentages into buffers for later average calculation
if (cpus > 1) { if (cpus > 1) {
userbuf += cpuData->userPercent; userbuf += cpuData->userPercent;
@ -165,8 +177,8 @@ static inline void SolarisProcessList_scanMemoryInfo(ProcessList* pl) {
// Part 1 - physical memory // Part 1 - physical memory
if (spl->kd != NULL && meminfo == NULL) { if (spl->kd != NULL && meminfo == NULL) {
// Look up the kstat chain just one, it never changes // Look up the kstat chain just once, it never changes
meminfo = kstat_lookup(spl->kd, "unix", 0, "system_pages"); meminfo = kstat_lookup(spl->kd, "unix", 0, "system_pages");
} }
if (meminfo != NULL) { if (meminfo != NULL) {
ksrphyserr = kstat_read(spl->kd, meminfo, NULL); ksrphyserr = kstat_read(spl->kd, meminfo, NULL);

1
solaris/SolarisProcessList.h
View File

@ -33,6 +33,7 @@ typedef struct CPUData_ {
double irqPercent; double irqPercent;
double idlePercent; double idlePercent;
double systemAllPercent; double systemAllPercent;
double frequency;
uint64_t luser; uint64_t luser;
uint64_t lkrnl; uint64_t lkrnl;
uint64_t lintr; uint64_t lintr;