simplify (handle recursive locking in RageMutex)

This commit is contained in:
Glenn Maynard
2004-06-11 19:08:56 +00:00
parent 0c7f5e113d
commit 4c14fb3943
5 changed files with 0 additions and 55 deletions
@@ -87,8 +87,6 @@ MutexImpl_Win32::MutexImpl_Win32( RageMutex *pParent ):
{
mutex = CreateMutex( NULL, false, NULL );
ASSERT_M( mutex != NULL, werr_ssprintf(GetLastError(), "CreateMutex") );
LockedBy = GetInvalidThreadId();
LockCnt = 0;
}
MutexImpl_Win32::~MutexImpl_Win32()
@@ -98,12 +96,6 @@ MutexImpl_Win32::~MutexImpl_Win32()
bool MutexImpl_Win32::Lock()
{
if( LockedBy == GetCurrentThreadId() )
{
++LockCnt;
return true;
}
int len = 15000;
int tries = 2;
@@ -120,7 +112,6 @@ bool MutexImpl_Win32::Lock()
break;
case WAIT_OBJECT_0:
LockedBy = GetCurrentThreadId();
return true;
case WAIT_TIMEOUT:
@@ -140,13 +131,6 @@ bool MutexImpl_Win32::Lock()
void MutexImpl_Win32::Unlock()
{
if( LockCnt )
{
--LockCnt;
return;
}
LockedBy = GetInvalidThreadId();
const bool ret = !!ReleaseMutex( mutex );
/* We can't ASSERT here, since this is called from checkpoints, which is
@@ -155,11 +139,6 @@ void MutexImpl_Win32::Unlock()
sm_crash( werr_ssprintf( GetLastError(), "ReleaseMutex failed" ) );
}
uint64_t MutexImpl_Win32::GetLockedByThreadId() const
{
return LockedBy;
}
uint64_t GetThisThreadId()
{
return GetCurrentThreadId();