[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src w32.c
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs/src w32.c |
Date: |
Fri, 02 Jan 2009 15:07:20 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Eli Zaretskii <eliz> 09/01/02 15:07:20
Modified files:
src : w32.c
Log message:
(process_times): Compute sum of utime and stime.
(system_process_attributes): Add Qtime to the alist.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32.c?cvsroot=emacs&r1=1.157&r2=1.158
Patches:
Index: w32.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- w32.c 19 Dec 2008 19:50:39 -0000 1.157
+++ w32.c 2 Jan 2009 15:07:19 -0000 1.158
@@ -3771,14 +3771,14 @@
}
static int
-process_times (h_proc, ctime, etime, stime, utime, pcpu)
+process_times (h_proc, ctime, etime, stime, utime, ttime, pcpu)
HANDLE h_proc;
- Lisp_Object *ctime, *etime, *stime, *utime;
+ Lisp_Object *ctime, *etime, *stime, *utime, *ttime;
double *pcpu;
{
FILETIME ft_creation, ft_exit, ft_kernel, ft_user, ft_current;
long ctime_sec, ctime_usec, stime_sec, stime_usec, utime_sec, utime_usec;
- long etime_sec, etime_usec;
+ long etime_sec, etime_usec, ttime_sec, ttime_usec;
long double tem1, tem2, tem;
if (!h_proc
@@ -3797,6 +3797,9 @@
utime_usec = fmodl (tem2, 1000000.0L);
utime_sec = tem2 * 0.000001L;
*utime = ltime (utime_sec, utime_usec);
+ ttime_usec = fmodl (tem1 + tem2, 1000000.0L);
+ ttime_sec = (tem1 + tem2) * 0.000001L;
+ *ttime = ltime (ttime_sec, ttime_usec);
tem = convert_time_raw (ft_creation);
/* Process no 4 (System) returns zero creation time. */
if (tem)
@@ -3850,7 +3853,7 @@
MEMORYSTATUS memst;
MEMORY_STATUS_EX memstex;
double totphys = 0.0;
- Lisp_Object ctime, stime, utime, etime;
+ Lisp_Object ctime, stime, utime, etime, ttime;
double pcpu;
BOOL result = FALSE;
@@ -4109,10 +4112,11 @@
attrs = Fcons (Fcons (Qpmem, make_float (100. * rss / totphys)), attrs);
}
- if (process_times (h_proc, &ctime, &etime, &stime, &utime, &pcpu))
+ if (process_times (h_proc, &ctime, &etime, &stime, &utime, &ttime, &pcpu))
{
attrs = Fcons (Fcons (Qutime, utime), attrs);
attrs = Fcons (Fcons (Qstime, stime), attrs);
+ attrs = Fcons (Fcons (Qtime, ttime), attrs);
attrs = Fcons (Fcons (Qstart, ctime), attrs);
attrs = Fcons (Fcons (Qetime, etime), attrs);
attrs = Fcons (Fcons (Qpcpu, make_float (pcpu)), attrs);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src w32.c,
Eli Zaretskii <=