generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-04 12:17:37 +01:00
Code Issues Projects Releases Wiki Activity

fixed GH #424: Poco::Timer deadlock

Browse Source
This commit is contained in:
Guenter Obiltschnig
2014-06-05 15:02:46 +02:00
parent c2704199ae
commit 6512ff1f6d
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Foundation/src/Timer.cpp
View File

@@ -62,14 +62,27 @@ void Timer::start(const AbstractTimerCallback& method, Thread::Priority priority
Clock nextInvocation; Clock nextInvocation;
nextInvocation += static_cast<Clock::ClockVal>(_startInterval)*1000; nextInvocation += static_cast<Clock::ClockVal>(_startInterval)*1000;
poco_assert (!_pCallback);
FastMutex::ScopedLock lock(_mutex); FastMutex::ScopedLock lock(_mutex);
if (_pCallback)
{
throw Poco::IllegalStateException("Timer already running");
}
_nextInvocation = nextInvocation; _nextInvocation = nextInvocation;
_pCallback = method.clone(); _pCallback = method.clone();
_wakeUp.reset(); _wakeUp.reset();
try
{
threadPool.startWithPriority(priority, *this); threadPool.startWithPriority(priority, *this);
} }
catch (...)
{
delete _pCallback;
_pCallback = 0;
throw;
}
}
void Timer::stop() void Timer::stop()