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

don't track heartbeat independent of any timers set. This allows

Browse source 
infinite timeout when no devices present.
This commit is contained in:
ehouse 2005-10-19 03:42:17 +00:00
parent b0d592a174
commit f2213d05c7
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
relay/timermgr.cpp
View file

@ -29,7 +29,6 @@
TimerMgr::TimerMgr() TimerMgr::TimerMgr()
: m_nextFireTime(0) : m_nextFireTime(0)
, m_heartbeat(RelayConfigs::GetConfigs()->GetHeartbeatInterval() )
{ {
pthread_mutex_init( &m_timersMutex, NULL ); pthread_mutex_init( &m_timersMutex, NULL );
} }
@ -74,15 +73,16 @@ TimerMgr::GetPollTimeout()
time_t tout = m_nextFireTime; time_t tout = m_nextFireTime;
if ( tout == 0 ) { if ( tout == 0 ) {
tout = m_heartbeat; tout = -1;
} else { } else {
tout -= now(); tout -= now();
if ( tout < 0 ) { if ( tout < 0 ) {
tout = 0; tout = 0;
} }
tout *= 1000;
} }
return tout * 1000; return tout;
} } /* GetPollTimeout */
int int
TimerMgr::getTimer( TimerProc proc, void* closure ) TimerMgr::getTimer( TimerProc proc, void* closure )

1
relay/timermgr.h
View file

@ -64,7 +64,6 @@ class TimerMgr {
list<TimerInfo> m_timers; list<TimerInfo> m_timers;
time_t m_nextFireTime; time_t m_nextFireTime;
time_t m_heartbeat;
}; };
#endif #endif