From: Tom Hughes <tom.hughes@palm.com>
Date: Sun, 13 Dec 2009 21:30:09 +0000 (-0800)
Subject: Use monotonic clock for _dbus_get_current_time() if it's available.
X-Git-Tag: dbus-1.2.18~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c6596eb52fdf196705efe6c06dcd9fe8f836afc;p=thirdparty%2Fdbus.git

Use monotonic clock for _dbus_get_current_time() if it's available.

_dbus_get_current_time() is used for timeouts, but uses gettimeofday(), which
relies on the wall clock time, which can change. If the time is changed forwards
or backwards, the timeouts are no longer valid, so the monotonic clock must be used.

https://bugs.freedesktop.org/show_bug.cgi?id=25624

Signed-off-by: Colin Walters <walters@verbum.org>
---

diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 66bcf3cb8..ce3475a6e 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -2036,7 +2036,8 @@ _dbus_poll (DBusPollFD *fds,
 }
 
 /**
- * Get current time, as in gettimeofday().
+ * Get current time, as in gettimeofday(). Use the monotonic clock if
+ * available, to avoid problems when the system time changes.
  *
  * @param tv_sec return location for number of seconds
  * @param tv_usec return location for number of microseconds (thousandths)
@@ -2047,12 +2048,22 @@ _dbus_get_current_time (long *tv_sec,
 {
   struct timeval t;
 
+#ifdef HAVE_MONOTONIC_CLOCK
+  struct timespec ts;
+  clock_gettime (CLOCK_MONOTONIC, &ts);
+
+  if (tv_sec)
+    *tv_sec = ts.tv_sec;
+  if (tv_usec)
+    *tv_usec = ts.tv_nsec / 1000;
+#else
   gettimeofday (&t, NULL);
 
   if (tv_sec)
     *tv_sec = t.tv_sec;
   if (tv_usec)
     *tv_usec = t.tv_usec;
+#endif
 }
 
 /**