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

Added exception checks in OOLog(). Exceptions caught in [Universe update:] now report context at entity granularity.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1500 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2008-03-22 15:26:57 +00:00
parent aa77a4fc6c
commit b9d729fb01
2 changed files with 91 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Core/OOLogging.m
View File

@ -90,6 +90,7 @@ SOFTWARE.
#define OOLOG_BAD_SETTING 1 #define OOLOG_BAD_SETTING 1
#define OOLOG_BAD_DEFAULT_SETTING 1 #define OOLOG_BAD_DEFAULT_SETTING 1
#define OOLOG_BAD_POP_INDENT 1 #define OOLOG_BAD_POP_INDENT 1
#define OOLOG_EXCEPTION_IN_LOG 1
// Used to track OOLogPushIndent()/OOLogPopIndent() state. // Used to track OOLogPushIndent()/OOLogPopIndent() state.
@ -433,12 +434,12 @@ void OOLogWithFunctionFileAndLineAndArguments(NSString *inMessageClass, const ch
#endif #endif
pool = [[NSAutoreleasePool alloc] init]; pool = [[NSAutoreleasePool alloc] init];
NS_DURING
// Do argument substitution // Do argument substitution
formattedMessage = [[[NSString alloc] initWithFormat:inFormat arguments:inArguments] autorelease]; formattedMessage = [[[NSString alloc] initWithFormat:inFormat arguments:inArguments] autorelease];
// Apply various prefix options // Apply various prefix options
#ifndef OOLOG_NO_FILE_NAME #ifndef OOLOG_NO_FILE_NAME
if (sShowFileAndLine && inFile != NULL) if (sShowFileAndLine && inFile != NULL)
{ {
if (sShowFunction) if (sShowFunction)
@ -451,7 +452,7 @@ void OOLogWithFunctionFileAndLineAndArguments(NSString *inMessageClass, const ch
} }
} }
else else
#endif #endif
{ {
if (sShowFunction) if (sShowFunction)
{ {
@ -508,6 +509,9 @@ void OOLogWithFunctionFileAndLineAndArguments(NSString *inMessageClass, const ch
} }
OOLogOutputHandlerPrint(formattedMessage); OOLogOutputHandlerPrint(formattedMessage);
NS_HANDLER
OOLogInternal(OOLOG_EXCEPTION_IN_LOG, @"***** Exception thrown during logging: %@ : %@", [localException name], [localException reason]);
NS_ENDHANDLER
[pool release]; [pool release];
} }
@ -679,6 +683,7 @@ static void OOLogInternal_(const char *inFunction, NSString *inFormat, ...)
pool = [[NSAutoreleasePool alloc] init]; pool = [[NSAutoreleasePool alloc] init];
NS_DURING
va_start(args, inFormat); va_start(args, inFormat);
formattedMessage = [[[NSString alloc] initWithFormat:inFormat arguments:args] autorelease]; formattedMessage = [[[NSString alloc] initWithFormat:inFormat arguments:args] autorelease];
va_end(args); va_end(args);
@ -687,6 +692,9 @@ static void OOLogInternal_(const char *inFunction, NSString *inFormat, ...)
if (sShowApplication) formattedMessage = [NSString stringWithFormat:@"%@: %@", APPNAME, formattedMessage]; if (sShowApplication) formattedMessage = [NSString stringWithFormat:@"%@: %@", APPNAME, formattedMessage];
OOLogOutputHandlerPrint(formattedMessage); OOLogOutputHandlerPrint(formattedMessage);
NS_HANDLER
fprintf(stderr, "***** Exception in OOLogInternal_(): %s : %s", [[localException name] UTF8String], [[localException reason] UTF8String]);
NS_ENDHANDLER
[pool release]; [pool release];
} }

23
src/Core/Universe.m
View File

@ -5303,29 +5303,27 @@ OOINLINE BOOL EntityInRange(Vector p1, Entity *e2, float range)
for (i = 0; i < ent_count; i++) for (i = 0; i < ent_count; i++)
{ {
Entity *thing = my_entities[i]; Entity *thing = my_entities[i];
#ifndef NDEBUG
update_stage = [NSString stringWithFormat:@"update:entity[%@]", [thing shortDescription]];
#endif
[thing update:delta_t]; [thing update:delta_t];
// maintain sorted lists // maintain distance-from-player list
double z_distance = thing->zero_distance; double z_distance = thing->zero_distance;
// zero_index first..
int index = thing->zero_index; int index = thing->zero_index;
while ((index > 0)&&(z_distance < sortedEntities[index - 1]->zero_distance)) while (index > 0 && z_distance < sortedEntities[index - 1]->zero_distance)
{ {
sortedEntities[index] = sortedEntities[index - 1]; // bubble up the list, usually by just one position sortedEntities[index] = sortedEntities[index - 1]; // bubble up the list, usually by just one position
sortedEntities[index - 1 ] = thing; sortedEntities[index - 1] = thing;
thing->zero_index = index - 1; thing->zero_index = index - 1;
sortedEntities[index]->zero_index = index; sortedEntities[index]->zero_index = index;
index--; index--;
} }
// done maintaining sorted lists
// update deterministic AI // update deterministic AI
if ([thing isShip])
if (thing->isShip)
{ {
AI* theShipsAI = [(ShipEntity *)thing getAI]; AI* theShipsAI = [(ShipEntity *)thing getAI];
if (theShipsAI) if (theShipsAI)
@ -5333,6 +5331,9 @@ OOINLINE BOOL EntityInRange(Vector p1, Entity *e2, float range)
double thinkTime = [theShipsAI nextThinkTime]; double thinkTime = [theShipsAI nextThinkTime];
if ((universal_time > thinkTime)||(thinkTime == 0.0)) if ((universal_time > thinkTime)||(thinkTime == 0.0))
{ {
#ifndef NDEBUG
update_stage = [NSString stringWithFormat:@"update:think[%@]", [thing shortDescription]];
#endif
[theShipsAI setNextThinkTime:universal_time + [theShipsAI thinkTimeInterval]]; [theShipsAI setNextThinkTime:universal_time + [theShipsAI thinkTimeInterval]];
[theShipsAI think]; [theShipsAI think];
} }
@ -5340,10 +5341,12 @@ OOINLINE BOOL EntityInRange(Vector p1, Entity *e2, float range)
} }
} }
// Maintain x/y/z order lists
update_stage = @"updating linked lists"; update_stage = @"updating linked lists";
for (i = 0; i < ent_count; i++) for (i = 0; i < ent_count; i++)
{
[my_entities[i] updateLinkedLists]; [my_entities[i] updateLinkedLists];
}
// detect collisions and light ships that can see the sun // detect collisions and light ships that can see the sun