trunk/branch integration: VxWorks & Wince

This commit is contained in:
Marian Krivos 2011-08-23 07:12:01 +00:00
parent ccbcadd4ab
commit c349742cf5
4 changed files with 59 additions and 54 deletions

View File

@ -1,7 +1,7 @@
//
// Thread.cpp
//
// $Id: //poco/Main/Foundation/src/Thread.cpp#16 $
// $Id: //poco/1.4/Foundation/src/Thread.cpp#2 $
//
// Library: Foundation
// Package: Threading
@ -47,6 +47,8 @@
#else
#include "Thread_WIN32.cpp"
#endif
#elif defined(POCO_VXWORKS)
#include "Thread_VX.cpp"
#else
#include "Thread_POSIX.cpp"
#endif

View File

@ -473,7 +473,7 @@ PooledThread* ThreadPool::getThread()
pThread->start();
_threads.push_back(pThread);
}
catch(SystemException& e)
catch (...)
{
delete pThread;
throw;

View File

@ -164,8 +164,10 @@ void ThreadImpl::setStackSizeImpl(int size)
const int PAGE_SIZE = 4096;
size = ((size + PAGE_SIZE - 1)/PAGE_SIZE)*PAGE_SIZE;
#endif
#if !defined(POCO_ANDROID)
if (size < PTHREAD_STACK_MIN)
size = PTHREAD_STACK_MIN;
#endif
}
_pData->stackSize = size;
#endif

View File

@ -144,6 +144,7 @@ void ThreadImpl::startImpl(Callable target, void* pData)
if (isRunningImpl())
throw SystemException("thread already running");
threadCleanup();
_callbackTarget.callback = target;
_callbackTarget.pData = pData;