Use pthread_cond_timedwait_monotonic on Android.

diff --git a/configure.in b/configure.in
index a80a81b..f5de580 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -304,6 +304,8 @@ AC_TRY_RUN(
 )
 dnl check if we actually are able to configure attributes on cond vars
 AC_CHECK_FUNCS(pthread_condattr_init)
+dnl instead of pthread_condattr_setclock Android has this function
+AC_CHECK_FUNCS(pthread_cond_timedwait_monotonic)
 dnl check if native rwlocks are available
 AC_CHECK_FUNCS(pthread_rwlock_init)
 LIBS=$saved_LIBS

diff --git a/src/libstrongswan/threading/mutex.c b/src/libstrongswan/threading/mutex.c
index 9c05ff0..a356956 100644 (file)
--- a/src/libstrongswan/threading/mutex.c
+++ b/src/libstrongswan/threading/mutex.c
@@ -253,6 +253,11 @@ static void _wait(private_condvar_t *this, private_mutex_t *mutex)
        }
 }
 
+/* use the monotonic clock based version of this function if available */
+#ifdef HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC
+#define pthread_cond_timedwait pthread_cond_timedwait_monotonic
+#endif
+
 /**
  * Implementation of condvar_t.timed_wait_abs.
  */

diff --git a/src/libstrongswan/utils.c b/src/libstrongswan/utils.c
index a3cb870..e331ac0 100644 (file)
--- a/src/libstrongswan/utils.c
+++ b/src/libstrongswan/utils.c
@@ -167,7 +167,9 @@ bool mkdir_p(const char *path, mode_t mode)
  */
 time_t time_monotonic(timeval_t *tv)
 {
-#if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_CONDATTR_CLOCK_MONOTONIC)
+#if defined(HAVE_CLOCK_GETTIME) && \
+       (defined(HAVE_CONDATTR_CLOCK_MONOTONIC) || \
+        defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC))
        /* as we use time_monotonic() for condvar operations, we use the
         * monotonic time source only if it is also supported by pthread. */
        timespec_t ts;
@@ -181,7 +183,7 @@ time_t time_monotonic(timeval_t *tv)
                }
                return ts.tv_sec;
        }
-#endif /* HAVE_CLOCK_MONOTONIC && HAVE_CONDATTR_CLOCK_MONOTONIC */
+#endif /* HAVE_CLOCK_GETTIME && (...) */
        /* Fallback to non-monotonic timestamps:
         * On MAC OS X, creating monotonic timestamps is rather difficult. We
         * could use mach_absolute_time() and catch sleep/wakeup notifications.