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_proc.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_proc.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_proc.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc index 97b8a1751..417b59a25 100644 --- a/winsup/cygwin/fhandler_proc.cc +++ b/winsup/cygwin/fhandler_proc.cc @@ -23,6 +23,7 @@ details. */ #include "cygheap.h" #include <assert.h> #include <sys/utsname.h> +#include <sys/param.h> #include "ntdll.h" #define _COMPILING_NEWLIB @@ -423,9 +424,8 @@ format_proc_uptime (char *destbuf, size_t maxsize) else { idle_time = spt.IdleTime.QuadPart / 100000ULL; - uptime = (spt.InterruptTime.QuadPart + spt.KernelTime.QuadPart + - spt.IdleTime.QuadPart + spt.UserTime.QuadPart + - spt.DpcTime.QuadPart) / 100000ULL; + uptime = (spt.KernelTime.QuadPart + + spt.UserTime.QuadPart) / 100000ULL; } return __small_sprintf (destbuf, "%U.%02u %U.%02u\n", @@ -467,9 +467,9 @@ format_proc_stat (char *destbuf, size_t maxsize) ret, RtlNtStatusToDosError (ret)); return 0; } - kernel_time = (spt.KernelTime.QuadPart + spt.InterruptTime.QuadPart + spt.DpcTime.QuadPart) / 100000ULL; - user_time = spt.UserTime.QuadPart / 100000ULL; - idle_time = spt.IdleTime.QuadPart / 100000ULL; + kernel_time = (spt.KernelTime.QuadPart - spt.IdleTime.QuadPart) * HZ / 10000000ULL; + user_time = spt.UserTime.QuadPart * HZ / 10000000ULL; + idle_time = spt.IdleTime.QuadPart * HZ / 10000000ULL; interrupt_count = spt.InterruptCount; pages_in = spi.PagesRead; pages_out = spi.PagefilePagesWritten + spi.MappedFilePagesWritten; |