From: Michał Kępień <michal@isc.org>
Date: Wed, 13 Jul 2022 11:19:32 +0000 (+0200)
Subject: Improve reporting for barrier errors
X-Git-Tag: v9.19.4~31^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b67ff4728f557fd0342c8139903094d8c6796ed9;p=thirdparty%2Fbind9.git

Improve reporting for barrier errors

uv_barrier_init() errors are currently ignored.  Use UV_RUNTIME_CHECK()
to catch them and to improve error reporting for any uv_barrier_init()
run-time failures (by augmenting error messages with file/line
information and the error string corresponding to the value returned).
---

diff --git a/lib/isc/include/isc/barrier.h b/lib/isc/include/isc/barrier.h
index 20bfdab0acd..5dcc13ccaf7 100644
--- a/lib/isc/include/isc/barrier.h
+++ b/lib/isc/include/isc/barrier.h
@@ -56,8 +56,14 @@ typedef uv_barrier_t isc_barrier_t;
 
 #endif /* ISC_TRACK_PTHREADS_OBJECTS */
 
-#define isc__barrier_init(bp, count) uv_barrier_init(bp, count)
-#define isc__barrier_wait(bp)	     uv_barrier_wait(bp)
-#define isc__barrier_destroy(bp)     uv_barrier_destroy(bp)
+#define isc__barrier_init(bp, count)                     \
+	{                                                \
+		int _ret = uv_barrier_init(bp, count);   \
+		UV_RUNTIME_CHECK(uv_barrier_init, _ret); \
+	}
+
+#define isc__barrier_wait(bp) uv_barrier_wait(bp)
+
+#define isc__barrier_destroy(bp) uv_barrier_destroy(bp)
 
 #endif /* __SANITIZE_THREAD__ */