generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-25 10:09:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #199 from syvex/ThreadNames

Browse Source 
Debug build and debugger shouldn't be required for OS thread names
This commit is contained in:
Aleksandar Fabijanic
2013-06-04 19:00:12 -07:00
parent f1d92d5722 ee77d05ab5
commit ca16b76f9f
2 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Foundation/src/Thread_POSIX.cpp
View File

@@ -36,7 +36,6 @@
#include "Poco/Thread_POSIX.h" #include "Poco/Thread_POSIX.h"
#include "Poco/Thread.h" #include "Poco/Thread.h"
#include "Poco/Debugger.h"
#include "Poco/Exception.h" #include "Poco/Exception.h"
#include "Poco/ErrorHandler.h" #include "Poco/ErrorHandler.h"
#include "Poco/Timespan.h" #include "Poco/Timespan.h"
@@ -77,21 +76,18 @@ namespace
#endif #endif
#if defined(_DEBUG) && defined(POCO_POSIX_DEBUGGER_THREAD_NAMES) #if defined(POCO_POSIX_DEBUGGER_THREAD_NAMES)
namespace namespace
{ {
void setThreadName(pthread_t thread, const char* threadName) void setThreadName(pthread_t thread, const char* threadName)
{ {
if (Poco::Debugger::isAvailable())
{
# if (POCO_OS == POCO_OS_MAC_OS_X) # if (POCO_OS == POCO_OS_MAC_OS_X)
pthread_setname_np(threadName); // __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2) pthread_setname_np(threadName); // __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2)
# else # else
pthread_setname_np(thread, threadName); pthread_setname_np(thread, threadName);
# endif # endif
}
} }
} }
@@ -405,7 +401,7 @@ void* ThreadImpl::runnableEntry(void* pThread)
#endif #endif
ThreadImpl* pThreadImpl = reinterpret_cast<ThreadImpl*>(pThread); ThreadImpl* pThreadImpl = reinterpret_cast<ThreadImpl*>(pThread);
#if defined(_DEBUG) && 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
AutoPtr<ThreadData> pData = pThreadImpl->_pData; AutoPtr<ThreadData> pData = pThreadImpl->_pData;
@@ -446,7 +442,7 @@ void* ThreadImpl::callableEntry(void* pThread)
#endif #endif
ThreadImpl* pThreadImpl = reinterpret_cast<ThreadImpl*>(pThread); ThreadImpl* pThreadImpl = reinterpret_cast<ThreadImpl*>(pThread);
#if defined(_DEBUG) && 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
AutoPtr<ThreadData> pData = pThreadImpl->_pData; AutoPtr<ThreadData> pData = pThreadImpl->_pData;

33
Foundation/src/Thread_WIN32.cpp
View File

@@ -40,7 +40,7 @@
#include <process.h> #include <process.h>
#if defined(_DEBUG) && defined(POCO_WIN32_DEBUGGER_THREAD_NAMES) #if defined(POCO_WIN32_DEBUGGER_THREAD_NAMES)
namespace namespace
@@ -63,22 +63,19 @@ namespace
void setThreadName(DWORD dwThreadID, const char* threadName) void setThreadName(DWORD dwThreadID, const char* threadName)
{ {
if (IsDebuggerPresent()) THREADNAME_INFO info;
{ info.dwType = 0x1000;
THREADNAME_INFO info; info.szName = threadName;
info.dwType = 0x1000; info.dwThreadID = dwThreadID;
info.szName = threadName; info.dwFlags = 0;
info.dwThreadID = dwThreadID;
info.dwFlags = 0;
__try __try
{ {
RaiseException(MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info); RaiseException(MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info);
} }
__except (EXCEPTION_CONTINUE_EXECUTION) __except (EXCEPTION_CONTINUE_EXECUTION)
{ {
} }
}
} }
} }
@@ -237,7 +234,7 @@ unsigned __stdcall ThreadImpl::runnableEntry(void* pThread)
#endif #endif
{ {
_currentThreadHolder.set(reinterpret_cast<ThreadImpl*>(pThread)); _currentThreadHolder.set(reinterpret_cast<ThreadImpl*>(pThread));
#if defined(_DEBUG) && defined(POCO_WIN32_DEBUGGER_THREAD_NAMES) #if defined(POCO_WIN32_DEBUGGER_THREAD_NAMES)
setThreadName(-1, reinterpret_cast<Thread*>(pThread)->getName().c_str()); setThreadName(-1, reinterpret_cast<Thread*>(pThread)->getName().c_str());
#endif #endif
try try
@@ -267,7 +264,7 @@ unsigned __stdcall ThreadImpl::callableEntry(void* pThread)
#endif #endif
{ {
_currentThreadHolder.set(reinterpret_cast<ThreadImpl*>(pThread)); _currentThreadHolder.set(reinterpret_cast<ThreadImpl*>(pThread));
#if defined(_DEBUG) && defined(POCO_WIN32_DEBUGGER_THREAD_NAMES) #if defined(POCO_WIN32_DEBUGGER_THREAD_NAMES)
setThreadName(-1, reinterpret_cast<Thread*>(pThread)->getName().c_str()); setThreadName(-1, reinterpret_cast<Thread*>(pThread)->getName().c_str());
#endif #endif
try try