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. --- darwin/DarwinProcess.c | 12 ++--- darwin/DarwinProcess.h | 4 +- darwin/DarwinProcessList.c | 126 -------------------------------------------- darwin/DarwinProcessList.h | 22 -------- darwin/DarwinProcessTable.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ darwin/DarwinProcessTable.h | 22 ++++++++ 6 files changed, 156 insertions(+), 156 deletions(-) delete mode 100644 darwin/DarwinProcessList.c delete mode 100644 darwin/DarwinProcessList.h create mode 100644 darwin/DarwinProcessTable.c create mode 100644 darwin/DarwinProcessTable.h (limited to 'darwin') diff --git a/darwin/DarwinProcess.c b/darwin/DarwinProcess.c index ec98341e..4f58832d 100644 --- a/darwin/DarwinProcess.c +++ b/darwin/DarwinProcess.c @@ -299,7 +299,7 @@ void DarwinProcess_setFromKInfoProc(Process* proc, const struct kinfo_proc* ps, /* UNSET HERE : * * processor - * user (set at ProcessList level) + * user (set at ProcessTable level) * nlwp * percent_cpu * percent_mem @@ -362,7 +362,7 @@ void DarwinProcess_setFromKInfoProc(Process* proc, const struct kinfo_proc* ps, proc->super.updated = true; } -void DarwinProcess_setFromLibprocPidinfo(DarwinProcess* proc, DarwinProcessList* dpl, double timeIntervalNS) { +void DarwinProcess_setFromLibprocPidinfo(DarwinProcess* proc, DarwinProcessTable* dpt, double timeIntervalNS) { struct proc_taskinfo pti; if (sizeof(pti) == proc_pidinfo(Process_getPid(&proc->super), PROC_PIDTASKINFO, 0, &pti, sizeof(pti))) { @@ -394,10 +394,10 @@ void DarwinProcess_setFromLibprocPidinfo(DarwinProcess* proc, DarwinProcessList* proc->stime = system_time_ns; proc->utime = user_time_ns; - dpl->super.kernelThreads += 0; /*pti.pti_threads_system;*/ - dpl->super.userlandThreads += pti.pti_threadnum; /*pti.pti_threads_user;*/ - dpl->super.totalTasks += pti.pti_threadnum; - dpl->super.runningTasks += pti.pti_numrunning; + dpt->super.kernelThreads += 0; /*pti.pti_threads_system;*/ + dpt->super.userlandThreads += pti.pti_threadnum; /*pti.pti_threads_user;*/ + dpt->super.totalTasks += pti.pti_threadnum; + dpt->super.runningTasks += pti.pti_numrunning; } } diff --git a/darwin/DarwinProcess.h b/darwin/DarwinProcess.h index 89a0576d..496b179b 100644 --- a/darwin/DarwinProcess.h +++ b/darwin/DarwinProcess.h @@ -10,7 +10,7 @@ in the source distribution for its full text. #include #include "Machine.h" -#include "darwin/DarwinProcessList.h" +#include "darwin/DarwinProcessTable.h" #define PROCESS_FLAG_TTY 0x00000100 @@ -34,7 +34,7 @@ void Process_delete(Object* cast); void DarwinProcess_setFromKInfoProc(Process* proc, const struct kinfo_proc* ps, bool exists); -void DarwinProcess_setFromLibprocPidinfo(DarwinProcess* proc, DarwinProcessList* dpl, double timeIntervalNS); +void DarwinProcess_setFromLibprocPidinfo(DarwinProcess* proc, DarwinProcessTable* dpt, double timeIntervalNS); /* * Scan threads for process state information. diff --git a/darwin/DarwinProcessList.c b/darwin/DarwinProcessList.c deleted file mode 100644 index 1545600e..00000000 --- a/darwin/DarwinProcessList.c +++ /dev/null @@ -1,126 +0,0 @@ -/* -htop - DarwinProcessList.c -(C) 2014 Hisham H. Muhammad -Released under the GNU GPLv2+, see the COPYING file -in the source distribution for its full text. -*/ - -#include "darwin/DarwinProcessList.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "CRT.h" -#include "ProcessList.h" -#include "darwin/DarwinMachine.h" -#include "darwin/DarwinProcess.h" -#include "darwin/Platform.h" -#include "darwin/PlatformHelpers.h" -#include "generic/openzfs_sysctl.h" -#include "zfs/ZfsArcStats.h" - - -static struct kinfo_proc* ProcessList_getKInfoProcs(size_t* count) { - int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL, 0 }; - struct kinfo_proc* processes = NULL; - - for (unsigned int retry = 0; retry < 4; retry++) { - size_t size = 0; - if (sysctl(mib, 4, NULL, &size, NULL, 0) < 0 || size == 0) { - CRT_fatalError("Unable to get size of kproc_infos"); - } - - size += 16 * retry * retry * sizeof(struct kinfo_proc); - processes = xRealloc(processes, size); - - if (sysctl(mib, 4, processes, &size, NULL, 0) == 0) { - *count = size / sizeof(struct kinfo_proc); - return processes; - } - - if (errno != ENOMEM) - break; - } - - CRT_fatalError("Unable to get kinfo_procs"); -} - -ProcessList* ProcessList_new(Machine* host, Hashtable* pidMatchList) { - DarwinProcessList* this = xCalloc(1, sizeof(DarwinProcessList)); - Object_setClass(this, Class(ProcessList)); - - ProcessList* super = &this->super; - ProcessList_init(super, Class(DarwinProcess), host, pidMatchList); - - return super; -} - -void ProcessList_delete(Object* cast) { - DarwinProcessList* this = (DarwinProcessList*) cast; - ProcessList_done(&this->super); - free(this); -} - -void ProcessList_goThroughEntries(ProcessList* super) { - const Machine* host = super->super.host; - const DarwinMachine* dhost = (const DarwinMachine*) host; - DarwinProcessList* dpl = (DarwinProcessList*) super; - bool preExisting = true; - struct kinfo_proc* ps; - size_t count; - DarwinProcess* proc; - - /* Get the time difference */ - dpl->global_diff = 0; - for (unsigned int i = 0; i < host->existingCPUs; ++i) { - for (size_t j = 0; j < CPU_STATE_MAX; ++j) { - dpl->global_diff += dhost->curr_load[i].cpu_ticks[j] - dhost->prev_load[i].cpu_ticks[j]; - } - } - - const double time_interval_ns = Platform_schedulerTicksToNanoseconds(dpl->global_diff) / (double) host->activeCPUs; - - /* We use kinfo_procs for initial data since : - * - * 1) They always succeed. - * 2) They contain the basic information. - * - * We attempt to fill-in additional information with libproc. - */ - ps = ProcessList_getKInfoProcs(&count); - - for (size_t i = 0; i < count; ++i) { - proc = (DarwinProcess*)ProcessList_getProcess(super, ps[i].kp_proc.p_pid, &preExisting, DarwinProcess_new); - - DarwinProcess_setFromKInfoProc(&proc->super, &ps[i], preExisting); - DarwinProcess_setFromLibprocPidinfo(proc, dpl, time_interval_ns); - - if (proc->super.st_uid != ps[i].kp_eproc.e_ucred.cr_uid) { - proc->super.st_uid = ps[i].kp_eproc.e_ucred.cr_uid; - proc->super.user = UsersTable_getRef(host->usersTable, proc->super.st_uid); - } - - // Disabled for High Sierra due to bug in macOS High Sierra - bool isScanThreadSupported = !Platform_KernelVersionIsBetween((KernelVersion) {17, 0, 0}, (KernelVersion) {17, 5, 0}); - - if (isScanThreadSupported) { - DarwinProcess_scanThreads(proc); - } - - super->totalTasks += 1; - - if (!preExisting) { - ProcessList_add(super, &proc->super); - } - } - - free(ps); -} diff --git a/darwin/DarwinProcessList.h b/darwin/DarwinProcessList.h deleted file mode 100644 index 56d6c1b5..00000000 --- a/darwin/DarwinProcessList.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef HEADER_DarwinProcessList -#define HEADER_DarwinProcessList -/* -htop - DarwinProcessList.h -(C) 2014 Hisham H. Muhammad -Released under the GNU GPLv2+, see the COPYING file -in the source distribution for its full text. -*/ - -#include -#include - -#include "ProcessList.h" - - -typedef struct DarwinProcessList_ { - ProcessList super; - - uint64_t global_diff; -} DarwinProcessList; - -#endif diff --git a/darwin/DarwinProcessTable.c b/darwin/DarwinProcessTable.c new file mode 100644 index 00000000..850b503f --- /dev/null +++ b/darwin/DarwinProcessTable.c @@ -0,0 +1,126 @@ +/* +htop - DarwinProcessTable.c +(C) 2014 Hisham H. Muhammad +Released under the GNU GPLv2+, see the COPYING file +in the source distribution for its full text. +*/ + +#include "darwin/DarwinProcessTable.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "CRT.h" +#include "ProcessTable.h" +#include "darwin/DarwinMachine.h" +#include "darwin/DarwinProcess.h" +#include "darwin/Platform.h" +#include "darwin/PlatformHelpers.h" +#include "generic/openzfs_sysctl.h" +#include "zfs/ZfsArcStats.h" + + +static struct kinfo_proc* ProcessTable_getKInfoProcs(size_t* count) { + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL, 0 }; + struct kinfo_proc* processes = NULL; + + for (unsigned int retry = 0; retry < 4; retry++) { + size_t size = 0; + if (sysctl(mib, 4, NULL, &size, NULL, 0) < 0 || size == 0) { + CRT_fatalError("Unable to get size of kproc_infos"); + } + + size += 16 * retry * retry * sizeof(struct kinfo_proc); + processes = xRealloc(processes, size); + + if (sysctl(mib, 4, processes, &size, NULL, 0) == 0) { + *count = size / sizeof(struct kinfo_proc); + return processes; + } + + if (errno != ENOMEM) + break; + } + + CRT_fatalError("Unable to get kinfo_procs"); +} + +ProcessTable* ProcessTable_new(Machine* host, Hashtable* pidMatchList) { + DarwinProcessTable* this = xCalloc(1, sizeof(DarwinProcessTable)); + Object_setClass(this, Class(ProcessTable)); + + ProcessTable* super = &this->super; + ProcessTable_init(super, Class(DarwinProcess), host, pidMatchList); + + return super; +} + +void ProcessTable_delete(Object* cast) { + DarwinProcessTable* this = (DarwinProcessTable*) cast; + ProcessTable_done(&this->super); + free(this); +} + +void ProcessTable_goThroughEntries(ProcessTable* super) { + const Machine* host = super->super.host; + const DarwinMachine* dhost = (const DarwinMachine*) host; + DarwinProcessTable* dpt = (DarwinProcessTable*) super; + bool preExisting = true; + struct kinfo_proc* ps; + size_t count; + DarwinProcess* proc; + + /* Get the time difference */ + dpt->global_diff = 0; + for (unsigned int i = 0; i < host->existingCPUs; ++i) { + for (size_t j = 0; j < CPU_STATE_MAX; ++j) { + dpt->global_diff += dhost->curr_load[i].cpu_ticks[j] - dhost->prev_load[i].cpu_ticks[j]; + } + } + + const double time_interval_ns = Platform_schedulerTicksToNanoseconds(dpt->global_diff) / (double) host->activeCPUs; + + /* We use kinfo_procs for initial data since : + * + * 1) They always succeed. + * 2) They contain the basic information. + * + * We attempt to fill-in additional information with libproc. + */ + ps = ProcessTable_getKInfoProcs(&count); + + for (size_t i = 0; i < count; ++i) { + proc = (DarwinProcess*)ProcessTable_getProcess(super, ps[i].kp_proc.p_pid, &preExisting, DarwinProcess_new); + + DarwinProcess_setFromKInfoProc(&proc->super, &ps[i], preExisting); + DarwinProcess_setFromLibprocPidinfo(proc, dpt, time_interval_ns); + + if (proc->super.st_uid != ps[i].kp_eproc.e_ucred.cr_uid) { + proc->super.st_uid = ps[i].kp_eproc.e_ucred.cr_uid; + proc->super.user = UsersTable_getRef(host->usersTable, proc->super.st_uid); + } + + // Disabled for High Sierra due to bug in macOS High Sierra + bool isScanThreadSupported = !Platform_KernelVersionIsBetween((KernelVersion) {17, 0, 0}, (KernelVersion) {17, 5, 0}); + + if (isScanThreadSupported) { + DarwinProcess_scanThreads(proc); + } + + super->totalTasks += 1; + + if (!preExisting) { + ProcessTable_add(super, &proc->super); + } + } + + free(ps); +} diff --git a/darwin/DarwinProcessTable.h b/darwin/DarwinProcessTable.h new file mode 100644 index 00000000..7467bfd9 --- /dev/null +++ b/darwin/DarwinProcessTable.h @@ -0,0 +1,22 @@ +#ifndef HEADER_DarwinProcessTable +#define HEADER_DarwinProcessTable +/* +htop - DarwinProcessTable.h +(C) 2014 Hisham H. Muhammad +Released under the GNU GPLv2+, see the COPYING file +in the source distribution for its full text. +*/ + +#include +#include + +#include "ProcessTable.h" + + +typedef struct DarwinProcessTable_ { + ProcessTable super; + + uint64_t global_diff; +} DarwinProcessTable; + +#endif -- cgit v1.2.3