From 61bb649e0a87b75926704142d638aa007c490104 Mon Sep 17 00:00:00 2001
From: "Guy M. Broome" <thrirhrafnir@gmail.com>
Date: Tue, 27 Mar 2018 16:48:58 -0400
Subject: [PATCH] Solaris: remove unneeded accumulators for process and thread
 counting

---
 solaris/SolarisProcessList.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/solaris/SolarisProcessList.c b/solaris/SolarisProcessList.c
index 54e7179b..ce36c231 100644
--- a/solaris/SolarisProcessList.c
+++ b/solaris/SolarisProcessList.c
@@ -381,8 +381,6 @@ void ProcessList_goThroughEntries(ProcessList* this) {
    prusage_t _prusage;
    char filename[MAX_NAME+1];
    FILE *fp = NULL;
-   uint64_t addRunning = 0;
-   uint64_t addTotal = 0;
    struct timeval tv;
    struct tm date;
 
@@ -397,8 +395,6 @@ void ProcessList_goThroughEntries(ProcessList* this) {
    // We always count the scheduler
    this->kernelThreads = 1;
    while ((entry = readdir(dir)) != NULL) {
-      addRunning = 0;
-      addTotal = 0;
       name = entry->d_name;
       pid = atoi(name);
       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->contid         = _psinfo.pr_contract;
       }
+
       if (proc->nlwp > 1) {
          ProcessList_enumerateLWPs(proc, name, this, tv);
       }
@@ -505,22 +502,23 @@ void ProcessList_goThroughEntries(ProcessList* this) {
 
       if (sproc->kernel && !this->settings->hideKernelThreads) {
          this->kernelThreads += proc->nlwp;
-         addTotal = proc->nlwp+1;
-         if (proc->state == 'O') addRunning++;
+         this->totalTasks += proc->nlwp+1;
+         if (proc->state == 'O') this->runningTasks++;
       } else if (!sproc->kernel) {
-         if (proc->state == 'O') addRunning++;
+         if (proc->state == 'O') this->runningTasks++;
          if (this->settings->hideUserlandThreads) {
-            addTotal++;
+            this->totalTasks++;
          } else {
             this->userlandThreads += proc->nlwp;
-            addTotal = proc->nlwp+1;
+            this->totalTasks += proc->nlwp+1;
          }
       }
 
-      this->runningTasks+=addRunning;
-      this->totalTasks+=addTotal;
       proc->updated = true;
+
    } // while ((entry = readdir(dir)) != NULL)
+
    closedir(dir);
+
 }