Fix support for setting thread names on linux and macos

Signed-off-by: Rye <rye@alchemyviewer.org>

7 files changed, 40 insertions, 33 deletions

diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
index 1bd1bb2d2b..b82ced2f8d 100644
--- a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
+++ b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
@@ -345,6 +345,11 @@ public:
 
 int main(int argc, char** argv)
 {
+    // Call Tracy first thing to have it allocate memory
+    // https://github.com/wolfpld/tracy/issues/196
+    LL_PROFILER_FRAME_END;
+    LL_PROFILER_SET_THREAD_NAME("App");
+
     // List of input and output files
     std::list<std::string> input_filenames;
     std::list<std::string> output_filenames;
diff --git a/indra/llappearanceutility/appearance_utility.cpp b/indra/llappearanceutility/appearance_utility.cpp
index 88034cd171..a9a310eb89 100644
--- a/indra/llappearanceutility/appearance_utility.cpp
+++ b/indra/llappearanceutility/appearance_utility.cpp
@@ -34,6 +34,11 @@
 
 int main(int argc, char** argv)
 {
+    // Call Tracy first thing to have it allocate memory
+    // https://github.com/wolfpld/tracy/issues/196
+    LL_PROFILER_FRAME_END;
+    LL_PROFILER_SET_THREAD_NAME("App");
+
     // Create an application instance.
     ll_init_apr();
     LLAppAppearanceUtility* app = new LLAppAppearanceUtility(argc, argv);
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index 692941a892..e1f0d531cf 100644
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -42,6 +42,10 @@
 #include <sched.h>
 #endif
 
+#if LL_DARWIN || LL_LINUX
+#include <pthread.h>
+#endif
+
 
 #ifdef LL_WINDOWS
 
@@ -56,25 +60,32 @@ typedef struct tagTHREADNAME_INFO
     DWORD dwFlags; // Reserved for future use, must be zero.
 } THREADNAME_INFO;
 #pragma pack(pop)
+#endif
 
-void set_thread_name( DWORD dwThreadID, const char* threadName)
+void set_thread_name(const char* threadName)
 {
+#if LL_WINDOWS
     THREADNAME_INFO info;
-    info.dwType = 0x1000;
-    info.szName = threadName;
-    info.dwThreadID = dwThreadID;
-    info.dwFlags = 0;
+    info.dwType     = 0x1000;
+    info.szName     = threadName;
+    info.dwThreadID = GetCurrentThreadId();
+    info.dwFlags    = 0;
 
     __try
     {
-        ::RaiseException( MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(DWORD), (ULONG_PTR*)&info );
+        ::RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(DWORD), (ULONG_PTR*)&info);
     }
-    __except(EXCEPTION_CONTINUE_EXECUTION)
+    __except (EXCEPTION_CONTINUE_EXECUTION)
     {
     }
-}
+#elif LL_DARWIN
+    std::string truncated_name(std::string_view(threadName).substr(0, 15));
+    pthread_setname_np(truncated_name.c_str());
+#elif LL_LINUX
+    std::string truncated_name(std::string_view(threadName).substr(0, 15));
+    pthread_setname_np(pthread_self(), truncated_name.c_str());
 #endif
-
+}
 
 //----------------------------------------------------------------------------
 // Usage:
@@ -148,27 +159,12 @@ LL_COMMON_API bool assert_main_thread()
     return false;
 }
 
-// this function has become moot
-void LLThread::registerThreadID() {}
-
 //
 // Handed to the APR thread creation function
 //
 void LLThread::threadRun()
 {
-#ifdef LL_WINDOWS
-    set_thread_name(-1, mName.c_str());
-
-#if 0 // probably a bad idea, see usage of SetThreadIdealProcessor in LLWindowWin32)
-    HANDLE hThread = GetCurrentThread();
-    if (hThread)
-    {
-        SetThreadAffinityMask(hThread, (DWORD_PTR) 0xFFFFFFFFFFFFFFFE);
-    }
-#endif
-
-#endif
-
+    set_thread_name(mName.c_str());
     LL_PROFILER_SET_THREAD_NAME( mName.c_str() );
 
     // this is the first point at which we're actually running in the new thread
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index 8794ac93aa..b97d479abc 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -28,10 +28,11 @@
 #define LL_LLTHREAD_H
 
 #include "llapr.h"
-#include "boost/intrusive_ptr.hpp"
 #include "llrefcount.h"
 #include <thread>
 
+extern void set_thread_name(const char* threadName);
+
 namespace LLTrace
 {
     class ThreadRecorder;
@@ -86,11 +87,6 @@ public:
 
     id_t getID() const { return mID; }
 
-    // Called by threads *not* created via LLThread to register some
-    // internal state used by LLMutex.  You must call this once early
-    // in the running thread to prevent collisions with the main thread.
-    static void registerThreadID();
-
 private:
     bool                mPaused;
     std::thread::native_handle_type mNativeHandle; // for termination in case of issues
diff --git a/indra/llcommon/threadpool.cpp b/indra/llcommon/threadpool.cpp
index 451e60c083..6adbdffba8 100644
--- a/indra/llcommon/threadpool.cpp
+++ b/indra/llcommon/threadpool.cpp
@@ -78,6 +78,7 @@ void LL::ThreadPoolBase::start()
         std::string tname{ stringize(mName, ':', (i+1), '/', mThreadCount) };
         mThreads.emplace_back(tname, [this, tname]()
             {
+                set_thread_name(tname.c_str());
                 LL_PROFILER_SET_THREAD_NAME(tname.c_str());
                 run(tname);
             });
diff --git a/indra/llcorehttp/_httpservice.cpp b/indra/llcorehttp/_httpservice.cpp
index 5880fb7e87..03a2eab8e3 100644
--- a/indra/llcorehttp/_httpservice.cpp
+++ b/indra/llcorehttp/_httpservice.cpp
@@ -283,12 +283,11 @@ void HttpService::shutdown()
 // requested to stop.
 void HttpService::threadRun(LLCoreInt::HttpThread * thread)
 {
+    set_thread_name("HttpService");
     LL_PROFILER_SET_THREAD_NAME("HttpService");
 
     boost::this_thread::disable_interruption di;
 
-    LLThread::registerThreadID();
-
     ELoopSpeed loop(REQUEST_SLEEP);
     while (! mExitRequested)
     {
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index b611e52835..bf685ef20f 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -505,6 +505,11 @@ static LLTrace::ThreadRecorder* sMasterThreadRecorder = NULL;
 
 int main(int argc, char **argv)
 {
+    // Call Tracy first thing to have it allocate memory
+    // https://github.com/wolfpld/tracy/issues/196
+    LL_PROFILER_FRAME_END;
+    LL_PROFILER_SET_THREAD_NAME("App");
+
     ll_init_apr();
     apr_getopt_t* os = NULL;
     if(APR_SUCCESS != apr_getopt_init(&os, gAPRPoolp, argc, argv))