diff --git a/cmake/pthread_checks.cmake b/cmake/pthread_checks.cmake index c5e6d98b..c52ed22a 100644 --- a/cmake/pthread_checks.cmake +++ b/cmake/pthread_checks.cmake @@ -19,6 +19,14 @@ check_cxx_source_compiles(" }" HAVE_PTHREAD_GETNAME_NP) +check_cxx_source_compiles(" + #include + int main() + { + return pthread_setname_np(pthread_self(), \"name\"); + }" + HAVE_PTHREAD_SETNAME_NP_2ARG) + check_cxx_source_compiles(" #include int main() diff --git a/include/mp/config.h.in b/include/mp/config.h.in index b4ca6ded..05223b70 100644 --- a/include/mp/config.h.in +++ b/include/mp/config.h.in @@ -10,6 +10,7 @@ #cmakedefine HAVE_KJ_FILESYSTEM #cmakedefine HAVE_PTHREAD_GETNAME_NP @HAVE_PTHREAD_GETNAME_NP@ +#cmakedefine HAVE_PTHREAD_SETNAME_NP_2ARG @HAVE_PTHREAD_SETNAME_NP_2ARG@ #cmakedefine HAVE_PTHREAD_SETNAME_NP_3ARG @HAVE_PTHREAD_SETNAME_NP_3ARG@ #cmakedefine HAVE_PTHREAD_THREADID_NP @HAVE_PTHREAD_THREADID_NP@ #cmakedefine HAVE_PTHREAD_GETTHREADID_NP @HAVE_PTHREAD_GETTHREADID_NP@ diff --git a/src/mp/util.cpp b/src/mp/util.cpp index e9710eaa..e13eea2a 100644 --- a/src/mp/util.cpp +++ b/src/mp/util.cpp @@ -181,13 +181,15 @@ void SetOsThreadName(const char* name) { #if defined(PR_SET_NAME) // Only the first 15 characters are used (16 - NUL terminator) - ::prctl(PR_SET_NAME, name, 0, 0, 0); + ::prctl(PR_SET_NAME, name, 0, 0, 0); // Linux #elif defined(HAVE_PTHREAD_SETNAME_NP_3ARG) - pthread_setname_np(pthread_self(), "%s", const_cast(name)); + pthread_setname_np(pthread_self(), "%s", const_cast(name)); // NetBSD #elif defined(HAVE_PTHREAD_GETTHREADID_NP) - pthread_set_name_np(pthread_self(), name); + pthread_set_name_np(pthread_self(), name); // FreeBSD +#elif defined(HAVE_PTHREAD_SETNAME_NP_2ARG) + pthread_setname_np(pthread_self(), name); // illumos #elif defined(__APPLE__) - pthread_setname_np(name); + pthread_setname_np(name); // macOS #else // Prevent warnings for unused parameters... (void)name;