generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-02-20 22:31:23 +01:00
Code Issues Projects Releases Wiki Activity

ThreadPool fix from trunk

Browse Source
This commit is contained in:
Marian Krivos 2012-04-29 10:51:00 +00:00
parent b0629106ca
commit 51c8a14ae1
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Foundation/src/ThreadPool.cpp
View File

@ -191,8 +191,12 @@ void PooledThread::release()
_mutex.lock();
_pTarget = 0;
_mutex.unlock();
// In case of a statically allocated thread pool (such
// as the default thread pool), Windows may have already
// terminated the thread before we got here.
if (_thread.isRunning())
_targetReady.set();
_targetReady.set();
if (_thread.tryJoin(JOIN_TIMEOUT))
{
delete this;
@ -457,25 +461,26 @@ PooledThread* ThreadPool::getThread()
PooledThread* pThread = 0;
for (ThreadVec::iterator it = _threads.begin(); !pThread && it != _threads.end(); ++it)
{
if ((*it)->idle()) pThread = *it;
if ((*it)->idle())
pThread = *it;
}
if (!pThread)
{
if (_threads.size() < _maxCapacity)
{
pThread = createThread();
try
{
pThread->start();
_threads.push_back(pThread);
}
catch (...)
{
delete pThread;
throw;
}
pThread = createThread();
try
{
pThread->start();
_threads.push_back(pThread);
} catch (...)
{
delete pThread;
throw;
}
}
else throw NoThreadAvailableException();
else
throw NoThreadAvailableException();
}
pThread->activate();
return pThread;