From 39d831f95d23d2ff23470d4e1998cc7621decc58 Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Sun, 19 Aug 2018 02:47:54 +0200 Subject: [PATCH] core: make pthread_get_name_np work when available FreeBSD will have a pthread_get_name_np() in libpthread Code for that was submitted Signed-off-by: Willem Jan Withagen --- CMakeLists.txt | 1 + src/include/compat.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9ec6bc4dd68e..8142f17d5a19f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,6 +104,7 @@ cmake_push_check_state(RESET) set(CMAKE_REQUIRED_LIBRARIES pthread) CHECK_FUNCTION_EXISTS(pthread_spin_init HAVE_PTHREAD_SPINLOCK) CHECK_FUNCTION_EXISTS(pthread_set_name_np HAVE_PTHREAD_SET_NAME_NP) +CHECK_FUNCTION_EXISTS(pthread_get_name_np HAVE_PTHREAD_GET_NAME_NP) CHECK_FUNCTION_EXISTS(pthread_setname_np HAVE_PTHREAD_SETNAME_NP) CHECK_FUNCTION_EXISTS(pthread_getname_np HAVE_PTHREAD_GETNAME_NP) CHECK_FUNCTION_EXISTS(pthread_rwlockattr_setkind_np HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP) diff --git a/src/include/compat.h b/src/include/compat.h index 06b4b127a7ecd..b6c629b7e03dd 100644 --- a/src/include/compat.h +++ b/src/include/compat.h @@ -159,6 +159,10 @@ #if defined(HAVE_PTHREAD_GETNAME_NP) #define ceph_pthread_getname pthread_getname_np +#elif defined(HAVE_PTHREAD_GET_NAME_NP) + #define ceph_pthread_getname(thread, name, len) ({ \ + pthread_get_name_np(thread, name, len); \ + 0; }) #else /* compiler warning free success noop */ #define ceph_pthread_getname(thread, name, len) ({ \ -- 2.39.5