luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-14 09:53:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

gthread: Use pthread_cond_timedwait_monotonic() if available

Browse Source 
Otherwise we have to rely on pthread_cond_timedwait() actually using
the monotonic clock, which might be true or not. On Android at least
it is using the realtime clock, no pthread_condattr_setclock() is available
but instead pthread_cond_timedwait_monotonic() can be used.
This commit is contained in:
Sebastian Dröge 2013-07-04 10:27:02 +02:00
parent a4c352cd99
commit dbdfcb69ce
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -2383,6 +2383,24 @@ AS_IF([ test x"$have_threads" = xposix], [
AC_DEFINE(HAVE_PTHREAD_CONDATTR_SETCLOCK,1, AC_DEFINE(HAVE_PTHREAD_CONDATTR_SETCLOCK,1,
[Have function pthread_condattr_setclock])], [Have function pthread_condattr_setclock])],
[AC_MSG_RESULT(no)]) [AC_MSG_RESULT(no)])
AC_MSG_CHECKING(for pthread_cond_timedwait_monotonic)
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[#include <pthread.h>],
[pthread_cond_timedwait_monotonic(NULL, NULL, NULL)])],
[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC,1,
[Have function pthread_cond_timedwait_monotonic])],
[AC_MSG_RESULT(no)])
AC_MSG_CHECKING(for pthread_cond_timedwait_monotonic_np)
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[#include <pthread.h>],
[pthread_cond_timedwait_monotonic_np(NULL, NULL, NULL)])],
[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC_NP,1,
[Have function pthread_cond_timedwait_monotonic_np])],
[AC_MSG_RESULT(no)])
CPPFLAGS="$glib_save_CPPFLAGS" CPPFLAGS="$glib_save_CPPFLAGS"
]) ])

9
glib/gthread-posix.c
View File

@ -859,8 +859,17 @@ g_cond_wait_until (GCond *cond,
ts.tv_sec = end_time / 1000000; ts.tv_sec = end_time / 1000000;
ts.tv_nsec = (end_time % 1000000) * 1000; ts.tv_nsec = (end_time % 1000000) * 1000;
#if defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC)
if ((status = pthread_cond_timedwait_monotonic (g_cond_get_impl (cond), g_mutex_get_impl (mutex), &ts)) == 0)
return TRUE;
#elif defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC_NP)
if ((status = pthread_cond_timedwait_monotonic_np (g_cond_get_impl (cond), g_mutex_get_impl (mutex), &ts)) == 0)
return TRUE;
#else
/* Pray that the cond is actually using the monotonic clock */
if ((status = pthread_cond_timedwait (g_cond_get_impl (cond), g_mutex_get_impl (mutex), &ts)) == 0) if ((status = pthread_cond_timedwait (g_cond_get_impl (cond), g_mutex_get_impl (mutex), &ts)) == 0)
return TRUE; return TRUE;
#endif
if G_UNLIKELY (status != ETIMEDOUT) if G_UNLIKELY (status != ETIMEDOUT)
g_thread_abort (status, "pthread_cond_timedwait"); g_thread_abort (status, "pthread_cond_timedwait");