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

Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus 

# Conflicts:
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.cpp
meow-7.2.2
Ansariel 2024-07-10 11:22:37 +02:00
parent 6ecb0278db d730e31e6e
commit 5a44c9ffed
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/llcommon/llerror.cpp
View File

@ -55,6 +55,7 @@
#include "llsingleton.h"
#include "llstl.h"
#include "lltimer.h"
#include <boost/fiber/recursive_mutex.hpp>
// On Mac, got:
// #error "Boost.Stacktrace requires `_Unwind_Backtrace` function. Define
@ -511,7 +512,7 @@ namespace
LLError::TimeFunction mTimeFunction;
Recorders mRecorders;
LLCoros::Mutex mRecorderMutex;
boost::fibers::recursive_mutex mRecorderMutex;
int mShouldLogCallCounter;
@ -1055,7 +1056,7 @@ namespace LLError
return;
}
SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
LLCoros::LockType lock(s->mRecorderMutex);
std::unique_lock lock(s->mRecorderMutex);
s->mRecorders.push_back(recorder);
}
@ -1066,7 +1067,7 @@ namespace LLError
return;
}
SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
LLCoros::LockType lock(s->mRecorderMutex);
std::unique_lock lock(s->mRecorderMutex);
s->mRecorders.erase(std::remove(s->mRecorders.begin(), s->mRecorders.end(), recorder),
s->mRecorders.end());
}
@ -1115,7 +1116,7 @@ namespace LLError
std::shared_ptr<RECORDER> findRecorder()
{
SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
LLCoros::LockType lock(s->mRecorderMutex);
std::unique_lock lock(s->mRecorderMutex);
return findRecorderPos<RECORDER>(s).first;
}
@ -1126,7 +1127,7 @@ namespace LLError
bool removeRecorder()
{
SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
LLCoros::LockType lock(s->mRecorderMutex);
std::unique_lock lock(s->mRecorderMutex);
auto found = findRecorderPos<RECORDER>(s);
if (found.first)
{
@ -1232,7 +1233,7 @@ namespace
std::string escaped_message;
LLCoros::LockType lock(s->mRecorderMutex);
std::unique_lock lock(s->mRecorderMutex);
for (LLError::RecorderPtr& r : s->mRecorders)
{
// <FS:Ansariel> Crash fix