Changeset 191

Timestamp:

Sep 23, 2009, 12:39:29 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Oops, fixed regression of r190 (hang at application termination). Also repaced fcntl() with ioctl() calls as the former is known to not always work in kLIBC ~0.6.3.

File:

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

trunk/src/corelib/io/qprocess_os2.cpp

@@ -217 +217 @@
         QProcessManager *instance = QProcessManager::instance;
         QProcessManager::instance = 0;
-        // disable the signal handler
-        while (!instance->eventSemGuard.testAndSetAcquire(1, 0))
-            DosSleep(0);
-        instance->uninstallSigHandler();
-        // stop the thread
-        instance->finish = true;
-        locker.unlock();
-        DosPostEventSem(instance->eventSem);
-        instance->wait();
+        // disable the signal handler and stop the thread if necessary
+        if (instance->isRunning()) {
+            Q_ASSERT(instance->eventSemGuard == 1 || instance->eventSemGuard == 2);
+            while (!instance->eventSemGuard.testAndSetRelease(1, 0))
+                DosSleep(0);
+            instance->uninstallSigHandler();
+            // stop the thread
+            instance->finish = true;
+            locker.unlock();
+            DosPostEventSem(instance->eventSem);
+            instance->wait();
+        }
         delete instance;
     }
@@ -661 +664 @@
                                        .arg(qPrintable(qt_error_string(errno))));
         emit q->error(processError);
-        removeProcess(q);
+        removeProcess(q);
         cleanup();
         return;
@@ -667 +670 @@
 
     this->pid = Q_PID(pid);
+
+
 
     // close the ends we don't use and make all pipes non-blocking
@@ -674 +679 @@
     }
     if (stdinChannel.pipe[1] != -1)
-        ::fcntl(stdinChannel.pipe[1], F_SETFL, ::fcntl(stdinChannel.pipe[1], F_GETFL) | O_NONBLOCK);
+        ::);
 
     if (stdoutChannel.pipe[1] != -1) {
@@ -681 +686 @@
     }
     if (stdoutChannel.pipe[0] != -1)
-        ::fcntl(stdoutChannel.pipe[0], F_SETFL, ::fcntl(stdoutChannel.pipe[0], F_GETFL) | O_NONBLOCK);
+        ::);
 
     if (stderrChannel.pipe[1] != -1) {
@@ -688 +693 @@
     }
     if (stderrChannel.pipe[0] != -1)
-        ::fcntl(stderrChannel.pipe[0], F_SETFL, ::fcntl(stderrChannel.pipe[0], F_GETFL) | O_NONBLOCK);
+        ::);
 
     // give the process a chance to start ...