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

cleanup

Browse source
This commit is contained in:
ehouse 2009-07-28 05:09:24 +00:00
parent 6b1cf247bf
commit 0d03ed71bb
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
xwords4/relay/timermgr.cpp
View file

@ -87,6 +87,7 @@ TimerMgr::GetPollTimeout()
bool
TimerMgr::getTimer( TimerProc proc, void* closure )
{
/* Don't call this unless have the lock!!! */
list<TimerInfo>::iterator iter;
for ( iter = m_timers.begin(); iter != m_timers.end(); ++iter ) {
if ( (*iter).proc == proc
@ -139,33 +140,32 @@ TimerMgr::ClearTimer( TimerProc proc, void* closure )
void
TimerMgr::FireElapsedTimers()
{
pthread_mutex_lock( &m_timersMutex );
time_t curTime = uptime();
vector<TimerProc> procs;
vector<void*> closures;
{
MutexLock ml( &m_timersMutex );
/* loop until we get through without firing a single one. Only fire one
per run, though, since calling erase invalidates the iterator.
PENDING: all this needs a mutex!!!! */
list<TimerInfo>::iterator iter;
for ( iter = m_timers.begin(); iter != m_timers.end(); ++iter ) {
TimerInfo* tip = &(*iter);
if ( tip->when <= curTime ) {
/* loop until we get through without firing a single one. Only fire one
per run, though, since calling erase invalidates the iterator.
PENDING: all this needs a mutex!!!! */
list<TimerInfo>::iterator iter;
for ( iter = m_timers.begin(); iter != m_timers.end(); ++iter ) {
TimerInfo* tip = &(*iter);
if ( tip->when <= curTime ) {
procs.push_back(tip->proc);
closures.push_back(tip->closure);
procs.push_back(tip->proc);
closures.push_back(tip->closure);
if ( tip->interval ) {
tip->when += tip->interval;
} else {
tip->when = 0; /* flag for removal */
if ( tip->interval ) {
tip->when += tip->interval;
} else {
tip->when = 0; /* flag for removal */
}
}
}
}
pthread_mutex_unlock( &m_timersMutex );
vector<TimerProc>::iterator iter1 = procs.begin();
vector<void*>::iterator iter2 = closures.begin();
while ( iter1 != procs.end() ) {

2
xwords4/relay/xwrelay.cpp
View file

@ -317,7 +317,7 @@ processReconnect( unsigned char* bufp, int bufLen, int socket )
&& getNetByte( &bufp, end, &nPlayersT )
&& readStr( &bufp, end, connName, sizeof(connName) ) ) {
SafeCref scr( connName, 0, srcID, socket, nPlayersH, nPlayersT );
SafeCref scr( connName, false, srcID, socket, nPlayersH, nPlayersT );
success = scr.Reconnect( socket, srcID, nPlayersH, nPlayersT );
}