QEventDispatcher(Win): Always honor interrupted status to avoid races

There may be a race where e.g. thread 'B' is woken up by a queued invoke.
At the same time thread 'A' asks 'B' to quit, which will set various
atomics (some important ones are 'interrupt' in the dispatcher and
'exit' in the event loop), but it does _not_ try to send another wake
since there is already an unhandled wake triggered by 'B' itself.
Sadly 'B' reads the 'exit' atomic before 'A' updates it.
Then, slightly before, 'B' sets 'interrupt' back to 0, 'A' write 1 to
it, meaning 'A's interrupt is ignored. Then, since there is no
interrupt, 'B' goes back to waiting for events, leaving the thread alive
and running instead of quitting.

Maybe this has unforeseen consequences (one consequence is that it will
return and re-enter the event dispatcher once more, possible
unnecessarily)

Fixes: QTBUG-91539
Change-Id: Ie6f861f42ffddf4817d5c8af2d764abe9d9103c2
Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit f274f91cebb0a4fd2ebe37bb3a605c47d6acd404)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2021-03-05 14:33:01 +01:00 committed by Qt Cherry-pick Bot
parent 4dc30edb4b
commit 955ce882f7
2 changed files with 32 additions and 1 deletions

View File

@ -492,13 +492,17 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
{ {
Q_D(QEventDispatcherWin32); Q_D(QEventDispatcherWin32);
d->interrupt.storeRelaxed(false); // We don't know _when_ the interrupt occurred so we have to honor it.
const bool wasInterrupted = d->interrupt.fetchAndStoreRelaxed(false);
emit awake(); emit awake();
// To prevent livelocks, send posted events once per iteration. // To prevent livelocks, send posted events once per iteration.
// QCoreApplication::sendPostedEvents() takes care about recursions. // QCoreApplication::sendPostedEvents() takes care about recursions.
sendPostedEvents(); sendPostedEvents();
if (wasInterrupted)
return false;
auto threadData = d->threadData.loadRelaxed(); auto threadData = d->threadData.loadRelaxed();
bool canWait; bool canWait;
bool retVal = false; bool retVal = false;

View File

@ -69,6 +69,7 @@ private slots:
void processEventsOnlySendsQueuedEvents(); void processEventsOnlySendsQueuedEvents();
void postedEventsPingPong(); void postedEventsPingPong();
void eventLoopExit(); void eventLoopExit();
void interruptTrampling();
}; };
bool tst_QEventDispatcher::event(QEvent *e) bool tst_QEventDispatcher::event(QEvent *e)
@ -419,5 +420,31 @@ void tst_QEventDispatcher::eventLoopExit()
QVERIFY(!timeoutObserved); QVERIFY(!timeoutObserved);
} }
// Based on QTBUG-91539: In the event dispatcher on Windows we overwrite the
// interrupt once we start processing events (this pattern is also in the 'unix' dispatcher)
// which would lead the dispatcher to accidentally ignore certain interrupts and,
// as in the bug report, would not quit, leaving the thread alive and running.
void tst_QEventDispatcher::interruptTrampling()
{
class WorkerThread : public QThread
{
void run() override {
auto dispatcher = eventDispatcher();
QVERIFY(dispatcher);
dispatcher->processEvents(QEventLoop::AllEvents);
QTimer::singleShot(0, [dispatcher]() {
dispatcher->wakeUp();
});
dispatcher->processEvents(QEventLoop::WaitForMoreEvents);
dispatcher->interrupt();
dispatcher->processEvents(QEventLoop::WaitForMoreEvents);
}
};
WorkerThread thread;
thread.start();
QVERIFY(thread.wait(1000));
QVERIFY(thread.isFinished());
}
QTEST_MAIN(tst_QEventDispatcher) QTEST_MAIN(tst_QEventDispatcher)
#include "tst_qeventdispatcher.moc" #include "tst_qeventdispatcher.moc"