diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2014-02-27 16:35:22 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2014-02-27 16:35:22 -0300 |
commit | 6d90e58c01c606841753fb23b4effe3d815223cd (patch) | |
tree | 99153968af5251fdfbf534e1fc5b8e606f652c67 /Process.h | |
parent | 953ec71235f51934014f025ea113e788238e2e24 (diff) |
alignment improvements
Diffstat (limited to 'Process.h')
-rw-r--r-- | Process.h | 94 |
1 files changed, 52 insertions, 42 deletions
@@ -73,7 +73,6 @@ typedef struct Process_ { Object super; struct ProcessList_ *pl; - bool updated; pid_t pid; char* comm; @@ -89,12 +88,12 @@ typedef struct Process_ { pid_t tgid; int tpgid; unsigned long int flags; - #ifdef DEBUG - unsigned long int minflt; - unsigned long int cminflt; - unsigned long int majflt; - unsigned long int cmajflt; - #endif + + uid_t st_uid; + float percent_cpu; + float percent_mem; + char* user; + unsigned long long int utime; unsigned long long int stime; unsigned long long int cutime; @@ -105,25 +104,21 @@ typedef struct Process_ { IOPriority ioPriority; char starttime_show[8]; time_t starttime_ctime; - #ifdef DEBUG - long int itrealvalue; - unsigned long int vsize; - long int rss; - unsigned long int rlim; - unsigned long int startcode; - unsigned long int endcode; - unsigned long int startstack; - unsigned long int kstkesp; - unsigned long int kstkeip; - unsigned long int signal; - unsigned long int blocked; - unsigned long int sigignore; - unsigned long int sigcatch; - unsigned long int wchan; - unsigned long int nswap; - unsigned long int cnswap; + + #ifdef HAVE_TASKSTATS + unsigned long long io_rchar; + unsigned long long io_wchar; + unsigned long long io_syscr; + unsigned long long io_syscw; + unsigned long long io_read_bytes; + unsigned long long io_write_bytes; + unsigned long long io_cancelled_write_bytes; + double io_rate_read_bps; + unsigned long long io_rate_read_time; + double io_rate_write_bps; + unsigned long long io_rate_write_time; #endif - int exit_signal; + int processor; int m_size; int m_resident; @@ -132,10 +127,7 @@ typedef struct Process_ { int m_drs; int m_lrs; int m_dt; - uid_t st_uid; - float percent_cpu; - float percent_mem; - char* user; + #ifdef HAVE_OPENVZ unsigned int ctid; unsigned int vpid; @@ -143,25 +135,40 @@ typedef struct Process_ { #ifdef HAVE_VSERVER unsigned int vxid; #endif - #ifdef HAVE_TASKSTATS - unsigned long long io_rchar; - unsigned long long io_wchar; - unsigned long long io_syscr; - unsigned long long io_syscw; - unsigned long long io_read_bytes; - unsigned long long io_write_bytes; - unsigned long long io_cancelled_write_bytes; - double io_rate_read_bps; - unsigned long long io_rate_read_time; - double io_rate_write_bps; - unsigned long long io_rate_write_time; - #endif + #ifdef HAVE_CGROUP char* cgroup; #endif #ifdef HAVE_OOM unsigned int oom; #endif + + int exit_signal; + bool updated; + + #ifdef DEBUG + unsigned long int minflt; + unsigned long int cminflt; + unsigned long int majflt; + unsigned long int cmajflt; + long int itrealvalue; + unsigned long int vsize; + long int rss; + unsigned long int rlim; + unsigned long int startcode; + unsigned long int endcode; + unsigned long int startstack; + unsigned long int kstkesp; + unsigned long int kstkeip; + unsigned long int signal; + unsigned long int blocked; + unsigned long int sigignore; + unsigned long int sigcatch; + unsigned long int wchan; + unsigned long int nswap; + unsigned long int cnswap; + #endif + } Process; @@ -178,6 +185,9 @@ void Process_getMaxPid(); #define ONE_M (ONE_K * ONE_K) #define ONE_G (ONE_M * ONE_K) +#define ONE_DECIMAL_K 1000 +#define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K) + void Process_delete(Object* cast); extern ObjectClass Process_class; |