Commit 33b5bfb9 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Don't call pthread_condattr_setclock() unless it exists 

Fixes bug 17819; bugfix on 0.2.6.3-alpha (specifically, d684dbb0).
parent 784e9fff

changes/bug17819

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (compilation):

    - Don't try to use the pthrad_condattr_setclock() function unless

      it actually exists.  Fixes compilation on NetBSD-6.x. Fixes bug

      17819; bugfix on 0.2.6.3-alpha.

configure.ac

+1 −0
Original line number Diff line number Diff line
@@ -425,6 +425,7 @@ AC_CHECK_FUNCS( 
if test "$bwin32" != true; then

  AC_CHECK_HEADERS(pthread.h)

  AC_CHECK_FUNCS(pthread_create)

  AC_CHECK_FUNCS(pthread_condattr_setclock)

fi



if test "$bwin32" = true; then

src/common/compat_pthreads.c

+2 −1
Original line number Diff line number Diff line
@@ -185,7 +185,8 @@ tor_cond_init(tor_cond_t *cond) 
    return -1;

  }



#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)

#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC) \

  && defined(HAVE_PTHREAD_CONDATTR_SETCLOCK)

  /* Use monotonic time so when we timedwait() on it, any clock adjustment

   * won't affect the timeout value. */

  if (pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC)) {