New upstream version 3.0.5upstream/3.0.5

1 files changed, 15 insertions, 82 deletions

diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h
index ad396fb..2e9a9d1 100644
--- a/linux/LinuxProcess.h
+++ b/linux/LinuxProcess.h
@@ -18,85 +18,18 @@ in the source distribution for its full text.
 #include "Settings.h"
 
 
-#define PROCESS_FLAG_LINUX_IOPRIO   0x00000100
-#define PROCESS_FLAG_LINUX_OPENVZ   0x00000200
-#define PROCESS_FLAG_LINUX_VSERVER  0x00000400
-#define PROCESS_FLAG_LINUX_CGROUP   0x00000800
-#define PROCESS_FLAG_LINUX_OOM      0x00001000
-#define PROCESS_FLAG_LINUX_SMAPS    0x00002000
-#define PROCESS_FLAG_LINUX_CTXT     0x00004000
-#define PROCESS_FLAG_LINUX_SECATTR  0x00008000
-#define PROCESS_FLAG_LINUX_LRS_FIX  0x00010000
-#define PROCESS_FLAG_LINUX_CWD      0x00020000
-
-typedef enum UnsupportedProcessFields {
-   FLAGS = 9,
-   ITREALVALUE = 20,
-   VSIZE = 22,
-   RSS = 23,
-   RLIM = 24,
-   STARTCODE = 25,
-   ENDCODE = 26,
-   STARTSTACK = 27,
-   KSTKESP = 28,
-   KSTKEIP = 29,
-   SIGNAL = 30,
-   BLOCKED = 31,
-   SSIGIGNORE = 32,
-   SIGCATCH = 33,
-   WCHAN = 34,
-   NSWAP = 35,
-   CNSWAP = 36,
-   EXIT_SIGNAL = 37,
-} UnsupportedProcessField;
-
-typedef enum LinuxProcessFields {
-   CMINFLT = 11,
-   CMAJFLT = 13,
-   UTIME = 14,
-   STIME = 15,
-   CUTIME = 16,
-   CSTIME = 17,
-   M_SHARE = 41,
-   M_TRS = 42,
-   M_DRS = 43,
-   M_LRS = 44,
-   M_DT = 45,
-   #ifdef HAVE_OPENVZ
-   CTID = 100,
-   VPID = 101,
-   #endif
-   #ifdef HAVE_VSERVER
-   VXID = 102,
-   #endif
-   RCHAR = 103,
-   WCHAR = 104,
-   SYSCR = 105,
-   SYSCW = 106,
-   RBYTES = 107,
-   WBYTES = 108,
-   CNCLWB = 109,
-   IO_READ_RATE = 110,
-   IO_WRITE_RATE = 111,
-   IO_RATE = 112,
-   CGROUP = 113,
-   OOM = 114,
-   IO_PRIORITY = 115,
-   #ifdef HAVE_DELAYACCT
-   PERCENT_CPU_DELAY = 116,
-   PERCENT_IO_DELAY = 117,
-   PERCENT_SWAP_DELAY = 118,
-   #endif
-   M_PSS = 119,
-   M_SWAP = 120,
-   M_PSSWP = 121,
-   CTXT = 122,
-   SECATTR = 123,
-   PROC_COMM = 124,
-   PROC_EXE = 125,
-   CWD = 126,
-   LAST_PROCESSFIELD = 127,
-} LinuxProcessField;
+#define PROCESS_FLAG_LINUX_IOPRIO    0x00000100
+#define PROCESS_FLAG_LINUX_OPENVZ    0x00000200
+#define PROCESS_FLAG_LINUX_VSERVER   0x00000400
+#define PROCESS_FLAG_LINUX_CGROUP    0x00000800
+#define PROCESS_FLAG_LINUX_OOM       0x00001000
+#define PROCESS_FLAG_LINUX_SMAPS     0x00002000
+#define PROCESS_FLAG_LINUX_CTXT      0x00004000
+#define PROCESS_FLAG_LINUX_SECATTR   0x00008000
+#define PROCESS_FLAG_LINUX_LRS_FIX   0x00010000
+#define PROCESS_FLAG_LINUX_CWD       0x00020000
+#define PROCESS_FLAG_LINUX_DELAYACCT 0x00040000
+
 
 /* LinuxProcessMergedCommand is populated by LinuxProcess_makeCommandStr: It
  * contains the merged Command string, and the information needed by
@@ -191,11 +124,11 @@ static inline bool Process_isUserlandThread(const Process* this) {
    return this->pid != this->tgid;
 }
 
-extern long long btime;
+extern int pageSize;
 
-extern ProcessFieldData Process_fields[];
+extern int pageSizeKB;
 
-extern ProcessPidColumn Process_pidColumns[];
+extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD];
 
 extern const ProcessClass LinuxProcess_class;