diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2018-01-28 22:33:26 -0200 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-02-26 20:13:09 -0300 |
| commit | b4a8f048d19ab419df2c60f2f746e538369c8aa0 (patch) | |
| tree | 97b2d9a6ced22b9f837e68ec14d02dc2ffedad65 /linux | |
| parent | 2df1f61d7738fb8b66afdb54068222dde3484b8a (diff) | |
Use screen's flags when reading process data
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/LinuxProcess.c | 1 | ||||
| -rw-r--r-- | linux/LinuxProcess.h | 1 | ||||
| -rw-r--r-- | linux/LinuxProcessList.c | 13 |
3 files changed, 7 insertions, 8 deletions
diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c index 3bfc697d..c646cdc7 100644 --- a/linux/LinuxProcess.c +++ b/linux/LinuxProcess.c @@ -475,4 +475,3 @@ long LinuxProcess_compare(const void* v1, const void* v2) { bool Process_isThread(Process* this) { return (Process_isUserlandThread(this) || Process_isKernelThread(this)); } - diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h index 9400d7be..5995dafb 100644 --- a/linux/LinuxProcess.h +++ b/linux/LinuxProcess.h @@ -176,5 +176,4 @@ long LinuxProcess_compare(const void* v1, const void* v2); bool Process_isThread(Process* this); - #endif diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index 158a7ea2..e0aaeb06 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -761,6 +761,7 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char* DIR* dir; struct dirent* entry; Settings* settings = pl->settings; + ScreenSettings* ss = settings->ss; time_t curTime = tv.tv_sec; #ifdef HAVE_TASKSTATS @@ -806,7 +807,7 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char* LinuxProcessList_recurseProcTree(this, subdirname, proc, period, tv); #ifdef HAVE_TASKSTATS - if (settings->flags & PROCESS_FLAG_IO) + if (ss->flags & PROCESS_FLAG_IO) LinuxProcessList_readIoFile(lp, dirname, name, now); #endif @@ -825,7 +826,7 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char* free(lp->ttyDevice); lp->ttyDevice = LinuxProcessList_updateTtyDevice(this->ttyDrivers, proc->tty_nr); } - if (settings->flags & PROCESS_FLAG_LINUX_IOPRIO) + if (ss->flags & PROCESS_FLAG_LINUX_IOPRIO) LinuxProcess_updateIOPriority(lp); float percent_cpu = (lp->utime + lp->stime - lasttimes) / period * 100.0; proc->percent_cpu = CLAMP(percent_cpu, 0.0, cpus * 100.0); @@ -840,13 +841,13 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char* proc->user = UsersTable_getRef(pl->usersTable, proc->st_uid); #ifdef HAVE_OPENVZ - if (settings->flags & PROCESS_FLAG_LINUX_OPENVZ) { + if (ss->flags & PROCESS_FLAG_LINUX_OPENVZ) { LinuxProcessList_readOpenVZData(lp, dirname, name); } #endif #ifdef HAVE_VSERVER - if (settings->flags & PROCESS_FLAG_LINUX_VSERVER) { + if (ss->flags & PROCESS_FLAG_LINUX_VSERVER) { LinuxProcessList_readVServerData(lp, dirname, name); } #endif @@ -869,11 +870,11 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char* #endif #ifdef HAVE_CGROUP - if (settings->flags & PROCESS_FLAG_LINUX_CGROUP) + if (ss->flags & PROCESS_FLAG_LINUX_CGROUP) LinuxProcessList_readCGroupFile(lp, dirname, name); #endif - if (settings->flags & PROCESS_FLAG_LINUX_OOM) + if (ss->flags & PROCESS_FLAG_LINUX_OOM) LinuxProcessList_readOomData(lp, dirname, name); if (proc->state == 'Z' && (proc->basenameOffset == 0)) { |