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

Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop

master
Brad Linden 2024-07-09 17:43:30 -05:00
parent 2a7030992f b6447dec4c
commit a79e02da0f
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
@ -506,7 +507,7 @@ namespace
LLError::TimeFunction mTimeFunction;
Recorders mRecorders;
LLCoros::Mutex mRecorderMutex;
boost::fibers::recursive_mutex mRecorderMutex;
int mShouldLogCallCounter;
@ -1044,7 +1045,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);
}
@ -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.erase(std::remove(s->mRecorders.begin(), s->mRecorders.end(), recorder),
s->mRecorders.end());
}
@ -1104,7 +1105,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;
}
@ -1115,7 +1116,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)
{
@ -1221,7 +1222,7 @@ namespace
std::string escaped_message;
LLCoros::LockType lock(s->mRecorderMutex);
std::unique_lock lock(s->mRecorderMutex);
for (LLError::RecorderPtr& r : s->mRecorders)
{
if (!r->enabled())