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

Renames variable from opl to npl for consistency.

This commit is contained in:
fraggerfox 2021-04-24 09:59:11 +05:30 committed by BenBE
parent 497f468ed0
commit e42ae55d69
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
netbsd/NetBSDProcessList.c
View File

@ -45,8 +45,8 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, ui
size_t size; size_t size;
char errbuf[_POSIX2_LINE_MAX]; char errbuf[_POSIX2_LINE_MAX];
NetBSDProcessList* opl = xCalloc(1, sizeof(NetBSDProcessList)); NetBSDProcessList* npl = xCalloc(1, sizeof(NetBSDProcessList));
ProcessList* pl = (ProcessList*) opl; ProcessList* pl = (ProcessList*) npl;
ProcessList_init(pl, Class(NetBSDProcess), usersTable, pidMatchList, userId); ProcessList_init(pl, Class(NetBSDProcess), usersTable, pidMatchList, userId);
size = sizeof(pl->cpuCount); size = sizeof(pl->cpuCount);
@ -54,7 +54,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, ui
if (r < 0 || pl->cpuCount < 1) { if (r < 0 || pl->cpuCount < 1) {
pl->cpuCount = 1; pl->cpuCount = 1;
} }
opl->cpus = xCalloc(pl->cpuCount + 1, sizeof(CPUData)); npl->cpus = xCalloc(pl->cpuCount + 1, sizeof(CPUData));
size = sizeof(fscale); size = sizeof(fscale);
if (sysctl(fmib, 2, &fscale, &size, NULL, 0) < 0) { if (sysctl(fmib, 2, &fscale, &size, NULL, 0) < 0) {
@ -66,13 +66,13 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, ui
pageSizeKB = pageSize / ONE_K; pageSizeKB = pageSize / ONE_K;
for (unsigned int i = 0; i <= pl->cpuCount; i++) { for (unsigned int i = 0; i <= pl->cpuCount; i++) {
CPUData* d = opl->cpus + i; CPUData* d = npl->cpus + i;
d->totalTime = 1; d->totalTime = 1;
d->totalPeriod = 1; d->totalPeriod = 1;
} }
opl->kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf); npl->kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf);
if (opl->kd == NULL) { if (npl->kd == NULL) {
CRT_fatalError("kvm_openfiles() failed"); CRT_fatalError("kvm_openfiles() failed");
} }
@ -80,13 +80,13 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, ui
} }
void ProcessList_delete(ProcessList* this) { void ProcessList_delete(ProcessList* this) {
NetBSDProcessList* opl = (NetBSDProcessList*) this; NetBSDProcessList* npl = (NetBSDProcessList*) this;
if (opl->kd) { if (npl->kd) {
kvm_close(opl->kd); kvm_close(npl->kd);
} }
free(opl->cpus); free(npl->cpus);
ProcessList_done(this); ProcessList_done(this);
free(this); free(this);
@ -303,15 +303,15 @@ static void NetBSDProcessList_scanCPUTime(NetBSDProcessList* this) {
} }
void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) { void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
NetBSDProcessList* opl = (NetBSDProcessList*) super; NetBSDProcessList* npl = (NetBSDProcessList*) super;
NetBSDProcessList_scanMemoryInfo(super); NetBSDProcessList_scanMemoryInfo(super);
NetBSDProcessList_scanCPUTime(opl); NetBSDProcessList_scanCPUTime(npl);
// in pause mode only gather global data for meters (CPU/memory/...) // in pause mode only gather global data for meters (CPU/memory/...)
if (pauseProcessUpdate) { if (pauseProcessUpdate) {
return; return;
} }
NetBSDProcessList_scanProcs(opl); NetBSDProcessList_scanProcs(npl);
} }

4
netbsd/Platform.c
View File

@ -199,8 +199,8 @@ int Platform_getMaxPid() {
} }
double Platform_setCPUValues(Meter* this, int cpu) { double Platform_setCPUValues(Meter* this, int cpu) {
const NetBSDProcessList* pl = (const NetBSDProcessList*) this->pl; const NetBSDProcessList* npl = (const NetBSDProcessList*) this->pl;
const CPUData* cpuData = &(pl->cpus[cpu]); const CPUData* cpuData = &npl->cpus[cpu];
double total = cpuData->totalPeriod == 0 ? 1 : cpuData->totalPeriod; double total = cpuData->totalPeriod == 0 ? 1 : cpuData->totalPeriod;
double totalPercent; double totalPercent;
double* v = this->values; double* v = this->values;