From c8bef4002688ea8a5d919c312f25c899f5552625 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 31 Aug 2002 16:37:51 +0000 Subject: * fhandler_proc.cc: Add 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 include. (format_process_stat): Make number of 'jiffies' per second same as HZ define. Use KernelTime and UserTime only to calculate start_time. --- winsup/cygwin/fhandler_proc.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'winsup/cygwin/fhandler_proc.cc') 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 #include +#include #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; -- cgit v1.2.3