Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 00ba7cdd0608b1507027428f9f87b1cb9747372b Mon Sep 17 00:00:00 2001 |
| 2 | From: Dengke Du <dengke.du@windriver.com> |
| 3 | Date: Thu, 9 Feb 2017 15:54:53 +0800 |
| 4 | Subject: [PATCH] lib: Use PTHREAD_MUTEX_RECURSIVE in place of |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5 | PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP for non-glibc |
| 6 | |
| 7 | e.g. musl does not implement the _NP mutex types |
| 8 | |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 10 | Signed-off-by: Dengke Du <dengke.du@windriver.com> |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame^] | 11 | |
| 12 | Upstream-Status: Pending |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 13 | --- |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 14 | lib/tst_res.c | 4 ++++ |
| 15 | 1 file changed, 4 insertions(+) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 16 | |
| 17 | diff --git a/lib/tst_res.c b/lib/tst_res.c |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 18 | index 61daaeb..435224f 100644 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 19 | --- a/lib/tst_res.c |
| 20 | +++ b/lib/tst_res.c |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 21 | @@ -79,7 +79,11 @@ int TEST_ERRNO; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 22 | assert(strlen(buf) > 0); \ |
| 23 | } while (0) |
| 24 | |
| 25 | +#ifdef __GLIBC__ |
| 26 | static pthread_mutex_t tmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 27 | +#else |
| 28 | +static pthread_mutex_t tmutex = { PTHREAD_MUTEX_RECURSIVE }; |
| 29 | +#endif |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 30 | |
| 31 | static void check_env(void); |
| 32 | static void tst_condense(int tnum, int ttype, const char *tmesg); |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 33 | -- |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 34 | 2.7.4 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 35 | |