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

Bug fix in debug code.

Browse Source
This commit is contained in:
Aleric Inglewood
2013-03-07 05:23:23 +01:00
parent 58c07f8054
commit 4e0269b3d0
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
indra/aistatemachine/aistatemachine.cpp
View File

@@ -456,7 +456,7 @@ void AIStateMachine::multiplex(event_type event)
break; break;
} }
} }
mDebugLastState = state; // More sanity checks.
if (state == bs_multiplex) if (state == bs_multiplex)
{ {
// set_state is only called from multiplex_impl and therefore synced with mMultiplexMutex. // set_state is only called from multiplex_impl and therefore synced with mMultiplexMutex.
@@ -466,13 +466,6 @@ void AIStateMachine::multiplex(event_type event)
} }
// Any previous reason to run is voided by actually running. // Any previous reason to run is voided by actually running.
mDebugShouldRun = false; mDebugShouldRun = false;
// Make sure we only call ref() once and in balance with unref().
if (state == bs_initialize)
{
// This -- and call to ref() (and the test when we're about to call unref()) -- is all done in the critical area of mMultiplexMutex.
llassert(!mDebugRefCalled);
mDebugRefCalled = true;
}
#endif #endif
mRunMutex.lock(); mRunMutex.lock();
@@ -483,7 +476,20 @@ void AIStateMachine::multiplex(event_type event)
{ {
// abort() was called from a child state machine, from another thread, while we were already scheduled to run normally from an engine. // abort() was called from a child state machine, from another thread, while we were already scheduled to run normally from an engine.
state = bs_abort; state = bs_abort;
#ifdef CWDEBUG
Dout(dc::statemachine, "Late abort detected! Running state " << state_str(state) << " instead [" << (void*)this << "]");
#endif
} }
#ifdef SHOW_ASSERT
mDebugLastState = state;
// Make sure we only call ref() once and in balance with unref().
if (state == bs_initialize)
{
// This -- and call to ref() (and the test when we're about to call unref()) -- is all done in the critical area of mMultiplexMutex.
llassert(!mDebugRefCalled);
mDebugRefCalled = true;
}
#endif
switch(state) switch(state)
{ {
case bs_reset: case bs_reset: