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

Solaris: remove unneeded accumulators for process and thread counting

This commit is contained in:
Guy M. Broome 2018-03-27 16:48:58 -04:00 committed by Hisham Muhammad
parent b8ec1c0337
commit 61bb649e0a
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
solaris/SolarisProcessList.c
View File

@ -381,8 +381,6 @@ void ProcessList_goThroughEntries(ProcessList* this) {
prusage_t _prusage; prusage_t _prusage;
char filename[MAX_NAME+1]; char filename[MAX_NAME+1];
FILE *fp = NULL; FILE *fp = NULL;
uint64_t addRunning = 0;
uint64_t addTotal = 0;
struct timeval tv; struct timeval tv;
struct tm date; struct tm date;
@ -397,8 +395,6 @@ void ProcessList_goThroughEntries(ProcessList* this) {
// We always count the scheduler // We always count the scheduler
this->kernelThreads = 1; this->kernelThreads = 1;
while ((entry = readdir(dir)) != NULL) { while ((entry = readdir(dir)) != NULL) {
addRunning = 0;
addTotal = 0;
name = entry->d_name; name = entry->d_name;
pid = atoi(name); pid = atoi(name);
proc = ProcessList_getProcess(this, pid, &preExisting, (Process_New) SolarisProcess_new); proc = ProcessList_getProcess(this, pid, &preExisting, (Process_New) SolarisProcess_new);
@ -497,6 +493,7 @@ void ProcessList_goThroughEntries(ProcessList* this) {
sproc->poolid = _psinfo.pr_poolid; sproc->poolid = _psinfo.pr_poolid;
sproc->contid = _psinfo.pr_contract; sproc->contid = _psinfo.pr_contract;
} }
if (proc->nlwp > 1) { if (proc->nlwp > 1) {
ProcessList_enumerateLWPs(proc, name, this, tv); ProcessList_enumerateLWPs(proc, name, this, tv);
} }
@ -505,22 +502,23 @@ void ProcessList_goThroughEntries(ProcessList* this) {
if (sproc->kernel && !this->settings->hideKernelThreads) { if (sproc->kernel && !this->settings->hideKernelThreads) {
this->kernelThreads += proc->nlwp; this->kernelThreads += proc->nlwp;
addTotal = proc->nlwp+1; this->totalTasks += proc->nlwp+1;
if (proc->state == 'O') addRunning++; if (proc->state == 'O') this->runningTasks++;
} else if (!sproc->kernel) { } else if (!sproc->kernel) {
if (proc->state == 'O') addRunning++; if (proc->state == 'O') this->runningTasks++;
if (this->settings->hideUserlandThreads) { if (this->settings->hideUserlandThreads) {
addTotal++; this->totalTasks++;
} else { } else {
this->userlandThreads += proc->nlwp; this->userlandThreads += proc->nlwp;
addTotal = proc->nlwp+1; this->totalTasks += proc->nlwp+1;
} }
} }
this->runningTasks+=addRunning;
this->totalTasks+=addTotal;
proc->updated = true; proc->updated = true;
} // while ((entry = readdir(dir)) != NULL) } // while ((entry = readdir(dir)) != NULL)
closedir(dir); closedir(dir);
} }