diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-09-06 21:19:52 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-09-16 16:32:53 +0300 |
| commit | 8311d60d627dabcf5f74be9e50b4b7d6aedcd5e7 (patch) | |
| tree | 9243915671c49339cb62df8af66162b59158664b | |
| parent | e7d70e34509e948ec67a0d9182bdc9dd12f98ac1 (diff) | |
| download | qtserialport-8311d60d627dabcf5f74be9e50b4b7d6aedcd5e7.tar.gz | |
Revert "Emit _q_notify only if there's no notification pending"
This reverts commit 85ee2c658a45d2958a54045951d236769640337f.
That commit completely breaks the I/O on Windows.
Task-number: QTBUG-78086
Change-Id: I6c6b8ef0b5af7bd9dcbea791fbb8322c9e68b900
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit f6b43c36b3839dae54308a6437bbdd99ae9a44de)
| -rw-r--r-- | src/serialport/qwinoverlappedionotifier.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/serialport/qwinoverlappedionotifier.cpp b/src/serialport/qwinoverlappedionotifier.cpp index 233ee69..615dacc 100644 --- a/src/serialport/qwinoverlappedionotifier.cpp +++ b/src/serialport/qwinoverlappedionotifier.cpp @@ -129,7 +129,6 @@ public: HANDLE hSemaphore = nullptr; HANDLE hResultsMutex = nullptr; QAtomicInt waiting; - QAtomicInt pendingNotifications; QQueue<IOResult> results; }; @@ -396,17 +395,14 @@ void QWinOverlappedIoNotifierPrivate::notify(DWORD numberOfBytes, DWORD errorCod results.enqueue(IOResult(numberOfBytes, errorCode, overlapped)); ReleaseMutex(hResultsMutex); ReleaseSemaphore(hSemaphore, 1, NULL); - if (!waiting && pendingNotifications-- == 0) + if (!waiting) emit q->_q_notify(); } void QWinOverlappedIoNotifierPrivate::_q_notified() { - int n = pendingNotifications.fetchAndStoreAcquire(0); - while (--n >= 0) { - if (WaitForSingleObject(hSemaphore, 0) == WAIT_OBJECT_0) - dispatchNextIoResult(); - } + if (WaitForSingleObject(hSemaphore, 0) == WAIT_OBJECT_0) + dispatchNextIoResult(); } OVERLAPPED *QWinOverlappedIoNotifierPrivate::dispatchNextIoResult() |