Changeset 190

Timestamp:

Sep 22, 2009, 10:44:03 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QProcess: Implemented child termination/death detection using SIGCHILD and an auxiliary thread.

Location:

trunk/src/corelib/io

Files:

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

trunk/src/corelib/io/qprocess.cpp

@@ -437 +437 @@
     serial = 0;
 #endif
+
+
+
 }
 
@@ -443 +446 @@
 QProcessPrivate::~QProcessPrivate()
 {
+
+
+
     if (stdinChannel.process)
         stdinChannel.process->stdoutChannel.clear();
@@ -744 +750 @@
     processError = QProcess::FailedToStart;
     emit q->error(processError);
-#ifdef Q_OS_UNIX
+#if
     // make sure the process manager removes this entry
     waitForDeadChild();
@@ -801 +807 @@
         waitForFinished();
     }
-#ifdef Q_OS_UNIX
+#if
     // make sure the process manager removes this entry
     d->findExitCode();

trunk/src/corelib/io/qprocess_os2.cpp

@@ -51 +51 @@
 #include <ctype.h>
 
+
+
 /*
     Returns a human readable representation of the first \a len
@@ -122 +124 @@
     ::fcntl(pipe[0], F_SETFD, FD_CLOEXEC);
     ::fcntl(pipe[1], F_SETFD, FD_CLOEXEC);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -372 +607 @@
         return;
 
+
+
     // Start the process (platform dependent)
     q->setProcessState(QProcess::Starting);
@@ -424 +661 @@
                                        .arg(qPrintable(qt_error_string(errno))));
         emit q->error(processError);
+
         cleanup();
         return;
@@ -452 +690 @@
         ::fcntl(stderrChannel.pipe[0], F_SETFL, ::fcntl(stderrChannel.pipe[0], F_GETFL) | O_NONBLOCK);
 
-    q->setProcessState(QProcess::Running);
-    // User can call kill()/terminate() from the stateChanged() slot
-    // so check before proceeding
-    if (!pid)
-        return;
-
     // give the process a chance to start ...
     DosSleep(100);
+
     _q_startupNotification();
 }
@@ -465 +698 @@
 bool QProcessPrivate::processStarted()
 {
-    return processState == QProcess::Running;
+    // we don't actually wait for any notification from the child process
+    // assuming it has been started as long as spawnvpe() returns success
+    return processState == QProcess::Starting;
 }
 
@@ -589 +824 @@
     Q_Q(QProcess);
 
-    if (processStarted())
+    if (processSta)
         return true;
 
@@ -820 +1055 @@
 void QProcessPrivate::findExitCode()
 {
+
+
+
+
+
+
+
+
 }
 
@@ -838 +1081 @@
 #if defined QPROCESS_DEBUG
     qDebug() << "QProcessPrivate::waitForDeadChild() not dead!";
+
+
 #endif
     return false;

trunk/src/corelib/io/qprocess_p.h

@@ -195 +195 @@
     qint64 pipeWriterBytesToWrite() const;
 #endif
+
+
+
+
 
     static bool startDetached(const QString &program, const QStringList &arguments, const QString &workingDirectory = QString(),