Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved reporting of AI stack overflows. Also added a test case, which I hope to make a habit of.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2366 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2009-09-03 16:44:52 +00:00
parent b15825ddfd
commit cb8524ae91
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Resources/Config/logcontrol.plist
View File

@ -63,7 +63,10 @@
ai.takeAction.debugMessage = inherit;
ai.takeAction.badSelector = inherit;
ai.pop = inherit;
ai.error.recursion = $aiError;
ai.error = $aiError;
ai.error.recursion = inherit;
ai.error.stackOverflow = inherit;
ai.error.stackOverflow.dump = inherit;
ai.setTakeOffFromPlanet.noPlanet = $aiError;
ai.suggestEscort = inherit;
ai.suggestEscort.refused = inherit;

41
src/Core/AI.m
View File

@ -1,3 +1,4 @@
/*
AI.m
@ -38,6 +39,13 @@ MA 02110-1301, USA.
#define kOOLogUnconvertedNSLog @"unclassified.AI"
enum
{
kRecursionLimiter = 32, // reactToMethod: recursion
kStackLimiter = 32 // setAITo: stack overflow
};
typedef struct
{
AI *ai;
@ -170,6 +178,32 @@ static AI *sCurrentlyRunningAI = nil;
}
- (void) reportStackOverflow
{
if (OOLogWillDisplayMessagesInClass(@"ai.error.stackOverflow"))
{
BOOL stackDump = OOLogWillDisplayMessagesInClass(@"ai.error.stackOverflow.dump");
NSString *trailer = stackDump ? @" -- stack:" : @".";
OOLogERR(@"ai.error.stackOverflow", @"AI stack overflow for %@ in %@: %@%@\n", [_owner shortDescription], stateMachineName, currentState, trailer);
if (stackDump)
{
OOLogIndent();
unsigned count = [aiStack count];
while (count--)
{
NSDictionary *pickledMachine = [aiStack objectAtIndex:count];
OOLog(@"ai.error.stackOverflow.dump", @"%3u: %@: %@", count, [pickledMachine stringForKey:@"stateMachineName"], [pickledMachine stringForKey:@"currentState"]);
}
OOLogOutdent();
}
}
}
- (void) preserveCurrentStateMachine
{
if (!stateMachine)
@ -184,9 +218,10 @@ static AI *sCurrentlyRunningAI = nil;
if (aiStack == nil) aiStack = [[NSMutableArray alloc] init];
if ([aiStack count] > 32)
if ([aiStack count] >= kStackLimiter)
{
OOLogERR(@"ai.pushStateMachine.overflow", @"AI stack overflow for %@ stack:\n%@", [_owner shortDescription], aiStack);
[self reportStackOverflow];
[NSException raise:@"OoliteException"
format:@"AI stack overflow for %@", _owner];
}
@ -346,7 +381,7 @@ static AI *sCurrentlyRunningAI = nil;
in takeAction:, but that could potentially miss indirect recursion via
scripts.
*/
if (recursionLimiter > 32)
if (recursionLimiter > kRecursionLimiter)
{
OOLogERR(@"ai.error.recursion", @"AI reactToMessage: recursion in AI %@, state %@, aborting. It is not valid to call reactToMessage: FOO in state FOO.", stateMachineName, currentState);
return;