Changeset 913 for trunk/src/corelib/io/qprocess.cpp

Timestamp:

Jul 28, 2011, 12:43:59 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: QProcess: New I/O pipe notification mechanism.

This remake is to fix a number of problems such as hangs
and truncated data during interprocess communication using
redirection of standard I/O channels through the QIODevice
interface provided by QProcess. See #199.

File:

• trunk/src/corelib/io/qprocess.cpp (modified) (3 diffs)

trunk/src/corelib/io/qprocess.cpp

@@ -842 +842 @@
     destroyPipe(childStartedPipe);
     destroyPipe(deathPipe);
-#else
-    pipeData[InPipe].bytesLeft = 0;
-    pipeData[OutPipe].bytesLeft = pipeData[ErrPipe].bytesLeft = 0;
-    pipeData[InPipe].newBytes = 0;
-    pipeData[OutPipe].newBytes = pipeData[ErrPipe].newBytes = 0;
 #endif
 #ifdef Q_OS_UNIX
@@ -1877 +1872 @@
             d->stdinChannel.notifier->setEnabled(true);
 #if defined QPROCESS_DEBUG
-    qDebug("QProcess::writeData(%p \"%s\", %lld) == 1 (written to buffer)",
-           data, qt_prettyDebug(data, len, 16).constData(), len);
+    qDebug("QProcess::writeData(%p \"%s\", %lld) == 1 (written to buffer)",
+           data, qt_prettyDebug(data, len, 16).constData(), len);
 #endif
 #if defined(Q_OS_OS2)
         // try to write some bytes (there may be space in the pipe)
-        d->_q_canWrite();
+        d->_q_);
 #endif
         return 1;
@@ -1896 +1891 @@
 #endif
 #if defined(Q_OS_OS2)
-        // try to write some bytes (there may be space in the pipe)
-        d->_q_canWrite();
+    // try to write some bytes (there may be space in the pipe)
+    );
 #endif
     return len;