lib: make pthread_set[_]name_np test OS agnostic

FreeBSD supports pthread_set_name_np() too.  Also, pthread_set_name_np()
returns void.  And NetBSD has pthread_setname_np() with an extra arg...

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/configure.ac b/configure.ac
index 779c7ebb6a12eeefddbed5aca1a1c275a3a7840b..294d3bf3252e6e020fdc7142404d8785bb7a16f8 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -818,6 +818,7 @@ int main(int argc, char **argv) {
 AC_CHECK_HEADERS([pthread_np.h],,, [
 #include <pthread.h>
 ])
+AC_CHECK_FUNCS([pthread_setname_np pthread_set_name_np])
 
 dnl Utility macro to avoid retyping includes all the time
 m4_define([FRR_INCLUDES],

diff --git a/lib/frr_pthread.c b/lib/frr_pthread.c
index 7cae889ca9b83461ea291bcb0913877b31fff6d9..d48b23f38a9a1804831cfa81f1541d03260adc9f 100644 (file)
--- a/lib/frr_pthread.c
+++ b/lib/frr_pthread.c
@@ -166,10 +166,14 @@ int frr_pthread_set_name(struct frr_pthread *fpt, const char *name,
                pthread_mutex_lock(&fpt->mtx);
                snprintf(fpt->os_name, OS_THREAD_NAMELEN, "%s", os_name);
                pthread_mutex_unlock(&fpt->mtx);
-#ifdef GNU_LINUX
+#ifdef HAVE_PTHREAD_SETNAME_NP
+# ifdef GNU_LINUX
                ret = pthread_setname_np(fpt->thread, fpt->os_name);
-#elif defined(OPEN_BSD)
-               ret = pthread_set_name_np(fpt->thread, fpt->os_name);
+# else /* NetBSD */
+               ret = pthread_setname_np(fpt->thread, fpt->os_name, NULL);
+# endif
+#elif defined(HAVE_PTHREAD_SET_NAME_NP)
+               pthread_set_name_np(fpt->thread, fpt->os_name);
 #endif
        }