mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-13 03:33:48 +00:00
clean up
This commit is contained in:
parent
31481931e8
commit
a81c6ebd06
8 changed files with 201 additions and 187 deletions
|
|
@ -49,7 +49,7 @@ static void CheckExitCode(S64 exitCode)
|
|||
{
|
||||
if (exitCode != 0)
|
||||
{
|
||||
Con::errorf(ConsoleLogEntry::General,
|
||||
Con::errorf(ConsoleLogEntry::General,
|
||||
"Nonzero exit code: %d, triggering SIGSEGV for core dump",
|
||||
exitCode);
|
||||
kill(getpid(), SIGSEGV);
|
||||
|
|
@ -63,7 +63,7 @@ static void SignalHandler(int sigtype)
|
|||
{
|
||||
signal(SIGSEGV, SIG_DFL);
|
||||
signal(SIGTRAP, SIG_DFL);
|
||||
// restore the signal handling to default so that we don't get into
|
||||
// restore the signal handling to default so that we don't get into
|
||||
// a crash loop with ImmediateShutdown
|
||||
ImmediateShutdown(-sigtype, sigtype);
|
||||
}
|
||||
|
|
@ -86,7 +86,7 @@ void Cleanup(bool minimal)
|
|||
|
||||
StdConsole::destroy();
|
||||
|
||||
#ifndef TORQUE_DEDICATED
|
||||
#ifndef TORQUE_DEDICATED
|
||||
SDL_Quit();
|
||||
#endif
|
||||
}
|
||||
|
|
@ -106,7 +106,7 @@ void ImmediateShutdown(S32 exitCode, S32 signalNum)
|
|||
}
|
||||
else
|
||||
{
|
||||
// there is a problem in kernel 2.4.17 which causes a hang when a segfault
|
||||
// there is a problem in kernel 2.4.17 which causes a hang when a segfault
|
||||
// occurs. also subsequent runs of "ps" will hang and the machine has to be
|
||||
// hard reset to clear up the problem
|
||||
// JMQ: this bug appears to be fixed in 2.4.18
|
||||
|
|
@ -131,7 +131,7 @@ void ProcessControlInit()
|
|||
signal(SIGTTIN, SIG_IGN);
|
||||
signal(SIGTTOU, SIG_IGN);
|
||||
|
||||
// we're not interested in the exit status of child processes, so this
|
||||
// we're not interested in the exit status of child processes, so this
|
||||
// prevents zombies from accumulating.
|
||||
#if defined(__FreeBSD__) || defined(__APPLE__)
|
||||
signal(SIGCHLD, SIG_IGN);
|
||||
|
|
@ -149,10 +149,6 @@ void ProcessControlInit()
|
|||
void Platform::postQuitMessage(const S32 in_quitVal)
|
||||
{
|
||||
|
||||
Process::requestShutdown();
|
||||
return;
|
||||
|
||||
|
||||
// if we have a window send a quit event, otherwise just force shutdown
|
||||
#if 0
|
||||
if (x86UNIXState->windowCreated())
|
||||
|
|
@ -161,18 +157,19 @@ void Platform::postQuitMessage(const S32 in_quitVal)
|
|||
SendQuitEvent();
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
forceShutdown(in_quitVal);
|
||||
}
|
||||
#endif
|
||||
Process::requestShutdown();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void Platform::debugBreak()
|
||||
{
|
||||
// in windows, "Calling DebugBreak causes the program to display
|
||||
// in windows, "Calling DebugBreak causes the program to display
|
||||
// a dialog box as if it had crashed." So we segfault.
|
||||
Con::errorf(ConsoleLogEntry::General,
|
||||
Con::errorf(ConsoleLogEntry::General,
|
||||
"Platform::debugBreak: triggering SIGSEGV for core dump");
|
||||
//kill(getpid(), SIGSEGV);
|
||||
|
||||
|
|
@ -203,20 +200,20 @@ void Platform::forceShutdown(S32 returnValue)
|
|||
void Platform::outputDebugString(const char *string, ...)
|
||||
{
|
||||
char buffer[2048];
|
||||
|
||||
|
||||
va_list args;
|
||||
va_start( args, string );
|
||||
|
||||
|
||||
dVsprintf( buffer, sizeof(buffer), string, args );
|
||||
va_end( args );
|
||||
|
||||
|
||||
U32 length = dStrlen(buffer);
|
||||
if( length == (sizeof(buffer) - 1 ) )
|
||||
length--;
|
||||
|
||||
|
||||
buffer[length++] = '\n';
|
||||
buffer[length] = '\0';
|
||||
|
||||
|
||||
fwrite(buffer, sizeof(char), length, stderr);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue