Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/aistatemachine/aistatemachine.cpp
View File

@@ -320,7 +320,7 @@ void print_statemachine_diagnostics(U64 total_clocks, AIStateMachine::StateTimer
AIStateMachine::StateTimerBase::DumpTimers(msg);
llwarns << msg.str() << llendl;
LL_WARNS() << msg.str() << LL_ENDL;
}
#endif
@@ -1264,7 +1264,7 @@ void AIStateMachine::abort(void)
// Block until the current run finished.
if (!mRunMutex.try_lock())
{
llwarns << "AIStateMachine::abort() blocks because the statemachine is still executing code in another thread." << llendl;
LL_WARNS() << "AIStateMachine::abort() blocks because the statemachine is still executing code in another thread." << LL_ENDL;
mRunMutex.lock();
}
mRunMutex.unlock();
@@ -1463,6 +1463,6 @@ void stopEngineThread(void)
{
ms_sleep(10);
}
llinfos << "State machine thread" << (!AIEngineThread::sInstance->isStopped() ? " not" : "") << " stopped after " << ((400 - count) * 10) << "ms." << llendl;
LL_INFOS() << "State machine thread" << (!AIEngineThread::sInstance->isStopped() ? " not" : "") << " stopped after " << ((400 - count) * 10) << "ms." << LL_ENDL;
}

2
indra/aistatemachine/aistatemachinethread.cpp
View File

@@ -149,7 +149,7 @@ void AIStateMachineThreadBase::abort_impl(void)
{
// The thread is still happily running (and will clean up itself).
// Lets make sure we're not flooded with this situation.
llwarns << "Thread state machine aborted while the thread is still running. That is a waste of CPU and should be avoided." << llendl;
LL_WARNS() << "Thread state machine aborted while the thread is still running. That is a waste of CPU and should be avoided." << LL_ENDL;
}
}
}