Changeset 646 for trunk/src

Timestamp:

Mar 7, 2010, 9:17:02 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QProcess: Fixed a problem that, depending on the order of events, could cause a failure to write to the standard input channel of the started process (accompanied by an assertion in QProcessPrivate::writeToStdin() in debug mode).

Location:

trunk/src/corelib/io

Files:

• qprocess.cpp (modified) (2 diffs)
• qprocess_os2.cpp (modified) (4 diffs)
• qprocess_p.h (modified) (1 diff)

trunk/src/corelib/io/qprocess.cpp

@@ -1816 +1816 @@
 #endif
 #if defined(Q_OS_OS2)
-        qint64 available = d->bytesAvailableInStdin();
-        if (available > 0)
-            d->_q_canWrite();
+        // try to write some bytes (there may be space in the pipe)
+        d->_q_canWrite();
 #endif
         return 1;
@@ -1832 +1831 @@
 #endif
 #if defined(Q_OS_OS2)
-        qint64 available = d->bytesAvailableInStdin();
-        if (available > 0)
-            d->_q_canWrite();
+        // try to write some bytes (there may be space in the pipe)
+        d->_q_canWrite();
 #endif
     return len;

trunk/src/corelib/io/qprocess_os2.cpp

@@ -1314 +1314 @@
     }
 
-    that->pipeData[OutPipe].bytesLeft += newBytes;
+    if (newBytes)
+        that->pipeData[OutPipe].bytesLeft = newBytes;
 
 #if defined (QPROCESS_DEBUG)
@@ -1348 +1349 @@
     }
 
-    that->pipeData[ErrPipe].bytesLeft += newBytes;
+    if (newBytes)
+        that->pipeData[ErrPipe].bytesLeft = newBytes;
 
 #if defined (QPROCESS_DEBUG)
@@ -1355 +1357 @@
 #endif
     return that->pipeData[ErrPipe].bytesLeft;
-}
-
-qint64 QProcessPrivate::bytesAvailableInStdin() const
-{
-    QProcessPrivate* that = const_cast<QProcessPrivate*>(this);
-
-    // grab new bytes from QProcessManager (if any)
-    int newBytes = that->pipeData[InPipe].newBytes.fetchAndStoreRelaxed(0);
-    that->pipeData[InPipe].bytesLeft += newBytes;
-
-#if defined (QPROCESS_DEBUG)
-    qDebug("QProcessPrivate::bytesAvailableInStdin() == %lld",
-           that->pipeData[InPipe].bytesLeft);
-#endif
-    return that->pipeData[InPipe].bytesLeft;
 }
 
@@ -1414 +1401 @@
 qint64 QProcessPrivate::writeToStdin(const char *data, qint64 maxlen)
 {
+    QProcessPrivate* that = const_cast<QProcessPrivate*>(this);
+
+    // grab new bytes from QProcessManager (if any)
+    int newBytes = that->pipeData[InPipe].newBytes.fetchAndStoreRelaxed(0);
+    if (newBytes)
+        that->pipeData[InPipe].bytesLeft = newBytes;
+
+#if defined (QPROCESS_DEBUG)
+    qDebug("QProcessPrivate::writeToStdin(): %lld free bytes in pipe",
+           that->pipeData[InPipe].bytesLeft);
+#endif
+    if (!that->pipeData[InPipe].bytesLeft)
+        return 0;
+
     ULONG actual = 0;
     APIRET arc = DosWrite(stdinChannel.pipe.server, data, maxlen, &actual);

trunk/src/corelib/io/qprocess_p.h

@@ -271 +271 @@
     qint64 bytesAvailableFromStdout() const;
     qint64 bytesAvailableFromStderr() const;
-#if defined(Q_OS_OS2)
-    qint64 bytesAvailableInStdin() const;
-#endif
+
     qint64 readFromStdout(char *data, qint64 maxlen);
     qint64 readFromStderr(char *data, qint64 maxlen);