Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From f627fe16099a2b08d8b4e9023ae6b4f352451967 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 6 Nov 2016 08:59:08 -0800 |
| 4 | Subject: [PATCH] Test for pthread_getname_np before using it |
| 5 | |
| 6 | Its a GNU extention and not all libc implement it |
| 7 | musl e.g. implements the setname API but not getname |
| 8 | in any case, it seems to be safer to check for the |
| 9 | function before using it. |
| 10 | |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | --- |
| 13 | Upstream-Status: Submitted |
| 14 | |
| 15 | config.h.in | 3 +++ |
| 16 | configure.ac | 10 ++++++++++ |
| 17 | glib/tests/thread.c | 2 +- |
| 18 | 3 files changed, 14 insertions(+), 1 deletion(-) |
| 19 | |
| 20 | diff --git a/config.h.in b/config.h.in |
| 21 | index 2c35ff1..da7ac30 100644 |
| 22 | --- a/config.h.in |
| 23 | +++ b/config.h.in |
| 24 | @@ -326,6 +326,9 @@ |
| 25 | #undef HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP |
| 26 | |
| 27 | /* Have function pthread_setname_np(const char*) */ |
| 28 | +#undef HAVE_PTHREAD_GETNAME_NP |
| 29 | + |
| 30 | +/* Have function pthread_setname_np(const char*) */ |
| 31 | #undef HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID |
| 32 | |
| 33 | /* Have function pthread_setname_np(pthread_t, const char*) */ |
| 34 | diff --git a/configure.ac b/configure.ac |
| 35 | index 4309671..209770a 100644 |
| 36 | --- a/configure.ac |
| 37 | +++ b/configure.ac |
| 38 | @@ -2121,6 +2121,16 @@ AS_IF([ test x"$have_threads" = xposix], [ |
| 39 | AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP,1, |
| 40 | [Have function pthread_cond_timedwait_relative_np])], |
| 41 | [AC_MSG_RESULT(no)]) |
| 42 | + dnl gets thread names |
| 43 | + AC_MSG_CHECKING(for pthread_getname_np(pthread_t, char*, size_t)) |
| 44 | + AC_LINK_IFELSE( |
| 45 | + [AC_LANG_PROGRAM( |
| 46 | + [#include <pthread.h>], |
| 47 | + [pthread_getname_np(pthread_self(),"example",0)])], |
| 48 | + [AC_MSG_RESULT(yes) |
| 49 | + AC_DEFINE(HAVE_PTHREAD_GETNAME_NP,1, |
| 50 | + [Have function pthread_setname_np(const char*)])], |
| 51 | + [AC_MSG_RESULT(no)]) |
| 52 | dnl Sets thread names on OS X 10.6, iOS 3.2 (and higher) |
| 53 | AC_MSG_CHECKING(for pthread_setname_np(const char*)) |
| 54 | AC_LINK_IFELSE( |
| 55 | diff --git a/glib/tests/thread.c b/glib/tests/thread.c |
| 56 | index 5447836..2f248a6 100644 |
| 57 | --- a/glib/tests/thread.c |
| 58 | +++ b/glib/tests/thread.c |
| 59 | @@ -174,7 +174,7 @@ test_thread5 (void) |
| 60 | static gpointer |
| 61 | thread6_func (gpointer data) |
| 62 | { |
| 63 | -#ifdef HAVE_PTHREAD_SETNAME_NP_WITH_TID |
| 64 | +#if defined(HAVE_PTHREAD_SETNAME_NP_WITH_TID) && defined(HAVE_PTHREAD_GETNAME_NP) |
| 65 | char name[16]; |
| 66 | |
| 67 | pthread_getname_np (pthread_self(), name, 16); |
| 68 | -- |
| 69 | 2.10.2 |
| 70 | |