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

Thread POSIX: tid is numeric OS thread ID on Linux and OSX instead of pthread_t.

Browse Source
This commit is contained in:
Matej Kenda 2015-06-01 09:59:01 +02:00
parent 375eca2ec4
commit f1e6cba313
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,18 @@ namespace Poco {
class Foundation_API ThreadImpl class Foundation_API ThreadImpl
{ {
public: public:
#if POCO_OS == POCO_OS_LINUX
// OS kernel thread ID
typedef pid_t TIDImpl;
#elif POCO_OS == POCO_OS_MAC_OS_X
// OS kernel thread ID
typedef mach_port_t TIDImpl;
#else
// Default: pthread id
typedef pthread_t TIDImpl; typedef pthread_t TIDImpl;
#endif
typedef void (*Callable)(void*); typedef void (*Callable)(void*);
enum Priority enum Priority
@ -136,6 +147,7 @@ private:
SharedPtr<Runnable> pRunnableTarget; SharedPtr<Runnable> pRunnableTarget;
pthread_t thread; pthread_t thread;
TIDImpl tid;
int prio; int prio;
int osPrio; int osPrio;
int policy; int policy;
@ -191,7 +203,7 @@ inline int ThreadImpl::getStackSizeImpl() const
inline ThreadImpl::TIDImpl ThreadImpl::tidImpl() const inline ThreadImpl::TIDImpl ThreadImpl::tidImpl() const
{ {
return _pData->thread; return _pData->tid;
} }

26
Foundation/src/Thread_POSIX.cpp
View File

@ -28,14 +28,16 @@
#endif #endif
#if POCO_OS == POCO_OS_LINUX || POCO_OS == POCO_OS_MAC_OS_X || POCO_OS == POCO_OS_QNX #if POCO_OS == POCO_OS_LINUX || POCO_OS == POCO_OS_MAC_OS_X || POCO_OS == POCO_OS_QNX
# include <time.h> # include <time.h>
# include <unistd.h> # include <unistd.h>
#endif #endif
#if POCO_OS == POCO_OS_MAC_OS_X #if POCO_OS == POCO_OS_MAC_OS_X
# include <mach/mach.h> # include <mach/mach.h>
# include <mach/task.h> # include <mach/task.h>
# include <mach/thread_policy.h> # include <mach/thread_policy.h>
#endif #endif
#if POCO_OS == POCO_OS_LINUX
#include <sys/syscall.h>
#endif
// //
// Block SIGPIPE in main thread. // Block SIGPIPE in main thread.
@ -296,6 +298,15 @@ void ThreadImpl::startImpl(SharedPtr<Runnable> pTarget)
pthread_attr_destroy(&attributes); pthread_attr_destroy(&attributes);
throw SystemException("cannot start thread"); throw SystemException("cannot start thread");
} }
#if POCO_OS == POCO_OS_LINUX
// On Linux the TID is acquired from the running thread using syscall
_pData->tid = 0;
#elif POCO_OS == POCO_OS_MAC_OS_X
_pData->tid = static_cast<TIDImpl>( pthread_mach_thread_np(_pData->thread) );
#else
_pData->tid = _pData->thread;
#endif
_pData->started = true; _pData->started = true;
pthread_attr_destroy(&attributes); pthread_attr_destroy(&attributes);
@ -353,7 +364,13 @@ ThreadImpl* ThreadImpl::currentImpl()
ThreadImpl::TIDImpl ThreadImpl::currentTidImpl() ThreadImpl::TIDImpl ThreadImpl::currentTidImpl()
{ {
#if POCO_OS == POCO_OS_LINUX
return static_cast<TIDImpl>( syscall (SYS_gettid) );
#elif POCO_OS == POCO_OS_MAC_OS_X
return static_cast<TIDImpl>( pthread_mach_thread_np(pthread_self()) );
#else
return pthread_self(); return pthread_self();
#endif
} }
@ -430,7 +447,12 @@ void* ThreadImpl::runnableEntry(void* pThread)
#if defined(POCO_POSIX_DEBUGGER_THREAD_NAMES) #if defined(POCO_POSIX_DEBUGGER_THREAD_NAMES)
setThreadName(pThreadImpl->_pData->thread, reinterpret_cast<Thread*>(pThread)->getName().c_str()); setThreadName(pThreadImpl->_pData->thread, reinterpret_cast<Thread*>(pThread)->getName().c_str());
#endif #endif
#if POCO_OS == POCO_OS_LINUX
pThreadImpl->_pData->tid = static_cast<TIDImpl>( syscall (SYS_gettid) );
#endif
AutoPtr<ThreadData> pData = pThreadImpl->_pData; AutoPtr<ThreadData> pData = pThreadImpl->_pData;
try try
{ {
pData->pRunnableTarget->run(); pData->pRunnableTarget->run();