King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed bug 2656893. Removed redundant assertions.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@995 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
rich_sposato 2009-03-04 07:13:07 +00:00
parent dc9c2b0ed9
commit da01e0f541
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/LevelMutex.cpp
View file

@ -574,7 +574,6 @@ void LevelMutexInfo::DecrementCount( void ) volatile
bool LevelMutexInfo::IsLockedByCurrentThread( void ) const volatile bool LevelMutexInfo::IsLockedByCurrentThread( void ) const volatile
{ {
assert( IsValid() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; ) LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
if ( !IsLocked() ) if ( !IsLocked() )
@ -593,7 +592,6 @@ bool LevelMutexInfo::IsLockedByCurrentThread( void ) const volatile
bool LevelMutexInfo::IsRecentLock( void ) const volatile bool LevelMutexInfo::IsRecentLock( void ) const volatile
{ {
assert( IsValid() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; ) LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
if ( 0 == m_count ) if ( 0 == m_count )
@ -615,7 +613,6 @@ bool LevelMutexInfo::IsRecentLock( void ) const volatile
bool LevelMutexInfo::IsRecentLock( unsigned int count ) const volatile bool LevelMutexInfo::IsRecentLock( unsigned int count ) const volatile
{ {
assert( IsValid() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; ) LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
if ( 0 == count ) if ( 0 == count )
@ -636,7 +633,6 @@ bool LevelMutexInfo::IsRecentLock( unsigned int count ) const volatile
bool LevelMutexInfo::IsLockedByAnotherThread( void ) const volatile bool LevelMutexInfo::IsLockedByAnotherThread( void ) const volatile
{ {
assert( IsValid() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; ) LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
if ( !IsLocked() ) if ( !IsLocked() )
@ -652,12 +648,11 @@ bool LevelMutexInfo::IsLockedByAnotherThread( void ) const volatile
void LevelMutexInfo::PostLock( void ) volatile void LevelMutexInfo::PostLock( void ) volatile
{ {
assert( IsValid() ); LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
assert( 0 == m_count ); assert( 0 == m_count );
assert( nullptr == m_previous ); assert( nullptr == m_previous );
assert( this != s_currentMutex ); assert( this != s_currentMutex );
assert( !IsLockedByCurrentThread() ); assert( !IsLockedByCurrentThread() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
m_count = 1; m_count = 1;
m_previous = s_currentMutex; m_previous = s_currentMutex;
@ -668,12 +663,11 @@ void LevelMutexInfo::PostLock( void ) volatile
void LevelMutexInfo::PreUnlock( void ) volatile void LevelMutexInfo::PreUnlock( void ) volatile
{ {
assert( IsValid() ); LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
assert( 1 == m_count ); assert( 1 == m_count );
assert( nullptr != s_currentMutex ); assert( nullptr != s_currentMutex );
assert( this == s_currentMutex ); assert( this == s_currentMutex );
assert( IsLockedByCurrentThread() ); assert( IsLockedByCurrentThread() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
s_currentMutex = m_previous; s_currentMutex = m_previous;
m_previous = nullptr; m_previous = nullptr;
@ -684,7 +678,6 @@ void LevelMutexInfo::PreUnlock( void ) volatile
MutexErrors::Type LevelMutexInfo::PreLockCheck( bool forTryLock ) volatile MutexErrors::Type LevelMutexInfo::PreLockCheck( bool forTryLock ) volatile
{ {
assert( IsValid() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; ) LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
const unsigned int currentLevel = GetCurrentThreadsLevel(); const unsigned int currentLevel = GetCurrentThreadsLevel();
@ -719,7 +712,6 @@ MutexErrors::Type LevelMutexInfo::PreLockCheck( bool forTryLock ) volatile
MutexErrors::Type LevelMutexInfo::PreUnlockCheck( void ) volatile MutexErrors::Type LevelMutexInfo::PreUnlockCheck( void ) volatile
{ {
assert( IsValid() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; ) LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
if ( 0 == m_count ) if ( 0 == m_count )
@ -760,9 +752,9 @@ MutexErrors::Type ThrowOnBadDesignMutexError::CheckError( MutexErrors::Type erro
unsigned int level ) unsigned int level )
{ {
if ( ( error == MutexErrors::LevelTooHigh ) if ( ( error == MutexErrors::LevelTooHigh )
&& ( error == MutexErrors::LevelTooLow ) ) || ( error == MutexErrors::LevelTooLow ) )
{ {
throw MutexException( "Error occurred using mutex.", level, error ); throw MutexException( "Design error! Program used mutexes in wrong order.", level, error );
} }
return error; return error;
} }