Changeset 609

Timestamp:

Feb 26, 2010, 7:44:40 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed QProcess: Data could not be successfully read or written to the standard streams of the started process in 'highmem' link mode (which is on by default since 4.5.1 GA).

File:

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

trunk/src/corelib/io/qprocess_os2.cpp

@@ -190 +190 @@
         return;
 
-    // set deathEvent to 1 and post the semaphore if not already done so
+    // set death to 1 and post the semaphore if not already done so
     if (instance->deathFlag.testAndSetRelaxed(0, 1)) {
         APIRET rc = DosPostEventSem(instance->eventSem);
@@ -366 +366 @@
 void QProcessManager::installSigHandler()
 {
-    // set up the SIGCHLD handler which calls posts a semaphore wenever
+    // set up the SIGCHLD handler which enever
     // our child dies
     struct sigaction oldAction;
@@ -407 +407 @@
 
     // an array for 1 process is initially enough
-    QVector<PIPESEMSTATE> pipeStates(3 * 2 + 1);
+    int pipeStatesSize = sizeof(PIPESEMSTATE) * (3 * 2 + 1);
+    PPIPESEMSTATE pipeStates = (PPIPESEMSTATE)::_lmalloc(pipeStatesSize);
 
     do {
@@ -448 +449 @@
         // is sz * 2 (to be able to store both NPSS_RDATA/NPSS_WSPACE and
         // NPSS_CLOSE for every pipe) + one for NPSS_EOI
-        int bestSize = processes.size() * 3 * 2 + 1;
-        if (pipeStates.size() < bestSize)
-            pipeStates.resize(bestSize);
-
-        arc = DosQueryNPipeSemState((HSEM)eventSem, pipeStates.data(),
-                                    pipeStates.size() * sizeof(PIPESEMSTATE));
+        int bestSize = sizeof(PIPESEMSTATE) * (processes.size() * 3 * 2 + 1);
+        if (pipeStatesSize < bestSize) {
+            pipeStates = (PPIPESEMSTATE)_lrealloc(pipeStates, bestSize);
+            pipeStatesSize = bestSize;
+        }
+
+        arc = DosQueryNPipeSemState((HSEM)eventSem, pipeStates, pipeStatesSize);
         if (arc != NO_ERROR) {
             qWarning("QProcessManager::run: DosQueryNPipeSemState returned %lu", arc);
@@ -533 +535 @@
         }
     } while (true);
+
+
 
 #if defined (QPROCESS_DEBUG)