Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

log when no event pushed while adding players -- this may be how state machine is getting screwed up

Browse source
This commit is contained in:
Eric House 2010-07-27 20:47:04 -07:00
parent ea2b6b6df9
commit b335151172
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
xwords4/relay/cref.cpp
View file

@ -377,7 +377,6 @@ CookieRef::_HandleHeartbeat( HostID id, int socket )
void void
CookieRef::_CheckHeartbeats( time_t now ) CookieRef::_CheckHeartbeats( time_t now )
{ {
logf( XW_LOGINFO, "%s", __func__ );
ASSERT_LOCKED(); ASSERT_LOCKED();
vector<HostRec>::iterator iter; vector<HostRec>::iterator iter;
for ( iter = m_sockets.begin(); iter != m_sockets.end(); ++iter ) { for ( iter = m_sockets.begin(); iter != m_sockets.end(); ++iter ) {
@ -648,6 +647,10 @@ CookieRef::handleEvents()
m_curState = nextState; m_curState = nextState;
} else { } else {
/* CRefEvent evt; */
/* evt.type = XWE_SHUTDOWN; */
/* m_eventQueue.push_back( evt ); */
logf( XW_LOGERROR, "unable to find transition " logf( XW_LOGERROR, "unable to find transition "
"from %s on event %s", stateString(m_curState), "from %s on event %s", stateString(m_curState),
eventString(evt.type) ); eventString(evt.type) );
@ -799,6 +802,8 @@ CookieRef::increasePlayerCounts( const CRefEvent* evt, bool reconn )
if ( newevt.type != XWE_NONE ) { if ( newevt.type != XWE_NONE ) {
m_eventQueue.push_back( newevt ); m_eventQueue.push_back( newevt );
} else {
logf( XW_LOGERROR, "%s: not pushing an event", __func__ );
} }
if ( addHost ) { if ( addHost ) {
@ -820,7 +825,7 @@ CookieRef::increasePlayerCounts( const CRefEvent* evt, bool reconn )
void void
CookieRef::reducePlayerCounts( int socket ) CookieRef::reducePlayerCounts( int socket )
{ {
logf( XW_LOGVERBOSE1, "reducePlayerCounts on socket %d", socket ); logf( XW_LOGVERBOSE1, "%s(socket=%d)", __func__, socket );
ASSERT_LOCKED(); ASSERT_LOCKED();
vector<HostRec>::iterator iter; vector<HostRec>::iterator iter;
for ( iter = m_sockets.begin(); iter != m_sockets.end(); ++iter ) { for ( iter = m_sockets.begin(); iter != m_sockets.end(); ++iter ) {
@ -832,8 +837,9 @@ CookieRef::reducePlayerCounts( int socket )
} }
m_nPlayersHere -= iter->m_nPlayersH; m_nPlayersHere -= iter->m_nPlayersH;
logf( XW_LOGVERBOSE1, "reducePlayerCounts: m_nPlayersHere=%d; m_nPlayersSought=%d", logf( XW_LOGVERBOSE1,
m_nPlayersHere, m_nPlayersSought ); "%s: m_nPlayersHere=%d; m_nPlayersSought=%d",
__func__, m_nPlayersHere, m_nPlayersSought );
break; break;
} }