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

move into namespace

Browse Source
This commit is contained in:
Glenn Maynard
2005-12-31 04:00:41 +00:00
parent 644801396c
commit 4d97933c43
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
+3 -3
View File
@@ -45,7 +45,7 @@ static void DoCrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *u
if( !IsFatalSignal(signal) ) if( !IsFatalSignal(signal) )
return; return;
CrashSignalHandler( signal, si, uc ); CrashHandler::CrashSignalHandler( signal, si, uc );
} }
#endif #endif
@@ -151,8 +151,8 @@ ArchHooks_Unix::ArchHooks_Unix()
SignalHandler::OnClose( DoCleanShutdown ); SignalHandler::OnClose( DoCleanShutdown );
#if defined(CRASH_HANDLER) #if defined(CRASH_HANDLER)
CrashHandlerHandleArgs( g_argc, g_argv ); CrashHandler::CrashHandlerHandleArgs( g_argc, g_argv );
InitializeCrashHandler(); CrashHandler::InitializeCrashHandler();
SignalHandler::OnClose( DoCrashSignalHandler ); SignalHandler::OnClose( DoCrashSignalHandler );
#endif #endif
stepmania/src/archutils/Unix/CrashHandler.cpp
+4 -4
View File
@@ -352,7 +352,7 @@ static void RunCrashHandler( const CrashData *crash )
} }
} }
void ForceCrashHandler( const char *reason ) void CrashHandler::ForceCrash( const char *reason )
{ {
CrashData crash; CrashData crash;
memset( &crash, 0, sizeof(crash) ); memset( &crash, 0, sizeof(crash) );
@@ -366,7 +366,7 @@ void ForceCrashHandler( const char *reason )
RunCrashHandler( &crash ); RunCrashHandler( &crash );
} }
void ForceCrashHandlerDeadlock( CString reason, uint64_t iID ) void CrashHandler::ForceDeadlock( CString reason, uint64_t iID )
{ {
CrashData crash; CrashData crash;
memset( &crash, 0, sizeof(crash) ); memset( &crash, 0, sizeof(crash) );
@@ -417,7 +417,7 @@ void ForceCrashHandlerDeadlock( CString reason, uint64_t iID )
/* XXX test for recursive crashes here (eg. GetBacktrace crashing) */ /* XXX test for recursive crashes here (eg. GetBacktrace crashing) */
void CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc ) void CrashHandler::CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc )
{ {
CrashData crash; CrashData crash;
memset( &crash, 0, sizeof(crash) ); memset( &crash, 0, sizeof(crash) );
@@ -435,7 +435,7 @@ void CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc )
RunCrashHandler( &crash ); RunCrashHandler( &crash );
} }
void InitializeCrashHandler() void CrashHandler::InitializeCrashHandler()
{ {
InitializeBacktrace(); InitializeBacktrace();
} }
stepmania/src/archutils/Unix/CrashHandler.h
+10 -7
View File
@@ -1,15 +1,18 @@
#ifndef CRASH_HANDLER_H #ifndef CRASH_HANDLER_H
#define CRASH_HANDLER_H #define CRASH_HANDLER_H
void ForceCrashHandler( const char *reason );
struct BacktraceContext;
void ForceCrashHandlerDeadlock( CString reason, uint64_t CrashHandle );
void CrashHandlerHandleArgs( int argc, char* argv[] );
void InitializeCrashHandler();
#include <csignal> #include <csignal>
#include <ucontext.h> #include <ucontext.h>
void CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc ); struct BacktraceContext;
namespace CrashHandler
{
void CrashHandlerHandleArgs( int argc, char* argv[] );
void InitializeCrashHandler();
void CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc );
void ForceCrash( const char *reason );
void ForceDeadlock( CString reason, uint64_t CrashHandle );
}
#endif #endif
stepmania/src/archutils/Unix/CrashHandlerChild.cpp
+1 -1
View File
@@ -366,7 +366,7 @@ static void child_process()
} }
void CrashHandlerHandleArgs( int argc, char* argv[] ) void CrashHandler::CrashHandlerHandleArgs( int argc, char* argv[] )
{ {
g_pCrashHandlerArgv0 = argv[0]; g_pCrashHandlerArgv0 = argv[0];
if( argc == 2 && !strcmp(argv[1], CHILD_MAGIC_PARAMETER) ) if( argc == 2 && !strcmp(argv[1], CHILD_MAGIC_PARAMETER) )