diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-02-14 12:13:53 -0800 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2017-02-15 08:08:58 +0000 |
| commit | b58af67d7b5f22eaf2916b91d8a7060781203561 (patch) | |
| tree | 0a64ed53af9efff75731c36ced07bea405d4903f /src/corelib/kernel | |
| parent | 265db5ad9bda9c984393c1e95fd27dcc4633ed1c (diff) | |
Turn QThreadData::threadId into a QAtomicPointer
Solves a data race found by TSan.
Since thread and threadId are QAtomicPointer, I've removed the explicit
initialization in the QThreadData constructor
Task-number: QTBUG-58855
Change-Id: I4139d5f93dcb4b429ae9fffd14a34082f2683f76
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index c44e4b16b1..b1de62bceb 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3686,7 +3686,7 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i continue; QObject * const receiver = c->receiver; - const bool receiverInSameThread = currentThreadId == receiver->d_func()->threadData->threadId; + const bool receiverInSameThread = currentThreadId == receiver->d_func()->threadData->threadId.load(); // determine if this connection should be sent immediately or // put into the event queue |