setThreadName: abbreviate thread name if too long

This commit is contained in:
Guenter Obiltschnig 2015-09-28 22:49:06 +02:00
parent 2374402291
commit d89c841298

View File

@ -59,16 +59,23 @@ namespace
#if defined(POCO_POSIX_DEBUGGER_THREAD_NAMES) #if defined(POCO_POSIX_DEBUGGER_THREAD_NAMES)
namespace namespace {
void setThreadName(pthread_t thread, const std::string& threadName)
{ {
void setThreadName(pthread_t thread, const char* threadName) #if (POCO_OS == POCO_OS_MAC_OS_X)
{ pthread_setname_np(threadName.c_str()); // __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2)
# if (POCO_OS == POCO_OS_MAC_OS_X) #else
pthread_setname_np(threadName); // __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2) if (pthread_setname_np(thread, threadName.c_str()))
# else {
pthread_setname_np(thread, threadName); char truncName[16] = {0};
# endif std::size_t suffixIndex = threadName.length() - 7;
} std::memcpy(truncName, &threadName[0], 7);
truncName[7] = '~';
memcpy(&truncName[8], &threadName[suffixIndex], 7);
pthread_setname_np(thread, truncName);
}
#endif
}
} }
@ -336,7 +343,7 @@ void* ThreadImpl::runnableEntry(void* pThread)
ThreadImpl* pThreadImpl = reinterpret_cast<ThreadImpl*>(pThread); ThreadImpl* pThreadImpl = reinterpret_cast<ThreadImpl*>(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());
#endif #endif
AutoPtr<ThreadData> pData = pThreadImpl->_pData; AutoPtr<ThreadData> pData = pThreadImpl->_pData;
try try