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

Merge integration refs/builds/qtci/dev/1616661627

Browse Source
This commit is contained in:
Qt CI Bot 2021-03-25 11:01:18 +00:00
commit d30f88cbf1
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/corelib/io/qprocess_win.cpp
View File

@ -693,29 +693,14 @@ bool QProcessPrivate::waitForBytesWritten(const QDeadlineTimer &deadline)
QIncrementalSleepTimer timer(deadline.remainingTime()); QIncrementalSleepTimer timer(deadline.remainingTime());
forever { forever {
bool pendingDataInPipe = stdinChannel.writer && stdinChannel.writer->bytesToWrite(); // If no write is pending, try to start one. However, at entry into
// the loop the write buffer can be empty to start with, in which
// If we don't have pending data, and our write buffer is // case _q_caWrite() fails immediately.
// empty, we fail. if (pipeWriterBytesToWrite() == 0 && !_q_canWrite())
if (!pendingDataInPipe && writeBuffer.isEmpty())
return false; return false;
// If we don't have pending data and we do have data in our Q_ASSERT(stdinChannel.writer);
// write buffer, try to flush that data over to the pipe if (stdinChannel.writer->waitForWrite(0))
// writer. Fail on error.
if (!pendingDataInPipe) {
if (!_q_canWrite())
return false;
}
// Wait for the pipe writer to acknowledge that it has
// written. This will succeed if either the pipe writer has
// already written the data, or if it manages to write data
// within the given timeout. If the write buffer was non-empty
// and the stdinChannel.writer is now dead, that means _q_canWrite()
// destroyed the writer after it successfully wrote the last
// batch.
if (!stdinChannel.writer || stdinChannel.writer->waitForWrite(0))
return true; return true;
// If we wouldn't write anything, check if we can read stdout. // If we wouldn't write anything, check if we can read stdout.