Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix a couple of rare failures due to race conditions testing or

Browse source 
valgrind flushed out.
This commit is contained in:
Andy2 2011-07-02 13:28:24 -07:00
parent 3db7fccb53
commit 175aace629
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xwords4/relay/crefmgr.cpp
View file

@ -373,7 +373,6 @@ CRefMgr::getMakeCookieRef( const char* const connName, bool* isDead )
} }
break; break;
} }
assert( cinfo->GetRef() );
return cinfo; return cinfo;
} }
@ -405,7 +404,15 @@ CRefMgr::PrintSocketInfo( int socket, string& out )
CidInfo* CidInfo*
CRefMgr::getCookieRef( CookieID cid ) CRefMgr::getCookieRef( CookieID cid )
{ {
return m_cidlock->Claim( cid ); CidInfo* cinfo = NULL;
for ( ; ; ) {
cinfo = m_cidlock->Claim( cid );
if ( NULL != cinfo->GetRef() ) {
break;
}
m_cidlock->Relinquish( cinfo, true );
}
return cinfo;
} /* getCookieRef */ } /* getCookieRef */
CidInfo* CidInfo*
@ -627,7 +634,7 @@ SafeCref::SafeCref( const char* connName, const char* cookie, HostID hid,
} }
} }
/* ConnName case -- must exist */ /* ConnName case -- must exist (unless DB record's been removed */
SafeCref::SafeCref( const char* const connName ) SafeCref::SafeCref( const char* const connName )
: m_cinfo( NULL ) : m_cinfo( NULL )
, m_mgr( CRefMgr::Get() ) , m_mgr( CRefMgr::Get() )
@ -635,7 +642,7 @@ SafeCref::SafeCref( const char* const connName )
{ {
bool isDead = false; bool isDead = false;
CidInfo* cinfo = m_mgr->getMakeCookieRef( connName, &isDead ); CidInfo* cinfo = m_mgr->getMakeCookieRef( connName, &isDead );
if ( cinfo != NULL ) { if ( NULL != cinfo && NULL != cinfo->GetRef() ) {
assert( cinfo->GetCid() == cinfo->GetRef()->GetCid() ); assert( cinfo->GetCid() == cinfo->GetRef()->GetCid() );
m_locked = cinfo->GetRef()->Lock(); m_locked = cinfo->GetRef()->Lock();
m_cinfo = cinfo; m_cinfo = cinfo;