From 697f5bb9c14a89b2e04519c956fc7e455c9b1cc0 Mon Sep 17 00:00:00 2001 From: gmbroome Date: Fri, 2 Mar 2018 16:20:46 -0500 Subject: [PATCH] Import Solaris support (#741) This commit adds support for Solaris, squashed from PR #741: Summary of additions: * Initial setup of Solaris platform directory * Add Solaris platform into autoconf template * Uptime and load averages * Add dependency on libkstat * Basic process listing * Zone name display * CPU detection * Per-process memory and CPU usage parsed correctly * Uses sysconf to discover number of CPUs, instead of more complex libkstat code * Simple memory display working * Reduce repetitive calls to the PAGE_SIZE macro when reading memory info * Add Project, Contract, Task, and Pool into process properties * Use system major()/minor() implementations and remove extraneous definition of mkdev() * Get the STARTTIME column working properly, using the Linux implementation as a guide --- Makefile.am | 10 + configure.ac | 8 + solaris/Battery.c | 8 + solaris/Battery.h | 9 + solaris/Platform.c | 214 ++++++++++++++++++ solaris/Platform.h | 53 +++++ solaris/SolarisCRT.c | 21 ++ solaris/SolarisCRT.h | 15 ++ solaris/SolarisProcess.c | 193 +++++++++++++++++ solaris/SolarisProcess.h | 65 ++++++ solaris/SolarisProcessList.c | 410 +++++++++++++++++++++++++++++++++++ solaris/SolarisProcessList.h | 53 +++++ 12 files changed, 1059 insertions(+) create mode 100644 solaris/Battery.c create mode 100644 solaris/Battery.h create mode 100644 solaris/Platform.c create mode 100644 solaris/Platform.h create mode 100644 solaris/SolarisCRT.c create mode 100644 solaris/SolarisCRT.h create mode 100644 solaris/SolarisProcess.c create mode 100644 solaris/SolarisProcess.h create mode 100644 solaris/SolarisProcessList.c create mode 100644 solaris/SolarisProcessList.h diff --git a/Makefile.am b/Makefile.am index e033c35d..a3a5b6b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,6 +79,16 @@ myhtopplatheaders = darwin/Platform.h darwin/DarwinProcess.h \ darwin/DarwinProcessList.h darwin/DarwinCRT.h darwin/Battery.h endif +if HTOP_SOLARIS +myhtopplatsources = solaris/Platform.c \ +solaris/SolarisProcess.c solaris/SolarisProcessList.c \ +solaris/SolarisCRT.c solaris/Battery.c + +myhtopplatheaders = solaris/Platform.h \ +solaris/SolarisProcess.h solaris/SolarisProcessList.h \ +solaris/SolarisCRT.h solaris/Battery.h +endif + if HTOP_UNSUPPORTED myhtopplatsources = unsupported/Platform.c \ unsupported/UnsupportedProcess.c unsupported/UnsupportedProcessList.c \ diff --git a/configure.ac b/configure.ac index 3d69756d..bf7b4c95 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,9 @@ dragonfly*) darwin*) my_htop_platform=darwin ;; +solaris*) + my_htop_platform=solaris + ;; *) my_htop_platform=unsupported ;; @@ -238,6 +241,10 @@ if test "$my_htop_platform" = "openbsd"; then AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"]) fi +if test "$my_htop_platform" = "solaris"; then + AC_CHECK_LIB([kstat], [kstat_open], [], [missing_libraries="$missing_libraries libkstat"]) +fi + AC_ARG_ENABLE(linux_affinity, [AS_HELP_STRING([--enable-linux-affinity], [enable Linux sched_setaffinity and sched_getaffinity for affinity support, disables hwloc])], ,enable_linux_affinity="yes") if test "x$enable_linux_affinity" = xyes -a "x$cross_compiling" = xno; then AC_MSG_CHECKING([for usable sched_setaffinity]) @@ -302,6 +309,7 @@ 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_SOLARIS], [test "$my_htop_platform" = solaris]) AM_CONDITIONAL([HTOP_UNSUPPORTED], [test "$my_htop_platform" = unsupported]) AC_SUBST(my_htop_platform) AC_CONFIG_FILES([Makefile htop.1]) diff --git a/solaris/Battery.c b/solaris/Battery.c new file mode 100644 index 00000000..6d6e94bd --- /dev/null +++ b/solaris/Battery.c @@ -0,0 +1,8 @@ + +#include "BatteryMeter.h" + +void Battery_getData(double* level, ACPresence* isOnAC) { + *level = -1; + *isOnAC = AC_ERROR; +} + diff --git a/solaris/Battery.h b/solaris/Battery.h new file mode 100644 index 00000000..8dc0cef6 --- /dev/null +++ b/solaris/Battery.h @@ -0,0 +1,9 @@ +/* Do not edit this file. It was automatically generated. */ + +#ifndef HEADER_Battery +#define HEADER_Battery + +void Battery_getData(double* level, ACPresence* isOnAC); + + +#endif diff --git a/solaris/Platform.c b/solaris/Platform.c new file mode 100644 index 00000000..2a8efa88 --- /dev/null +++ b/solaris/Platform.c @@ -0,0 +1,214 @@ +/* +htop - solaris/Platform.c +(C) 2014 Hisham H. Muhammad +(C) 2015 David C. Hunt +(C) 2017 Guy M. Broome +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + +#include "Platform.h" +#include "Meter.h" +#include "CPUMeter.h" +#include "MemoryMeter.h" +#include "SwapMeter.h" +#include "TasksMeter.h" +#include "LoadAverageMeter.h" +#include "ClockMeter.h" +#include "HostnameMeter.h" +#include "UptimeMeter.h" +#include "SolarisProcess.h" +#include "SolarisProcessList.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/*{ +#include "Action.h" +#include "BatteryMeter.h" +#include "SignalsPanel.h" +#include + +extern ProcessFieldData Process_fields[]; +typedef struct var kvar_t; + +}*/ + +double plat_loadavg[3] = {0}; + +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/IOT", .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 SIGUSR1", .number = 16 }, + { .name = "17 SIGUSR2", .number = 17 }, + { .name = "18 SIGCHLD/CLD", .number = 18 }, + { .name = "19 SIGPWR", .number = 19 }, + { .name = "20 SIGWINCH", .number = 20 }, + { .name = "21 SIGURG", .number = 21 }, + { .name = "22 SIGPOLL/IO", .number = 22 }, + { .name = "23 SIGSTOP", .number = 23 }, + { .name = "24 SIGTSTP", .number = 24 }, + { .name = "25 SIGCONT", .number = 25 }, + { .name = "26 SIGTTIN", .number = 26 }, + { .name = "27 SIGTTOU", .number = 27 }, + { .name = "28 SIGVTALRM", .number = 28 }, + { .name = "29 SIGPROF", .number = 29 }, + { .name = "30 SIGXCPU", .number = 30 }, + { .name = "31 SIGXFSZ", .number = 31 }, + { .name = "32 SIGWAITING", .number = 32 }, + { .name = "33 SIGLWP", .number = 33 }, + { .name = "34 SIGFREEZE", .number = 34 }, + { .name = "35 SIGTHAW", .number = 35 }, + { .name = "36 SIGCANCEL", .number = 36 }, + { .name = "37 SIGLOST", .number = 37 }, + { .name = "38 SIGXRES", .number = 38 }, + { .name = "39 SIGJVM1", .number = 39 }, + { .name = "40 SIGJVM2", .number = 40 }, + { .name = "41 SIGINFO", .number = 41 }, +}; + +const unsigned int Platform_numberOfSignals = sizeof(Platform_signals)/sizeof(SignalItem); + +ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; + +MeterClass* Platform_meterTypes[] = { + &CPUMeter_class, + &ClockMeter_class, + &LoadAverageMeter_class, + &LoadMeter_class, + &MemoryMeter_class, + &SwapMeter_class, + &TasksMeter_class, + &BatteryMeter_class, + &HostnameMeter_class, + &UptimeMeter_class, + &AllCPUsMeter_class, + &AllCPUs2Meter_class, + &LeftCPUsMeter_class, + &RightCPUsMeter_class, + &LeftCPUs2Meter_class, + &RightCPUs2Meter_class, + &BlankMeter_class, + NULL +}; + +void Platform_setBindings(Htop_Action* keys) { + (void) keys; +} + +int Platform_numberOfFields = LAST_PROCESSFIELD; + +extern char Process_pidFormat[20]; + +int Platform_getUptime() { + int boot_time = 0; + int curr_time = time(NULL); + struct utmpx * ent; + + while (( ent = getutxent() )) { + if ( !strcmp("system boot", ent->ut_line )) { + boot_time = ent->ut_tv.tv_sec; + } + } + + endutxent(); + + return (curr_time-boot_time); +} + +void Platform_getLoadAverage(double* one, double* five, double* fifteen) { + getloadavg( plat_loadavg, 3 ); + *one = plat_loadavg[LOADAVG_1MIN]; + *five = plat_loadavg[LOADAVG_5MIN]; + *fifteen = plat_loadavg[LOADAVG_15MIN]; +} + +int Platform_getMaxPid() { + kstat_ctl_t *kc = NULL; + kstat_t *kshandle = NULL; + kvar_t *ksvar = NULL; + int vproc = 32778; // Reasonable Solaris default + kc = kstat_open(); + if (kc != NULL) { kshandle = kstat_lookup(kc,"unix",0,"var"); } + if (kshandle != NULL) { kstat_read(kc,kshandle,NULL); } + ksvar = kshandle->ks_data; + if (ksvar->v_proc > 0 ) { + vproc = ksvar->v_proc; + } + if (kc != NULL) { kstat_close(kc); } + return vproc; +} + +double Platform_setCPUValues(Meter* this, int cpu) { + SolarisProcessList* spl = (SolarisProcessList*) this->pl; + int cpus = this->pl->cpuCount; + CPUData* cpuData = NULL; + + if (cpus == 1) { + // single CPU box has everything in spl->cpus[0] + cpuData = &(spl->cpus[0]); + } else { + cpuData = &(spl->cpus[cpu]); + } + + double percent; + double* v = this->values; + + v[CPU_METER_NICE] = cpuData->nicePercent; + v[CPU_METER_NORMAL] = cpuData->userPercent; + if (this->pl->settings->detailedCPUTime) { + v[CPU_METER_KERNEL] = cpuData->systemPercent; + v[CPU_METER_IRQ] = cpuData->irqPercent; + Meter_setItems(this, 4); + percent = v[0]+v[1]+v[2]+v[3]; + } else { + v[2] = cpuData->systemAllPercent; + Meter_setItems(this, 3); + percent = v[0]+v[1]+v[2]; + } + + percent = CLAMP(percent, 0.0, 100.0); + if (isnan(percent)) percent = 0.0; + return percent; +} + +void Platform_setMemoryValues(Meter* this) { + ProcessList* pl = (ProcessList*) this->pl; + this->total = pl->totalMem; + this->values[0] = pl->usedMem; + this->values[1] = pl->buffersMem; + this->values[2] = pl->cachedMem; +} + +void Platform_setSwapValues(Meter* this) { + ProcessList* pl = (ProcessList*) this->pl; + this->total = pl->totalSwap; + this->values[0] = pl->usedSwap; +} + +char* Platform_getProcessEnv(pid_t pid) { + (void) pid; + return NULL; +} diff --git a/solaris/Platform.h b/solaris/Platform.h new file mode 100644 index 00000000..280ed1ff --- /dev/null +++ b/solaris/Platform.h @@ -0,0 +1,53 @@ +/* Do not edit this file. It was automatically generated. */ + +#ifndef HEADER_Platform +#define HEADER_Platform +/* +htop - solaris/Platform.h +(C) 2014 Hisham H. Muhammad +(C) 2015 David C. Hunt +(C) 2017 Guy M. Broome +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + +#include "Action.h" +#include "BatteryMeter.h" +#include "SignalsPanel.h" +#include + +extern ProcessFieldData Process_fields[]; +typedef struct var kvar_t; + + +extern double plat_loadavg[3]; + +extern const SignalItem Platform_signals[]; + +extern const unsigned int Platform_numberOfSignals; + +extern ProcessField Platform_defaultFields[]; + +extern MeterClass* Platform_meterTypes[]; + +void Platform_setBindings(Htop_Action* keys); + +extern int Platform_numberOfFields; + +extern char Process_pidFormat[20]; + +int Platform_getUptime(); + +void Platform_getLoadAverage(double* one, double* five, double* fifteen); + +int Platform_getMaxPid(); + +double Platform_setCPUValues(Meter* this, int cpu); + +void Platform_setMemoryValues(Meter* this); + +void Platform_setSwapValues(Meter* this); + +char* Platform_getProcessEnv(pid_t pid); + +#endif diff --git a/solaris/SolarisCRT.c b/solaris/SolarisCRT.c new file mode 100644 index 00000000..28511697 --- /dev/null +++ b/solaris/SolarisCRT.c @@ -0,0 +1,21 @@ +/* +htop - SolarisCRT.c +(C) 2014 Hisham H. Muhammad +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + +#include "config.h" +#include "CRT.h" +#include +#include + +void CRT_handleSIGSEGV(int sgn) { + (void) sgn; + CRT_done(); + fprintf(stderr, "\n\nhtop " VERSION " aborting.\n"); + fprintf(stderr, "\nUnfortunately, you seem to be using an unsupported platform!"); + fprintf(stderr, "\nPlease contact your platform package maintainer!\n\n"); + abort(); +} + diff --git a/solaris/SolarisCRT.h b/solaris/SolarisCRT.h new file mode 100644 index 00000000..c26de36b --- /dev/null +++ b/solaris/SolarisCRT.h @@ -0,0 +1,15 @@ +/* Do not edit this file. It was automatically generated. */ + +#ifndef HEADER_SolarisCRT +#define HEADER_SolarisCRT +/* +htop - SolarisCRT.h +(C) 2014 Hisham H. Muhammad +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/solaris/SolarisProcess.c b/solaris/SolarisProcess.c new file mode 100644 index 00000000..b935a814 --- /dev/null +++ b/solaris/SolarisProcess.c @@ -0,0 +1,193 @@ +/* +htop - SolarisProcess.c +(C) 2015 Hisham H. Muhammad +(C) 2017 Guy M. Broome +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + +#include "Process.h" +#include "ProcessList.h" +#include "SolarisProcess.h" +#include "Platform.h" +#include "CRT.h" + +#include +#include +#include +#include + +/*{ +#include "Settings.h" +#include + +typedef enum SolarisProcessFields { + // Add platform-specific fields here, with ids >= 100 + ZONEID = 100, + ZONE = 101, + PROJID = 102, + TASKID = 103, + POOLID = 104, + CONTID = 105, + LAST_PROCESSFIELD = 106, +} SolarisProcessField; + + +typedef struct SolarisProcess_ { + Process super; + int kernel; + zoneid_t zoneid; + char zname[ZONENAME_MAX+1]; + taskid_t taskid; + projid_t projid; + poolid_t poolid; + ctid_t contid; +} SolarisProcess; + + +#ifndef Process_isKernelThread +#define Process_isKernelThread(_process) (_process->kernel == 1) +#endif + +#ifndef Process_isUserlandThread +#define Process_isUserlandThread(_process) (_process->pid != _process->tgid) +#endif + +}*/ + +ProcessClass SolarisProcess_class = { + .super = { + .extends = Class(Process), + .display = Process_display, + .delete = Process_delete, + .compare = SolarisProcess_compare + }, + .writeField = (Process_WriteField) SolarisProcess_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, R running, D disk, Z zombie, T traced, W paging)", .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, }, + [ZONEID] = { .name = "ZONEID", .title = " ZONEID ", .description = "Zone ID", .flags = 0, }, + [ZONE] = { .name = "ZONE", .title = "ZONE ", .description = "Zone name", .flags = 0, }, + [PROJID] = { .name = "PROJID", .title = " PRJID ", .description = "Project ID", .flags = 0, }, + [TASKID] = { .name = "TASKID", .title = " TSKID ", .description = "Task ID", .flags = 0, }, + [POOLID] = { .name = "POOLID", .title = " POLID ", .description = "Pool ID", .flags = 0, }, + [CONTID] = { .name = "CONTID", .title = " CNTID ", .description = "Contract ID", .flags = 0, }, + [LAST_PROCESSFIELD] = { .name = "*** report bug! ***", .title = NULL, .description = NULL, .flags = 0, }, +}; + +ProcessPidColumn Process_pidColumns[] = { + { .id = ZONEID, .label = "ZONEID" }, + { .id = TASKID, .label = "TSKID" }, + { .id = PROJID, .label = "PRJID" }, + { .id = POOLID, .label = "POLID" }, + { .id = CONTID, .label = "CNTID" }, + { .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 }, +}; + +SolarisProcess* SolarisProcess_new(Settings* settings) { + SolarisProcess* this = xCalloc(1, sizeof(SolarisProcess)); + Object_setClass(this, Class(SolarisProcess)); + Process_init(&this->super, settings); + return this; +} + +void Process_delete(Object* cast) { + SolarisProcess* this = (SolarisProcess*) cast; + Process_done((Process*)cast); + free(this->zname); + free(this); +} + +void SolarisProcess_writeField(Process* this, RichString* str, ProcessField field) { + SolarisProcess* sp = (SolarisProcess*) this; + char buffer[256]; buffer[255] = '\0'; + int attr = CRT_colors[DEFAULT_COLOR]; + int n = sizeof(buffer) - 1; + switch ((int) field) { + // add Solaris-specific fields here + case ZONEID: xSnprintf(buffer, n, Process_pidFormat, sp->zoneid); break; + case PROJID: xSnprintf(buffer, n, Process_pidFormat, sp->projid); break; + case TASKID: xSnprintf(buffer, n, Process_pidFormat, sp->taskid); break; + case POOLID: xSnprintf(buffer, n, Process_pidFormat, sp->poolid); break; + case CONTID: xSnprintf(buffer, n, Process_pidFormat, sp->contid); break; + case ZONE:{ + xSnprintf(buffer, n, "%-*s ", ZONENAME_MAX/4, sp->zname); break; + if (buffer[ZONENAME_MAX/4] != '\0') { + buffer[ZONENAME_MAX/4] = ' '; + buffer[(ZONENAME_MAX/4)+1] = '\0'; + } + break; + } + default: + Process_writeField(this, str, field); + return; + } + RichString_append(str, attr, buffer); +} + +long SolarisProcess_compare(const void* v1, const void* v2) { + SolarisProcess *p1, *p2; + Settings* settings = ((Process*)v1)->settings; + if (settings->direction == 1) { + p1 = (SolarisProcess*)v1; + p2 = (SolarisProcess*)v2; + } else { + p2 = (SolarisProcess*)v1; + p1 = (SolarisProcess*)v2; + } + switch ((int) settings->sortKey) { + case ZONEID: + return (p1->zoneid - p2->zoneid); + case PROJID: + return (p1->projid - p2->projid); + case TASKID: + return (p1->taskid - p2->taskid); + case POOLID: + return (p1->poolid - p2->poolid); + case CONTID: + return (p1->contid - p2->contid); + case ZONE: + return strcmp(p1->zname ? p1->zname : "global", p2->zname ? p2->zname : "global"); + default: + return Process_compare(v1, v2); + } +} + +bool Process_isThread(Process* this) { + SolarisProcess* fp = (SolarisProcess*) this; + + if (fp->kernel == 1 ) + return 1; + else + return 0; +} diff --git a/solaris/SolarisProcess.h b/solaris/SolarisProcess.h new file mode 100644 index 00000000..e1f4945a --- /dev/null +++ b/solaris/SolarisProcess.h @@ -0,0 +1,65 @@ +/* Do not edit this file. It was automatically generated. */ + +#ifndef HEADER_SolarisProcess +#define HEADER_SolarisProcess +/* +htop - SolarisProcess.h +(C) 2015 Hisham H. Muhammad +(C) 2017 Guy M. Broome +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + +#include "Settings.h" +#include + +typedef enum SolarisProcessFields { + // Add platform-specific fields here, with ids >= 100 + ZONEID = 100, + ZONE = 101, + PROJID = 102, + TASKID = 103, + POOLID = 104, + CONTID = 105, + LAST_PROCESSFIELD = 106, +} SolarisProcessField; + + +typedef struct SolarisProcess_ { + Process super; + int kernel; + zoneid_t zoneid; + char zname[ZONENAME_MAX+1]; + taskid_t taskid; + projid_t projid; + poolid_t poolid; + ctid_t contid; +} SolarisProcess; + + +#ifndef Process_isKernelThread +#define Process_isKernelThread(_process) (_process->kernel == 1) +#endif + +#ifndef Process_isUserlandThread +#define Process_isUserlandThread(_process) (_process->pid != _process->tgid) +#endif + + +extern ProcessClass SolarisProcess_class; + +extern ProcessFieldData Process_fields[]; + +extern ProcessPidColumn Process_pidColumns[]; + +SolarisProcess* SolarisProcess_new(Settings* settings); + +void Process_delete(Object* cast); + +void SolarisProcess_writeField(Process* this, RichString* str, ProcessField field); + +long SolarisProcess_compare(const void* v1, const void* v2); + +bool Process_isThread(Process* this); + +#endif diff --git a/solaris/SolarisProcessList.c b/solaris/SolarisProcessList.c new file mode 100644 index 00000000..2c4d964b --- /dev/null +++ b/solaris/SolarisProcessList.c @@ -0,0 +1,410 @@ +/* +htop - SolarisProcessList.c +(C) 2014 Hisham H. Muhammad +(C) 2017 Guy M. Broome +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + +#include "ProcessList.h" +#include "SolarisProcessList.h" +#include "SolarisProcess.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MAXCMDLINE 255 + +/*{ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define ZONE_ERRMSGLEN 1024 +char zone_errmsg[ZONE_ERRMSGLEN]; + +typedef struct CPUData_ { + double userPercent; + double nicePercent; + double systemPercent; + double irqPercent; + double idlePercent; + double systemAllPercent; + uint64_t luser; + uint64_t lkrnl; + uint64_t lintr; + uint64_t lidle; +} CPUData; + +typedef struct SolarisProcessList_ { + ProcessList super; + kstat_ctl_t* kd; + CPUData* cpus; +} SolarisProcessList; + +}*/ + +static void setCommand(Process* process, const char* command, int len) { + if (process->comm && process->commLen >= len) { + strncpy(process->comm, command, len + 1); + } else { + free(process->comm); + process->comm = xStrdup(command); + } + process->commLen = len; +} + +static void setZoneName(kstat_ctl_t* kd, SolarisProcess* sproc) { + if ( sproc->zoneid == 0 ) { + strncpy( sproc->zname, "global ", 11); + } else if ( kd == NULL ) { + strncpy( sproc->zname, "unknown ", 11); + } else { + kstat_t* ks = kstat_lookup( kd, "zones", sproc->zoneid, NULL ); + strncpy( sproc->zname, ks->ks_name, strlen(ks->ks_name) ); + } +} + +ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId) { + SolarisProcessList* spl = xCalloc(1, sizeof(SolarisProcessList)); + ProcessList* pl = (ProcessList*) spl; + ProcessList_init(pl, Class(SolarisProcess), usersTable, pidWhiteList, userId); + + spl->kd = kstat_open(); + + pl->cpuCount = sysconf(_SC_NPROCESSORS_ONLN); + + if (pl->cpuCount == 1 ) { + spl->cpus = xRealloc(spl->cpus, sizeof(CPUData)); + } else { + spl->cpus = xRealloc(spl->cpus, (pl->cpuCount + 1) * sizeof(CPUData)); + } + + return pl; +} + +static inline void SolarisProcessList_scanCPUTime(ProcessList* pl) { + const SolarisProcessList* spl = (SolarisProcessList*) pl; + int cpus = pl->cpuCount; + kstat_t *cpuinfo = NULL; + int kchain = 0; + kstat_named_t *idletime = NULL; + kstat_named_t *intrtime = NULL; + kstat_named_t *krnltime = NULL; + kstat_named_t *usertime = NULL; + double idlebuf = 0; + double intrbuf = 0; + double krnlbuf = 0; + double userbuf = 0; + uint64_t totaltime = 0; + int arrskip = 0; + + assert(cpus > 0); + + if (cpus > 1) { + // Store values for the stats loop one extra element up in the array + // to leave room for the average to be calculated afterwards + arrskip++; + } + + // Calculate per-CPU statistics first + for (int i = 0; i < cpus; i++) { + if (spl->kd != NULL) { cpuinfo = kstat_lookup(spl->kd,"cpu",i,"sys"); } + if (cpuinfo != NULL) { kchain = kstat_read(spl->kd,cpuinfo,NULL); } + if (kchain != -1 ) { + idletime = kstat_data_lookup(cpuinfo,"cpu_nsec_idle"); + intrtime = kstat_data_lookup(cpuinfo,"cpu_nsec_intr"); + krnltime = kstat_data_lookup(cpuinfo,"cpu_nsec_kernel"); + usertime = kstat_data_lookup(cpuinfo,"cpu_nsec_user"); + } + + assert( (idletime != NULL) && (intrtime != NULL) + && (krnltime != NULL) && (usertime != NULL) ); + + CPUData* cpuData = &(spl->cpus[i+arrskip]); + totaltime = (idletime->value.ui64 - cpuData->lidle) + + (intrtime->value.ui64 - cpuData->lintr) + + (krnltime->value.ui64 - cpuData->lkrnl) + + (usertime->value.ui64 - cpuData->luser); + // Calculate percentages of deltas since last reading + cpuData->userPercent = ((usertime->value.ui64 - cpuData->luser) / (double)totaltime) * 100.0; + cpuData->nicePercent = (double)0.0; // Not implemented on Solaris + cpuData->systemPercent = ((krnltime->value.ui64 - cpuData->lkrnl) / (double)totaltime) * 100.0; + cpuData->irqPercent = ((intrtime->value.ui64 - cpuData->lintr) / (double)totaltime) * 100.0; + cpuData->systemAllPercent = cpuData->systemPercent + cpuData->irqPercent; + cpuData->idlePercent = ((idletime->value.ui64 - cpuData->lidle) / (double)totaltime) * 100.0; + // Store current values to use for the next round of deltas + cpuData->luser = usertime->value.ui64; + cpuData->lkrnl = krnltime->value.ui64; + cpuData->lintr = intrtime->value.ui64; + cpuData->lidle = idletime->value.ui64; + // Accumulate the current percentages into buffers for later average calculation + if (cpus > 1) { + userbuf += cpuData->userPercent; + krnlbuf += cpuData->systemPercent; + intrbuf += cpuData->irqPercent; + idlebuf += cpuData->idlePercent; + } + } + + if (cpus > 1) { + CPUData* cpuData = &(spl->cpus[0]); + cpuData->userPercent = userbuf / cpus; + cpuData->nicePercent = (double)0.0; // Not implemented on Solaris + cpuData->systemPercent = krnlbuf / cpus; + cpuData->irqPercent = intrbuf / cpus; + cpuData->systemAllPercent = cpuData->systemPercent + cpuData->irqPercent; + cpuData->idlePercent = idlebuf / cpus; + } +} + +static inline void SolarisProcessList_scanMemoryInfo(ProcessList* pl) { + SolarisProcessList* spl = (SolarisProcessList*) pl; + kstat_t *meminfo = NULL; + int ksrphyserr = 0; + kstat_named_t *totalmem_pgs = NULL; + kstat_named_t *lockedmem_pgs = NULL; + kstat_named_t *pages = NULL; + struct swaptable *sl = NULL; + struct swapent *swapdev = NULL; + uint64_t totalswap = 0; + uint64_t totalfree = 0; + int nswap = 0; + char *spath = NULL; + // PAGE_SIZE is a macro to a function call. + // Since we use it so much in here, go ahead copy + // the value locally. + int pgsiz = PAGE_SIZE; + + // Part 1 - physical memory + if (spl->kd != NULL) { meminfo = kstat_lookup(spl->kd,"unix",0,"system_pages"); } + if (meminfo != NULL) { ksrphyserr = kstat_read(spl->kd,meminfo,NULL); } + if (ksrphyserr != -1) { + totalmem_pgs = kstat_data_lookup( meminfo, "physmem" ); + lockedmem_pgs = kstat_data_lookup( meminfo, "pageslocked" ); + pages = kstat_data_lookup( meminfo, "pagestotal" ); + + pl->totalMem = ((totalmem_pgs->value.ui64)/1024) * pgsiz; + pl->usedMem = ((lockedmem_pgs->value.ui64)/1024) * pgsiz; + // Not sure how to implement this on Solaris - suggestions welcome! + pl->cachedMem = 0; + // Not really "buffers" but the best Solaris analogue that I can find to + // "memory in use but not by programs or the kernel itself" + pl->buffersMem = (((totalmem_pgs->value.ui64)/1024) - (pages->value.ui64)/1024) * pgsiz; + } else { + // Fall back to basic sysconf if kstat isn't working + pl->totalMem = sysconf(_SC_PHYS_PAGES) * pgsiz; + pl->buffersMem = 0; + pl->cachedMem = 0; + pl->usedMem = pl->totalMem - (sysconf(_SC_AVPHYS_PAGES) * pgsiz); + } + + // Part 2 - swap + nswap = swapctl(SC_GETNSWP, NULL); + if (nswap > 0) { sl = malloc(nswap * sizeof(swapent_t) + sizeof(int)); } + if (sl != NULL) { spath = malloc( nswap * MAXPATHLEN ); } + if (spath != NULL) { + swapdev = sl->swt_ent; + for (int i = 0; i < nswap; i++, swapdev++) { + swapdev->ste_path = spath; + spath += MAXPATHLEN; + } + sl->swt_n = nswap; + } + nswap = swapctl(SC_LIST, sl); + if (nswap > 0) { + swapdev = sl->swt_ent; + for (int i = 0; i < nswap; i++, swapdev++) { + totalswap += swapdev->ste_pages; + totalfree += swapdev->ste_free; + free(swapdev->ste_path); + } + free(sl); + } + pl->totalSwap = (totalswap * pgsiz)/1024; + pl->usedSwap = pl->totalSwap - ((totalfree * pgsiz)/1024); +} + +void ProcessList_delete(ProcessList* this) { + const SolarisProcessList* spl = (SolarisProcessList*) this; + if (spl->kd) kstat_close(spl->kd); + free(spl->cpus); + ProcessList_done(this); + free(this); +} + +void ProcessList_goThroughEntries(ProcessList* this) { + SolarisProcessList* spl = (SolarisProcessList*) this; + Settings* settings = this->settings; + bool hideKernelThreads = settings->hideKernelThreads; + bool hideUserlandThreads = settings->hideUserlandThreads; + DIR* dir = NULL; + struct dirent* entry = NULL; + char* name = NULL; + int pid; + bool preExisting = false; + Process* proc = NULL; + Process* parent = NULL; + SolarisProcess* sproc = NULL; + psinfo_t _psinfo; + pstatus_t _pstatus; + prusage_t _prusage; + char filename[MAX_NAME+1]; + FILE *fp = NULL; + uint64_t addRunning = 0; + uint64_t addTotal = 0; + struct timeval tv; + struct tm date; + + gettimeofday(&tv, NULL); + + // If these fail, then the relevant metrics will simply display as zero + SolarisProcessList_scanCPUTime(this); + SolarisProcessList_scanMemoryInfo(this); + + dir = opendir(PROCDIR); + if (!dir) return; // Is proc mounted? + while ((entry = readdir(dir)) != NULL) { + addRunning = 0; + addTotal = 0; + name = entry->d_name; + pid = atoi(name); + proc = ProcessList_getProcess(this, pid, &preExisting, (Process_New) SolarisProcess_new); + proc->tgid = parent ? parent->pid : pid; + sproc = (SolarisProcess *) proc; + xSnprintf(filename, MAX_NAME, "%s/%s/psinfo", PROCDIR, name); + fp = fopen(filename, "r"); + if ( fp == NULL ) continue; + fread(&_psinfo,sizeof(psinfo_t),1,fp); + fclose(fp); + xSnprintf(filename, MAX_NAME, "%s/%s/status", PROCDIR, name); + fp = fopen(filename, "r"); + if ( fp != NULL ) { + fread(&_pstatus,sizeof(pstatus_t),1,fp); + } + fclose(fp); + xSnprintf(filename, MAX_NAME, "%s/%s/usage", PROCDIR, name); + fp = fopen(filename,"r"); + if ( fp == NULL ) continue; + fread(&_prusage,sizeof(prusage_t),1,fp); + fclose(fp); + + if(!preExisting) { + sproc->kernel = false; + proc->pid = _psinfo.pr_pid; + proc->ppid = _psinfo.pr_ppid; + proc->tgid = _psinfo.pr_pid; + sproc->zoneid = _psinfo.pr_zoneid; + proc->tty_nr = _psinfo.pr_ttydev; + proc->pgrp = _psinfo.pr_pgid; + // NOTE: These 'percentages' are 16-bit BINARY FRACTIONS where 1.0 = 0x8000 + // Source: https://docs.oracle.com/cd/E19253-01/816-5174/proc-4/index.html + // (accessed on 18 November 2017) + proc->percent_cpu = ((uint16_t)_psinfo.pr_pctcpu/(double)32768)*(double)100.0; + proc->percent_mem = ((uint16_t)_psinfo.pr_pctmem/(double)32768)*(double)100.0; + proc->st_uid = _psinfo.pr_euid; + proc->user = UsersTable_getRef(this->usersTable, proc->st_uid); + proc->nlwp = _psinfo.pr_nlwp; + proc->session = _pstatus.pr_sid; + setCommand(proc,_psinfo.pr_fname,PRFNSZ); + setZoneName(spl->kd,sproc); + proc->majflt = _prusage.pr_majf; + proc->minflt = _prusage.pr_minf; + proc->m_resident = (_psinfo.pr_rssize)/8; + proc->m_size = (_psinfo.pr_size)/8; + proc->priority = _psinfo.pr_lwp.pr_pri; + proc->nice = _psinfo.pr_lwp.pr_nice; + proc->processor = _psinfo.pr_lwp.pr_onpro; + proc->state = _psinfo.pr_lwp.pr_sname; + proc->time = _psinfo.pr_time.tv_sec; + sproc->taskid = _psinfo.pr_taskid; + sproc->projid = _psinfo.pr_projid; + sproc->poolid = _psinfo.pr_poolid; + sproc->contid = _psinfo.pr_contract; + proc->starttime_ctime = _psinfo.pr_start.tv_sec; + (void) localtime_r((time_t*) &proc->starttime_ctime, &date); + strftime(proc->starttime_show, 7, ((proc->starttime_ctime > tv.tv_sec - 86400) ? "%R " : "%b%d "), &date); + ProcessList_add(this, proc); + } else { + proc->ppid = _psinfo.pr_ppid; + sproc->zoneid = _psinfo.pr_zoneid; + // See note above about these percentages + proc->percent_cpu = ((uint16_t)_psinfo.pr_pctcpu/(double)32768)*(double)100.0; + proc->percent_mem = ((uint16_t)_psinfo.pr_pctmem/(double)32768)*(double)100.0; + proc->st_uid = _psinfo.pr_euid; + proc->pgrp = _psinfo.pr_pgid; + proc->nlwp = _psinfo.pr_nlwp; + proc->user = UsersTable_getRef(this->usersTable, proc->st_uid); + setCommand(proc,_psinfo.pr_fname,PRFNSZ); + setZoneName(spl->kd,sproc); + proc->majflt = _prusage.pr_majf; + proc->minflt = _prusage.pr_minf; + proc->m_resident = (_psinfo.pr_rssize)/8; + proc->m_size = (_psinfo.pr_size)/8; + proc->priority = _psinfo.pr_lwp.pr_pri; + proc->nice = _psinfo.pr_lwp.pr_nice; + proc->processor = _psinfo.pr_lwp.pr_onpro; + proc->state = _psinfo.pr_lwp.pr_sname; + proc->time = _psinfo.pr_time.tv_sec; + sproc->taskid = _psinfo.pr_taskid; + sproc->projid = _psinfo.pr_projid; + sproc->poolid = _psinfo.pr_poolid; + sproc->contid = _psinfo.pr_contract; + } + proc->show = !(hideKernelThreads && (_pstatus.pr_flags & PR_ISSYS)); + if (_pstatus.pr_flags & PR_ISSYS) { + if (hideKernelThreads) { + addRunning = 0; + addTotal = 0; + } else { + this->kernelThreads += proc->nlwp; + if (proc->state == 'O') { + addRunning++; + addTotal = proc->nlwp+1; + } else { + addTotal = proc->nlwp+1; + } + } + } else { + if (hideUserlandThreads) { + if(proc->state == 'O') { + addRunning++; + addTotal++; + } else { + addTotal++; + } + } else { + this->userlandThreads += proc->nlwp; + if(proc->state == 'O') { + addRunning++; + addTotal = proc->nlwp+1; + } else { + addTotal = proc->nlwp+1; + } + } + } + this->runningTasks+=addRunning; + this->totalTasks+=addTotal; + proc->updated = true; + } // while ((entry = readdir(dir)) != NULL) + closedir(dir); +} + diff --git a/solaris/SolarisProcessList.h b/solaris/SolarisProcessList.h new file mode 100644 index 00000000..5690ee87 --- /dev/null +++ b/solaris/SolarisProcessList.h @@ -0,0 +1,53 @@ +/* Do not edit this file. It was automatically generated. */ + +#ifndef HEADER_SolarisProcessList +#define HEADER_SolarisProcessList +/* +htop - SolarisProcessList.h +(C) 2014 Hisham H. Muhammad +(C) 2017 Guy M. Broome +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + +#define MAXCMDLINE 255 + + +#include +#include +#include +#include +#include +#include +#include +#include + +#define ZONE_ERRMSGLEN 1024 +char zone_errmsg[ZONE_ERRMSGLEN]; + +typedef struct CPUData_ { + double userPercent; + double nicePercent; + double systemPercent; + double irqPercent; + double idlePercent; + double systemAllPercent; + uint64_t luser; + uint64_t lkrnl; + uint64_t lintr; + uint64_t lidle; +} CPUData; + +typedef struct SolarisProcessList_ { + ProcessList super; + kstat_ctl_t* kd; + CPUData* cpus; +} SolarisProcessList; + +ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId); + +void ProcessList_delete(ProcessList* this); + +void ProcessList_goThroughEntries(ProcessList* this); + +#endif