diff options
-rw-r--r-- | .gitignore | 7 | ||||
-rw-r--r-- | Makefile.am | 9 | ||||
-rw-r--r-- | configure.ac | 23 | ||||
-rw-r--r-- | dragonflybsd/Battery.c | 26 | ||||
-rw-r--r-- | dragonflybsd/Battery.h | 15 | ||||
-rw-r--r-- | dragonflybsd/DragonFlyBSDCRT.c | 21 | ||||
-rw-r--r-- | dragonflybsd/DragonFlyBSDCRT.h | 16 | ||||
-rw-r--r-- | dragonflybsd/DragonFlyBSDProcess.c | 166 | ||||
-rw-r--r-- | dragonflybsd/DragonFlyBSDProcess.h | 56 | ||||
-rw-r--r-- | dragonflybsd/DragonFlyBSDProcessList.c | 552 | ||||
-rw-r--r-- | dragonflybsd/DragonFlyBSDProcessList.h | 71 | ||||
-rw-r--r-- | dragonflybsd/Platform.c | 210 | ||||
-rw-r--r-- | dragonflybsd/Platform.h | 52 |
13 files changed, 1214 insertions, 10 deletions
@@ -4,6 +4,11 @@ htop # all object files *.o +# skip all backups +*.bak +*~ + +# skip coverage files *.gcda */*.gcda *.gcno @@ -22,6 +27,7 @@ config.h config.h.in config.log config.status +config.cache config.sub configure depcomp @@ -32,4 +38,3 @@ ltmain.sh m4/ missing stamp-h1 - diff --git a/Makefile.am b/Makefile.am index 19c9eb47..cdd4fb95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,15 @@ myhtopplatheaders = freebsd/Platform.h freebsd/FreeBSDProcessList.h \ freebsd/FreeBSDProcess.h freebsd/FreeBSDCRT.h freebsd/Battery.h endif +if HTOP_DRAGONFLYBSD +htop_LDFLAGS += -lkvm -lkinfo +myhtopplatsources = dragonflybsd/Platform.c dragonflybsd/DragonFlyBSDProcessList.c \ +dragonflybsd/DragonFlyBSDProcess.c dragonflybsd/DragonFlyBSDCRT.c dragonflybsd/Battery.c + +myhtopplatheaders = dragonflybsd/Platform.h dragonflybsd/DragonFlyBSDProcessList.h \ +dragonflybsd/DragonFlyBSDProcess.h dragonflybsd/DragonFlyBSDCRT.h dragonflybsd/Battery.h +endif + if HTOP_OPENBSD myhtopplatsources = openbsd/Platform.c openbsd/OpenBSDProcessList.c \ openbsd/OpenBSDProcess.c openbsd/OpenBSDCRT.c openbsd/Battery.c diff --git a/configure.ac b/configure.ac index eb055b56..90b0e850 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AM_PROG_CC_C_O # Required by hwloc scripts AC_USE_SYSTEM_EXTENSIONS -LT_INIT([disable-shared static]) +#LT_INIT([disable-shared static]) # Checks for platform. # ---------------------------------------------------------------------- @@ -40,6 +40,9 @@ freebsd*|kfreebsd*) openbsd*) my_htop_platform=openbsd ;; +dragonfly*) + my_htop_platform=dragonflybsd + ;; darwin*) my_htop_platform=darwin ;; @@ -186,14 +189,15 @@ m4_define([HTOP_CHECK_LIB], AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") if test "x$enable_unicode" = xyes; then HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", - HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", - HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", - HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], - HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], - HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], - missing_libraries="$missing_libraries libncursesw" - AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.]) - )))))) + HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", + HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", + HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", + HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], + HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], + HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], + missing_libraries="$missing_libraries libncursesw" + AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.]) + ))))))) AC_CHECK_HEADERS([ncursesw/curses.h],[:], [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], @@ -264,6 +268,7 @@ AC_DEFINE_UNQUOTED(COPYRIGHT, "(C) 2004-$year Hisham Muhammad", [Copyright messa # ---------------------------------------------------------------------- AM_CONDITIONAL([HTOP_LINUX], [test "$my_htop_platform" = linux]) AM_CONDITIONAL([HTOP_FREEBSD], [test "$my_htop_platform" = freebsd]) +AM_CONDITIONAL([HTOP_DRAGONFLYBSD], [test "$my_htop_platform" = dragonflybsd]) AM_CONDITIONAL([HTOP_OPENBSD], [test "$my_htop_platform" = openbsd]) AM_CONDITIONAL([HTOP_DARWIN], [test "$my_htop_platform" = darwin]) AM_CONDITIONAL([HTOP_UNSUPPORTED], [test "$my_htop_platform" = unsupported]) diff --git a/dragonflybsd/Battery.c b/dragonflybsd/Battery.c new file mode 100644 index 00000000..f17efb5d --- /dev/null +++ b/dragonflybsd/Battery.c @@ -0,0 +1,26 @@ +/* +htop - dragonflybsd/Battery.c +(C) 2015 Hisham H. Muhammad +(C) 2017 Diederik de Groot +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + +#include "BatteryMeter.h" +#include <sys/sysctl.h> + +void Battery_getData(double* level, ACPresence* isOnAC) { + int life; + size_t life_len = sizeof(life); + if (sysctlbyname("hw.acpi.battery.life", &life, &life_len, NULL, 0) == -1) + *level = -1; + else + *level = life; + + int acline; + size_t acline_len = sizeof(acline); + if (sysctlbyname("hw.acpi.acline", &acline, &acline_len, NULL, 0) == -1) + *isOnAC = AC_ERROR; + else + *isOnAC = acline == 0 ? AC_ABSENT : AC_PRESENT; +} diff --git a/dragonflybsd/Battery.h b/dragonflybsd/Battery.h new file mode 100644 index 00000000..efb44a8e --- /dev/null +++ b/dragonflybsd/Battery.h @@ -0,0 +1,15 @@ +/* Do not edit this file. It was automatically generated. */ + +#ifndef HEADER_Battery +#define HEADER_Battery +/* +htop - dragonflybsd/Battery.h +(C) 2015 Hisham H. Muhammad +(C) 2017 Diederik de Groot +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + +void Battery_getData(double* level, ACPresence* isOnAC); + +#endif diff --git a/dragonflybsd/DragonFlyBSDCRT.c b/dragonflybsd/DragonFlyBSDCRT.c new file mode 100644 index 00000000..52e86d9e --- /dev/null +++ b/dragonflybsd/DragonFlyBSDCRT.c @@ -0,0 +1,21 @@ +/* +htop - dragonflybsd/DragonFlyBSDCRT.c +(C) 2014 Hisham H. Muhammad +(C) 2017 Diederik de Groot +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + +#include "config.h" +#include "CRT.h" +#include <stdio.h> +#include <stdlib.h> + +void CRT_handleSIGSEGV(int sgn) { + (void) sgn; + CRT_done(); + fprintf(stderr, "\n\nhtop " VERSION " aborting.\n"); + fprintf(stderr, "\nPlease contact your DragonFlyBSD package maintainer!\n\n"); + abort(); +} + diff --git a/dragonflybsd/DragonFlyBSDCRT.h b/dragonflybsd/DragonFlyBSDCRT.h new file mode 100644 index 00000000..1b650046 --- /dev/null +++ b/dragonflybsd/DragonFlyBSDCRT.h @@ -0,0 +1,16 @@ +/* Do not edit this file. It was automatically generated. */ + +#ifndef HEADER_DragonFlyBSDCRT +#define HEADER_DragonFlyBSDCRT +/* +htop - dragonflybsd/DragonFlyBSDCRT.h +(C) 2014 Hisham H. Muhammad +(C) 2017 Diederik de Groot +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + +void CRT_handleSIGSEGV(int sgn); + + +#endif diff --git a/dragonflybsd/DragonFlyBSDProcess.c b/dragonflybsd/DragonFlyBSDProcess.c new file mode 100644 index 00000000..77d709d8 --- /dev/null +++ b/dragonflybsd/DragonFlyBSDProcess.c @@ -0,0 +1,166 @@ +/* +htop - dragonflybsd/DragonFlyBSDProcess.c +(C) 2015 Hisham H. Muhammad +(C) 2017 Diederik de Groot +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + +#include "Process.h" +#include "ProcessList.h" +#include "DragonFlyBSDProcess.h" +#include "Platform.h" +#include "CRT.h" + +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/syscall.h> + +/*{ + +typedef enum DragonFlyBSDProcessFields { + // Add platform-specific fields here, with ids >= 100 + JID = 100, + JAIL = 101, + LAST_PROCESSFIELD = 102, +} DragonFlyBSDProcessField; + + +typedef struct DragonFlyBSDProcess_ { + Process super; + int kernel; + int jid; + char* jname; +} DragonFlyBSDProcess; + + +#ifndef Process_isKernelThread +#define Process_isKernelThread(_process) (_process->kernel == 1) +#endif + +#ifndef Process_isUserlandThread +//#define Process_isUserlandThread(_process) (_process->pid != _process->tgid) +#define Process_isUserlandThread(_process) (_process->nlwp > 1) +#endif + +}*/ + +ProcessClass DragonFlyBSDProcess_class = { + .super = { + .extends = Class(Process), + .display = Process_display, + .delete = Process_delete, + .compare = DragonFlyBSDProcess_compare + }, + .writeField = (Process_WriteField) DragonFlyBSDProcess_writeField, +}; + +ProcessFieldData Process_fields[] = { + [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, }, + [PID] = { .name = "PID", .title = " PID ", .description = "Process/thread ID", .flags = 0, }, + [COMM] = { .name = "Command", .title = "Command ", .description = "Command line", .flags = 0, }, + [STATE] = { .name = "STATE", .title = "S ", .description = "Process state (S sleeping (<20s), I Idle, Q Queued for Run, R running, D disk, Z zombie, T traced, W paging, B Blocked, A AskedPage, C Core, J Jailed)", .flags = 0, }, + [PPID] = { .name = "PPID", .title = " PPID ", .description = "Parent process ID", .flags = 0, }, + [PGRP] = { .name = "PGRP", .title = " PGRP ", .description = "Process group ID", .flags = 0, }, + [SESSION] = { .name = "SESSION", .title = " SID ", .description = "Process's session ID", .flags = 0, }, + [TTY_NR] = { .name = "TTY_NR", .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, }, + [MINFLT] = { .name = "MINFLT", .title = " MINFLT ", .description = "Number of minor faults which have not required loading a memory page from disk", .flags = 0, }, + [MAJFLT] = { .name = "MAJFLT", .title = " MAJFLT ", .description = "Number of major faults which have required loading a memory page from disk", .flags = 0, }, + [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, }, + [PROCESSOR] = { .name = "PROCESSOR", .title = "CPU ", .description = "Id of the CPU the process last executed on", .flags = 0, }, + [M_SIZE] = { .name = "M_SIZE", .title = " VIRT ", .description = "Total program size in virtual memory", .flags = 0, }, + [M_RESIDENT] = { .name = "M_RESIDENT", .title = " RES ", .description = "Resident set size, size of the text and data sections, plus stack usage", .flags = 0, }, + [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, }, + [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, }, + [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, }, + [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, }, + [JID] = { .name = "JID", .title = " JID ", .description = "Jail prison ID", .flags = 0, }, + [JAIL] = { .name = "JAIL", .title = "JAIL ", .description = "Jail prison name", .flags = 0, }, + [LAST_PROCESSFIELD] = { .name = "*** report bug! ***", .title = NULL, .description = NULL, .flags = 0, }, +}; + +ProcessPidColumn Process_pidColumns[] = { + { .id = JID, .label = "JID" }, + { .id = PID, .label = "PID" }, + { .id = PPID, .label = "PPID" }, + { .id = TPGID, .label = "TPGID" }, + { .id = TGID, .label = "TGID" }, + { .id = PGRP, .label = "PGRP" }, + { .id = SESSION, .label = "SID" }, + { .id = 0, .label = NULL }, +}; + +DragonFlyBSDProcess* DragonFlyBSDProcess_new(Settings* settings) { + DragonFlyBSDProcess* this = xCalloc(1, sizeof(DragonFlyBSDProcess)); + Object_setClass(this, Class(DragonFlyBSDProcess)); + Process_init(&this->super, settings); + return this; +} + +void Process_delete(Object* cast) { + DragonFlyBSDProcess* this = (DragonFlyBSDProcess*) cast; + Process_done((Process*)cast); + free(this->jname); + free(this); +} + +void DragonFlyBSDProcess_writeField(Process* this, RichString* str, ProcessField field) { + DragonFlyBSDProcess* fp = (DragonFlyBSDProcess*) this; + char buffer[256]; buffer[255] = '\0'; + int attr = CRT_colors[DEFAULT_COLOR]; + int n = sizeof(buffer) - 1; + switch ((int) field) { + // add Platform-specific fields here + case PID: snprintf(buffer, n, Process_pidFormat, (fp->kernel ? -1 : this->pid)); break; + case JID: snprintf(buffer, n, Process_pidFormat, fp->jid); break; + case JAIL:{ + snprintf(buffer, n, "%-11s ", fp->jname); break; + if (buffer[11] != '\0') { + buffer[11] = ' '; + buffer[12] = '\0'; + } + break; + } + default: + Process_writeField(this, str, field); + return; + } + RichString_append(str, attr, buffer); +} + +long DragonFlyBSDProcess_compare(const void* v1, const void* v2) { + DragonFlyBSDProcess *p1, *p2; + Settings *settings = ((Process*)v1)->settings; + if (settings->direction == 1) { + p1 = (DragonFlyBSDProcess*)v1; + p2 = (DragonFlyBSDProcess*)v2; + } else { + p2 = (DragonFlyBSDProcess*)v1; + p1 = (DragonFlyBSDProcess*)v2; + } + switch ((int) settings->sortKey) { + // add Platform-specific fields here + case JID: + return (p1->jid - p2->jid); + case JAIL: + return strcmp(p1->jname ? p1->jname : "", p2->jname ? p2->jname : ""); + default: + return Process_compare(v1, v2); + } +} + +bool Process_isThread(Process* this) { + DragonFlyBSDProcess* fp = (DragonFlyBSDProcess*) this; + + if (fp->kernel == 1 ) + return 1; + else + return (Process_isUserlandThread(this)); +} diff --git a/dragonflybsd/DragonFlyBSDProcess.h b/dragonflybsd/DragonFlyBSDProcess.h new file mode 100644 index 00000000..4a0f9a5a --- /dev/null +++ b/dragonflybsd/DragonFlyBSDProcess.h @@ -0,0 +1,56 @@ +/* Do not edit this file. It was automatically generated. */ + +#ifndef HEADER_DragonFlyBSDProcess +#define HEADER_DragonFlyBSDProcess +/* +htop - dragonflybsd/DragonFlyBSDProcess.h +(C) 2015 Hisham H. Muhammad +(C) 2017 Diederik de Groot +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + + +typedef enum DragonFlyBSDProcessFields { + // Add platform-specific fields here, with ids >= 100 + JID = 100, + JAIL = 101, + LAST_PROCESSFIELD = 102, +} DragonFlyBSDProcessField; + + +typedef struct DragonFlyBSDProcess_ { + Process super; + int kernel; + int jid; + char* jname; +} DragonFlyBSDProcess; + + +#ifndef Process_isKernelThread +#define Process_isKernelThread(_process) (_process->kernel == 1) +#endif + +#ifndef Process_isUserlandThread +//#define Process_isUserlandThread(_process) (_process->pid != _process->tgid) +#define Process_isUserlandThread(_process) (_process->nlwp > 1) +#endif + + +extern ProcessClass DragonFlyBSDProcess_class; + +extern ProcessFieldData Process_fields[]; + +extern ProcessPidColumn Process_pidColumns[]; + +DragonFlyBSDProcess* DragonFlyBSDProcess_new(Settings* settings); + +void Process_delete(Object* cast); + +void DragonFlyBSDProcess_writeField(Process* this, RichString* str, ProcessField field); + +long DragonFlyBSDProcess_compare(const void* v1, const void* v2); + +bool Process_isThread(Process* this); + +#endif diff --git a/dragonflybsd/DragonFlyBSDProcessList.c b/dragonflybsd/DragonFlyBSDProcessList.c new file mode 100644 index 00000000..57445594 --- /dev/null +++ b/dragonflybsd/DragonFlyBSDProcessList.c @@ -0,0 +1,552 @@ +/* +htop - DragonFlyBSDProcessList.c +(C) 2014 Hisham H. Muhammad +(C) 2017 Diederik de Groot +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + +#include "ProcessList.h" +#include "DragonFlyBSDProcessList.h" +#include "DragonFlyBSDProcess.h" + +#include <unistd.h> +#include <stdlib.h> +#include <sys/types.h> +#include <sys/sysctl.h> +#include <sys/user.h> +#include <err.h> +#include <fcntl.h> +#include <limits.h> +#include <string.h> + + +/*{ + +#include <kvm.h> +#include <sys/param.h> +#include <osreldate.h> +#include <sys/kinfo.h> +#include <kinfo.h> +#include <sys/jail.h> +#include <sys/uio.h> +#include <sys/resource.h> +#include "DragonFlyBSDProcess.h" + +#define JAIL_ERRMSGLEN 1024 +char jail_errmsg[JAIL_ERRMSGLEN]; + +typedef struct CPUData_ { + + double userPercent; + double nicePercent; + double systemPercent; + double irqPercent; + double idlePercent; + double systemAllPercent; + +} CPUData; + +typedef struct DragonFlyBSDProcessList_ { + ProcessList super; + kvm_t* kd; + + unsigned long long int memWire; + unsigned long long int memActive; + unsigned long long int memInactive; + unsigned long long int memFree; + + CPUData* cpus; + + unsigned long *cp_time_o; + unsigned long *cp_time_n; + + unsigned long *cp_times_o; + unsigned long *cp_times_n; + +} DragonFlyBSDProcessList; + +}*/ + +#define _UNUSED_ __attribute__((unused)) + +static int MIB_hw_physmem[2]; +static int MIB_vm_stats_vm_v_page_count[4]; +static int pageSize; +static int pageSizeKb; + +static int MIB_vm_stats_vm_v_wire_count[4]; +static int MIB_vm_stats_vm_v_active_count[4]; +static int MIB_vm_stats_vm_v_cache_count[4]; +static int MIB_vm_stats_vm_v_inactive_count[4]; +static int MIB_vm_stats_vm_v_free_count[4]; + +static int MIB_vfs_bufspace[2]; + +static int MIB_kern_cp_time[2]; +static int MIB_kern_cp_times[2]; +static int kernelFScale; + +ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId) { + size_t len; + char errbuf[_POSIX2_LINE_MAX]; + DragonFlyBSDProcessList* dfpl = xCalloc(1, sizeof(DragonFlyBSDProcessList)); + ProcessList* pl = (ProcessList*) dfpl; + ProcessList_init(pl, Class(DragonFlyBSDProcess), usersTable, pidWhiteList, userId); + + // physical memory in system: hw.physmem + // physical page size: hw.pagesize + // usable pagesize : vm.stats.vm.v_page_size + len = 2; sysctlnametomib("hw.physmem", MIB_hw_physmem, &len); + + len = sizeof(pageSize); + if (sysctlbyname("vm.stats.vm.v_page_size", &pageSize, &len, NULL, 0) == -1) { + pageSize = PAGE_SIZE; + pageSizeKb = PAGE_SIZE_KB; + } else { + pageSizeKb = pageSize / ONE_K; + } + + // usable page count vm.stats.vm.v_page_count + // actually usable memory : vm.stats.vm.v_page_count * vm.stats.vm.v_page_size + len = 4; sysctlnametomib("vm.stats.vm.v_page_count", MIB_vm_stats_vm_v_page_count, &len); + + len = 4; sysctlnametomib("vm.stats.vm.v_wire_count", MIB_vm_stats_vm_v_wire_count, &len); + len = 4; sysctlnametomib("vm.stats.vm.v_active_count", MIB_vm_stats_vm_v_active_count, &len); + len = 4; sysctlnametomib("vm.stats.vm.v_cache_count", MIB_vm_stats_vm_v_cache_count, &len); + len = 4; sysctlnametomib("vm.stats.vm.v_inactive_count", MIB_vm_stats_vm_v_inactive_count, &len); + len = 4; sysctlnametomib("vm.stats.vm.v_free_count", MIB_vm_stats_vm_v_free_count, &len); + + len = 2; sysctlnametomib("vfs.bufspace", MIB_vfs_bufspace, &len); + + int cpus = 1; + len = sizeof(cpus); + if (sysctlbyname("hw.ncpu", &cpus, &len, NULL, 0) != 0) { + cpus = 1; + } + + size_t sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES; + len = 2; sysctlnametomib("kern.cp_time", MIB_kern_cp_time, &len); + dfpl->cp_time_o = xCalloc(cpus, sizeof_cp_time_array); + dfpl->cp_time_n = xCalloc(cpus, sizeof_cp_time_array); + len = sizeof_cp_time_array; + + // fetch initial single (or average) CPU clicks from kernel + sysctl(MIB_kern_cp_time, 2, dfpl->cp_time_o, &len, NULL, 0); + + // on smp box, fetch rest of initial CPU's clicks + if (cpus > 1) { + len = 2; sysctlnametomib("kern.cp_times", MIB_kern_cp_times, &len); + dfpl->cp_times_o = xCalloc(cpus, sizeof_cp_time_array); + dfpl->cp_times_n = xCalloc(cpus, sizeof_cp_time_array); + len = cpus * sizeof_cp_time_array; + sysctl(MIB_kern_cp_times, 2, dfpl->cp_times_o, &len, NULL, 0); + } + + pl->cpuCount = MAX(cpus, 1); + + if (cpus == 1 ) { + dfpl->cpus = xRealloc(dfpl->cpus, sizeof(CPUData)); + } else { + // on smp we need CPUs + 1 to store averages too (as kernel kindly provides that as well) + dfpl->cpus = xRealloc(dfpl->cpus, (pl->cpuCount + 1) * sizeof(CPUData)); + } + + len = sizeof(kernelFScale); + if (sysctlbyname("kern.fscale", &kernelFScale, &len, NULL, 0) == -1) { + //sane default for kernel provided CPU percentage scaling, at least on x86 machines, in case this sysctl call failed + kernelFScale = 2048; + } + + dfpl->kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, errbuf); + if (dfpl->kd == NULL) { + errx(1, "kvm_open: %s", errbuf); + } + + return pl; +} + +void ProcessList_delete(ProcessList* this) { + const DragonFlyBSDProcessList* dfpl = (DragonFlyBSDProcessList*) this; + if (dfpl->kd) kvm_close(dfpl->kd); + + free(dfpl->cp_time_o); + free(dfpl->cp_time_n); + free(dfpl->cp_times_o); + free(dfpl->cp_times_n); + free(dfpl->cpus); + + ProcessList_done(this); + free(this); +} + +static inline void DragonFlyBSDProcessList_scanCPUTime(ProcessList* pl) { + const DragonFlyBSDProcessList* dfpl = (DragonFlyBSDProcessList*) pl; + + int cpus = pl->cpuCount; // actual CPU count + int maxcpu = cpus; // max iteration (in case we have average + smp) + int cp_times_offset; + + assert(cpus > 0); + + size_t sizeof_cp_time_array; + + unsigned long *cp_time_n; // old clicks state + unsigned long *cp_time_o; // current clicks state + + unsigned long cp_time_d[CPUSTATES]; + double cp_time_p[CPUSTATES]; + + // get averages or single CPU clicks + sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES; + sysctl(MIB_kern_cp_time, 2, dfpl->cp_time_n, &sizeof_cp_time_array, NULL, 0); + + // get rest of CPUs + if (cpus > 1) { + // on smp systems DragonFlyBSD kernel concats all CPU states into one long array in + // kern.cp_times sysctl OID + // we store averages in dfpl->cpus[0], and actual cores after that + maxcpu = cpus + 1; + sizeof_cp_time_array = cpus * sizeof(unsigned long) * CPUSTATES; + sysctl(MIB_kern_cp_times, 2, dfpl->cp_times_n, &sizeof_cp_time_array, NULL, 0); + } + + for (int i = 0; i < maxcpu; i++) { + if (cpus == 1) { + // single CPU box + cp_time_n = dfpl->cp_time_n; + cp_time_o = dfpl->cp_time_o; + } else { + if (i == 0 ) { + // average + cp_time_n = dfpl->cp_time_n; + cp_time_o = dfpl->cp_time_o; + } else { + // specific smp cores + cp_times_offset = i - 1; + cp_time_n = dfpl->cp_times_n + (cp_times_offset * CPUSTATES); + cp_time_o = dfpl->cp_times_o + (cp_times_offset * CPUSTATES); + } + } + + // diff old vs new + unsigned long long total_o = 0; + unsigned long long total_n = 0; + unsigned long long total_d = 0; + for (int s = 0; s < CPUSTATES; s++) { + cp_time_d[s] = cp_time_n[s] - cp_time_o[s]; + total_o += cp_time_o[s]; + total_n += cp_time_n[s]; + } + + // totals + total_d = total_n - total_o; + if (total_d < 1 ) total_d = 1; + + // save current state as old and calc percentages + for (int s = 0; s < CPUSTATES; ++s) { + cp_time_o[s] = cp_time_n[s]; + cp_time_p[s] = ((double)cp_time_d[s]) / ((double)total_d) * 100; + } + + CPUData* cpuData = &(dfpl->cpus[i]); + cpuData->userPercent = cp_time_p[CP_USER]; + cpuData->nicePercent = cp_time_p[CP_NICE]; + cpuData->systemPercent = cp_time_p[CP_SYS]; + cpuData->irqPercent = cp_time_p[CP_INTR]; + cpuData->systemAllPercent = cp_time_p[CP_SYS] + cp_time_p[CP_INTR]; + // this one is not really used, but we store it anyway + cpuData->idlePercent = cp_time_p[CP_IDLE]; + } +} + +static inline void DragonFlyBSDProcessList_scanMemoryInfo(ProcessList* pl) { + DragonFlyBSDProcessList* dfpl = (DragonFlyBSDProcessList*) pl; + + // @etosan: + // memory counter relationships seem to be these: + // total = active + wired + inactive + cache + free + // htop_used (unavail to anybody) = active + wired + // htop_cache (for cache meter) = buffers + cache + // user_free (avail to procs) = buffers + inactive + cache + free + size_t len = sizeof(pl->totalMem); + + //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_hw_physmem, 2, &(pl->totalMem), &len, NULL, 0); + pl->totalMem /= 1024; + + sysctl(MIB_vm_stats_vm_v_active_count, 4, &(dfpl->memActive), &len, NULL, 0); + dfpl->memActive *= pageSizeKb; + + sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(dfpl->memWire), &len, NULL, 0); + dfpl->memWire *= pageSizeKb; + + sysctl(MIB_vfs_bufspace, 2, &(pl->buffersMem), &len, NULL, 0); + pl->buffersMem /= 1024; + + sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(pl->cachedMem), &len, NULL, 0); + pl->cachedMem *= pageSizeKb; + pl->usedMem = dfpl->memActive + dfpl->memWire; + + //currently unused, same as with arc, custom meter perhaps + //sysctl(MIB_vm_stats_vm_v_inactive_count, 4, &(dfpl->memInactive), &len, NULL, 0); + //sysctl(MIB_vm_stats_vm_v_free_count, 4, &(dfpl->memFree), &len, NULL, 0); + //pl->freeMem = dfpl->memInactive + dfpl->memFree; + //pl->freeMem *= pageSizeKb; + + struct kvm_swap swap[16]; + int nswap = kvm_getswapinfo(dfpl->kd, swap, sizeof(swap)/sizeof(swap[0]), 0); + pl->totalSwap = 0; + pl->usedSwap = 0; + for (int i = 0; i < nswap; i++) { + pl->totalSwap += swap[i].ksw_total; + pl->usedSwap += swap[i].ksw_used; + } + pl->totalSwap *= pageSizeKb; + pl->usedSwap *= pageSizeKb; + + pl->sharedMem = 0; // currently unused +} + +char* DragonFlyBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, int* basenameEnd) { + char** argv = kvm_getargv(kd, kproc, 0); + if (!argv) { + return xStrdup(kproc->kp_comm); + } + int len = 0; + for (int i = 0; argv[i]; i++) { + len += strlen(argv[i]) + 1; + } + char* comm = xMalloc(len); + char* at = comm; + *basenameEnd = 0; + for (int i = 0; argv[i]; i++) { + at = stpcpy(at, argv[i]); + if (!*basenameEnd) { + *basenameEnd = at - comm; + } + *at = ' '; + at++; + } + at--; + *at = '\0'; + return comm; +} + +char* DragonFlyBSDProcessList_readJailName(struct kinfo_proc* kproc) { + char* jname; + char jnamebuf[MAXHOSTNAMELEN]; + + if (kproc->kp_jailid != 0 ){ + memset(jnamebuf, 0, sizeof(jnamebuf)); +#if 0 /*EXCLUDED*/ + int jid; + struct iovec jiov[6]; + *(const void **)&jiov[0].iov_base = "jid"; + jiov[0].iov_len = sizeof("jid"); + jiov[1].iov_base = &kproc->kp_jailid; + jiov[1].iov_len = sizeof(kproc->kp_jailid); + *(const void **)&jiov[2].iov_base = "name"; + jiov[2].iov_len = sizeof("name"); + jiov[3].iov_base = jnamebuf; + jiov[3].iov_len = sizeof(jnamebuf); + *(const void **)&jiov[4].iov_base = "errmsg"; + jiov[4].iov_len = sizeof("errmsg"); + jiov[5].iov_base = jail_errmsg; + jiov[5].iov_len = JAIL_ERRMSGLEN; + jail_errmsg[0] = 0; + jid = jail_get(jiov, 6, 0); // not available on dragonfly + if (jid < 0) { + if (!jail_errmsg[0]) + snprintf(jail_errmsg, JAIL_ERRMSGLEN, "jail_get: %s", strerror(errno)); + return NULL; + } else if (jid == kproc->kp_jailid) { + jname = xStrdup(jnamebuf); + if (jname == NULL) + strerror_r(errno, jail_errmsg, JAIL_ERRMSGLEN); + return jname; + } else { + return NULL; + } +#endif + // TODO: need to figure out how to retreive the jail->hostname on dragonfly + snprintf(jnamebuf, MAXHOSTNAMELEN, "<jail=%i>", kproc->kp_jailid); + jname = xStrdup(jnamebuf); + } else { + jnamebuf[0]='-'; + jnamebuf[1]='\0'; + jname = xStrdup(jnamebuf); + } + return jname; +} + +void ProcessList_goThroughEntries(ProcessList* this) { + DragonFlyBSDProcessList* dfpl = (DragonFlyBSDProcessList*) this; + Settings* settings = this->settings; + bool hideKernelThreads = settings->hideKernelThreads; + bool hideUserlandThreads = settings->hideUserlandThreads; + + DragonFlyBSDProcessList_scanMemoryInfo(this); + DragonFlyBSDProcessList_scanCPUTime(this); + + int count = 0; + + // TODO Kernel Threads seem to be skipped, need to figure out the correct flag + struct kinfo_proc* kprocs = kvm_getprocs(dfpl->kd, KERN_PROC_ALL | (!hideUserlandThreads ? KERN_PROC_FLAG_LWP : 0), 0, &count); + + for (int i = 0; i < count; i++) { + struct kinfo_proc* kproc = &kprocs[i]; + bool preExisting = false; + bool _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(this, kproc->kp_ktaddr ? (pid_t)kproc->kp_ktaddr : kproc->kp_pid, &preExisting, (Process_New) DragonFlyBSDProcess_new); + DragonFlyBSDProcess* dfp = (DragonFlyBSDProcess*) proc; + + proc->show = ! ((hideKernelThreads && Process_isKernelThread(dfp)) || (hideUserlandThreads && Process_isUserlandThread(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 + proc->pid = (pid_t)kproc->kp_ktaddr; + dfp->kernel = 1; + } else { + proc->pid = kproc->kp_pid; // process ID + dfp->kernel = 0; + } + proc->ppid = kproc->kp_ppid; // parent process id + proc->tpgid = kproc->kp_tpgid; // tty process group id + proc->tgid = kproc->kp_lwp.kl_tid; // thread group id + proc->pgrp = kproc->kp_pgid; // process group id + proc->session = kproc->kp_sid; + proc->tty_nr = kproc->kp_tdev; // control terminal device number + proc->st_uid = kproc->kp_uid; // user ID + proc->processor = kproc->kp_lwp.kl_origcpu; + proc->starttime_ctime = kproc->kp_start.tv_sec; + proc->user = UsersTable_getRef(this->usersTable, proc->st_uid); + + ProcessList_add((ProcessList*)this, proc); + proc->comm = DragonFlyBSDProcessList_readProcessName(dfpl->kd, kproc, &proc->basenameOffset); + dfp->jname = DragonFlyBSDProcessList_readJailName(kproc); + } 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 = DragonFlyBSDProcessList_readJailName(kproc); + } + if (proc->ppid != kproc->kp_ppid) { // if there are reapers in the system, process can get reparented anytime + proc->ppid = 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(this->usersTable, proc->st_uid); + } + if (settings->updateProcessNames) { + free(proc->comm); + proc->comm = DragonFlyBSDProcessList_readProcessName(dfpl->kd, kproc, &proc->basenameOffset); + } + } + + proc->m_size = kproc->kp_vm_map_size / 1024 / pageSizeKb; + proc->m_resident = kproc->kp_vm_rssize; + proc->percent_mem = (proc->m_resident * PAGE_SIZE_KB) / (double)(this->totalMem) * 100.0; + proc->nlwp = kproc->kp_nthreads; // number of lwp thread + proc->time = (kproc->kp_swtime + 5000) / 10000; + + proc->percent_cpu = 100.0 * ((double)kproc->kp_lwp.kl_pctcpu / (double)kernelFScale); + proc->percent_mem = 100.0 * (proc->m_resident * PAGE_SIZE_KB) / (double)(this->totalMem); + + if (proc->percent_cpu > 0.1) { + // system idle process should own all CPU time left regardless of CPU count + if ( strcmp("idle", kproc->kp_comm) == 0 ) { + 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;< |