Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Assign 0 not NULL to pthread variables.

Browse source
This commit is contained in:
ehouse 2009-07-31 12:43:04 +00:00
parent bcc887c0b1
commit f537169db5
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
xwords4/relay/cref.cpp
View file

@ -48,10 +48,10 @@ using namespace std;
SocketsIterator::SocketsIterator( SocketMap::iterator iter, SocketsIterator::SocketsIterator( SocketMap::iterator iter,
SocketMap::iterator end, SocketMap::iterator end,
pthread_mutex_t* rwlock ) pthread_mutex_t* mutex )
: m_iter( iter ) : m_iter( iter )
, m_end( end ) , m_end( end )
, m_mutex( rwlock ) , m_mutex( mutex )
{ {
} }
@ -90,7 +90,7 @@ CookieRef::ReInit( const char* cookie, const char* connName, CookieID id )
m_nextHostID = HOST_ID_SERVER; m_nextHostID = HOST_ID_SERVER;
m_nPlayersTotal = 0; m_nPlayersTotal = 0;
m_nPlayersHere = 0; m_nPlayersHere = 0;
m_locking_thread = NULL; m_locking_thread = 0;
m_starttime = uptime(); m_starttime = uptime();
RelayConfigs::GetConfigs()->GetValueFor( "HEARTBEAT", &m_heatbeat ); RelayConfigs::GetConfigs()->GetValueFor( "HEARTBEAT", &m_heatbeat );
@ -154,9 +154,10 @@ CookieRef::Lock( void )
m_locking_thread = pthread_self(); m_locking_thread = pthread_self();
if ( notInUse() ) { if ( notInUse() ) {
logf( XW_LOGINFO, "%s: not locking %p because not in use", __func__, this ); logf( XW_LOGINFO, "%s: not locking %p because not in use", __func__,
this );
success = false; success = false;
m_locking_thread = NULL; m_locking_thread = 0;
pthread_mutex_unlock( &m_mutex ); pthread_mutex_unlock( &m_mutex );
} }
@ -166,7 +167,7 @@ CookieRef::Lock( void )
void void
CookieRef::Unlock() { CookieRef::Unlock() {
assert( m_locking_thread == pthread_self() ); assert( m_locking_thread == pthread_self() );
m_locking_thread = NULL; m_locking_thread = 0;
pthread_mutex_unlock( &m_mutex ); pthread_mutex_unlock( &m_mutex );
} }