livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-20743 Use LLMutex in LLImageBase for internal data thread-safety (update)

meow-7.2.2
Alexander Gavriliuk 2024-01-07 14:44:52 +01:00 committed by Guru
parent f62b8591a2
commit e4a1feb830
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/llcommon/llmutex.cpp
View File

@ -196,9 +196,18 @@ void LLSharedMutex::lockExclusive()
LLThread::id_t current_thread = LLThread::currentID();
mLockMutex.lock();
if (mLockingThreads.size() == 1 && mLockingThreads.begin()->first == current_thread)
iterator it = mLockingThreads.find(current_thread);
if (it != mLockingThreads.end())
{
mLockingThreads.begin()->second++;
if (mIsShared)
{
// The mutex is already locked in the current thread
// but this lock is SHARED (not EXCLISIVE)
// We can't lock it again, the lock stays shared
// This can lead to a collision (theoretically)
llassert_always(!"The current thread is already locked SHARED and can't be locked EXCLUSIVE");
}
it->second++;
}
else
{