From 2faaa7518af744436fb706ed53a3d19c3274b69a Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Fri, 23 Feb 2007 10:35:00 +0000 Subject: [PATCH] GetCurThreadName -> GetCurrentThreadName to match GetCurrentThreadID. --- stepmania/src/RageThreads.cpp | 2 +- stepmania/src/RageThreads.h | 4 ++-- stepmania/src/archutils/Unix/CrashHandler.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/src/RageThreads.cpp b/stepmania/src/RageThreads.cpp index 52bb0fbc5d..90775f973b 100644 --- a/stepmania/src/RageThreads.cpp +++ b/stepmania/src/RageThreads.cpp @@ -284,7 +284,7 @@ RageThreadRegister::~RageThreadRegister() m_pSlot = NULL; } -const char *RageThread::GetCurThreadName() +const char *RageThread::GetCurrentThreadName() { return GetThreadNameByID( GetCurrentThreadID() ); } diff --git a/stepmania/src/RageThreads.h b/stepmania/src/RageThreads.h index 392e0f7bbd..045e840c58 100644 --- a/stepmania/src/RageThreads.h +++ b/stepmania/src/RageThreads.h @@ -25,7 +25,7 @@ public: static uint64_t GetCurrentThreadID(); - static const char *GetCurThreadName(); + static const char *GetCurrentThreadName(); static const char *GetThreadNameByID( uint64_t iID ); static bool EnumThreadIDs( int n, uint64_t &iID ); int Wait(); @@ -49,7 +49,7 @@ private: static bool s_bIsShowingDialog; }; -/* Register a thread created outside of RageThread. This gives it a name for RageThread::GetCurThreadName, +/* Register a thread created outside of RageThread. This gives it a name for RageThread::GetCurrentThreadName, * and allocates a slot for checkpoints. */ class RageThreadRegister { diff --git a/stepmania/src/archutils/Unix/CrashHandler.cpp b/stepmania/src/archutils/Unix/CrashHandler.cpp index e0511cf8e6..9e45b405e1 100644 --- a/stepmania/src/archutils/Unix/CrashHandler.cpp +++ b/stepmania/src/archutils/Unix/CrashHandler.cpp @@ -171,7 +171,7 @@ static void parent_process( int to_child, const CrashData *crash ) return; /* 6. Write the crashed thread's name. */ - p = RageThread::GetCurThreadName(); + p = RageThread::GetCurrentThreadName(); size = strlen( p )+1; if( !parent_write(to_child, &size, sizeof(size)) ) return; @@ -365,7 +365,7 @@ void CrashHandler::ForceDeadlock( RString reason, uint64_t iID ) strncpy( crash.m_ThreadName[1], RageThread::GetThreadNameByID(iID), sizeof(crash.m_ThreadName[0])-1 ); } - strncpy( crash.m_ThreadName[0], RageThread::GetCurThreadName(), sizeof(crash.m_ThreadName[0])-1 ); + strncpy( crash.m_ThreadName[0], RageThread::GetCurrentThreadName(), sizeof(crash.m_ThreadName[0])-1 ); strncpy( crash.reason, reason, min(sizeof(crash.reason) - 1, reason.length()) ); crash.reason[ sizeof(crash.reason)-1 ] = 0; @@ -394,7 +394,7 @@ void CrashHandler::CrashSignalHandler( int signal, siginfo_t *si, const ucontext BacktraceAllThreads( crash ); #endif - strncpy( crash.m_ThreadName[0], RageThread::GetCurThreadName(), sizeof(crash.m_ThreadName[0])-1 ); + strncpy( crash.m_ThreadName[0], RageThread::GetCurrentThreadName(), sizeof(crash.m_ThreadName[0])-1 ); RunCrashHandler( &crash ); }