From 963e3aab2a736ae4be94220785d745f53cc71f33 Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Wed, 11 Jan 2006 06:19:47 +0000
Subject: [PATCH] Split out BacktraceAllThreads() and do so when signaled with
 SIGUSR1.

---
 stepmania/src/archutils/Unix/CrashHandler.cpp | 48 ++++++++++++-------
 .../src/archutils/Unix/SignalHandler.cpp      |  5 +-
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/stepmania/src/archutils/Unix/CrashHandler.cpp b/stepmania/src/archutils/Unix/CrashHandler.cpp
index f8744c4e16..ad8282839a 100644
--- a/stepmania/src/archutils/Unix/CrashHandler.cpp
+++ b/stepmania/src/archutils/Unix/CrashHandler.cpp
@@ -238,8 +238,11 @@ const char *SignalName( int signo )
 	X(SIGQUIT)
 	case SIGSEGV: return "Segmentation fault";
 	X(SIGTRAP) X(SIGTERM) X(SIGVTALRM) X(SIGXCPU) X(SIGXFSZ)
-#if defined(HAVE_DECL_SIGPWR) && HAVE_DECL_SIGPWR
+#if defined(HAVE_DECL_SIGPWR)
 	X(SIGPWR)
+#endif
+#if defined(HAVE_DECL_SIGUSR1)
+	case SIGUSR1: return "Forced crash";
 #endif
 	default:
 	{
@@ -352,6 +355,28 @@ static void RunCrashHandler( const CrashData *crash )
 	}
 }
 
+static void BacktraceAllThreads( CrashData& crash )
+{
+	int iCnt = 1;
+	uint64_t iID;
+	
+	for( int i = 0; RageThread::EnumThreadIDs(i, iID); ++i )
+	{
+		if( iID == GetInvalidThreadId() || iID == RageThread::GetCurrentThreadID() )
+			continue;
+		
+		BacktraceContext ctx;
+		if( GetThreadBacktraceContext( iID, &ctx ) )
+			GetBacktrace( crash.BacktracePointers[iCnt], BACKTRACE_MAX_SIZE, &ctx );
+		strncpy( crash.m_ThreadName[iCnt], RageThread::GetThreadNameByID(iID), sizeof(crash.m_ThreadName[0])-1 );
+		
+		++iCnt;
+		
+		if( iCnt == CrashData::MAX_BACKTRACE_THREADS )
+			break;
+	}
+}
+
 void CrashHandler::ForceCrash( const char *reason )
 {
 	CrashData crash;
@@ -378,22 +403,7 @@ void CrashHandler::ForceDeadlock( CString reason, uint64_t iID )
 	if( iID == GetInvalidThreadId() )
 	{
 		/* Backtrace all threads. */
-		int iCnt = 1;
-		for( int i = 0; RageThread::EnumThreadIDs(i, iID); ++i )
-		{
-			if( iID == GetInvalidThreadId() || iID == RageThread::GetCurrentThreadID() )
-				continue;
-
-			BacktraceContext ctx;
-			if( GetThreadBacktraceContext( iID, &ctx ) )
-				GetBacktrace( crash.BacktracePointers[iCnt], BACKTRACE_MAX_SIZE, &ctx );
-			strncpy( crash.m_ThreadName[iCnt], RageThread::GetThreadNameByID(iID), sizeof(crash.m_ThreadName[0])-1 );
-
-			++iCnt;
-
-			if( iCnt == CrashData::MAX_BACKTRACE_THREADS )
-				break;
-		}
+		BacktraceAllThreads( crash );
 	}
 	else
 	{
@@ -429,6 +439,10 @@ void CrashHandler::CrashSignalHandler( int signal, siginfo_t *si, const ucontext
 	BacktraceContext ctx;
 	GetSignalBacktraceContext( &ctx, uc );
 	GetBacktrace( crash.BacktracePointers[0], BACKTRACE_MAX_SIZE, &ctx );
+#if defined(HAVE_DECL_SIGUSR1)
+	if( signal == SIGUSR1 )
+		BacktraceAllThreads( crash );
+#endif
 
 	strncpy( crash.m_ThreadName[0], RageThread::GetCurThreadName(), sizeof(crash.m_ThreadName[0])-1 );
 
diff --git a/stepmania/src/archutils/Unix/SignalHandler.cpp b/stepmania/src/archutils/Unix/SignalHandler.cpp
index 8328f4e3d8..0495d3722d 100644
--- a/stepmania/src/archutils/Unix/SignalHandler.cpp
+++ b/stepmania/src/archutils/Unix/SignalHandler.cpp
@@ -33,8 +33,11 @@ static int signals[] =
 {
 	SIGALRM, SIGBUS, SIGFPE, SIGHUP, SIGILL, SIGINT, SIGABRT,
 	SIGQUIT, SIGSEGV, SIGTRAP, SIGTERM, SIGVTALRM, SIGXCPU, SIGXFSZ,
-#if defined(HAVE_DECL_SIGPWR) && HAVE_DECL_SIGPWR
+#if defined(HAVE_DECL_SIGPWR)
 	SIGPWR,
+#endif
+#if defined(HAVE_DECL_SIGUSR1)
+	SIGUSR1,
 #endif
 	-1
 };