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

Replaced assert( IsValid() ) with checker's call to IsValid.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@1024 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
rich_sposato 2009-09-26 23:07:10 +00:00
parent cbf7550f08
commit 81b896f459
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/loki/LevelMutex.h
View file

@ -280,8 +280,9 @@ protected:
{ {
public: public:
inline explicit Checker( const volatile LevelMutexInfo * mutex ) : inline explicit Checker( const volatile LevelMutexInfo * mutex ) :
m_mutex( mutex ) {} m_mutex( mutex ) { Check(); }
inline ~Checker( void ) { m_mutex->IsValid(); } inline ~Checker( void ) { Check(); }
inline bool Check( void ) const { return m_mutex->IsValid(); }
private: private:
Checker( void ); Checker( void );
Checker( const Checker & ); Checker( const Checker & );
@ -782,7 +783,6 @@ public:
virtual MutexErrors::Type TryLock( void ) volatile virtual MutexErrors::Type TryLock( void ) volatile
{ {
assert( IsValid() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; ) LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
MutexErrors::Type result = LevelMutexInfo::PreLockCheck( true ); MutexErrors::Type result = LevelMutexInfo::PreLockCheck( true );
@ -804,7 +804,6 @@ public:
virtual MutexErrors::Type Lock( void ) volatile virtual MutexErrors::Type Lock( void ) volatile
{ {
assert( IsValid() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; ) LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
MutexErrors::Type result = LevelMutexInfo::PreLockCheck( false ); MutexErrors::Type result = LevelMutexInfo::PreLockCheck( false );
@ -824,7 +823,6 @@ public:
virtual MutexErrors::Type Lock( unsigned int milliSeconds ) volatile virtual MutexErrors::Type Lock( unsigned int milliSeconds ) volatile
{ {
assert( IsValid() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; ) LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
MutexErrors::Type result = LevelMutexInfo::PreLockCheck( false ); MutexErrors::Type result = LevelMutexInfo::PreLockCheck( false );
@ -860,7 +858,6 @@ public:
virtual MutexErrors::Type Unlock( void ) volatile virtual MutexErrors::Type Unlock( void ) volatile
{ {
assert( IsValid() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; ) LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
MutexErrors::Type result = LevelMutexInfo::PreUnlockCheck(); MutexErrors::Type result = LevelMutexInfo::PreUnlockCheck();
@ -906,7 +903,6 @@ private:
*/ */
virtual MutexErrors::Type LockThis( void ) volatile virtual MutexErrors::Type LockThis( void ) volatile
{ {
assert( IsValid() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; ) LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
assert( this != LevelMutexInfo::GetCurrentMutex() ); assert( this != LevelMutexInfo::GetCurrentMutex() );
@ -927,7 +923,6 @@ private:
*/ */
virtual MutexErrors::Type LockThis( unsigned int milliSeconds ) volatile virtual MutexErrors::Type LockThis( unsigned int milliSeconds ) volatile
{ {
assert( IsValid() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; ) LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
clock_t timeOut = clock() + milliSeconds; clock_t timeOut = clock() + milliSeconds;
@ -953,9 +948,8 @@ private:
*/ */
virtual MutexErrors::Type UnlockThis( void ) volatile virtual MutexErrors::Type UnlockThis( void ) volatile
{ {
assert( IsValid() );
assert( NULL != LevelMutexInfo::GetCurrentMutex() );
LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; ) LOKI_MUTEX_DEBUG_CODE( Checker checker( this ); (void)checker; )
assert( NULL != LevelMutexInfo::GetCurrentMutex() );
if ( 1 < LevelMutexInfo::GetLockCount() ) if ( 1 < LevelMutexInfo::GetLockCount() )
{ {