diff options
author | Graham Inggs <ginggs@debian.org> | 2018-02-05 14:48:53 +0200 |
---|---|---|
committer | Graham Inggs <ginggs@debian.org> | 2018-02-05 14:48:53 +0200 |
commit | 0bffedf65c053726a3a09be93c5eabfc113550fc (patch) | |
tree | 8c14970f1890c710df6f72aaa85781d62cee11e5 /linux/LinuxProcess.h | |
parent | ba3d665468e9752a81a50bb2df7639950e0a3c77 (diff) | |
parent | 2ee50d030178cede83eb9d0005fbc19f819d30fe (diff) | |
download | debian_htop-0bffedf65c053726a3a09be93c5eabfc113550fc.tar.gz debian_htop-0bffedf65c053726a3a09be93c5eabfc113550fc.tar.bz2 debian_htop-0bffedf65c053726a3a09be93c5eabfc113550fc.zip |
Merge tag 'upstream/2.1.0'
Upstream version 2.1.0
Diffstat (limited to 'linux/LinuxProcess.h')
-rw-r--r-- | linux/LinuxProcess.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h index f2d81aa..9400d7b 100644 --- a/linux/LinuxProcess.h +++ b/linux/LinuxProcess.h @@ -73,7 +73,12 @@ typedef enum LinuxProcessFields { #endif OOM = 114, IO_PRIORITY = 115, - LAST_PROCESSFIELD = 116, + #ifdef HAVE_DELAYACCT + PERCENT_CPU_DELAY = 116, + PERCENT_IO_DELAY = 117, + PERCENT_SWAP_DELAY = 118, + #endif + LAST_PROCESSFIELD = 119, } LinuxProcessField; #include "IOPriority.h" @@ -116,6 +121,16 @@ typedef struct LinuxProcess_ { char* cgroup; #endif unsigned int oom; + char* ttyDevice; + #ifdef HAVE_DELAYACCT + unsigned long long int delay_read_time; + unsigned long long cpu_delay_total; + unsigned long long blkio_delay_total; + unsigned long long swapin_delay_total; + float cpu_delay_percent; + float blkio_delay_percent; + float swapin_delay_percent; + #endif } LinuxProcess; #ifndef Process_isKernelThread @@ -151,6 +166,10 @@ IOPriority LinuxProcess_updateIOPriority(LinuxProcess* this); bool LinuxProcess_setIOPriority(LinuxProcess* this, IOPriority ioprio); +#ifdef HAVE_DELAYACCT +void LinuxProcess_printDelay(float delay_percent, char* buffer, int n); +#endif + void LinuxProcess_writeField(Process* this, RichString* str, ProcessField field); long LinuxProcess_compare(const void* v1, const void* v2); |