summaryrefslogtreecommitdiffstats
path: root/solaris
diff options
context:
space:
mode:
authorZev Weiss <zev@bewilderbeest.net>2019-12-21 01:09:25 -0800
committerZev Weiss <zev@bewilderbeest.net>2020-09-03 11:58:58 -0500
commita1a027b9bd833db5384d7dc65046194018eb8bfa (patch)
treec8e906c53b485435ceb79b30a3b5faa28554f0ca /solaris
parent7734dfe55d7c005063f2682e5611fc11e9143fd9 (diff)
Axe automated header generation.
Reasoning: - implementation was unsound -- broke down when I added a fairly basic macro definition expanding to a struct initializer in a *.c file. - made it way too easy (e.g. via otherwise totally innocuous git commands) to end up with timestamps such that it always ran MakeHeader.py but never used its output, leading to overbuild noise when running what should be a null 'make'. - but mostly: it's just an awkward way of dealing with C code.
Diffstat (limited to 'solaris')
-rw-r--r--solaris/Battery.h2
-rw-r--r--solaris/Platform.c22
-rw-r--r--solaris/Platform.h2
-rw-r--r--solaris/SolarisCRT.h2
-rw-r--r--solaris/SolarisProcess.c44
-rw-r--r--solaris/SolarisProcess.h2
-rw-r--r--solaris/SolarisProcessList.c39
-rw-r--r--solaris/SolarisProcessList.h2
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 ab2cf68b..b822237f 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 06c1330e..0e85f576 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
/*