From 7a09a5391ac5172470eb6597f08b24cd5965e9ac Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 3 Dec 2019 11:33:55 -0500
Subject: [PATCH] DRTVWR-494: Add on_main_thread(), sibling to
assert_main_thread().
---
indra/llcommon/llthread.cpp | 28 ++++++++++++++++++++++++----
indra/llcommon/llthread.h | 3 +--
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index a4171729dbb..f875e4e0dc3 100644
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -97,14 +97,34 @@ U32 LL_THREAD_LOCAL sThreadID = 0;
U32 LLThread::sIDIter = 0;
+namespace
+{
+
+ U32 main_thread()
+ {
+ // Using a function-static variable to identify the main thread
+ // requires that control reach here from the main thread before it
+ // reaches here from any other thread. We simply trust that whichever
+ // thread gets here first is the main thread.
+ static U32 s_thread_id = LLThread::currentID();
+ return s_thread_id;
+ }
+
+} // anonymous namespace
+
+LL_COMMON_API bool on_main_thread()
+{
+ return (LLThread::currentID() == main_thread());
+}
LL_COMMON_API void assert_main_thread()
{
- static U32 s_thread_id = LLThread::currentID();
- if (LLThread::currentID() != s_thread_id)
+ auto curr = LLThread::currentID();
+ auto main = main_thread();
+ if (curr != main)
{
- LL_WARNS() << "Illegal execution from thread id " << (S32) LLThread::currentID()
- << " outside main thread " << (S32) s_thread_id << LL_ENDL;
+ LL_WARNS() << "Illegal execution from thread id " << curr
+ << " outside main thread " << main << LL_ENDL;
}
}
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index 863c9051f38..37f6e66bbb8 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -34,8 +34,6 @@
#include "llrefcount.h"
#include <thread>
-LL_COMMON_API void assert_main_thread();
-
namespace LLTrace
{
class ThreadRecorder;
@@ -168,5 +166,6 @@ class LL_COMMON_API LLResponder : public LLThreadSafeRefCount
//============================================================================
extern LL_COMMON_API void assert_main_thread();
+extern LL_COMMON_API bool on_main_thread();
#endif // LL_LLTHREAD_H
--
GitLab