generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 11:06:50 +01:00
Code Issues Projects Releases Wiki Activity

trunk/branch integration: VxWorks & Wince

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
Foundation/src/Thread.cpp
View File

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

2
Foundation/src/ThreadPool.cpp
View File

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

2
Foundation/src/Thread_POSIX.cpp
View File

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

1
Foundation/src/Thread_WIN32.cpp
View File

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