From d1f4a0fafa6286ef0e244a4e5f0cc75fefab735c Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 2 Sep 2008 01:19:07 +0000 Subject: [PATCH] * win32/win32.c (gettimeofday): calc tv_sec and tv_usec from system time by myself. [ruby-dev:36084] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@19050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/win32.c | 22 +++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9d3478ad1..ae21e306f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Sep 2 10:18:58 2008 NAKAMURA Usaku + + * win32/win32.c (gettimeofday): calc tv_sec and tv_usec from system + time by myself. [ruby-dev:36084] + Mon Sep 1 18:31:10 2008 NAKAMURA Usaku * win32/win32.c (gettimeofday): shouldn't use mktime(3) because it's diff --git a/win32/win32.c b/win32/win32.c index 0a0c3a299c..13ddbd374b 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2978,12 +2978,24 @@ waitpid(rb_pid_t pid, int *stat_loc, int options) int _cdecl gettimeofday(struct timeval *tv, struct timezone *tz) { - SYSTEMTIME st; - struct tm tm; + FILETIME ft; + ULARGE_INTEGER tmp; + unsigned LONG_LONG lt; - GetSystemTime(&st); - time(&tv->tv_sec); - tv->tv_usec = st.wMilliseconds * 1000; + GetSystemTimeAsFileTime(&ft); + tmp.LowPart = ft.dwLowDateTime; + tmp.HighPart = ft.dwHighDateTime; + lt = tmp.QuadPart; + + /* lt is now 100-nanosec intervals since 1601/01/01 00:00:00 UTC, + convert it into UNIX time (since 1970/01/01 00:00:00 UTC). + the first leap second is at 1972/06/30, so we doesn't need to think + about it. */ + lt /= 10000; /* to msec */ + lt -= (LONG_LONG)(369 * 365 + 24 * 3 + 17) * 24 * 60 * 60 * 1000; + + tv->tv_sec = lt / 1000; + tv->tv_usec = lt % 1000; return 0; }