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

Bike fix: Always set mStatus to STOPPED

Browse Source
This commit is contained in:
Aleric Inglewood
2013-01-29 20:45:08 +01:00
parent d5ed31ca9b
commit e99175444f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/aistatemachine/aistatemachinethread.cpp
View File

@@ -50,12 +50,16 @@ class AIStateMachineThreadBase::Thread : public LLThread {
} }
/*virtual*/ void terminated(void) /*virtual*/ void terminated(void)
{ {
mStatus = STOPPED;
if (mNeedCleanup) if (mNeedCleanup)
{ {
// The state machine that started us has disappeared! Clean up ourselves. // The state machine that started us has disappeared! Clean up ourselves.
mStatus = STOPPED; // Stop LLThread::shutdown from blocking a whole minute and then calling apr_thread_exit to never return!
// This is OK now because nobody is watching us and having set the status to STOPPED didn't change anything really. // This is OK now because in our case nobody is watching us and having set
// Normally is can cause the LLThread to be deleted directly after by the main thread. // the status to STOPPED didn't change anything really, although it will
// prevent LLThread::shutdown from blocking a whole minute and then calling
// apr_thread_exit to never return! Normally, the LLThread might be deleted
// immediately (by the main thread) after setting mStatus to STOPPED.
Thread::completed(this); Thread::completed(this);
} }
} }