From 16aa98b5b2c12a8b735147fc0b411157fb6f7dab Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 10 Nov 2004 22:10:52 +0000 Subject: [PATCH] fix m_LockedBy --- stepmania/src/RageThreads.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/stepmania/src/RageThreads.cpp b/stepmania/src/RageThreads.cpp index 2ca06c0766..bec4909cde 100644 --- a/stepmania/src/RageThreads.cpp +++ b/stepmania/src/RageThreads.cpp @@ -664,21 +664,28 @@ RageEvent::~RageEvent() delete m_pEvent; } +/* For each of these calls, the mutex must be locked, and must not be locked recursively. */ void RageEvent::Wait() { ASSERT( IsLockedByThisThread() ); + ASSERT( m_LockCnt == 0 ); + m_pEvent->Wait(); + + m_LockedBy = GetThisThreadId(); } void RageEvent::Signal() { ASSERT( IsLockedByThisThread() ); + ASSERT( m_LockCnt == 0 ); m_pEvent->Signal(); } void RageEvent::Broadcast() { ASSERT( IsLockedByThisThread() ); + ASSERT( m_LockCnt == 0 ); m_pEvent->Broadcast(); }