diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2015-10-19 17:22:54 -0200 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-10-19 17:22:54 -0200 |
commit | 78f2933e2b166f709bfa339c4834ff9610f842b4 (patch) | |
tree | b1f0929c0510e7c3c32a302425808769a959b2e9 /freebsd | |
parent | e906c0dddb051ca7e1960691ab783b7e9e6212cf (diff) |
Regenerate platform-dependent headers.
Closes #293.
Diffstat (limited to 'freebsd')
-rw-r--r-- | freebsd/FreeBSDCRT.h | 4 | ||||
-rw-r--r-- | freebsd/FreeBSDProcess.h | 13 | ||||
-rw-r--r-- | freebsd/FreeBSDProcessList.h | 8 | ||||
-rw-r--r-- | freebsd/Platform.h | 5 |
4 files changed, 25 insertions, 5 deletions
diff --git a/freebsd/FreeBSDCRT.h b/freebsd/FreeBSDCRT.h index 3c808ca6..eb1091a9 100644 --- a/freebsd/FreeBSDCRT.h +++ b/freebsd/FreeBSDCRT.h @@ -1,7 +1,7 @@ /* Do not edit this file. It was automatically generated. */ -#ifndef HEADER_UnsupportedCRT -#define HEADER_UnsupportedCRT +#ifndef HEADER_FreeBSDCRT +#define HEADER_FreeBSDCRT /* htop - UnsupportedCRT.h (C) 2014 Hisham H. Muhammad diff --git a/freebsd/FreeBSDProcess.h b/freebsd/FreeBSDProcess.h index e11d40d0..23d298a3 100644 --- a/freebsd/FreeBSDProcess.h +++ b/freebsd/FreeBSDProcess.h @@ -12,15 +12,22 @@ in the source distribution for its full text. typedef enum FreeBSDProcessFields { // Add platform-specific fields here, with ids >= 100 - LAST_PROCESSFIELD = 100, + JID = 100, + JAIL = 101, + LAST_PROCESSFIELD = 102, } FreeBSDProcessField; + typedef struct FreeBSDProcess_ { Process super; + int kernel; + int jid; + char* jname; } FreeBSDProcess; + #ifndef Process_isKernelThread -#define Process_isKernelThread(_process) (_process->pgrp == 0) +#define Process_isKernelThread(_process) (_process->kernel == 1) #endif #ifndef Process_isUserlandThread @@ -32,7 +39,7 @@ extern ProcessClass FreeBSDProcess_class; extern ProcessFieldData Process_fields[]; -extern char* Process_pidFormat; +extern ProcessPidColumn Process_pidColumns[]; FreeBSDProcess* FreeBSDProcess_new(Settings* settings); diff --git a/freebsd/FreeBSDProcessList.h b/freebsd/FreeBSDProcessList.h index 9889f7c2..d3ccfc3a 100644 --- a/freebsd/FreeBSDProcessList.h +++ b/freebsd/FreeBSDProcessList.h @@ -11,6 +11,12 @@ in the source distribution for its full text. #include <kvm.h> +#include <sys/param.h> +#include <sys/jail.h> +#include <sys/uio.h> + +#define JAIL_ERRMSGLEN 1024 +char jail_errmsg[JAIL_ERRMSGLEN]; typedef struct CPUData_ { unsigned long long int totalTime; @@ -32,6 +38,8 @@ void ProcessList_delete(ProcessList* this); char* FreeBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, int* basenameEnd); +char* FreeBSDProcessList_readJailName(struct kinfo_proc* kproc); + void ProcessList_goThroughEntries(ProcessList* this); #endif diff --git a/freebsd/Platform.h b/freebsd/Platform.h index 3758f57d..ef46442a 100644 --- a/freebsd/Platform.h +++ b/freebsd/Platform.h @@ -11,6 +11,7 @@ in the source distribution for its full text. #include "Action.h" #include "BatteryMeter.h" +#include "SignalsPanel.h" extern ProcessFieldData Process_fields[]; @@ -19,6 +20,10 @@ extern ProcessField Platform_defaultFields[]; extern int Platform_numberOfFields; +extern SignalItem Platform_signals[]; + +extern unsigned int Platform_numberOfSignals; + void Platform_setBindings(Htop_Action* keys); extern MeterClass* Platform_meterTypes[]; |