diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-08-31 16:37:51 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-08-31 16:37:51 +0000 |
| commit | c8bef4002688ea8a5d919c312f25c899f5552625 (patch) | |
| tree | 596b1e8476bf49712f5efc547ca6308cddd427c6 /winsup/cygwin/fhandler_process.cc | |
| parent | af598a3b0949b4d9f28d8d9933b79cd2cefd5d5a (diff) | |
| download | cygnal-c8bef4002688ea8a5d919c312f25c899f5552625.tar.gz cygnal-c8bef4002688ea8a5d919c312f25c899f5552625.tar.bz2 cygnal-c8bef4002688ea8a5d919c312f25c899f5552625.zip | |
* fhandler_proc.cc: Add <sys/param.h> include.
(format_proc_uptime): Use KernelTime and UserTime only as they include the
other counters.
(format_proc_stat): KernelTime includes IdleTime, so subtract IdleTime from
KernelTime. Make number of 'jiffies' per second same as HZ define.
* fhandler_process.cc: Add <sys/param.h> include.
(format_process_stat): Make number of 'jiffies' per second same as HZ define.
Use KernelTime and UserTime only to calculate start_time.
Diffstat (limited to 'winsup/cygwin/fhandler_process.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_process.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc index dc885820a..6f59b2abd 100644 --- a/winsup/cygwin/fhandler_process.cc +++ b/winsup/cygwin/fhandler_process.cc @@ -23,6 +23,7 @@ details. */ #include "dtable.h" #include "cygheap.h" #include "ntdll.h" +#include <sys/param.h> #include <assert.h> #define _COMPILING_NEWLIB @@ -454,22 +455,18 @@ format_process_stat (_pinfo *p, char *destbuf, size_t maxsize) return 0; } fault_count = vmc.PageFaultCount; - utime = put.UserTime.QuadPart / 100000ULL; - stime = put.KernelTime.QuadPart / 100000ULL; + utime = put.UserTime.QuadPart * HZ / 10000000ULL; + stime = put.KernelTime.QuadPart * HZ / 10000000ULL; if (stodi.CurrentTime.QuadPart > put.CreateTime.QuadPart) - start_time = (spt.InterruptTime.QuadPart + spt.KernelTime.QuadPart + - spt.IdleTime.QuadPart + spt.UserTime.QuadPart + - spt.DpcTime.QuadPart - stodi.CurrentTime.QuadPart + - put.CreateTime.QuadPart) / 100000ULL; + start_time = (spt.KernelTime.QuadPart + spt.UserTime.QuadPart - + stodi.CurrentTime.QuadPart + put.CreateTime.QuadPart) * HZ / 10000000ULL; else /* * sometimes stodi.CurrentTime is a bit behind * Note: some older versions of procps are broken and can't cope * with process start times > time(NULL). */ - start_time = (spt.InterruptTime.QuadPart + spt.KernelTime.QuadPart + - spt.IdleTime.QuadPart + spt.UserTime.QuadPart + - spt.DpcTime.QuadPart) / 100000ULL; + start_time = (spt.KernelTime.QuadPart + spt.UserTime.QuadPart) * HZ / 10000000ULL; priority = pbi.BasePriority; unsigned page_size = getpagesize(); vmsize = vmc.VirtualSize; @@ -478,7 +475,7 @@ format_process_stat (_pinfo *p, char *destbuf, size_t maxsize) } else { - start_time = (GetTickCount() / 1000 - time(NULL) + p->start_time) * 100; + start_time = (GetTickCount() / 1000 - time(NULL) + p->start_time) * HZ; } return __small_sprintf (destbuf, "%d (%s) %c " "%d %d %d %d %d " |