diff options
author | Nathan Scott <nathans@redhat.com> | 2020-09-08 16:45:11 +1000 |
---|---|---|
committer | Nathan Scott <nathans@redhat.com> | 2020-09-08 16:45:11 +1000 |
commit | eede79b29af116bc568c7f7a1be319f0c1dfd311 (patch) | |
tree | b271a1980e4b48a5178d60b8aed1efa6987e4e3d /solaris | |
parent | 85ff6960ed5c1312f9d773e695418fdbfffd5303 (diff) | |
parent | 7758ffcdeae26f47f4ad6ec847fb8292fd5ceee3 (diff) |
Merge branch 'noheadergen' of https://github.com/zevweiss/htop into zevweiss-noheadergen
Diffstat (limited to 'solaris')
-rw-r--r-- | solaris/Battery.h | 2 | ||||
-rw-r--r-- | solaris/Platform.c | 22 | ||||
-rw-r--r-- | solaris/Platform.h | 2 | ||||
-rw-r--r-- | solaris/SolarisCRT.h | 2 | ||||
-rw-r--r-- | solaris/SolarisProcess.c | 44 | ||||
-rw-r--r-- | solaris/SolarisProcess.h | 2 | ||||
-rw-r--r-- | solaris/SolarisProcessList.c | 39 | ||||
-rw-r--r-- | solaris/SolarisProcessList.h | 2 |
8 files changed, 0 insertions, 115 deletions
diff --git a/solaris/Battery.h b/solaris/Battery.h index 8dc0cef6..24d8f5c2 100644 --- a/solaris/Battery.h +++ b/solaris/Battery.h @@ -1,5 +1,3 @@ -/* Do not edit this file. It was automatically generated. */ - #ifndef HEADER_Battery #define HEADER_Battery diff --git a/solaris/Platform.c b/solaris/Platform.c index 092f4507..436c9ce9 100644 --- a/solaris/Platform.c +++ b/solaris/Platform.c @@ -33,28 +33,6 @@ in the source distribution for its full text. #include <math.h> #include <sys/var.h> -/*{ -#include "Action.h" -#include "BatteryMeter.h" -#include "SignalsPanel.h" -#include <signal.h> -#include <sys/mkdev.h> -#include <sys/proc.h> -#include <libproc.h> - -#define kill(pid, signal) kill(pid / 1024, signal) - -extern ProcessFieldData Process_fields[]; -typedef struct var kvar_t; - -typedef struct envAccum_ { - size_t capacity; - size_t size; - size_t bytes; - char *env; -} envAccum; - -}*/ double plat_loadavg[3] = {0}; diff --git a/solaris/Platform.h b/solaris/Platform.h index dd1962dd..041bf3fb 100644 --- a/solaris/Platform.h +++ b/solaris/Platform.h @@ -1,5 +1,3 @@ -/* Do not edit this file. It was automatically generated. */ - #ifndef HEADER_Platform #define HEADER_Platform /* diff --git a/solaris/SolarisCRT.h b/solaris/SolarisCRT.h index 6ab6dfca..01b75696 100644 --- a/solaris/SolarisCRT.h +++ b/solaris/SolarisCRT.h @@ -1,5 +1,3 @@ -/* Do not edit this file. It was automatically generated. */ - #ifndef HEADER_SolarisCRT #define HEADER_SolarisCRT /* diff --git a/solaris/SolarisProcess.c b/solaris/SolarisProcess.c index 514453fd..ab0bcab7 100644 --- a/solaris/SolarisProcess.c +++ b/solaris/SolarisProcess.c @@ -17,50 +17,6 @@ in the source distribution for its full text. #include <unistd.h> #include <sys/syscall.h> -/*{ -#include "Settings.h" -#include <zone.h> -#include <sys/proc.h> -#include <libproc.h> - -typedef enum SolarisProcessFields { - // Add platform-specific fields here, with ids >= 100 - ZONEID = 100, - ZONE = 101, - PROJID = 102, - TASKID = 103, - POOLID = 104, - CONTID = 105, - LWPID = 106, - LAST_PROCESSFIELD = 107, -} SolarisProcessField; - - -typedef struct SolarisProcess_ { - Process super; - int kernel; - zoneid_t zoneid; - char* zname; - taskid_t taskid; - projid_t projid; - poolid_t poolid; - ctid_t contid; - bool is_lwp; - pid_t realpid; - pid_t realppid; - pid_t lwpid; -} 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 = { diff --git a/solaris/SolarisProcess.h b/solaris/SolarisProcess.h index 1b3492a7..a1064a30 100644 --- a/solaris/SolarisProcess.h +++ b/solaris/SolarisProcess.h @@ -1,5 +1,3 @@ -/* Do not edit this file. It was automatically generated. */ - #ifndef HEADER_SolarisProcess #define HEADER_SolarisProcess /* diff --git a/solaris/SolarisProcessList.c b/solaris/SolarisProcessList.c index 4453c63d..e4074a7e 100644 --- a/solaris/SolarisProcessList.c +++ b/solaris/SolarisProcessList.c @@ -25,45 +25,6 @@ in the source distribution for its full text. #define MAXCMDLINE 255 -#define GZONE "global " -#define UZONE "unknown " -/*{ - -#include "zfs/ZfsArcStats.h" - -#include <kstat.h> -#include <sys/param.h> -#include <sys/uio.h> -#include <sys/resource.h> -#include <sys/sysconf.h> -#include <sys/sysinfo.h> -#include <sys/swap.h> - -#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; - ZfsArcStats zfs; -} SolarisProcessList; - -}*/ - char* SolarisProcessList_readZoneName(kstat_ctl_t* kd, SolarisProcess* sproc) { char* zname; if ( sproc->zoneid == 0 ) { diff --git a/solaris/SolarisProcessList.h b/solaris/SolarisProcessList.h index 97d5dc60..89ec46b2 100644 --- a/solaris/SolarisProcessList.h +++ b/solaris/SolarisProcessList.h @@ -1,5 +1,3 @@ -/* Do not edit this file. It was automatically generated. */ - #ifndef HEADER_SolarisProcessList #define HEADER_SolarisProcessList /* |