AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QThread: Fix unnecessary stricter accesses to QThreadData::thread

Browse Source 
Commit ec6556a2b9 changed the member from
a plain pointer to a QAtomicPointer. Not all accesses were caught.

Pick-to: 5.15
Change-Id: I3d4f433ff6e94fd390a9fffd161b4ff25508c48d
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Thiago Macieira 2020-06-23 16:26:35 -07:00
parent 48c8322a61
commit e7d76d79e8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,7 +415,7 @@ QThread::QThread(QObject *parent)
{
Q_D(QThread);
// fprintf(stderr, "QThreadData %p created for thread %p\n", d->data, this);
d->data->thread = this;
d->data->thread.storeRelaxed(this);
}
/*!
@ -426,7 +426,7 @@ QThread::QThread(QThreadPrivate &dd, QObject *parent)
{
Q_D(QThread);
// fprintf(stderr, "QThreadData %p taken from private data for thread %p\n", d->data, this);
d->data->thread = this;
d->data->thread.storeRelaxed(this);
}
/*!
@ -451,7 +451,7 @@ QThread::~QThread()
if (d->running && !d->finished && !d->data->isAdopted)
qFatal("QThread: Destroyed while thread is still running");
d->data->thread = nullptr;
d->data->thread.storeRelease(nullptr);
}
}
@ -797,7 +797,7 @@ QThread::QThread(QObject *parent)
: QObject(*(new QThreadPrivate), parent)
{
Q_D(QThread);
d->data->thread = this;
d->data->thread.storeRelaxed(this);
}
QThread::~QThread()
@ -915,7 +915,7 @@ QThread::QThread(QThreadPrivate &dd, QObject *parent)
{
Q_D(QThread);
// fprintf(stderr, "QThreadData %p taken from private data for thread %p\n", d->data, this);
d->data->thread = this;
d->data->thread.storeRelaxed(this);
}
QThreadPrivate::QThreadPrivate(QThreadData *d) : data(d ? d : new QThreadData)
@ -924,7 +924,7 @@ QThreadPrivate::QThreadPrivate(QThreadData *d) : data(d ? d : new QThreadData)
QThreadPrivate::~QThreadPrivate()
{
data->thread = nullptr; // prevent QThreadData from deleting the QThreadPrivate (again).
data->thread.storeRelease(nullptr); // prevent QThreadData from deleting the QThreadPrivate (again).
delete data;
}