1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify how we set thread name for UNIX threads

Browse Source 
Passing on the thread ID is confusing, as it's not really what the
function does. The QNX code path can resolve the thread ID by itself.

Change-Id: I5f0d54621058576cdcf3707d36a11762fe2383c8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Tor Arne Vestbø 2018-01-31 19:08:06 +01:00
parent 74045f8b9a
commit b1fe198d87
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/corelib/thread/qthread_unix.cpp
View File

@ -311,16 +311,14 @@ void QThreadPrivate::createEventDispatcher(QThreadData *data)
#ifndef QT_NO_THREAD #ifndef QT_NO_THREAD
#if (defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_QNX)) #if (defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_QNX))
static void setCurrentThreadName(pthread_t threadId, const char *name) static void setCurrentThreadName(const char *name)
{ {
# if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) # if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE)
Q_UNUSED(threadId);
prctl(PR_SET_NAME, (unsigned long)name, 0, 0, 0); prctl(PR_SET_NAME, (unsigned long)name, 0, 0, 0);
# elif defined(Q_OS_MAC) # elif defined(Q_OS_MAC)
Q_UNUSED(threadId);
pthread_setname_np(name); pthread_setname_np(name);
# elif defined(Q_OS_QNX) # elif defined(Q_OS_QNX)
pthread_setname_np(threadId, name); pthread_setname_np(pthread_self(), name);
# endif # endif
} }
#endif #endif
@ -361,14 +359,13 @@ void *QThreadPrivate::start(void *arg)
#if (defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_QNX)) #if (defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_QNX))
{ {
// sets the name of the current thread. // Sets the name of the current thread. We can only do this
QString objectName = thr->objectName(); // when the thread is starting, as we don't have a cross
// platform way of setting the name of an arbitrary thread.
pthread_t thread_id = from_HANDLE<pthread_t>(data->threadId.load()); if (Q_LIKELY(thr->objectName().isEmpty()))
if (Q_LIKELY(objectName.isEmpty())) setCurrentThreadName(thr->metaObject()->className());
setCurrentThreadName(thread_id, thr->metaObject()->className());
else else
setCurrentThreadName(thread_id, objectName.toLocal8Bit()); setCurrentThreadName(thr->objectName().toLocal8Bit());
} }
#endif #endif