actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Steve Checkoway
2006-01-09 02:10:14 +00:00
parent 7858052c43
commit e7943393b9
1 changed files with 112 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/archutils/Unix/CrashHandlerChild.cpp
+30 -25
View File
@@ -175,7 +175,7 @@ bool child_read( int fd, void *p, int size )
if( ret == 0 )
{
fprintf( stderr, "Crash handler: EOF communicating with parent.\n");
fprintf( stderr, "Crash handler: EOF communicating with parent.\n" );
return false;
}
@@ -249,15 +249,16 @@ static void child_process()
* This should time out, in case something deadlocks. */
char x;
int ret = read(3, &x, sizeof(x));
int ret = read( 3, &x, sizeof(x) );
if( ret > 0 )
{
fprintf( stderr, "Unexpected child read() result: %i\n", ret );
/* keep going */
} else if( (ret == -1 && errno != EPIPE) || ret != 0 )
}
else if( (ret == -1 && errno != EPIPE) || ret != 0 )
{
/* We expect an EOF or EPIPE. What happened? */
fprintf(stderr, "Unexpected child read() result: %i (%s)\n", ret, strerror(errno));
fprintf( stderr, "Unexpected child read() result: %i (%s)\n", ret, strerror(errno) );
/* keep going */
}
@@ -274,13 +275,13 @@ static void child_process()
exit(1);
}
fprintf(CrashDump, "%s crash report", PRODUCT_NAME_VER );
fprintf( CrashDump, "%s crash report", PRODUCT_NAME_VER );
#if defined(HAVE_VERSION_INFO)
fprintf(CrashDump, " (build %u)", version_num);
fprintf( CrashDump, " (build %u)", version_num);
#endif
fprintf(CrashDump, "\n");
fprintf(CrashDump, "--------------------------------------\n");
fprintf(CrashDump, "\n");
fprintf( CrashDump, "\n" );
fprintf( CrashDump, "--------------------------------------\n" );
fprintf( CrashDump, "\n" );
CString reason;
switch( crash.type )
@@ -296,8 +297,12 @@ static void child_process()
#endif
/* Linux puts the PID that sent the signal in si_addr for SI_USER. */
if( crash.si.si_code == SI_USER )
{
reason += ssprintf( " from pid %li", (long) crash.si.si_addr );
else switch( crash.signal )
}
else
{
switch( crash.signal )
{
case SIGILL:
case SIGFPE:
@@ -307,6 +312,7 @@ static void child_process()
}
break;
}
}
case CrashData::FORCE_CRASH:
crash.reason[ sizeof(crash.reason)-1] = 0;
reason = crash.reason;
@@ -317,9 +323,9 @@ static void child_process()
fprintf( CrashDump, "Crashed thread: %s\n\n", CrashedThread.c_str() );
fprintf(CrashDump, "Checkpoints:\n");
for (unsigned i=0; i<Checkpoints.size(); ++i)
fprintf(CrashDump, Checkpoints[i]);
fprintf(CrashDump, "\n");
for( unsigned i=0; i<Checkpoints.size(); ++i )
fprintf( CrashDump, Checkpoints[i] );
fprintf( CrashDump, "\n" );
for( int i = 0; i < CrashData::MAX_BACKTRACE_THREADS; ++i )
{
@@ -327,18 +333,18 @@ static void child_process()
break;
fprintf( CrashDump, "Thread: %s\n", crash.m_ThreadName[i] );
output_stack_trace( CrashDump, crash.BacktracePointers[i] );
fprintf(CrashDump, "\n");
fprintf( CrashDump, "\n" );
}
fprintf(CrashDump, "Static log:\n");
fprintf(CrashDump, "%s", Info);
fprintf(CrashDump, "%s", AdditionalLog);
fprintf(CrashDump, "\nPartial log:\n");
fprintf( CrashDump, "Static log:\n" );
fprintf( CrashDump, "%s", Info );
fprintf( CrashDump, "%s", AdditionalLog );
fprintf(CrashDump, "\nPartial log:\n" );
for( int i = 0; i < cnt; ++i )
fprintf(CrashDump, "%s\n", Recent[i] );
fprintf(CrashDump, "\n");
fprintf(CrashDump, "-- End of report\n");
fclose(CrashDump);
fprintf( CrashDump, "%s\n", Recent[i] );
fprintf( CrashDump, "\n" );
fprintf( CrashDump, "-- End of report\n" );
fclose( CrashDump) ;
#if defined(MACOSX)
/* Forcibly kill our parent. */
@@ -351,7 +357,7 @@ static void child_process()
if( tty == NULL )
tty = stderr;
fprintf(tty,
fprintf( tty,
"\n"
PRODUCT_NAME " has crashed. Debug information has been output to\n"
"\n"
@@ -360,8 +366,7 @@ static void child_process()
"Please report a bug at:\n"
"\n"
" " REPORT_BUG_URL "\n"
"\n"
);
"\n" );
#endif
}