sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Trying to fix strange timer crashes.

Browse Source
This commit is contained in:
lotodore
2009-06-09 23:04:04 +00:00
parent 71e9c35ff2
commit a33d9b7c3b
4 changed files with 51 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/common/timermanager.cpp
+3 -17
View File
@@ -38,6 +38,7 @@ TimerManager::RegisterTimer(unsigned timeoutMsec, boost::function<void()> timerH
boost::shared_ptr<TimerData> data(new TimerData);
data->timer.reset(
new boost::asio::deadline_timer(*m_ioService, boost::posix_time::milliseconds(timeoutMsec)));
data->id = id;
data->userHandler = timerHandler;
data->durationMsec = timeoutMsec;
data->autoRestart = autoRestart;
@@ -48,23 +49,6 @@ TimerManager::RegisterTimer(unsigned timeoutMsec, boost::function<void()> timerH
return id;
}
bool
TimerManager::AddTimer(unsigned timerId, unsigned timeoutMsec, boost::function<void()> timerHandler)
{
boost::recursive_mutex::scoped_lock lock(m_timerMutex);
bool restarted = false;
TimerMap::iterator pos = m_timerMap.find(timerId);
if (pos != m_timerMap.end())
{
pos->second->userHandler = timerHandler;
pos->second->timer.reset(
new boost::asio::deadline_timer(*m_ioService, boost::posix_time::milliseconds(timeoutMsec)));
pos->second->timer->async_wait(boost::bind(&TimerManager::Handler, this, boost::asio::placeholders::error, pos->second));
restarted = true;
}
return restarted;
}
bool
TimerManager::UnregisterTimer(unsigned timerId)
{
@@ -94,6 +78,8 @@ TimerManager::Handler(const boost::system::error_code &ec, boost::shared_ptr<Tim
new boost::asio::deadline_timer(*m_ioService, boost::posix_time::milliseconds(data->durationMsec)));
data->timer->async_wait(boost::bind(&TimerManager::Handler, this, boost::asio::placeholders::error, data));
}
else
UnregisterTimer(data->id);
}
}