1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QProcess::startDetached/Unix: simplify handling of the pipes

Browse Source 
Use a structure that will automatically close them for us. This doesn't
apply to startProcess() because the pipes there are long-lived (though
each of them in QProcessPrivate could be an AutoPipe...).

The destructor only runs in the parent process, so the child processes
don't need to worry about setting file descriptors to -1.

Change-Id: Ic90d8429a0eb4837971dfffd1664ed98f3d74d1c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
(cherry picked from commit f0ce50d3353e8a684f905e19dc6116dd1b515bf2)
This commit is contained in:
Thiago Macieira 2021-02-18 11:16:47 -08:00
parent d47e2a28b9
commit 4ffc03d9fd
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/corelib/io/qprocess_unix.cpp
View File

@ -148,6 +148,26 @@ QProcessEnvironment QProcessEnvironment::systemEnvironment()
#if QT_CONFIG(process) #if QT_CONFIG(process)
namespace { namespace {
struct AutoPipe
{
int pipe[2] = { -1, -1 };
AutoPipe(int flags = 0)
{
qt_safe_pipe(pipe, flags);
}
~AutoPipe()
{
for (int fd : pipe) {
if (fd >= 0)
qt_safe_close(fd);
}
}
explicit operator bool() const { return pipe[0] >= 0; }
int &operator[](int idx) { return pipe[idx]; }
int operator[](int idx) const { return pipe[idx]; }
};
struct QProcessPoller struct QProcessPoller
{ {
QProcessPoller(const QProcessPrivate &proc); QProcessPoller(const QProcessPrivate &proc);
@ -882,30 +902,18 @@ bool QProcessPrivate::startDetached(qint64 *pid)
{ {
QByteArray encodedWorkingDirectory = QFile::encodeName(workingDirectory); QByteArray encodedWorkingDirectory = QFile::encodeName(workingDirectory);
// To catch the startup of the child // To catch the startup of the child and communicate its pid
int startedPipe[2]; AutoPipe startedPipe, pidPipe;
if (qt_safe_pipe(startedPipe) != 0) { if (!startedPipe || !pidPipe) {
setErrorAndEmit(QProcess::FailedToStart, QLatin1String("pipe: ") + qt_error_string(errno)); setErrorAndEmit(QProcess::FailedToStart, QLatin1String("pipe: ") + qt_error_string(errno));
return false; return false;
} }
// To communicate the pid of the child
int pidPipe[2];
if (qt_safe_pipe(pidPipe) != 0) {
setErrorAndEmit(QProcess::FailedToStart, QLatin1String("pipe: ") + qt_error_string(errno));
qt_safe_close(startedPipe[0]);
qt_safe_close(startedPipe[1]);
return false;
}
if (!openChannelsForDetached()) { if (!openChannelsForDetached()) {
// openChannel sets the error string // openChannel sets the error string
closeChannel(&stdinChannel); closeChannel(&stdinChannel);
closeChannel(&stdoutChannel); closeChannel(&stdoutChannel);
closeChannel(&stderrChannel); closeChannel(&stderrChannel);
qt_safe_close(pidPipe[0]);
qt_safe_close(pidPipe[1]);
qt_safe_close(startedPipe[0]);
qt_safe_close(startedPipe[1]);
return false; return false;
} }
@ -976,20 +984,18 @@ bool QProcessPrivate::startDetached(qint64 *pid)
closeChannel(&stdinChannel); closeChannel(&stdinChannel);
closeChannel(&stdoutChannel); closeChannel(&stdoutChannel);
closeChannel(&stderrChannel); closeChannel(&stderrChannel);
qt_safe_close(startedPipe[1]);
qt_safe_close(pidPipe[1]);
if (childPid == -1) { if (childPid == -1) {
qt_safe_close(startedPipe[0]);
qt_safe_close(pidPipe[0]);
setErrorAndEmit(QProcess::FailedToStart, QLatin1String("fork: ") + qt_error_string(savedErrno)); setErrorAndEmit(QProcess::FailedToStart, QLatin1String("fork: ") + qt_error_string(savedErrno));
return false; return false;
} }
qt_safe_close(startedPipe[1]);
startedPipe[1] = -1;
char reply = '\0'; char reply = '\0';
int startResult = qt_safe_read(startedPipe[0], &reply, 1); int startResult = qt_safe_read(startedPipe[0], &reply, 1);
int result; int result;
qt_safe_close(startedPipe[0]);
qt_safe_waitpid(childPid, &result, 0); qt_safe_waitpid(childPid, &result, 0);
bool success = (startResult != -1 && reply == '\0'); bool success = (startResult != -1 && reply == '\0');
@ -1003,7 +1009,6 @@ bool QProcessPrivate::startDetached(qint64 *pid)
*pid = -1; *pid = -1;
setErrorAndEmit(QProcess::FailedToStart); setErrorAndEmit(QProcess::FailedToStart);
} }
qt_safe_close(pidPipe[0]);
return success; return success;
} }