summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2014-06-10 21:22:16 +0100
committerPádraig Brady <P@draigBrady.com>2014-06-10 23:44:45 +0100
commitb0d4fe9539b3c4651bfa6a34af03fe93f69cc72a (patch)
tree3d1ed85be7160bbe8df84e814c8398579a04c8e6
parenta008d625b7854d2c08c6606d90f6f2f48263f973 (diff)
downloadgnulib-b0d4fe9539b3c4651bfa6a34af03fe93f69cc72a.tar.gz
times: fix to return non constant value on MS-Windows
The existing implementation of times() for MS-Windows uses the process creation time returned by the GetProcessTimes API to construct the value that the function should return, which has two problems: The value is constant: every call to 'times' within the same process returns the same value. Callers generally expect the value to change, since Posix says the value is the elapsed time since some arbitrary point in time, and that point doesn't change for function calls in the same process. For example, Guile's test suite includes a test that calls 'times', sleeps for a few seconds, then calls 'times' again, and expects the return value to change according to approximately the number of seconds it slept. The value overflows the clock_t data type (which is 32 bits wide), because its point of origin is Jan 1, 1601. This is unnecessary, since the point of origin can change from process to process. * lib/times.c (times): Don't use the process creation time, rather clock() which on windows returns the number of clock ticks since the process started.
-rw-r--r--ChangeLog7
-rw-r--r--lib/times.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fbb05bd40d..105befe734 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-10 Eli Zaretskii <eliz@gnu.org>
+
+ times: fix to return non constant value on MS-Windows
+ * lib/times.c (times): Don't use the process creation time,
+ rather clock() which on windows returns the number of
+ clock ticks since the process started.
+
2014-06-09 Michael Goffioul <michael.goffioul@gmail.com>
isatty: fix to work on windows 8
diff --git a/lib/times.c b/lib/times.c
index 87cbcd7f61..697f04ab85 100644
--- a/lib/times.c
+++ b/lib/times.c
@@ -62,5 +62,5 @@ times (struct tms * buffer)
buffer->tms_cutime = 0;
buffer->tms_cstime = 0;
- return filetime2clock (creation_time);
+ return clock ();
}