From b095202cad97245a01563756c9342f090ca22df7 Mon Sep 17 00:00:00 2001
From: hniksic <devnull@localhost>
Date: Mon, 30 Oct 2000 13:07:04 -0800
Subject: [PATCH] [svn] Applied Adrian Aichner's patch from
<20001029223711.28688.qmail@web10601.mail.yahoo.com>.
---
src/ChangeLog | 6 ++++++
src/retr.c | 41 +++++++++++++++++++++++++++++++++++------
2 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index 95761f72..490dbd09 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-13 Adrian Aichner <adrian@xemacs.org>
+
+ * retr.c: Add msec timing support for WINDOWS.
+ * retr.c (reset_timer): GetSystemTime() on WINDOWS.
+ * retr.c (elapsed_time): Calculate delta time to msec on WINDOWS.
+
2000-10-27 Dan Harkless <dan-wget@dilvish.speed.net>
* retr.c (retrieve_url): Manually applied T. Bharath
diff --git a/src/retr.c b/src/retr.c
index 8fa76175..92e787fb 100644
--- a/src/retr.c
+++ b/src/retr.c
@@ -43,8 +43,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "host.h"
#include "connect.h"
+#ifdef WINDOWS
+LARGE_INTEGER internal_time;
+#else
/* Internal variables used by the timer. */
static long internal_secs, internal_msecs;
+#endif
void logflush PARAMS ((void));
@@ -229,15 +233,29 @@ show_progress (long res, long expected, enum spflags flags)
void
reset_timer (void)
{
-#ifdef HAVE_GETTIMEOFDAY
+#ifndef WINDOWS
+ /* Under Unix, the preferred way to measure the passage of time is
+ through gettimeofday() because of its granularity. However, on
+ some old or weird systems, gettimeofday() might not be available.
+ There we use the simple time(). */
+# ifdef HAVE_GETTIMEOFDAY
struct timeval t;
gettimeofday (&t, NULL);
internal_secs = t.tv_sec;
internal_msecs = t.tv_usec / 1000;
-#else
+# else /* not HAVE_GETTIMEOFDAY */
internal_secs = time (NULL);
internal_msecs = 0;
-#endif
+# endif /* not HAVE_GETTIMEOFDAY */
+#else /* WINDOWS */
+ /* Under Windows, use Windows-specific APIs. */
+ FILETIME ft;
+ SYSTEMTIME st;
+ GetSystemTime(&st);
+ SystemTimeToFileTime(&st,&ft);
+ internal_time.HighPart = ft.dwHighDateTime;
+ internal_time.LowPart = ft.dwLowDateTime;
+#endif /* WINDOWS */
}
/* Return the time elapsed from the last call to reset_timer(), in
@@ -245,14 +263,25 @@ reset_timer (void)
long
elapsed_time (void)
{
-#ifdef HAVE_GETTIMEOFDAY
+#ifndef WINDOWS
+# ifdef HAVE_GETTIMEOFDAY
struct timeval t;
gettimeofday (&t, NULL);
return ((t.tv_sec - internal_secs) * 1000
+ (t.tv_usec / 1000 - internal_msecs));
-#else
+# else /* not HAVE_GETTIMEOFDAY */
return 1000 * ((long)time (NULL) - internal_secs);
-#endif
+# endif /* not HAVE_GETTIMEOFDAY */
+#else /* WINDOWS */
+ FILETIME ft;
+ SYSTEMTIME st;
+ LARGE_INTEGER li;
+ GetSystemTime(&st);
+ SystemTimeToFileTime(&st,&ft);
+ li.HighPart = ft.dwHighDateTime;
+ li.LowPart = ft.dwLowDateTime;
+ return (long) ((li.QuadPart - internal_time.QuadPart) / 1e4);
+#endif /* WINDOWS */
}
/* Print out the appropriate download rate. Appropriate means that if