From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MU5bk-00063r-Pe
	for qemu-devel@nongnu.org; Thu, 23 Jul 2009 17:13:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MU5bg-0005zd-N5
	for qemu-devel@nongnu.org; Thu, 23 Jul 2009 17:13:44 -0400
Received: from [199.232.76.173] (port=52037 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MU5bg-0005zQ-Im
	for qemu-devel@nongnu.org; Thu, 23 Jul 2009 17:13:40 -0400
Received: from mail-px0-f201.google.com ([209.85.216.201]:55894)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <eswierk@aristanetworks.com>) id 1MU5bg-0002UW-33
	for qemu-devel@nongnu.org; Thu, 23 Jul 2009 17:13:40 -0400
Received: by pxi39 with SMTP id 39so790814pxi.4
	for <qemu-devel@nongnu.org>; Thu, 23 Jul 2009 14:13:36 -0700 (PDT)
From: Ed Swierk <eswierk@aristanetworks.com>
Content-Type: text/plain
Date: Thu, 23 Jul 2009 14:13:34 -0700
Message-Id: <1248383614.14831.40.camel@localhost.localdomain>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] [PATCH] slirp: Use monotonic clock if available (v2)
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Calling gettimeofday() to compute a time interval can cause problems if
the system clock jumps forwards or backwards; replace updtime() with
qemu_get_clock(rt_clock), which calls clock_gettime(CLOCK_MONOTONIC) if
it is available.

Also remove some useless macros.

Signed-off-by: Ed Swierk <eswierk@aristanetworks.com>

---
diff --git a/slirp/slirp.c b/slirp/slirp.c
index c68c6ab..3798780 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
+#include "qemu-timer.h"
 #include "qemu-char.h"
 #include "slirp.h"
 #include "hw/hw.h"
@@ -238,29 +239,6 @@ void slirp_cleanup(Slirp *slirp)
 #define CONN_CANFRCV(so) (((so)->so_state & (SS_FCANTRCVMORE|SS_ISFCONNECTED)) == SS_ISFCONNECTED)
 #define UPD_NFDS(x) if (nfds < (x)) nfds = (x)
 
-/*
- * curtime kept to an accuracy of 1ms
- */
-#ifdef _WIN32
-static void updtime(void)
-{
-    struct _timeb tb;
-
-    _ftime(&tb);
-
-    curtime = tb.time * 1000 + tb.millitm;
-}
-#else
-static void updtime(void)
-{
-    struct timeval tv;
-
-    gettimeofday(&tv, NULL);
-
-    curtime = tv.tv_sec * 1000 + tv.tv_usec / 1000;
-}
-#endif
-
 void slirp_select_fill(int *pnfds,
                        fd_set *readfds, fd_set *writefds, fd_set *xfds)
 {
@@ -399,8 +377,7 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds,
     global_writefds = writefds;
     global_xfds = xfds;
 
-	/* Update time */
-	updtime();
+    curtime = qemu_get_clock(rt_clock);
 
     TAILQ_FOREACH(slirp, &slirp_instances, entry) {
 	/*
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 22058cd..020412c 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -108,10 +108,6 @@ typedef unsigned char u_int8_t;
 #include <arpa/inet.h>
 #endif
 
-#ifdef GETTIMEOFDAY_ONE_ARG
-#define gettimeofday(x, y) gettimeofday(x)
-#endif
-
 /* Systems lacking strdup() definition in <string.h>. */
 #if defined(ultrix)
 char *strdup(const char *);
diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h
index ebaa99c..e977e77 100644
--- a/slirp/slirp_config.h
+++ b/slirp/slirp_config.h
@@ -187,9 +187,6 @@
 #define NO_UNIX_SOCKETS
 #endif
 
-/* Define if gettimeofday only takes one argument */
-#undef GETTIMEOFDAY_ONE_ARG
-
 /* Define if you have revoke() */
 #undef HAVE_REVOKE