diff options
Diffstat (limited to 'fedora/.local/bin/htop-vim/openbsd')
| -rw-r--r-- | fedora/.local/bin/htop-vim/openbsd/OpenBSDProcess.c | 257 | ||||
| -rw-r--r-- | fedora/.local/bin/htop-vim/openbsd/OpenBSDProcess.h | 33 | ||||
| -rw-r--r-- | fedora/.local/bin/htop-vim/openbsd/OpenBSDProcessList.c | 486 | ||||
| -rw-r--r-- | fedora/.local/bin/htop-vim/openbsd/OpenBSDProcessList.h | 60 | ||||
| -rw-r--r-- | fedora/.local/bin/htop-vim/openbsd/Platform.c | 371 | ||||
| -rw-r--r-- | fedora/.local/bin/htop-vim/openbsd/Platform.h | 118 | ||||
| -rw-r--r-- | fedora/.local/bin/htop-vim/openbsd/ProcessField.h | 15 |
7 files changed, 0 insertions, 1340 deletions
diff --git a/fedora/.local/bin/htop-vim/openbsd/OpenBSDProcess.c b/fedora/.local/bin/htop-vim/openbsd/OpenBSDProcess.c deleted file mode 100644 index c2f2ed4..0000000 --- a/fedora/.local/bin/htop-vim/openbsd/OpenBSDProcess.c +++ /dev/null @@ -1,257 +0,0 @@ -/* -htop - OpenBSDProcess.c -(C) 2015 Hisham H. Muhammad -(C) 2015 Michael McConville -Released under the GNU GPLv2+, see the COPYING file -in the source distribution for its full text. -*/ - -#include "openbsd/OpenBSDProcess.h" - -#include <stdlib.h> - -#include "CRT.h" -#include "Process.h" -#include "RichString.h" -#include "XUtils.h" - - -const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = { - [0] = { - .name = "", - .title = NULL, - .description = NULL, - .flags = 0, - }, - [PID] = { - .name = "PID", - .title = "PID", - .description = "Process/thread ID", - .flags = 0, - .pidColumn = true, - }, - [COMM] = { - .name = "Command", - .title = "Command ", - .description = "Command line", - .flags = 0, - }, - [STATE] = { - .name = "STATE", - .title = "S ", - .description = "Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging)", - .flags = 0, - }, - [PPID] = { - .name = "PPID", - .title = "PPID", - .description = "Parent process ID", - .flags = 0, - .pidColumn = true, - }, - [PGRP] = { - .name = "PGRP", - .title = "PGRP", - .description = "Process group ID", - .flags = 0, - .pidColumn = true, - }, - [SESSION] = { - .name = "SESSION", - .title = "SESN", - .description = "Process's session ID", - .flags = 0, - .pidColumn = true, - }, - [TTY] = { - .name = "TTY", - .title = "TTY ", - .description = "Controlling terminal", - .flags = 0, - }, - [TPGID] = { - .name = "TPGID", - .title = "TPGID", - .description = "Process ID of the fg process group of the controlling terminal", - .flags = 0, - .pidColumn = true, - }, - [MINFLT] = { - .name = "MINFLT", - .title = " MINFLT ", - .description = "Number of minor faults which have not required loading a memory page from disk", - .flags = 0, - .defaultSortDesc = true, - }, - [MAJFLT] = { - .name = "MAJFLT", - .title = " MAJFLT ", - .description = "Number of major faults which have required loading a memory page from disk", - .flags = 0, - .defaultSortDesc = true, - }, - [PRIORITY] = { - .name = "PRIORITY", - .title = "PRI ", - .description = "Kernel's internal priority for the process", - .flags = 0, - }, - [NICE] = { - .name = "NICE", - .title = " NI ", - .description = "Nice value (the higher the value, the more it lets other processes take priority)", - .flags = 0, - }, - [STARTTIME] = { - .name = "STARTTIME", - .title = "START ", - .description = "Time the process was started", - .flags = 0, - }, - [ELAPSED] = { - .name = "ELAPSED", - .title = "ELAPSED ", - .description = "Time since the process was started", - .flags = 0, - }, - [PROCESSOR] = { - .name = "PROCESSOR", - .title = "CPU ", - .description = "Id of the CPU the process last executed on", - .flags = 0, - }, - [M_VIRT] = { - .name = "M_VIRT", - .title = " VIRT ", - .description = "Total program size in virtual memory", - .flags = 0, - .defaultSortDesc = true, - }, - [M_RESIDENT] = { - .name = "M_RESIDENT", - .title = " RES ", - .description = "Resident set size, size of the text and data sections, plus stack usage", - .flags = 0, - .defaultSortDesc = true, - }, - [ST_UID] = { - .name = "ST_UID", - .title = "UID", - .description = "User ID of the process owner", - .flags = 0, - }, - [PERCENT_CPU] = { - .name = "PERCENT_CPU", - .title = " CPU%", - .description = "Percentage of the CPU time the process used in the last sampling", - .flags = 0, - .defaultSortDesc = true, - .autoWidth = true, - }, - [PERCENT_NORM_CPU] = { - .name = "PERCENT_NORM_CPU", - .title = "NCPU%", - .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", - .flags = 0, - .defaultSortDesc = true, - .autoWidth = true, - }, - [PERCENT_MEM] = { - .name = "PERCENT_MEM", - .title = "MEM% ", - .description = "Percentage of the memory the process is using, based on resident memory size", - .flags = 0, - .defaultSortDesc = true, - }, - [USER] = { - .name = "USER", - .title = "USER ", - .description = "Username of the process owner (or user ID if name cannot be determined)", - .flags = 0, - }, - [TIME] = { - .name = "TIME", - .title = " TIME+ ", - .description = "Total time the process has spent in user and system time", - .flags = 0, - .defaultSortDesc = true, - }, - [NLWP] = { - .name = "NLWP", - .title = "NLWP ", - .description = "Number of threads in the process", - .flags = 0, - }, - [TGID] = { - .name = "TGID", - .title = "TGID", - .description = "Thread group ID (i.e. process ID)", - .flags = 0, - .pidColumn = true, - }, - [PROC_COMM] = { - .name = "COMM", - .title = "COMM ", - .description = "comm string of the process", - .flags = 0, - }, - [CWD] = { - .name = "CWD", - .title = "CWD ", - .description = "The current working directory of the process", - .flags = PROCESS_FLAG_CWD, - }, - -}; - -Process* OpenBSDProcess_new(const Settings* settings) { - OpenBSDProcess* this = xCalloc(1, sizeof(OpenBSDProcess)); - Object_setClass(this, Class(OpenBSDProcess)); - Process_init(&this->super, settings); - return &this->super; -} - -void Process_delete(Object* cast) { - OpenBSDProcess* this = (OpenBSDProcess*) cast; - Process_done((Process*)cast); - free(this); -} - -static void OpenBSDProcess_writeField(const Process* this, RichString* str, ProcessField field) { - //const OpenBSDProcess* op = (const OpenBSDProcess*) this; - char buffer[256]; buffer[255] = '\0'; - int attr = CRT_colors[DEFAULT_COLOR]; - //int n = sizeof(buffer) - 1; - switch (field) { - // add OpenBSD-specific fields here - default: - Process_writeField(this, str, field); - return; - } - RichString_appendWide(str, attr, buffer); -} - -static int OpenBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) { - const OpenBSDProcess* p1 = (const OpenBSDProcess*)v1; - const OpenBSDProcess* p2 = (const OpenBSDProcess*)v2; - - // remove if actually used - (void)p1; (void)p2; - - switch (key) { - // add OpenBSD-specific fields here - default: - return Process_compareByKey_Base(v1, v2, key); - } -} - -const ProcessClass OpenBSDProcess_class = { - .super = { - .extends = Class(Process), - .display = Process_display, - .delete = Process_delete, - .compare = Process_compare - }, - .writeField = OpenBSDProcess_writeField, - .compareByKey = OpenBSDProcess_compareByKey -}; diff --git a/fedora/.local/bin/htop-vim/openbsd/OpenBSDProcess.h b/fedora/.local/bin/htop-vim/openbsd/OpenBSDProcess.h deleted file mode 100644 index 898c537..0000000 --- a/fedora/.local/bin/htop-vim/openbsd/OpenBSDProcess.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef HEADER_OpenBSDProcess -#define HEADER_OpenBSDProcess -/* -htop - OpenBSDProcess.h -(C) 2015 Hisham H. Muhammad -(C) 2015 Michael McConville -Released under the GNU GPLv2+, see the COPYING file -in the source distribution for its full text. -*/ - -#include <stdbool.h> - -#include "Object.h" -#include "Process.h" -#include "Settings.h" - - -typedef struct OpenBSDProcess_ { - Process super; - - /* 'Kernel virtual addr of u-area' to detect main threads */ - uint64_t addr; -} OpenBSDProcess; - -extern const ProcessClass OpenBSDProcess_class; - -extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD]; - -Process* OpenBSDProcess_new(const Settings* settings); - -void Process_delete(Object* cast); - -#endif diff --git a/fedora/.local/bin/htop-vim/openbsd/OpenBSDProcessList.c b/fedora/.local/bin/htop-vim/openbsd/OpenBSDProcessList.c deleted file mode 100644 index d070e5e..0000000 --- a/fedora/.local/bin/htop-vim/openbsd/OpenBSDProcessList.c +++ /dev/null @@ -1,486 +0,0 @@ -/* -htop - OpenBSDProcessList.c -(C) 2014 Hisham H. Muhammad -(C) 2015 Michael McConville -Released under the GNU GPLv2+, see the COPYING file -in the source distribution for its full text. -*/ - -#include "openbsd/OpenBSDProcessList.h" - -#include <kvm.h> -#include <limits.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <sys/mount.h> -#include <sys/param.h> -#include <sys/proc.h> -#include <sys/sched.h> -#include <sys/swap.h> -#include <sys/sysctl.h> -#include <sys/types.h> -#include <uvm/uvmexp.h> - -#include "CRT.h" -#include "Macros.h" -#include "Object.h" -#include "Process.h" -#include "ProcessList.h" -#include "Settings.h" -#include "XUtils.h" -#include "openbsd/OpenBSDProcess.h" - - -static long fscale; -static int pageSize; -static int pageSizeKB; - -static void OpenBSDProcessList_updateCPUcount(ProcessList* super) { - OpenBSDProcessList* opl = (OpenBSDProcessList*) super; - const int nmib[] = { CTL_HW, HW_NCPU }; - const int mib[] = { CTL_HW, HW_NCPUONLINE }; - int r; - unsigned int value; - size_t size; - bool change = false; - - size = sizeof(value); - r = sysctl(mib, 2, &value, &size, NULL, 0); - if (r < 0 || value < 1) { - value = 1; - } - - if (value != super->activeCPUs) { - super->activeCPUs = value; - change = true; - } - - size = sizeof(value); - r = sysctl(nmib, 2, &value, &size, NULL, 0); - if (r < 0 || value < 1) { - value = super->activeCPUs; - } - - if (value != super->existingCPUs) { - opl->cpuData = xReallocArray(opl->cpuData, value + 1, sizeof(CPUData)); - super->existingCPUs = value; - change = true; - } - - if (change) { - CPUData* dAvg = &opl->cpuData[0]; - memset(dAvg, '\0', sizeof(CPUData)); - dAvg->totalTime = 1; - dAvg->totalPeriod = 1; - dAvg->online = true; - - for (unsigned int i = 0; i < super->existingCPUs; i++) { - CPUData* d = &opl->cpuData[i + 1]; - memset(d, '\0', sizeof(CPUData)); - d->totalTime = 1; - d->totalPeriod = 1; - - const int ncmib[] = { CTL_KERN, KERN_CPUSTATS, i }; - struct cpustats cpu_stats; - - size = sizeof(cpu_stats); - if (sysctl(ncmib, 3, &cpu_stats, &size, NULL, 0) < 0) { - CRT_fatalError("ncmib sysctl call failed"); - } - d->online = (cpu_stats.cs_flags & CPUSTATS_ONLINE); - } - } -} - - -ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* dynamicMeters, Hashtable* dynamicColumns, Hashtable* pidMatchList, uid_t userId) { - const int fmib[] = { CTL_KERN, KERN_FSCALE }; - size_t size; - char errbuf[_POSIX2_LINE_MAX]; - - OpenBSDProcessList* opl = xCalloc(1, sizeof(OpenBSDProcessList)); - ProcessList* pl = (ProcessList*) opl; - ProcessList_init(pl, Class(OpenBSDProcess), usersTable, dynamicMeters, dynamicColumns, pidMatchList, userId); - - OpenBSDProcessList_updateCPUcount(pl); - - size = sizeof(fscale); - if (sysctl(fmib, 2, &fscale, &size, NULL, 0) < 0) { - CRT_fatalError("fscale sysctl call failed"); - } - - if ((pageSize = sysconf(_SC_PAGESIZE)) == -1) - CRT_fatalError("pagesize sysconf call failed"); - pageSizeKB = pageSize / ONE_K; - - opl->kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf); - if (opl->kd == NULL) { - CRT_fatalError("kvm_openfiles() failed"); - } - - opl->cpuSpeed = -1; - - return pl; -} - -void ProcessList_delete(ProcessList* this) { - OpenBSDProcessList* opl = (OpenBSDProcessList*) this; - - if (opl->kd) { - kvm_close(opl->kd); - } - - free(opl->cpuData); - - ProcessList_done(this); - free(this); -} - -static void OpenBSDProcessList_scanMemoryInfo(ProcessList* pl) { - const int uvmexp_mib[] = { CTL_VM, VM_UVMEXP }; - struct uvmexp uvmexp; - size_t size_uvmexp = sizeof(uvmexp); - - if (sysctl(uvmexp_mib, 2, &uvmexp, &size_uvmexp, NULL, 0) < 0) { - CRT_fatalError("uvmexp sysctl call failed"); - } - - pl->totalMem = uvmexp.npages * pageSizeKB; - pl->usedMem = (uvmexp.npages - uvmexp.free - uvmexp.paging) * pageSizeKB; - - // Taken from OpenBSD systat/iostat.c, top/machine.c and uvm_sysctl(9) - const int bcache_mib[] = { CTL_VFS, VFS_GENERIC, VFS_BCACHESTAT }; - struct bcachestats bcstats; - size_t size_bcstats = sizeof(bcstats); - - if (sysctl(bcache_mib, 3, &bcstats, &size_bcstats, NULL, 0) < 0) { - CRT_fatalError("cannot get vfs.bcachestat"); - } - - pl->cachedMem = bcstats.numbufpages * pageSizeKB; - - /* - * Copyright (c) 1994 Thorsten Lockert <tholo@sigmasoft.com> - * All rights reserved. - * - * Taken almost directly from OpenBSD's top(1) - * - * Originally released under a BSD-3 license - * Modified through htop developers applying GPL-2 - */ - int nswap = swapctl(SWAP_NSWAP, 0, 0); - if (nswap > 0) { - struct swapent swdev[nswap]; - int rnswap = swapctl(SWAP_STATS, swdev, nswap); - - /* Total things up */ - unsigned long long int total = 0, used = 0; - for (int i = 0; i < rnswap; i++) { - if (swdev[i].se_flags & SWF_ENABLE) { - used += (swdev[i].se_inuse / (1024 / DEV_BSIZE)); - total += (swdev[i].se_nblks / (1024 / DEV_BSIZE)); - } - } - - pl->totalSwap = total; - pl->usedSwap = used; - } else { - pl->totalSwap = pl->usedSwap = 0; - } -} - -static void OpenBSDProcessList_updateCwd(const struct kinfo_proc* kproc, Process* proc) { - const int mib[] = { CTL_KERN, KERN_PROC_CWD, kproc->p_pid }; - char buffer[2048]; - size_t size = sizeof(buffer); - if (sysctl(mib, 3, 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 OpenBSDProcessList_updateProcessName(kvm_t* kd, const struct kinfo_proc* kproc, Process* proc) { - Process_updateComm(proc, kproc->p_comm); - - /* - * Like OpenBSD's top(1), we try to fall back to the command name - * (argv[0]) if we fail to construct the full command. - */ - char** arg = kvm_getargv(kd, kproc, 500); - if (arg == NULL || *arg == NULL) { - Process_updateCmdline(proc, kproc->p_comm, 0, strlen(kproc->p_comm)); - return; - } - - size_t len = 0; - for (int i = 0; arg[i] != NULL; i++) { - len += strlen(arg[i]) + 1; /* room for arg and trailing space or NUL */ - } - - /* don't use xMalloc here - we want to handle huge argv's gracefully */ - char* s; - if ((s = malloc(len)) == NULL) { - Process_updateCmdline(proc, kproc->p_comm, 0, strlen(kproc->p_comm)); - return; - } - - *s = '\0'; - - int start = 0; - int end = 0; - for (int i = 0; arg[i] != NULL; i++) { - size_t n = strlcat(s, arg[i], len); - if (i == 0) { - end = MINIMUM(n, len - 1); - /* check if cmdline ended earlier, e.g 'kdeinit5: Running...' */ - for (int j = end; j > 0; j--) { - if (arg[0][j] == ' ' && arg[0][j - 1] != '\\') { - end = (arg[0][j - 1] == ':') ? (j - 1) : j; - } - } - } - /* the trailing space should get truncated anyway */ - strlcat(s, " ", len); - } - - Process_updateCmdline(proc, s, start, end); - - free(s); -} - -/* - * Taken from OpenBSD's ps(1). - */ -static double getpcpu(const struct kinfo_proc* kp) { - if (fscale == 0) - return 0.0; - - return 100.0 * (double)kp->p_pctcpu / fscale; -} - -static void OpenBSDProcessList_scanProcs(OpenBSDProcessList* this) { - const Settings* settings = this->super.settings; - const bool hideKernelThreads = settings->hideKernelThreads; - const bool hideUserlandThreads = settings->hideUserlandThreads; - int count = 0; - - const struct kinfo_proc* kprocs = kvm_getprocs(this->kd, KERN_PROC_KTHREAD | KERN_PROC_SHOW_THREADS, 0, sizeof(struct kinfo_proc), &count); - - for (int i = 0; i < count; i++) { - const struct kinfo_proc* kproc = &kprocs[i]; - - /* Ignore main threads */ - if (kproc->p_tid != -1) { - Process* containingProcess = ProcessList_findProcess(&this->super, kproc->p_pid); - if (containingProcess) { - if (((OpenBSDProcess*)containingProcess)->addr == kproc->p_addr) - continue; - - containingProcess->nlwp++; - } - } - - bool preExisting = false; - Process* proc = ProcessList_getProcess(&this->super, (kproc->p_tid == -1) ? kproc->p_pid : kproc->p_tid, &preExisting, OpenBSDProcess_new); - OpenBSDProcess* fp = (OpenBSDProcess*) proc; - - if (!preExisting) { - proc->ppid = kproc->p_ppid; - proc->tpgid = kproc->p_tpgid; - proc->tgid = kproc->p_pid; - proc->session = kproc->p_sid; - proc->pgrp = kproc->p__pgid; - proc->isKernelThread = proc->pgrp == 0; - proc->isUserlandThread = kproc->p_tid != -1; - proc->starttime_ctime = kproc->p_ustart_sec; - Process_fillStarttimeBuffer(proc); - ProcessList_add(&this->super, proc); - - OpenBSDProcessList_updateProcessName(this->kd, kproc, proc); - - if (settings->ss->flags & PROCESS_FLAG_CWD) { - OpenBSDProcessList_updateCwd(kproc, proc); - } - - proc->tty_nr = kproc->p_tdev; - const char* name = ((dev_t)kproc->p_tdev != NODEV) ? devname(kproc->p_tdev, S_IFCHR) : NULL; - if (!name || String_eq(name, "??")) { - free(proc->tty_name); - proc->tty_name = NULL; - } else { - free_and_xStrdup(&proc->tty_name, name); - } - } else { - if (settings->updateProcessNames) { - OpenBSDProcessList_updateProcessName(this->kd, kproc, proc); - } - } - - fp->addr = kproc->p_addr; - proc->m_virt = kproc->p_vm_dsize * pageSizeKB; - proc->m_resident = kproc->p_vm_rssize * pageSizeKB; - - proc->percent_mem = proc->m_resident / (float)this->super.totalMem * 100.0F; - proc->percent_cpu = CLAMP(getpcpu(kproc), 0.0F, this->super.activeCPUs * 100.0F); - Process_updateCPUFieldWidths(proc->percent_cpu); - - proc->nice = kproc->p_nice - 20; - proc->time = 100 * (kproc->p_rtime_sec + ((kproc->p_rtime_usec + 500000) / 1000000)); - proc->priority = kproc->p_priority - PZERO; - proc->processor = kproc->p_cpuid; - proc->minflt = kproc->p_uru_minflt; - proc->majflt = kproc->p_uru_majflt; - proc->nlwp = 1; - - if (proc->st_uid != kproc->p_uid) { - proc->st_uid = kproc->p_uid; - proc->user = UsersTable_getRef(this->super.usersTable, proc->st_uid); - } - - /* Taken from: https://github.com/openbsd/src/blob/6a38af0976a6870911f4b2de19d8da28723a5778/sys/sys/proc.h#L420 */ - switch (kproc->p_stat) { - case SIDL: proc->state = IDLE; break; - case SRUN: proc->state = RUNNABLE; break; - case SSLEEP: proc->state = SLEEPING; break; - case SSTOP: proc->state = STOPPED; break; - case SZOMB: proc->state = ZOMBIE; break; - case SDEAD: proc->state = DEFUNCT; break; - case SONPROC: proc->state = RUNNING; break; - default: proc->state = UNKNOWN; - } - - if (Process_isKernelThread(proc)) { - this->super.kernelThreads++; - } else if (Process_isUserlandThread(proc)) { - this->super.userlandThreads++; - } - - this->super.totalTasks++; - if (proc->state == RUNNING) { - this->super.runningTasks++; - } - - proc->show = ! ((hideKernelThreads && Process_isKernelThread(proc)) || (hideUserlandThreads && Process_isUserlandThread(proc))); - proc->updated = true; - } -} - -static void getKernelCPUTimes(unsigned int cpuId, u_int64_t* times) { - const int mib[] = { CTL_KERN, KERN_CPTIME2, cpuId }; - size_t length = sizeof(*times) * CPUSTATES; - if (sysctl(mib, 3, times, &length, NULL, 0) == -1 || length != sizeof(*times) * CPUSTATES) { - CRT_fatalError("sysctl kern.cp_time2 failed"); - } -} - -static void kernelCPUTimesToHtop(const u_int64_t* times, CPUData* cpu) { - unsigned long long totalTime = 0; - for (int i = 0; i < CPUSTATES; i++) { - totalTime += times[i]; - } - - unsigned long long sysAllTime = times[CP_INTR] + times[CP_SYS]; - - // XXX Not sure if CP_SPIN should be added to sysAllTime. - // See https://github.com/openbsd/src/commit/531d8034253fb82282f0f353c086e9ad827e031c - #ifdef CP_SPIN - sysAllTime += times[CP_SPIN]; - #endif - - cpu->totalPeriod = saturatingSub(totalTime, cpu->totalTime); - cpu->userPeriod = saturatingSub(times[CP_USER], cpu->userTime); - cpu->nicePeriod = saturatingSub(times[CP_NICE], cpu->niceTime); - cpu->sysPeriod = saturatingSub(times[CP_SYS], cpu->sysTime); - cpu->sysAllPeriod = saturatingSub(sysAllTime, cpu->sysAllTime); - #ifdef CP_SPIN - cpu->spinPeriod = saturatingSub(times[CP_SPIN], cpu->spinTime); - #endif - cpu->intrPeriod = saturatingSub(times[CP_INTR], cpu->intrTime); - cpu->idlePeriod = saturatingSub(times[CP_IDLE], cpu->idleTime); - - cpu->totalTime = totalTime; - cpu->userTime = times[CP_USER]; - cpu->niceTime = times[CP_NICE]; - cpu->sysTime = times[CP_SYS]; - cpu->sysAllTime = sysAllTime; - #ifdef CP_SPIN - cpu->spinTime = times[CP_SPIN]; - #endif - cpu->intrTime = times[CP_INTR]; - cpu->idleTime = times[CP_IDLE]; -} - -static void OpenBSDProcessList_scanCPUTime(OpenBSDProcessList* this) { - u_int64_t kernelTimes[CPUSTATES] = {0}; - u_int64_t avg[CPUSTATES] = {0}; - - for (unsigned int i = 0; i < this->super.existingCPUs; i++) { - CPUData* cpu = &this->cpuData[i + 1]; - - if (!cpu->online) { - continue; - } - - getKernelCPUTimes(i, kernelTimes); - kernelCPUTimesToHtop(kernelTimes, cpu); - - avg[CP_USER] += cpu->userTime; - avg[CP_NICE] += cpu->niceTime; - avg[CP_SYS] += cpu->sysTime; - #ifdef CP_SPIN - avg[CP_SPIN] += cpu->spinTime; - #endif - avg[CP_INTR] += cpu->intrTime; - avg[CP_IDLE] += cpu->idleTime; - } - - for (int i = 0; i < CPUSTATES; i++) { - avg[i] /= this->super.activeCPUs; - } - - kernelCPUTimesToHtop(avg, &this->cpuData[0]); - - { - const int mib[] = { CTL_HW, HW_CPUSPEED }; - int cpuSpeed; - size_t size = sizeof(cpuSpeed); - if (sysctl(mib, 2, &cpuSpeed, &size, NULL, 0) == -1) { - this->cpuSpeed = -1; - } else { - this->cpuSpeed = cpuSpeed; - } - } -} - -void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) { - OpenBSDProcessList* opl = (OpenBSDProcessList*) super; - - OpenBSDProcessList_updateCPUcount(super); - OpenBSDProcessList_scanMemoryInfo(super); - OpenBSDProcessList_scanCPUTime(opl); - - // in pause mode only gather global data for meters (CPU/memory/...) - if (pauseProcessUpdate) { - return; - } - - OpenBSDProcessList_scanProcs(opl); -} - -bool ProcessList_isCPUonline(const ProcessList* super, unsigned int id) { - assert(id < super->existingCPUs); - - const OpenBSDProcessList* opl = (const OpenBSDProcessList*) super; - return opl->cpuData[id + 1].online; -} diff --git a/fedora/.local/bin/htop-vim/openbsd/OpenBSDProcessList.h b/fedora/.local/bin/htop-vim/openbsd/OpenBSDProcessList.h deleted file mode 100644 index 89fdb09..0000000 --- a/fedora/.local/bin/htop-vim/openbsd/OpenBSDProcessList.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef HEADER_OpenBSDProcessList -#define HEADER_OpenBSDProcessList -/* -htop - OpenBSDProcessList.h -(C) 2014 Hisham H. Muhammad -(C) 2015 Michael McConville -Released under the GNU GPLv2+, see the COPYING file -in the source distribution for its full text. -*/ - -#include <kvm.h> -#include <stdbool.h> -#include <sys/types.h> - -#include "Hashtable.h" -#include "ProcessList.h" -#include "UsersTable.h" - - -typedef struct CPUData_ { - unsigned long long int totalTime; - unsigned long long int userTime; - unsigned long long int niceTime; - unsigned long long int sysTime; - unsigned long long int sysAllTime; - unsigned long long int spinTime; - unsigned long long int intrTime; - unsigned long long int idleTime; - - unsigned long long int totalPeriod; - unsigned long long int userPeriod; - unsigned long long int nicePeriod; - unsigned long long int sysPeriod; - unsigned long long int sysAllPeriod; - unsigned long long int spinPeriod; - unsigned long long int intrPeriod; - unsigned long long int idlePeriod; - - bool online; -} CPUData; - -typedef struct OpenBSDProcessList_ { - ProcessList super; - kvm_t* kd; - - CPUData* cpuData; - int cpuSpeed; - -} OpenBSDProcessList; - - -ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* dynamicMeters, Hashtable* dynamicColumns, Hashtable* pidMatchList, uid_t userId); - -void ProcessList_delete(ProcessList* this); - -void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate); - -bool ProcessList_isCPUonline(const ProcessList* super, unsigned int id); - -#endif diff --git a/fedora/.local/bin/htop-vim/openbsd/Platform.c b/fedora/.local/bin/htop-vim/openbsd/Platform.c deleted file mode 100644 index 1ce5ba1..0000000 --- a/fedora/.local/bin/htop-vim/openbsd/Platform.c +++ /dev/null @@ -1,371 +0,0 @@ -/* -htop - openbsd/Platform.c -(C) 2014 Hisham H. Muhammad -(C) 2015 Michael McConville -Released under the GNU GPLv2+, see the COPYING file -in the source distribution for its full text. -*/ - -#include "openbsd/Platform.h" - -#include <errno.h> -#include <kvm.h> -#include <limits.h> -#include <math.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> -#include <sys/signal.h> // needs to be included before <sys/proc.h> for 'struct sigaltstack' -#include <sys/proc.h> -#include <sys/resource.h> -#include <sys/sensors.h> -#include <sys/sysctl.h> -#include <sys/time.h> -#include <sys/types.h> -#include <uvm/uvmexp.h> - -#include "CPUMeter.h" -#include "ClockMeter.h" -#include "DateMeter.h" -#include "DateTimeMeter.h" -#include "HostnameMeter.h" -#include "LoadAverageMeter.h" -#include "Macros.h" -#include "MemoryMeter.h" -#include "MemorySwapMeter.h" -#include "Meter.h" -#include "ProcessList.h" -#include "Settings.h" -#include "SignalsPanel.h" -#include "SwapMeter.h" -#include "SysArchMeter.h" -#include "TasksMeter.h" -#include "UptimeMeter.h" -#include "XUtils.h" -#include "openbsd/OpenBSDProcess.h" -#include "openbsd/OpenBSDProcessList.h" - - -const ScreenDefaults Platform_defaultScreens[] = { - { - .name = "Main", - .columns = "PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command", - .sortKey = "PERCENT_CPU", - }, -}; - -const unsigned int Platform_numberOfDefaultScreens = ARRAYSIZE(Platform_defaultScreens); - -/* - * See /usr/include/sys/signal.h - */ -const SignalItem Platform_signals[] = { - { .name = " 0 Cancel", .number = 0 }, - { .name = " 1 SIGHUP", .number = 1 }, - { .name = " 2 SIGINT", .number = 2 }, - { .name = " 3 SIGQUIT", .number = 3 }, - { .name = " 4 SIGILL", .number = 4 }, - { .name = " 5 SIGTRAP", .number = 5 }, - { .name = " 6 SIGABRT", .number = 6 }, - { .name = " 6 SIGIOT", .number = 6 }, - { .name = " 7 SIGEMT", .number = 7 }, - { .name = " 8 SIGFPE", .number = 8 }, - { .name = " 9 SIGKILL", .number = 9 }, - { .name = "10 SIGBUS", .number = 10 }, - { .name = "11 SIGSEGV", .number = 11 }, - { .name = "12 SIGSYS", .number = 12 }, - { .name = "13 SIGPIPE", .number = 13 }, - { .name = "14 SIGALRM", .number = 14 }, - { .name = "15 SIGTERM", .number = 15 }, - { .name = "16 SIGURG", .number = 16 }, - { .name = "17 SIGSTOP", .number = 17 }, - { .name = "18 SIGTSTP", .number = 18 }, - { .name = "19 SIGCONT", .number = 19 }, - { .name = "20 SIGCHLD", .number = 20 }, - { .name = "21 SIGTTIN", .number = 21 }, - { .name = "22 SIGTTOU", .number = 22 }, - { .name = "23 SIGIO", .number = 23 }, - { .name = "24 SIGXCPU", .number = 24 }, - { .name = "25 SIGXFSZ", .number = 25 }, - { .name = "26 SIGVTALRM", .number = 26 }, - { .name = "27 SIGPROF", .number = 27 }, - { .name = "28 SIGWINCH", .number = 28 }, - { .name = "29 SIGINFO", .number = 29 }, - { .name = "30 SIGUSR1", .number = 30 }, - { .name = "31 SIGUSR2", .number = 31 }, - { .name = "32 SIGTHR", .number = 32 }, -}; - -const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals); - -const MeterClass* const Platform_meterTypes[] = { - &CPUMeter_class, - &ClockMeter_class, - &DateMeter_class, - &DateTimeMeter_class, - &LoadAverageMeter_class, - &LoadMeter_class, - &MemoryMeter_class, - &SwapMeter_class, - &MemorySwapMeter_class, - &TasksMeter_class, - &UptimeMeter_class, - &BatteryMeter_class, - &HostnameMeter_class, - &SysArchMeter_class, - &AllCPUsMeter_class, - &AllCPUs2Meter_class, - &AllCPUs4Meter_class, - &AllCPUs8Meter_class, - &LeftCPUsMeter_class, - &RightCPUsMeter_class, - &LeftCPUs2Meter_class, - &RightCPUs2Meter_class, - &LeftCPUs4Meter_class, - &RightCPUs4Meter_class, - &LeftCPUs8Meter_class, - &RightCPUs8Meter_class, - &BlankMeter_class, - NULL -}; - -bool Platform_init(void) { - /* no platform-specific setup needed */ - return true; -} - -void Platform_done(void) { - /* no platform-specific cleanup needed */ -} - -void Platform_setBindings(Htop_Action* keys) { - /* no platform-specific key bindings */ - (void) keys; -} - -int Platform_getUptime(void) { - struct timeval bootTime, currTime; - const int mib[2] = { CTL_KERN, KERN_BOOTTIME }; - size_t size = sizeof(bootTime); - - int err = sysctl(mib, 2, &bootTime, &size, NULL, 0); - if (err) { - return -1; - } - gettimeofday(&currTime, NULL); - - return (int) difftime(currTime.tv_sec, bootTime.tv_sec); -} - -void Platform_getLoadAverage(double* one, double* five, double* fifteen) { - struct loadavg loadAverage; - const int mib[2] = { CTL_VM, VM_LOADAVG }; - size_t size = sizeof(loadAverage); - - int err = sysctl(mib, 2, &loadAverage, &size, NULL, 0); - if (err) { - *one = 0; - *five = 0; - *fifteen = 0; - return; - } - *one = (double) loadAverage.ldavg[0] / loadAverage.fscale; - *five = (double) loadAverage.ldavg[1] / loadAverage.fscale; - *fifteen = (double) loadAverage.ldavg[2] / loadAverage.fscale; -} - -int Platform_getMaxPid(void) { - return 2 * THREAD_PID_OFFSET; -} - -double Platform_setCPUValues(Meter* this, unsigned int cpu) { - const OpenBSDProcessList* pl = (const OpenBSDProcessList*) this->pl; - const CPUData* cpuData = &(pl->cpuData[cpu]); - double total; - double totalPercent; - double* v = this->values; - - if (!cpuData->online) { - this->curItems = 0; - return NAN; - } - - total = cpuData->totalPeriod == 0 ? 1 : cpuData->totalPeriod; - - v[CPU_METER_NICE] = cpuData->nicePeriod / total * 100.0; - v[CPU_METER_NORMAL] = cpuData->userPeriod / total * 100.0; - if (this->pl->settings->detailedCPUTime) { - v[CPU_METER_KERNEL] = cpuData->sysPeriod / total * 100.0; - v[CPU_METER_IRQ] = cpuData->intrPeriod / total * 100.0; - v[CPU_METER_SOFTIRQ] = 0.0; - v[CPU_METER_STEAL] = 0.0; - v[CPU_METER_GUEST] = 0.0; - v[CPU_METER_IOWAIT] = 0.0; - v[CPU_METER_FREQUENCY] = NAN; - this->curItems = 8; - totalPercent = v[0] + v[1] + v[2] + v[3]; - } else { - v[2] = cpuData->sysAllPeriod / total * 100.0; - v[3] = 0.0; // No steal nor guest on OpenBSD - totalPercent = v[0] + v[1] + v[2]; - this->curItems = 4; - } - - totalPercent = CLAMP(totalPercent, 0.0, 100.0); - - v[CPU_METER_TEMPERATURE] = NAN; - - v[CPU_METER_FREQUENCY] = (pl->cpuSpeed != -1) ? pl->cpuSpeed : NAN; - - return totalPercent; -} - -void Platform_setMemoryValues(Meter* this) { - const ProcessList* pl = this->pl; - long int usedMem = pl->usedMem; - long int buffersMem = pl->buffersMem; - long int cachedMem = pl->cachedMem; - usedMem -= buffersMem + cachedMem; - this->total = pl->totalMem; - this->values[MEMORY_METER_USED] = usedMem; - this->values[MEMORY_METER_BUFFERS] = buffersMem; - // this->values[MEMORY_METER_SHARED] = "shared memory, like tmpfs and shm" - this->values[MEMORY_METER_CACHE] = cachedMem; - // this->values[MEMORY_METER_AVAILABLE] = "available memory" -} - -void Platform_setSwapValues(Meter* this) { - const ProcessList* pl = this->pl; - this->total = pl->totalSwap; - this->values[SWAP_METER_USED] = pl->usedSwap; - this->values[SWAP_METER_CACHE] = NAN; -} - -char* Platform_getProcessEnv(pid_t pid) { - char errbuf[_POSIX2_LINE_MAX]; - char* env; - char** ptr; - int count; - kvm_t* kt; - struct kinfo_proc* kproc; - size_t capacity = 4096, size = 0; - - if ((kt = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL) { - return NULL; - } - - if ((kproc = kvm_getprocs(kt, KERN_PROC_PID, pid, - sizeof(struct kinfo_proc), &count)) == NULL) { - (void) kvm_close(kt); - return NULL; - } - - if ((ptr = kvm_getenvv(kt, kproc, 0)) == NULL) { - (void) kvm_close(kt); - return NULL; - } - - env = xMalloc(capacity); - for (char** p = ptr; *p; p++) { - size_t len = strlen(*p) + 1; - - while (size + len > capacity) { - if (capacity > (SIZE_MAX / 2)) { - free(env); - env = NULL; - goto end; - } - - capacity *= 2; - env = xRealloc(env, capacity); - } - - strlcpy(env + size, *p, len); - size += len; - } - - if (size < 2 || env[size - 1] || env[size - 2]) { - if (size + 2 < capacity) - env = xRealloc(env, capacity + 2); - env[size] = 0; - env[size + 1] = 0; - } - -end: - (void) kvm_close(kt); - return env; -} - -FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid) { - (void)pid; - return NULL; -} - -bool Platform_getDiskIO(DiskIOData* data) { - // TODO - (void)data; - return false; -} - -bool Platform_getNetworkIO(NetworkIOData* data) { - // TODO - (void)data; - return false; -} - -static bool findDevice(const char* name, int* mib, struct sensordev* snsrdev, size_t* sdlen) { - for (int devn = 0;; devn++) { - mib[2] = devn; - if (sysctl(mib, 3, snsrdev, sdlen, NULL, 0) == -1) { - if (errno == ENXIO) - continue; - if (errno == ENOENT) - return false; - } - if (String_eq(name, snsrdev->xname)) { - return true; - } - } -} - -void Platform_getBattery(double* percent, ACPresence* isOnAC) { - int mib[] = {CTL_HW, HW_SENSORS, 0, 0, 0}; - struct sensor s; - size_t slen = sizeof(struct sensor); - struct sensordev snsrdev; - size_t sdlen = sizeof(struct sensordev); - - bool found = findDevice("acpibat0", mib, &snsrdev, &sdlen); - - *percent = NAN; - if (found) { - /* last full capacity */ - mib[3] = 7; - mib[4] = 0; - double last_full_capacity = 0; - if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1) - last_full_capacity = s.value; - if (last_full_capacity > 0) { - /* remaining capacity */ - mib[3] = 7; - mib[4] = 3; - if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1) { - double charge = s.value; - *percent = 100 * (charge / last_full_capacity); - if (charge >= last_full_capacity) { - *percent = 100; - } - } - } - } - - found = findDevice("acpiac0", mib, &snsrdev, &sdlen); - - *isOnAC = AC_ERROR; - if (found) { - mib[3] = 9; - mib[4] = 0; - if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1) - *isOnAC = s.value; - } -} diff --git a/fedora/.local/bin/htop-vim/openbsd/Platform.h b/fedora/.local/bin/htop-vim/openbsd/Platform.h deleted file mode 100644 index 27d792e..0000000 --- a/fedora/.local/bin/htop-vim/openbsd/Platform.h +++ /dev/null @@ -1,118 +0,0 @@ -#ifndef HEADER_Platform -#define HEADER_Platform -/* -htop - openbsd/Platform.h -(C) 2014 Hisham H. Muhammad -(C) 2015 Michael McConville -Released under the GNU GPLv2+, see the COPYING file -in the source distribution for its full text. -*/ - -#include <stdbool.h> -#include <sys/types.h> - -#include "Action.h" -#include "BatteryMeter.h" -#include "DiskIOMeter.h" -#include "Hashtable.h" -#include "Meter.h" -#include "NetworkIOMeter.h" -#include "Process.h" -#include "ProcessLocksScreen.h" -#include "SignalsPanel.h" -#include "CommandLine.h" -#include "generic/gettime.h" -#include "generic/hostname.h" -#include "generic/uname.h" - - -extern const ScreenDefaults Platform_defaultScreens[]; - -extern const unsigned int Platform_numberOfDefaultScreens; - -/* see /usr/include/sys/signal.h */ -extern const SignalItem Platform_signals[]; - -extern const unsigned int Platform_numberOfSignals; - -extern const MeterClass* const Platform_meterTypes[]; - -bool Platform_init(void); - -void Platform_done(void); - -void Platform_setBindings(Htop_Action* keys); - -int Platform_getUptime(void); - -void Platform_getLoadAverage(double* one, double* five, double* fifteen); - -int Platform_getMaxPid(void); - -double Platform_setCPUValues(Meter* this, unsigned int cpu); - -void Platform_setMemoryValues(Meter* this); - -void Platform_setSwapValues(Meter* this); - -char* Platform_getProcessEnv(pid_t pid); - -FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid); - -bool Platform_getDiskIO(DiskIOData* data); - -bool Platform_getNetworkIO(NetworkIOData* data); - -void Platform_getBattery(double* percent, ACPresence* isOnAC); - -static inline void Platform_getHostname(char* buffer, size_t size) { - Generic_hostname(buffer, size); -} - -static inline void Platform_getRelease(char** string) { - *string = Generic_uname(); -} - -#define PLATFORM_LONG_OPTIONS - -static inline void Platform_longOptionsUsage(ATTR_UNUSED const char* name) { } - -static inline CommandLineStatus Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) { - return STATUS_ERROR_EXIT; -} - -static inline void Platform_gettime_realtime(struct timeval* tv, uint64_t* msec) { - Generic_gettime_realtime(tv, msec); -} - -static inline void Platform_gettime_monotonic(uint64_t* msec) { - Generic_gettime_monotonic(msec); -} - -static inline Hashtable* Platform_dynamicMeters(void) { - return NULL; -} - -static inline void Platform_dynamicMetersDone(ATTR_UNUSED Hashtable* table) { } - -static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { } - -static inline void Platform_dynamicMeterUpdateValues(ATTR_UNUSED Meter* meter) { } - -static inline void Platform_dynamicMeterDisplay(ATTR_UNUSED const Meter* meter, ATTR_UNUSED RichString* out) { } - -static inline Hashtable* Platform_dynamicColumns(void) { - return NULL; -} - -static inline void Platform_dynamicColumnsDone(ATTR_UNUSED Hashtable* table) { } - -static inline const char* Platform_dynamicColumnInit(ATTR_UNUSED unsigned int key) { - return NULL; -} - -static inline bool Platform_dynamicColumnWriteField(ATTR_UNUSED const Process* proc, ATTR_UNUSED RichString* str, ATTR_UNUSED unsigned int key) { - return false; -} - -#endif diff --git a/fedora/.local/bin/htop-vim/openbsd/ProcessField.h b/fedora/.local/bin/htop-vim/openbsd/ProcessField.h deleted file mode 100644 index b8e8d6b..0000000 --- a/fedora/.local/bin/htop-vim/openbsd/ProcessField.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef HEADER_OpenBSDProcessField -#define HEADER_OpenBSDProcessField -/* -htop - openbsd/ProcessField.h -(C) 2020 htop dev team -Released under the GNU GPLv2+, see the COPYING file -in the source distribution for its full text. -*/ - - -#define PLATFORM_PROCESS_FIELDS \ - // End of list - - -#endif /* HEADER_OpenBSDProcessField */ |
