From 6906b42cdd3ab6eaa632c5d753aec34a4d2f193c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 11 Jan 2023 09:28:10 +0100 Subject: [PATCH] Prefer the pthread_barrier implementation over uv_barrier Prefer the pthread_barrier implementation on platforms where it is available over uv_barrier implementation. This also solves the problem with thread sanitizer builds on macOS that doesn't have pthread barrier. (cherry picked from commit d07c4a98da3d930aca83465347a4dd7bb423909f) --- configure.ac | 2 +- lib/isc/include/isc/barrier.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index aac4b1db74..d087762da8 100644 --- a/configure.ac +++ b/configure.ac @@ -498,7 +498,7 @@ LIBS="$PTHREAD_LIBS $LIBS" CFLAGS="$CFLAGS $PTHREAD_CFLAGS" CC="$PTHREAD_CC" -AC_CHECK_FUNCS([pthread_attr_getstacksize pthread_attr_setstacksize]) +AC_CHECK_FUNCS([pthread_attr_getstacksize pthread_attr_setstacksize pthread_barrier_init]) # [pairwise: --with-locktype=adaptive, --with-locktype=standard] AC_ARG_WITH([locktype], diff --git a/lib/isc/include/isc/barrier.h b/lib/isc/include/isc/barrier.h index 2ff380e158..a60472fd02 100644 --- a/lib/isc/include/isc/barrier.h +++ b/lib/isc/include/isc/barrier.h @@ -15,7 +15,7 @@ #include -#if __SANITIZE_THREAD__ +#if HAVE_PTHREAD_BARRIER_INIT #include