From b74673fe37fd379fc350789e696470556776d815 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 31 Aug 2023 11:56:43 +1000 Subject: Rename ProcessList to ProcessTable throughout Following up with some discusson from a few months back, where it was proposed that ProcessTable is a better name. This data structure is definitely not a list ... if it was one-dimensional it'd be a set, but in practice it has much more in common with a two-dimensional table. The Process table is a familiar operating system concept for many people too so it resonates a little in that way as well. --- dragonflybsd/DragonFlyBSDMachine.c | 8 +- dragonflybsd/DragonFlyBSDMachine.h | 2 +- dragonflybsd/DragonFlyBSDProcessList.c | 310 -------------------------------- dragonflybsd/DragonFlyBSDProcessList.h | 21 --- dragonflybsd/DragonFlyBSDProcessTable.c | 310 ++++++++++++++++++++++++++++++++ dragonflybsd/DragonFlyBSDProcessTable.h | 21 +++ dragonflybsd/Platform.c | 4 +- 7 files changed, 338 insertions(+), 338 deletions(-) delete mode 100644 dragonflybsd/DragonFlyBSDProcessList.c delete mode 100644 dragonflybsd/DragonFlyBSDProcessList.h create mode 100644 dragonflybsd/DragonFlyBSDProcessTable.c create mode 100644 dragonflybsd/DragonFlyBSDProcessTable.h (limited to 'dragonflybsd') diff --git a/dragonflybsd/DragonFlyBSDMachine.c b/dragonflybsd/DragonFlyBSDMachine.c index 04962d7c..fd5b58b6 100644 --- a/dragonflybsd/DragonFlyBSDMachine.c +++ b/dragonflybsd/DragonFlyBSDMachine.c @@ -223,7 +223,7 @@ static void DragonFlyBSDMachine_scanCPUTime(Machine* super) { } static void DragonFlyBSDMachine_scanMemoryInfo(Machine* super) { - DragonFlyBSDMachine* this = (DragonFlyBSDProcessList*) super; + DragonFlyBSDMachine* this = (DragonFlyBSDProcessTable*) super; // @etosan: // memory counter relationships seem to be these: @@ -235,10 +235,10 @@ static void DragonFlyBSDMachine_scanMemoryInfo(Machine* super) { //disabled for now, as it is always smaller than phycal amount of memory... //...to avoid "where is my memory?" questions - //sysctl(MIB_vm_stats_vm_v_page_count, 4, &(pl->totalMem), &len, NULL, 0); - //pl->totalMem *= pageSizeKb; + //sysctl(MIB_vm_stats_vm_v_page_count, 4, &(this->totalMem), &len, NULL, 0); + //this->totalMem *= pageSizeKb; sysctl(MIB_hw_physmem, 2, &(super->totalMem), &len, NULL, 0); - pl->totalMem /= 1024; + super->totalMem /= 1024; sysctl(MIB_vm_stats_vm_v_active_count, 4, &(this->memActive), &len, NULL, 0); this->memActive *= this->pageSizeKb; diff --git a/dragonflybsd/DragonFlyBSDMachine.h b/dragonflybsd/DragonFlyBSDMachine.h index 276a73d7..0d4d8ef1 100644 --- a/dragonflybsd/DragonFlyBSDMachine.h +++ b/dragonflybsd/DragonFlyBSDMachine.h @@ -19,7 +19,7 @@ in the source distribution for its full text. #include "Hashtable.h" #include "Machine.h" -#include "ProcessList.h" +#include "ProcessTable.h" #include "UsersTable.h" diff --git a/dragonflybsd/DragonFlyBSDProcessList.c b/dragonflybsd/DragonFlyBSDProcessList.c deleted file mode 100644 index 6330e911..00000000 --- a/dragonflybsd/DragonFlyBSDProcessList.c +++ /dev/null @@ -1,310 +0,0 @@ -/* -htop - DragonFlyBSDProcessList.c -(C) 2014 Hisham H. Muhammad -(C) 2017 Diederik de Groot -Released under the GNU GPLv2+, see the COPYING file -in the source distribution for its full text. -*/ - -#include "dragonflybsd/DragonFlyBSDProcessList.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "CRT.h" -#include "Macros.h" - -#include "dragonflybsd/DragonFlyBSDMachine.h" -#include "dragonflybsd/DragonFlyBSDProcess.h" - - -ProcessList* ProcessList_new(Machine* host, Hashtable* pidMatchList) { - DragonFlyBSDProcessList* this = xCalloc(1, sizeof(DragonFlyBSDProcessList)); - Object_setClass(this, Class(ProcessList)); - - ProcessList* super = (ProcessList*) this; - ProcessList_init(super, Class(DragonFlyBSDProcess), host, pidMatchList); - - return super; -} - -void ProcessList_delete(Object* cast) { - const DragonFlyBSDProcessList* this = (DragonFlyBSDProcessList*) cast; - ProcessList_done(&this->super); - free(this); -} - -//static void DragonFlyBSDProcessList_updateExe(const struct kinfo_proc* kproc, Process* proc) { -// const int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, kproc->kp_pid }; -// char buffer[2048]; -// size_t size = sizeof(buffer); -// if (sysctl(mib, 4, buffer, &size, NULL, 0) != 0) { -// Process_updateExe(proc, NULL); -// return; -// } -// -// /* Kernel threads return an empty buffer */ -// if (buffer[0] == '\0') { -// Process_updateExe(proc, NULL); -// return; -// } -// -// Process_updateExe(proc, buffer); -//} - -static void DragonFlyBSDProcessList_updateExe(const struct kinfo_proc* kproc, Process* proc) { - if (Process_isKernelThread(proc)) - return; - - char path[32]; - xSnprintf(path, sizeof(path), "/proc/%d/file", kproc->kp_pid); - - char target[PATH_MAX]; - ssize_t ret = readlink(path, target, sizeof(target) - 1); - if (ret <= 0) - return; - - target[ret] = '\0'; - Process_updateExe(proc, target); -} - -static void DragonFlyBSDProcessList_updateCwd(const struct kinfo_proc* kproc, Process* proc) { - const int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_CWD, kproc->kp_pid }; - char buffer[2048]; - size_t size = sizeof(buffer); - if (sysctl(mib, 4, buffer, &size, NULL, 0) != 0) { - free(proc->procCwd); - proc->procCwd = NULL; - return; - } - - /* Kernel threads return an empty buffer */ - if (buffer[0] == '\0') { - free(proc->procCwd); - proc->procCwd = NULL; - return; - } - - free_and_xStrdup(&proc->procCwd, buffer); -} - -static void DragonFlyBSDProcessList_updateProcessName(kvm_t* kd, const struct kinfo_proc* kproc, Process* proc) { - Process_updateComm(proc, kproc->kp_comm); - - char** argv = kvm_getargv(kd, kproc, 0); - if (!argv || !argv[0]) { - Process_updateCmdline(proc, kproc->kp_comm, 0, strlen(kproc->kp_comm)); - return; - } - - size_t len = 0; - for (int i = 0; argv[i]; i++) { - len += strlen(argv[i]) + 1; - } - - char* cmdline = xMalloc(len); - - char* at = cmdline; - int end = 0; - for (int i = 0; argv[i]; i++) { - at = stpcpy(at, argv[i]); - if (end == 0) { - end = at - cmdline; - } - *at++ = ' '; - } - at--; - *at = '\0'; - - Process_updateCmdline(proc, cmdline, 0, end); - - free(cmdline); -} - -void ProcessList_goThroughEntries(ProcessList* super) { - const Machine* host = super->host; - const DragonFlyMachine* dhost = (const DragonFlyMachine*) host; - const Settings* settings = host->settings; - - bool hideKernelThreads = settings->hideKernelThreads; - bool hideUserlandThreads = settings->hideUserlandThreads; - - int count = 0; - - const struct kinfo_proc* kprocs = kvm_getprocs(dhost->kd, KERN_PROC_ALL | (!hideUserlandThreads ? KERN_PROC_FLAG_LWP : 0), 0, &count); - - for (int i = 0; i < count; i++) { - const struct kinfo_proc* kproc = &kprocs[i]; - bool preExisting = false; - bool ATTR_UNUSED isIdleProcess = false; - - // note: dragonflybsd kernel processes all have the same pid, so we misuse the kernel thread address to give them a unique identifier - Process* proc = ProcessList_getProcess(super, kproc->kp_ktaddr ? (pid_t)kproc->kp_ktaddr : kproc->kp_pid, &preExisting, DragonFlyBSDProcess_new); - DragonFlyBSDProcess* dfp = (DragonFlyBSDProcess*) proc; - - if (!preExisting) { - dfp->jid = kproc->kp_jailid; - if (kproc->kp_ktaddr && kproc->kp_flags & P_SYSTEM) { - // dfb kernel threads all have the same pid, so we misuse the kernel thread address to give them a unique identifier - Process_setPid(proc, (pid_t)kproc->kp_ktaddr); - proc->isKernelThread = true; - } else { - Process_setPid(proc, kproc->kp_pid); // process ID - proc->isKernelThread = false; - } - proc->isUserlandThread = kproc->kp_nthreads > 1; - Process_setParent(proc, kproc->kp_ppid); // parent process id - proc->tpgid = kproc->kp_tpgid; // tty process group id - //Process_setThreadGroup(proc, kproc->kp_lwp.kl_tid); // thread group id - Process_setThreadGroup(proc, kproc->kp_pid); - proc->pgrp = kproc->kp_pgid; // process group id - proc->session = kproc->kp_sid; - proc->st_uid = kproc->kp_uid; // user ID - proc->processor = kproc->kp_lwp.kl_origcpu; - proc->starttime_ctime = kproc->kp_start.tv_sec; - Process_fillStarttimeBuffer(proc); - proc->user = UsersTable_getRef(host->usersTable, proc->st_uid); - - proc->tty_nr = kproc->kp_tdev; // control terminal device number - const char* name = (kproc->kp_tdev != NODEV) ? devname(kproc->kp_tdev, S_IFCHR) : NULL; - if (!name) { - free(proc->tty_name); - proc->tty_name = NULL; - } else { - free_and_xStrdup(&proc->tty_name, name); - } - - DragonFlyBSDProcessList_updateExe(kproc, proc); - DragonFlyBSDProcessList_updateProcessName(dhost->kd, kproc, proc); - - if (settings->ss->flags & PROCESS_FLAG_CWD) { - DragonFlyBSDProcessList_updateCwd(kproc, proc); - } - - ProcessList_add(super, proc); - - dfp->jname = DragonFlyBSDMachine_readJailName(dhost, kproc->kp_jailid); - } else { - proc->processor = kproc->kp_lwp.kl_cpuid; - if (dfp->jid != kproc->kp_jailid) { // process can enter jail anytime - dfp->jid = kproc->kp_jailid; - free(dfp->jname); - dfp->jname = DragonFlyBSDMachine_readJailName(dhost, kproc->kp_jailid); - } - // if there are reapers in the system, process can get reparented anytime - Process_setParent(proc, kproc->kp_ppid); - if (proc->st_uid != kproc->kp_uid) { // some processes change users (eg. to lower privs) - proc->st_uid = kproc->kp_uid; - proc->user = UsersTable_getRef(host->usersTable, proc->st_uid); - } - if (settings->updateProcessNames) { - DragonFlyBSDProcessList_updateProcessName(dhost->kd, kproc, proc); - } - } - - proc->m_virt = kproc->kp_vm_map_size / ONE_K; - proc->m_resident = kproc->kp_vm_rssize * dhost->pageSizeKb; - proc->nlwp = kproc->kp_nthreads; // number of lwp thread - proc->time = (kproc->kp_lwp.kl_uticks + kproc->kp_lwp.kl_sticks + kproc->kp_lwp.kl_iticks) / 10000; - - proc->percent_cpu = 100.0 * ((double)kproc->kp_lwp.kl_pctcpu / (double)dhost->kernelFScale); - proc->percent_mem = 100.0 * proc->m_resident / (double)(super->totalMem); - Process_updateCPUFieldWidths(proc->percent_cpu); - - if (proc->percent_cpu > 0.1) { - // system idle process should own all CPU time left regardless of CPU count - if (String_eq("idle", kproc->kp_comm)) { - isIdleProcess = true; - } - } - - if (kproc->kp_lwp.kl_pid != -1) - proc->priority = kproc->kp_lwp.kl_prio; - else - proc->priority = -kproc->kp_lwp.kl_tdprio; - - switch (kproc->kp_lwp.kl_rtprio.type) { - case RTP_PRIO_REALTIME: - proc->nice = PRIO_MIN - 1 - RTP_PRIO_MAX + kproc->kp_lwp.kl_rtprio.prio; - break; - case RTP_PRIO_IDLE: - proc->nice = PRIO_MAX + 1 + kproc->kp_lwp.kl_rtprio.prio; - break; - case RTP_PRIO_THREAD: - proc->nice = PRIO_MIN - 1 - RTP_PRIO_MAX - kproc->kp_lwp.kl_rtprio.prio; - break; - default: - proc->nice = kproc->kp_nice; - break; - } - - // would be nice if we could store multiple states in proc->state (as enum) and have writeField render them - /* Taken from: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/c163a4d7ee9c6857ee4e04a3a2cbb50c3de29da1/sys/sys/proc_common.h */ - switch (kproc->kp_stat) { - case SIDL: proc->state = IDLE; isIdleProcess = true; break; - case SACTIVE: - switch (kproc->kp_lwp.kl_stat) { - case LSSLEEP: - if (kproc->kp_lwp.kl_flags & LWP_SINTR) // interruptible wait short/long - if (kproc->kp_lwp.kl_slptime >= MAXSLP) { - proc->state = IDLE; - isIdleProcess = true; - } else { - proc->state = SLEEPING; - } - else if (kproc->kp_lwp.kl_tdflags & TDF_SINTR) // interruptible lwkt wait - proc->state = SLEEPING; - else if (kproc->kp_paddr) // uninterruptible wait - proc->state = UNINTERRUPTIBLE_WAIT; - else // uninterruptible lwkt wait - proc->state = UNINTERRUPTIBLE_WAIT; - break; - case LSRUN: - if (kproc->kp_lwp.kl_stat == LSRUN) { - if (!(kproc->kp_lwp.kl_tdflags & (TDF_RUNNING | TDF_RUNQ))) - proc->state = QUEUED; - else - proc->state = RUNNING; - } - break; - case LSSTOP: - proc->state = STOPPED; - break; - default: - proc->state = PAGING; - break; - } - break; - case SSTOP: proc->state = STOPPED; break; - case SZOMB: proc->state = ZOMBIE; break; - case SCORE: proc->state = BLOCKED; break; - default: proc->state = UNKNOWN; - } - - if (kproc->kp_flags & P_SWAPPEDOUT) - proc->state = SLEEPING; - if (kproc->kp_flags & P_TRACED) - proc->state = TRACED; - if (kproc->kp_flags & P_JAILED) - proc->state = TRACED; - - if (Process_isKernelThread(proc)) - super->kernelThreads++; - - super->totalTasks++; - - if (proc->state == RUNNING) - super->runningTasks++; - - proc->super.show = ! ((hideKernelThreads && Process_isKernelThread(proc)) || (hideUserlandThreads && Process_isUserlandThread(proc))); - proc->super.updated = true; - } -} diff --git a/dragonflybsd/DragonFlyBSDProcessList.h b/dragonflybsd/DragonFlyBSDProcessList.h deleted file mode 100644 index 3f5cdc3e..00000000 --- a/dragonflybsd/DragonFlyBSDProcessList.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef HEADER_DragonFlyBSDProcessList -#define HEADER_DragonFlyBSDProcessList -/* -htop - DragonFlyBSDProcessList.h -(C) 2014 Hisham H. Muhammad -(C) 2017 Diederik de Groot -Released under the GNU GPLv2+, see the COPYING file -in the source distribution for its full text. -*/ - -#include -#include - -#include "ProcessList.h" - - -typedef struct DragonFlyBSDProcessList_ { - ProcessList super; -} DragonFlyBSDProcessList; - -#endif diff --git a/dragonflybsd/DragonFlyBSDProcessTable.c b/dragonflybsd/DragonFlyBSDProcessTable.c new file mode 100644 index 00000000..07c852e5 --- /dev/null +++ b/dragonflybsd/DragonFlyBSDProcessTable.c @@ -0,0 +1,310 @@ +/* +htop - DragonFlyBSDProcessTable.c +(C) 2014 Hisham H. Muhammad +(C) 2017 Diederik de Groot +Released under the GNU GPLv2+, see the COPYING file +in the source distribution for its full text. +*/ + +#include "dragonflybsd/DragonFlyBSDProcessTable.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "CRT.h" +#include "Macros.h" + +#include "dragonflybsd/DragonFlyBSDMachine.h" +#include "dragonflybsd/DragonFlyBSDProcess.h" + + +ProcessTable* ProcessTable_new(Machine* host, Hashtable* pidMatchList) { + DragonFlyBSDProcessTable* this = xCalloc(1, sizeof(DragonFlyBSDProcessTable)); + Object_setClass(this, Class(ProcessTable)); + + ProcessTable* super = (ProcessTable*) this; + ProcessTable_init(super, Class(DragonFlyBSDProcess), host, pidMatchList); + + return super; +} + +void ProcessTable_delete(Object* cast) { + const DragonFlyBSDProcessTable* this = (DragonFlyBSDProcessTable*) cast; + ProcessTable_done(&this->super); + free(this); +} + +//static void DragonFlyBSDProcessTable_updateExe(const struct kinfo_proc* kproc, Process* proc) { +// const int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, kproc->kp_pid }; +// char buffer[2048]; +// size_t size = sizeof(buffer); +// if (sysctl(mib, 4, buffer, &size, NULL, 0) != 0) { +// Process_updateExe(proc, NULL); +// return; +// } +// +// /* Kernel threads return an empty buffer */ +// if (buffer[0] == '\0') { +// Process_updateExe(proc, NULL); +// return; +// } +// +// Process_updateExe(proc, buffer); +//} + +static void DragonFlyBSDProcessTable_updateExe(const struct kinfo_proc* kproc, Process* proc) { + if (Process_isKernelThread(proc)) + return; + + char path[32]; + xSnprintf(path, sizeof(path), "/proc/%d/file", kproc->kp_pid); + + char target[PATH_MAX]; + ssize_t ret = readlink(path, target, sizeof(target) - 1); + if (ret <= 0) + return; + + target[ret] = '\0'; + Process_updateExe(proc, target); +} + +static void DragonFlyBSDProcessTable_updateCwd(const struct kinfo_proc* kproc, Process* proc) { + const int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_CWD, kproc->kp_pid }; + char buffer[2048]; + size_t size = sizeof(buffer); + if (sysctl(mib, 4, buffer, &size, NULL, 0) != 0) { + free(proc->procCwd); + proc->procCwd = NULL; + return; + } + + /* Kernel threads return an empty buffer */ + if (buffer[0] == '\0') { + free(proc->procCwd); + proc->procCwd = NULL; + return; + } + + free_and_xStrdup(&proc->procCwd, buffer); +} + +static void DragonFlyBSDProcessTable_updateProcessName(kvm_t* kd, const struct kinfo_proc* kproc, Process* proc) { + Process_updateComm(proc, kproc->kp_comm); + + char** argv = kvm_getargv(kd, kproc, 0); + if (!argv || !argv[0]) { + Process_updateCmdline(proc, kproc->kp_comm, 0, strlen(kproc->kp_comm)); + return; + } + + size_t len = 0; + for (int i = 0; argv[i]; i++) { + len += strlen(argv[i]) + 1; + } + + char* cmdline = xMalloc(len); + + char* at = cmdline; + int end = 0; + for (int i = 0; argv[i]; i++) { + at = stpcpy(at, argv[i]); + if (end == 0) { + end = at - cmdline; + } + *at++ = ' '; + } + at--; + *at = '\0'; + + Process_updateCmdline(proc, cmdline, 0, end); + + free(cmdline); +} + +void ProcessTable_goThroughEntries(ProcessTable* super) { + const Machine* host = super->host; + const DragonFlyMachine* dhost = (const DragonFlyMachine*) host; + const Settings* settings = host->settings; + + bool hideKernelThreads = settings->hideKernelThreads; + bool hideUserlandThreads = settings->hideUserlandThreads; + + int count = 0; + + const struct kinfo_proc* kprocs = kvm_getprocs(dhost->kd, KERN_PROC_ALL | (!hideUserlandThreads ? KERN_PROC_FLAG_LWP : 0), 0, &count); + + for (int i = 0; i < count; i++) { + const struct kinfo_proc* kproc = &kprocs[i]; + bool preExisting = false; + bool ATTR_UNUSED isIdleProcess = false; + + // note: dragonflybsd kernel processes all have the same pid, so we misuse the kernel thread address to give them a unique identifier + Process* proc = ProcessTable_getProcess(super, kproc->kp_ktaddr ? (pid_t)kproc->kp_ktaddr : kproc->kp_pid, &preExisting, DragonFlyBSDProcess_new); + DragonFlyBSDProcess* dfp = (DragonFlyBSDProcess*) proc; + + if (!preExisting) { + dfp->jid = kproc->kp_jailid; + if (kproc->kp_ktaddr && kproc->kp_flags & P_SYSTEM) { + // dfb kernel threads all have the same pid, so we misuse the kernel thread address to give them a unique identifier + Process_setPid(proc, (pid_t)kproc->kp_ktaddr); + proc->isKernelThread = true; + } else { + Process_setPid(proc, kproc->kp_pid); // process ID + proc->isKernelThread = false; + } + proc->isUserlandThread = kproc->kp_nthreads > 1; + Process_setParent(proc, kproc->kp_ppid); // parent process id + proc->tpgid = kproc->kp_tpgid; // tty process group id + //Process_setThreadGroup(proc, kproc->kp_lwp.kl_tid); // thread group id + Process_setThreadGroup(proc, kproc->kp_pid); + proc->pgrp = kproc->kp_pgid; // process group id + proc->session = kproc->kp_sid; + proc->st_uid = kproc->kp_uid; // user ID + proc->processor = kproc->kp_lwp.kl_origcpu; + proc->starttime_ctime = kproc->kp_start.tv_sec; + Process_fillStarttimeBuffer(proc); + proc->user = UsersTable_getRef(host->usersTable, proc->st_uid); + + proc->tty_nr = kproc->kp_tdev; // control terminal device number + const char* name = (kproc->kp_tdev != NODEV) ? devname(kproc->kp_tdev, S_IFCHR) : NULL; + if (!name) { + free(proc->tty_name); + proc->tty_name = NULL; + } else { + free_and_xStrdup(&proc->tty_name, name); + } + + DragonFlyBSDProcessTable_updateExe(kproc, proc); + DragonFlyBSDProcessTable_updateProcessName(dhost->kd, kproc, proc); + + if (settings->ss->flags & PROCESS_FLAG_CWD) { + DragonFlyBSDProcessTable_updateCwd(kproc, proc); + } + + ProcessTable_add(super, proc); + + dfp->jname = DragonFlyBSDMachine_readJailName(dhost, kproc->kp_jailid); + } else { + proc->processor = kproc->kp_lwp.kl_cpuid; + if (dfp->jid != kproc->kp_jailid) { // process can enter jail anytime + dfp->jid = kproc->kp_jailid; + free(dfp->jname); + dfp->jname = DragonFlyBSDMachine_readJailName(dhost, kproc->kp_jailid); + } + // if there are reapers in the system, process can get reparented anytime + Process_setParent(proc, kproc->kp_ppid); + if (proc->st_uid != kproc->kp_uid) { // some processes change users (eg. to lower privs) + proc->st_uid = kproc->kp_uid; + proc->user = UsersTable_getRef(host->usersTable, proc->st_uid); + } + if (settings->updateProcessNames) { + DragonFlyBSDProcessTable_updateProcessName(dhost->kd, kproc, proc); + } + } + + proc->m_virt = kproc->kp_vm_map_size / ONE_K; + proc->m_resident = kproc->kp_vm_rssize * dhost->pageSizeKb; + proc->nlwp = kproc->kp_nthreads; // number of lwp thread + proc->time = (kproc->kp_lwp.kl_uticks + kproc->kp_lwp.kl_sticks + kproc->kp_lwp.kl_iticks) / 10000; + + proc->percent_cpu = 100.0 * ((double)kproc->kp_lwp.kl_pctcpu / (double)dhost->kernelFScale); + proc->percent_mem = 100.0 * proc->m_resident / (double)(super->totalMem); + Process_updateCPUFieldWidths(proc->percent_cpu); + + if (proc->percent_cpu > 0.1) { + // system idle process should own all CPU time left regardless of CPU count + if (String_eq("idle", kproc->kp_comm)) { + isIdleProcess = true; + } + } + + if (kproc->kp_lwp.kl_pid != -1) + proc->priority = kproc->kp_lwp.kl_prio; + else + proc->priority = -kproc->kp_lwp.kl_tdprio; + + switch (kproc->kp_lwp.kl_rtprio.type) { + case RTP_PRIO_REALTIME: + proc->nice = PRIO_MIN - 1 - RTP_PRIO_MAX + kproc->kp_lwp.kl_rtprio.prio; + break; + case RTP_PRIO_IDLE: + proc->nice = PRIO_MAX + 1 + kproc->kp_lwp.kl_rtprio.prio; + break; + case RTP_PRIO_THREAD: + proc->nice = PRIO_MIN - 1 - RTP_PRIO_MAX - kproc->kp_lwp.kl_rtprio.prio; + break; + default: + proc->nice = kproc->kp_nice; + break; + } + + // would be nice if we could store multiple states in proc->state (as enum) and have writeField render them + /* Taken from: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/c163a4d7ee9c6857ee4e04a3a2cbb50c3de29da1/sys/sys/proc_common.h */ + switch (kproc->kp_stat) { + case SIDL: proc->state = IDLE; isIdleProcess = true; break; + case SACTIVE: + switch (kproc->kp_lwp.kl_stat) { + case LSSLEEP: + if (kproc->kp_lwp.kl_flags & LWP_SINTR) // interruptible wait short/long + if (kproc->kp_lwp.kl_slptime >= MAXSLP) { + proc->state = IDLE; + isIdleProcess = true; + } else { + proc->state = SLEEPING; + } + else if (kproc->kp_lwp.kl_tdflags & TDF_SINTR) // interruptible lwkt wait + proc->state = SLEEPING; + else if (kproc->kp_paddr) // uninterruptible wait + proc->state = UNINTERRUPTIBLE_WAIT; + else // uninterruptible lwkt wait + proc->state = UNINTERRUPTIBLE_WAIT; + break; + case LSRUN: + if (kproc->kp_lwp.kl_stat == LSRUN) { + if (!(kproc->kp_lwp.kl_tdflags & (TDF_RUNNING | TDF_RUNQ))) + proc->state = QUEUED; + else + proc->state = RUNNING; + } + break; + case LSSTOP: + proc->state = STOPPED; + break; + default: + proc->state = PAGING; + break; + } + break; + case SSTOP: proc->state = STOPPED; break; + case SZOMB: proc->state = ZOMBIE; break; + case SCORE: proc->state = BLOCKED; break; + default: proc->state = UNKNOWN; + } + + if (kproc->kp_flags & P_SWAPPEDOUT) + proc->state = SLEEPING; + if (kproc->kp_flags & P_TRACED) + proc->state = TRACED; + if (kproc->kp_flags & P_JAILED) + proc->state = TRACED; + + if (Process_isKernelThread(proc)) + super->kernelThreads++; + + super->totalTasks++; + + if (proc->state == RUNNING) + super->runningTasks++; + + proc->super.show = ! ((hideKernelThreads && Process_isKernelThread(proc)) || (hideUserlandThreads && Process_isUserlandThread(proc))); + proc->super.updated = true; + } +} diff --git a/dragonflybsd/DragonFlyBSDProcessTable.h b/dragonflybsd/DragonFlyBSDProcessTable.h new file mode 100644 index 00000000..e8ff1af4 --- /dev/null +++ b/dragonflybsd/DragonFlyBSDProcessTable.h @@ -0,0 +1,21 @@ +#ifndef HEADER_DragonFlyBSDProcessTable +#define HEADER_DragonFlyBSDProcessTable +/* +htop - DragonFlyBSDProcessTable.h +(C) 2014 Hisham H. Muhammad +(C) 2017 Diederik de Groot +Released under the GNU GPLv2+, see the COPYING file +in the source distribution for its full text. +*/ + +#include +#include + +#include "ProcessTable.h" + + +typedef struct DragonFlyBSDProcessTable_ { + ProcessTable super; +} DragonFlyBSDProcessTable; + +#endif diff --git a/dragonflybsd/Platform.c b/dragonflybsd/Platform.c index 51d89467..95f0bec6 100644 --- a/dragonflybsd/Platform.c +++ b/dragonflybsd/Platform.c @@ -26,14 +26,14 @@ in the source distribution for its full text. #include "Macros.h" #include "MemoryMeter.h" #include "MemorySwapMeter.h" -#include "ProcessList.h" +#include "ProcessTable.h" #include "SwapMeter.h" #include "SysArchMeter.h" #include "TasksMeter.h" #include "UptimeMeter.h" #include "XUtils.h" #include "dragonflybsd/DragonFlyBSDProcess.h" -#include "dragonflybsd/DragonFlyBSDProcessList.h" +#include "dragonflybsd/DragonFlyBSDProcessTable.h" #include "generic/fdstat_sysctl.h" -- cgit v1.2.3