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

Fix more implicit QAtomic<T> <-> T conversions

Browse Source 
These were hidden in !QT_CONFIG(thread) code. The irony!

This patch does not change the semantics of the operations. It
just makes the implicit operations explicit.

Any fixes or optimizations are left for follow-up patches, if any.

Change-Id: I014eb71745532dae2efe7963aa87321f61b1bd7a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Marc Mutz 2019-07-13 09:50:16 +02:00
parent c563e5b3c7
commit 8b34296e6a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/thread/qthread.cpp
View File

@ -851,7 +851,7 @@ Qt::HANDLE QThread::currentThreadId() noexcept
QThread *QThread::currentThread() QThread *QThread::currentThread()
{ {
return QThreadData::current()->thread; return QThreadData::current()->thread.loadAcquire();
} }
int QThread::idealThreadCount() noexcept int QThread::idealThreadCount() noexcept
@ -883,11 +883,11 @@ QThreadData *QThreadData::current(bool createIfNecessary)
if (!data && createIfNecessary) { if (!data && createIfNecessary) {
data = new QThreadData; data = new QThreadData;
data->thread = new QAdoptedThread(data); data->thread = new QAdoptedThread(data);
data->threadId.storeRelaxed(Qt::HANDLE(data->thread)); data->threadId.storeRelaxed(Qt::HANDLE(data->thread.loadAcquire()));
data->deref(); data->deref();
data->isAdopted = true; data->isAdopted = true;
if (!QCoreApplicationPrivate::theMainThread) if (!QCoreApplicationPrivate::theMainThread.loadAcquire())
QCoreApplicationPrivate::theMainThread = data->thread.loadRelaxed(); QCoreApplicationPrivate::theMainThread.storeRelease(data->thread.loadRelaxed());
} }
return data; return data;
} }