Attachment 20192 Details for Bug 18121 – updated CLOCK_MONOTONIC patch

[patch] updated CLOCK_MONOTONIC patch

dbus-clock-monotonic.patch (text/plain), 3.69 KB, created by Colin Walters on 2008-11-10 09:40:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2008-11-10 09:40:56 UTC

Size: 3.69 KB

patch

obsolete

>diff --git a/configure.in b/configure.in
>index 5c21440..be2ceaf 100644
>--- a/configure.in
>+++ b/configure.in
>@@ -889,8 +889,30 @@ if $dbus_use_libxml; then
> fi
> 
> # Thread lib detection
>-AC_CHECK_FUNC(pthread_cond_timedwait,,[AC_CHECK_LIB(pthread,pthread_cond_timedwait,
>+AC_CHECK_FUNC(pthread_cond_timedwait,[AC_CHECK_LIB(pthread,pthread_cond_timedwait,
>                                                     [THREAD_LIBS="-lpthread"])])
>+save_libs="$LIBS"
>+LIBS="$LIBS $THREAD_LIBS"
>+AC_CHECK_FUNC(pthread_condattr_setclock,have_pthread_condattr_setclock=true,have_pthread_condattr_setclock=false)
>+if test x$have_pthread_condattr_setclock = xtrue; then
>+    AC_MSG_CHECKING([for CLOCK_MONOTONIC])
>+    AC_TRY_COMPILE([#include <time.h>
>+#include <pthread.h>
>+], [
>+struct timespec monotonic_timer;
>+pthread_condattr_t attr;
>+pthread_condattr_init (&attr);
>+pthread_condattr_setclock (&attr, CLOCK_MONOTONIC);
>+clock_getres (&monotonic_timer, CLOCK_MONOTONIC);
>+], have_clock_monotonic=true, have_clock_monotonic=false)
>+if test x$have_clock_monotonic = xtrue; then
>+    AC_MSG_RESULT([found])
>+    AC_DEFINE(HAVE_MONOTONIC_CLOCK, 1, [Define if we have CLOCK_MONOTONIC])
>+else
>+    AC_MSG_RESULT([not found])
>+fi
>+fi
>+LIBS="$save_libs"
> 
> # SELinux detection
> if test x$enable_selinux = xno ; then
>diff --git a/dbus/dbus-sysdeps-pthread.c b/dbus/dbus-sysdeps-pthread.c
>index 121ee12..22d20a3 100644
>--- a/dbus/dbus-sysdeps-pthread.c
>+++ b/dbus/dbus-sysdeps-pthread.c
>@@ -33,6 +33,15 @@
> #include <errno.h>
> #endif
> 
>+#include <config.h>
>+
>+/* Whether we have a "monotonic" clock; i.e. a clock not affected by
>+ * changes in system time.
>+ * This is initialized once in check_monotonic_clock below.
>+ * https://bugs.freedesktop.org/show_bug.cgi?id=18121
>+ */
>+static dbus_bool_t have_monotonic_clock = 0;
>+
> typedef struct {
>   pthread_mutex_t lock; /**< lock protecting count field */
>   volatile int count;   /**< count of how many times lock holder has recursively locked */
>@@ -184,13 +193,21 @@ static DBusCondVar *
> _dbus_pthread_condvar_new (void)
> {
>   DBusCondVarPThread *pcond;
>+  pthread_condattr_t attr;
>   int result;
>   
>   pcond = dbus_new (DBusCondVarPThread, 1);
>   if (pcond == NULL)
>     return NULL;
> 
>-  result = pthread_cond_init (&pcond->cond, NULL);
>+  pthread_condattr_init (&attr);
>+#ifdef HAVE_CLOCK_MONOTONIC
>+  if (have_monotonic_clock)
>+    pthread_condattr_setclock (&attr, CLOCK_MONOTONIC);
>+#endif
>+
>+  result = pthread_cond_init (&pcond->cond, &attr);
>+  pthread_condattr_destroy (&attr);
> 
>   if (result == EAGAIN || result == ENOMEM)
>     {
>@@ -248,8 +265,20 @@ _dbus_pthread_condvar_wait_timeout (DBusCondVar               *cond,
>   
>   _dbus_assert (pmutex->count > 0);
>   _dbus_assert (pthread_equal (pmutex->holder, pthread_self ()));  
>-  
>+
>+#ifdef HAVE_CLOCK_MONOTONIC
>+  if (have_monotonic_clock)
>+    {
>+      struct timespec monotonic_timer;
>+      clock_getres (&monotonic_timer, CLOCK_MONOTONIC);
>+      time_now.tv_sec = monotonic_timer.tv_sec;
>+      time_now.tv_usec = monotonic_timer.tv_nsec / 1000;
>+    }
>+  else
>+    /* This else falls through to gettimeofday */
>+#endif
>   gettimeofday (&time_now, NULL);
>+
>   
>   end_time.tv_sec = time_now.tv_sec + timeout_milliseconds / 1000;
>   end_time.tv_nsec = (time_now.tv_usec + (timeout_milliseconds % 1000) * 1000) * 1000;
>@@ -317,8 +346,19 @@ static const DBusThreadFunctions pthread_functions =
>   _dbus_pthread_mutex_unlock
> };
> 
>+static void
>+check_monotonic_clock (void)
>+{
>+#ifdef HAVE_CLOCK_MONOTONIC
>+  struct timespec dummy;
>+  if (clock_getres (CLOCK_MONOTONIC, &dummy) == 0)
>+    have_monotonic_clock = TRUE;
>+#endif
>+}
>+
> dbus_bool_t
> _dbus_threads_init_platform_specific (void)
> {
>+  check_monotonic_clock ();
>   return dbus_threads_init (&pthread_functions);
> }

Actions: View | Splinter Review

Attachments on bug 18121: 19739 | 20192 | 25224 | 25787

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.