Changeset 212 for trunk/src

Timestamp:

Oct 7, 2009, 1:29:22 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QProcess: Fixed: Don't lose the remaining stdout/stderr bytes from the child process when the death notification gets delivered before the data availability signal.

File:

• trunk/src/corelib/io/qprocess_os2.cpp (modified) (4 diffs)

trunk/src/corelib/io/qprocess_os2.cpp

@@ -316 +316 @@
     // to guarantee that the given procKey may be reused, we must close all
     // pipes in order to ensure that we won't get late NPSS_CLOSE for the
-    // removed process that may be already associated with a different process
+    // removed process 
     QProcessPrivate *d = process->d_func();
     d->destroyPipe(d->stdinChannel.pipe);
@@ -358 +358 @@
 void QProcessManager::installSigHandler()
 {
-    // set up the SIGCHLD handler, which calls _q_processDied on all
-    // known QProcessPrivate instances every time a child dies.
+    // set up the SIGCHLD handler
+    // 
     struct sigaction oldAction;
     struct sigaction action;
@@ -1055 +1055 @@
     QProcessPrivate* that = const_cast<QProcessPrivate*>(this);
 
-    // grab new bytes from QProcessManager (if any)
-    int newBytes = that->pipeData[OutPipe].newBytes.fetchAndStoreRelaxed(0);
+    int newBytes = 0;
+    if (dying) {
+        // we are dying and won't get notifications from QProcessManager
+        // anymore, look manually if there's stiil something in the pipe
+        APIRET arc;
+        ULONG state;
+        AVAILDATA avail;
+        if (that->stdoutChannel.type == QProcessPrivate::Channel::Normal &&
+            that->stdoutChannel.pipe.server != HPIPE(~0)) {
+            arc = DosPeekNPipe(that->stdoutChannel.pipe.server, 0, 0, 0, &avail, &state);
+            Q_ASSERT(arc == NO_ERROR || arc == ERROR_INVALID_PARAMETER);
+            // note that even if ERROR_INVALID_PARAMETER, it seems to return the
+            // correct values in avail and state (undocumented)
+            newBytes = avail.cbpipe;
+            that->pipeData[OutPipe].newBytes = 0;
+        }
+    } else {
+        // grab new bytes from QProcessManager (if any)
+        newBytes = that->pipeData[OutPipe].newBytes.fetchAndStoreRelaxed(0);
+    }
+
     that->pipeData[OutPipe].bytesLeft += newBytes;
 
@@ -1070 +1089 @@
     QProcessPrivate* that = const_cast<QProcessPrivate*>(this);
 
-    // grab new bytes from QProcessManager (if any)
-    int newBytes = that->pipeData[ErrPipe].newBytes.fetchAndStoreRelaxed(0);
-    that->pipeData[ErrPipe].bytesLeft += newBytes;
+    int newBytes = 0;
+    if (dying) {
+        // we are dying and won't get notifications from QProcessManager
+        // anymore, look manually if there's stiil something in the pipe
+        APIRET arc;
+        ULONG state;
+        AVAILDATA avail;
+        if (that->stderrChannel.type == QProcessPrivate::Channel::Normal &&
+            that->stderrChannel.pipe.server != HPIPE(~0)) {
+            arc = DosPeekNPipe(that->stderrChannel.pipe.server, 0, 0, 0, &avail, &state);
+            Q_ASSERT(arc == NO_ERROR || arc == ERROR_INVALID_PARAMETER);
+            // note that even if ERROR_INVALID_PARAMETER, it seems to return the
+            // correct values in avail and state (undocumented)
+            newBytes = avail.cbpipe;
+            that->pipeData[ErrPipe].newBytes = 0;
+        }
+    } else {
+        // grab new bytes from QProcessManager (if any)
+        newBytes = that->pipeData[ErrPipe].newBytes.fetchAndStoreRelaxed(0);
+    }
 
 #if defined (QPROCESS_DEBUG)