[llvm] 647f892 - [llvm][Support] Simplify HAVE_PTHREAD_GETNAME/SETNAME_NP handling. NFCI (#106486)

[via llvm-commits]

Author: Brad Smith
Date: 2024-09-02T00:29:24-04:00
New Revision: 647f892a7281e99c4209cee07097f6a052ed474f

URL: https://github.com/llvm/llvm-project/commit/647f892a7281e99c4209cee07097f6a052ed474f
DIFF: https://github.com/llvm/llvm-project/commit/647f892a7281e99c4209cee07097f6a052ed474f.diff

LOG: [llvm][Support] Simplify HAVE_PTHREAD_GETNAME/SETNAME_NP handling. NFCI (#106486)

Added: 
    

Modified: 
    llvm/lib/Support/Unix/Threading.inc

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Support/Unix/Threading.inc b/llvm/lib/Support/Unix/Threading.inc
index 839c00c5ebbf96..6ba6395e6b8d63 100644
--- a/llvm/lib/Support/Unix/Threading.inc
+++ b/llvm/lib/Support/Unix/Threading.inc
@@ -141,12 +141,8 @@ static constexpr uint32_t get_max_thread_name_length_impl() {
   return PTHREAD_MAX_NAMELEN_NP;
 #elif defined(__APPLE__)
   return 64;
-#elif defined(__linux__)
-#if HAVE_PTHREAD_SETNAME_NP
+#elif defined(__linux__) && HAVE_PTHREAD_SETNAME_NP
   return 16;
-#else
-  return 0;
-#endif
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
   return 16;
 #elif defined(__OpenBSD__)
@@ -174,12 +170,8 @@ void llvm::set_thread_name(const Twine &Name) {
   if (get_max_thread_name_length() > 0)
     NameStr = NameStr.take_back(get_max_thread_name_length() - 1);
   (void)NameStr;
-#if defined(__linux__)
-#if (defined(__GLIBC__) && defined(_GNU_SOURCE)) || defined(__ANDROID__)
-#if HAVE_PTHREAD_SETNAME_NP
+#if defined(__linux__) && HAVE_PTHREAD_SETNAME_NP
   ::pthread_setname_np(::pthread_self(), NameStr.data());
-#endif
-#endif
 #elif defined(__FreeBSD__) || defined(__OpenBSD__)
   ::pthread_set_name_np(::pthread_self(), NameStr.data());
 #elif defined(__NetBSD__)
@@ -241,14 +233,12 @@ void llvm::get_thread_name(SmallVectorImpl<char> &Name) {
   ::pthread_get_name_np(::pthread_self(), buf, len);
 
   Name.append(buf, buf + strlen(buf));
-#elif defined(__linux__)
-#if HAVE_PTHREAD_GETNAME_NP
+#elif defined(__linux__) && HAVE_PTHREAD_GETNAME_NP
   constexpr uint32_t len = get_max_thread_name_length_impl();
   char Buffer[len] = {'\0'}; // FIXME: working around MSan false positive.
   if (0 == ::pthread_getname_np(::pthread_self(), Buffer, len))
     Name.append(Buffer, Buffer + strlen(Buffer));
 #endif
-#endif
 }
 
 SetThreadPriorityResult llvm::set_thread_priority(ThreadPriority Priority) {