diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-04-02 10:51:53 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-04-05 20:45:46 -0400 |
| commit | bfe8ef8e577a41ce9f29cb5f7879368f5e4b5897 (patch) | |
| tree | 4cbdb76a3f126d50179739c0ccd61d387b1a73b6 /configure.ac | |
| parent | eac9d3764a35b6c219d74d750bad9d8e790cff77 (diff) | |
| download | haskell-bfe8ef8e577a41ce9f29cb5f7879368f5e4b5897.tar.gz | |
rts: Fix usage of pthread_setname_np
Previously we used this non-portable function unconditionally, breaking
FreeBSD.
Fixes #19637.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 68 |
1 files changed, 59 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index d602670cbb..9a164d8635 100644 --- a/configure.ac +++ b/configure.ac @@ -1214,20 +1214,70 @@ AC_CHECK_FUNC(pthread_create, AC_DEFINE_UNQUOTED([NEED_PTHREAD_LIB], [$need_lpthread], [Define 1 if we need to link code using pthreads with -lpthread]) +dnl Setting thread names +dnl ~~~~~~~~~~~~~~~~~~~~ +dnl The portability situation here is complicated: +dnl +dnl * FreeBSD supports pthread_set_name_np in <pthread_np.h> +dnl * glibc supports pthread_setname_np +dnl * Darwin supports pthread_setname_np but does not take a +dnl pthread_t argument. +dnl +AC_CHECK_HEADERS([pthread_np.h]) + dnl ** pthread_setname_np is a recent addition to glibc, and OS X has dnl a different single-argument version. AC_CHECK_LIB(pthread, pthread_setname_np) -AC_MSG_CHECKING(for pthread_setname_np) -AC_LINK_IFELSE([AC_LANG_PROGRAM( -[[ -#define _GNU_SOURCE -#include <pthread.h> -]], -[[pthread_setname_np(pthread_self(), "name");]])], + +AC_MSG_CHECKING([for pthread_setname_np (Darwin)]) +AC_LINK_IFELSE([ + AC_LANG_PROGRAM( + [[ + #include <pthread.h> + ]], + [[pthread_setname_np("name");]] + )], + [ + AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_DARWIN], [1], + [Define to 1 if you have the Darwin version of pthread_setname_np]) + ], + AC_MSG_RESULT(no) +) + +dnl glibc +AC_MSG_CHECKING([for pthread_setname_np (glibc)]) +AC_LINK_IFELSE([ + AC_LANG_PROGRAM( + [[ + #define _GNU_SOURCE + #include <pthread.h> + ]], + [[pthread_setname_np(pthread_self(), "name");]] + )], + [ AC_MSG_RESULT(yes) AC_DEFINE([HAVE_PTHREAD_SETNAME_NP], [1], - [Define to 1 if you have the glibc version of pthread_setname_np]), - AC_MSG_RESULT(no) + [Define to 1 if you have the glibc version of pthread_setname_np]) + ], + AC_MSG_RESULT(no) +) + +dnl FreeBSD +AC_MSG_CHECKING([for pthread_set_name_np]) +AC_LINK_IFELSE([ + AC_LANG_PROGRAM( + [[ + #include <pthread_np.h> + ]], + [[pthread_setname_np(pthread_self(), "name");]] + )], + [ + AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_PTHREAD_SET_NAME_NP], [1], + [Define to 1 if you have pthread_set_name_np]) + ], + AC_MSG_RESULT(no) ) dnl ** check for eventfd which is needed by the I/O manager |