generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2026-01-26 21:44:49 +01:00
Code Issues Projects Releases Wiki Activity

removed Mutex from Win32, split POSIX entry() function into two

Browse Source
This commit is contained in:
Aleksandar Fabijanic
2008-04-11 10:15:43 +00:00
parent 01613f5cf6
commit 1867398d32
4 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Foundation/include/Poco/Thread_POSIX.h
View File

@@ -98,7 +98,8 @@ public:
static ThreadImpl* currentImpl();
protected:
static void* entry(void* pThread);
static void* runnableEntry(void* pThread);
static void* functionEntry(void* pThread);
static int mapPrio(int prio);
private:
@@ -123,7 +124,7 @@ private:
};
AutoPtr<ThreadData> _pData;
static pthread_key_t _currentKey;
static bool _haveCurrentKey;

2
Foundation/include/Poco/Thread_WIN32.h
View File

@@ -42,7 +42,6 @@
#include "Poco/Foundation.h"
#include "Poco/Runnable.h"
#include "Poco/Mutex.h"
#include "Poco/UnWindows.h"
@@ -118,7 +117,6 @@ private:
HANDLE _thread;
int _prio;
std::size_t _stackSize;
Mutex _mutex;
static DWORD _currentKey;
};

55
Foundation/src/Thread_POSIX.cpp
View File

@@ -118,7 +118,7 @@ void ThreadImpl::startImpl(Runnable& target)
pthread_attr_setstacksize(&attributes, _pData->stackSize);
_pData->pRunnableTarget = &target;
if (pthread_create(&_pData->thread, &attributes, entry, this))
if (pthread_create(&_pData->thread, &attributes, runnableEntry, this))
{
_pData->pRunnableTarget = 0;
throw SystemException("cannot start thread");
@@ -151,7 +151,7 @@ void ThreadImpl::startImpl(Callback target, void* pData)
_pData->pCallbackTarget->callback = target;
_pData->pCallbackTarget->pData = pData;
if (pthread_create(&_pData->thread, &attributes, entry, this))
if (pthread_create(&_pData->thread, &attributes, functionEntry, this))
{
_pData->pCallbackTarget->callback = 0;
_pData->pCallbackTarget->pData = 0;
@@ -199,7 +199,7 @@ ThreadImpl* ThreadImpl::currentImpl()
}
void* ThreadImpl::entry(void* pThread)
void* ThreadImpl::runnableEntry(void* pThread)
{
pthread_setspecific(_currentKey, pThread);
@@ -216,10 +216,7 @@ void* ThreadImpl::entry(void* pThread)
AutoPtr<ThreadData> pData = pThreadImpl->_pData;
try
{
if (pData->pRunnableTarget)
pData->pRunnableTarget->run();
else
pData->pCallbackTarget->callback(pData->pCallbackTarget->pData);
pData->pRunnableTarget->run();
}
catch (Exception& exc)
{
@@ -233,13 +230,47 @@ void* ThreadImpl::entry(void* pThread)
{
ErrorHandler::handle();
}
if (pData->pRunnableTarget)
pData->pRunnableTarget = 0;
else
pData->pRunnableTarget = 0;
pData->done.set();
return 0;
}
void* ThreadImpl::functionEntry(void* pThread)
{
pthread_setspecific(_currentKey, pThread);
#if defined(POCO_OS_FAMILY_UNIX)
sigset_t sset;
sigemptyset(&sset);
sigaddset(&sset, SIGQUIT);
sigaddset(&sset, SIGTERM);
sigaddset(&sset, SIGPIPE);
pthread_sigmask(SIG_BLOCK, &sset, 0);
#endif
ThreadImpl* pThreadImpl = reinterpret_cast<ThreadImpl*>(pThread);
AutoPtr<ThreadData> pData = pThreadImpl->_pData;
try
{
pData->pCallbackTarget->callback = 0;
pData->pCallbackTarget->pData = 0;
pData->pCallbackTarget->callback(pData->pCallbackTarget->pData);
}
catch (Exception& exc)
{
ErrorHandler::handle(exc);
}
catch (std::exception& exc)
{
ErrorHandler::handle(exc);
}
catch (...)
{
ErrorHandler::handle();
}
pData->pCallbackTarget->callback = 0;
pData->pCallbackTarget->pData = 0;
pData->done.set();
return 0;

4
Foundation/src/Thread_WIN32.cpp
View File

@@ -83,8 +83,6 @@ void ThreadImpl::setPriorityImpl(int prio)
void ThreadImpl::startImpl(Runnable& target)
{
Mutex::ScopedLock lock(_mutex);
if (isRunningImpl())
throw SystemException("thread already running");
@@ -96,8 +94,6 @@ void ThreadImpl::startImpl(Runnable& target)
void ThreadImpl::startImpl(Callback target, void* pData)
{
Mutex::ScopedLock lock(_mutex);
if (isRunningImpl())
throw SystemException("thread already running");