diff options
author | Daniel Lange <DLange@git.local> | 2021-09-21 08:35:20 +0200 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2021-09-21 08:35:20 +0200 |
commit | a2b6942d15d220bb0518003d4f818a922d88e9f9 (patch) | |
tree | 7f60a44dec34af24da75b8d5b68c88eca94b9f6a /linux/LinuxProcessList.h | |
parent | 37d8824862a2f6b9375022e1c45ba4548162650f (diff) | |
parent | 69f439eff387a6ecb52734e400b297a3c85f2285 (diff) | |
download | debian_htop-a2b6942d15d220bb0518003d4f818a922d88e9f9.tar.gz debian_htop-a2b6942d15d220bb0518003d4f818a922d88e9f9.tar.bz2 debian_htop-a2b6942d15d220bb0518003d4f818a922d88e9f9.zip |
Update upstream source from tag 'upstream/3.1.0'
Update to upstream version '3.1.0'
with Debian dir d4ecdd99a38d7105de46689cebcb051bf0046a76
Diffstat (limited to 'linux/LinuxProcessList.h')
-rw-r--r-- | linux/LinuxProcessList.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/linux/LinuxProcessList.h b/linux/LinuxProcessList.h index 09b84af..a5640e2 100644 --- a/linux/LinuxProcessList.h +++ b/linux/LinuxProcessList.h @@ -18,6 +18,8 @@ in the source distribution for its full text. #include "ZramStats.h" #include "zfs/ZfsArcStats.h" +#define HTOP_HUGEPAGE_BASE_SHIFT 16 +#define HTOP_HUGEPAGE_COUNT 24 typedef struct CPUData_ { unsigned long long int totalTime; @@ -51,6 +53,8 @@ typedef struct CPUData_ { #ifdef HAVE_SENSORS_SENSORS_H double temperature; #endif + + bool online; } CPUData; typedef struct TtyDriver_ { @@ -63,15 +67,22 @@ typedef struct TtyDriver_ { typedef struct LinuxProcessList_ { ProcessList super; - CPUData* cpus; + CPUData* cpuData; + TtyDriver* ttyDrivers; bool haveSmapsRollup; + bool haveAutogroup; #ifdef HAVE_DELAYACCT struct nl_sock* netlink_socket; int netlink_family; #endif + memory_t totalHugePageMem; + memory_t usedHugePageMem[HTOP_HUGEPAGE_COUNT]; + + memory_t availableMem; + ZfsArcStats zfs; ZramStats zram; } LinuxProcessList; @@ -104,10 +115,12 @@ typedef struct LinuxProcessList_ { #define PROC_LINE_LENGTH 4096 #endif -ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, uid_t userId); +ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* dynamicMeters, Hashtable* dynamicColumns, Hashtable* pidMatchList, uid_t userId); void ProcessList_delete(ProcessList* pl); void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate); +bool ProcessList_isCPUonline(const ProcessList* super, unsigned int id); + #endif |