From 5103c5d643f7e7de7983619204a25c3c774478e8 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Fri, 21 Feb 2014 16:40:16 -0500 Subject: [PATCH] GCond: check result of pthread_condattr_setclock() Make sure this call succeeds, aborting if it doesn't This will prevent people from having to waste time chasing down the problems that would otherwise be caused by this silent failure. --- glib/gthread-posix.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c index 4a01f4d..c98c2d8 100644 --- a/glib/gthread-posix.c +++ b/glib/gthread-posix.c @@ -639,8 +639,13 @@ g_cond_impl_new (void) gint status; pthread_condattr_init (&attr); -#if defined (HAVE_PTHREAD_CONDATTR_SETCLOCK) && defined (CLOCK_MONOTONIC) - pthread_condattr_setclock (&attr, CLOCK_MONOTONIC); + +#ifdef HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP +#elif defined (HAVE_PTHREAD_CONDATTR_SETCLOCK) && defined (CLOCK_MONOTONIC) + if G_UNLIKELY ((status = pthread_condattr_setclock (&attr, CLOCK_MONOTONIC)) != 0) + g_thread_abort (status, "pthread_condattr_setclock"); +#else +#error Cannot support GCond on your platform. #endif cond = malloc (sizeof (pthread_cond_t)); -- 2.7.4