summaryrefslogtreecommitdiff
path: root/indra/llcommon/llmutex.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-12-05 14:22:18 -0800
committerRichard Linden <none@none>2012-12-05 14:22:18 -0800
commit68967e7b2b9416ff66cb49ae755fb33d7b81d129 (patch)
tree677a3fc20b046ddb5d656da31fc081a4c9baaa4c /indra/llcommon/llmutex.cpp
parent6c7825107f6ebb3dd8697a52aeb5d29a93060dc4 (diff)
SH-3406 WIP convert fast timers to lltrace system
changed thread id declaration to be local to llthread.cpp and use currentID() uniformly across platforms
Diffstat (limited to 'indra/llcommon/llmutex.cpp')
-rw-r--r--indra/llcommon/llmutex.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llcommon/llmutex.cpp b/indra/llcommon/llmutex.cpp
index e6beb9e680..b685bb4d60 100644
--- a/indra/llcommon/llmutex.cpp
+++ b/indra/llcommon/llmutex.cpp
@@ -83,11 +83,7 @@ void LLMutex::lock()
mIsLocked[id] = TRUE;
#endif
-#if LL_DARWIN
mLockingThread = LLThread::currentID();
-#else
- mLockingThread = LLThread::sThreadID;
-#endif
}
void LLMutex::unlock()
@@ -126,11 +122,7 @@ bool LLMutex::isLocked()
bool LLMutex::isSelfLocked()
{
-#if LL_DARWIN
return mLockingThread == LLThread::currentID();
-#else
- return mLockingThread == LLThread::sThreadID;
-#endif
}
U32 LLMutex::lockingThread() const