AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QProcess: consolidate channel management

Browse Source 
We have the same channel forwarding, redirecting, and merging rules for
all platforms. This makes it possible to introduce the openChannels()
function, which consolidates the logic and performs high-level general
processing of the channels configuration properties.

Change-Id: Id3574fc42a56829328369b6a1a6ec9c95fce8eca
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
This commit is contained in:
Alex Trotsenko 2020-12-22 18:45:55 +02:00
parent 8be9fb66f7
commit 1fb9c5348e
4 changed files with 80 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/corelib/io/qprocess.cpp
View File

@ -940,6 +940,78 @@ void QProcessPrivate::setErrorAndEmit(QProcess::ProcessError error, const QStrin
emit q->errorOccurred(processError);
}
/*!
\internal
*/
bool QProcessPrivate::openChannels()
{
// stdin channel.
if (inputChannelMode == QProcess::ForwardedInputChannel) {
if (stdinChannel.type != Channel::Normal)
qWarning("QProcess::openChannels: Inconsistent stdin channel configuration");
} else if (!openChannel(stdinChannel)) {
return false;
}
// stdout channel.
if (processChannelMode == QProcess::ForwardedChannels
|| processChannelMode == QProcess::ForwardedOutputChannel) {
if (stdoutChannel.type != Channel::Normal)
qWarning("QProcess::openChannels: Inconsistent stdout channel configuration");
} else if (!openChannel(stdoutChannel)) {
return false;
}
// stderr channel.
if (processChannelMode == QProcess::ForwardedChannels
|| processChannelMode == QProcess::ForwardedErrorChannel
|| processChannelMode == QProcess::MergedChannels) {
if (stderrChannel.type != Channel::Normal)
qWarning("QProcess::openChannels: Inconsistent stderr channel configuration");
} else if (!openChannel(stderrChannel)) {
return false;
}
return true;
}
/*!
\internal
*/
bool QProcessPrivate::openChannelsForDetached()
{
// stdin channel.
if (stdinChannel.type != Channel::Normal
&& (stdinChannel.type != Channel::Redirect
|| inputChannelMode == QProcess::ForwardedInputChannel)) {
qWarning("QProcess::openChannelsForDetached: Inconsistent stdin channel configuration");
}
if (stdinChannel.type == Channel::Redirect && !openChannel(stdinChannel))
return false;
// stdout channel.
if (stdoutChannel.type != Channel::Normal
&& (stdoutChannel.type != Channel::Redirect
|| processChannelMode == QProcess::ForwardedChannels
|| processChannelMode == QProcess::ForwardedOutputChannel)) {
qWarning("QProcess::openChannelsForDetached: Inconsistent stdout channel configuration");
}
if (stdoutChannel.type == Channel::Redirect && !openChannel(stdoutChannel))
return false;
// stderr channel.
if (processChannelMode == QProcess::MergedChannels || (stderrChannel.type != Channel::Normal
&& (stderrChannel.type != Channel::Redirect
|| processChannelMode == QProcess::ForwardedChannels
|| processChannelMode == QProcess::ForwardedErrorChannel))) {
qWarning("QProcess::openChannelsForDetached: Inconsistent stderr channel configuration");
}
if (stderrChannel.type == Channel::Redirect && !openChannel(stderrChannel))
return false;
return true;
}
/*!
\internal
Returns \c true if we emitted readyRead().

2
src/corelib/io/qprocess_p.h
View File

@ -316,6 +316,8 @@ public:
Channel stdinChannel;
Channel stdoutChannel;
Channel stderrChannel;
bool openChannels();
bool openChannelsForDetached();
bool openChannel(Channel &channel);
void closeChannel(Channel *channel);
void closeWriteChannel();

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

@ -221,36 +221,11 @@ void QProcessPrivate::closeChannel(Channel *channel)
/*
Create the pipes to a QProcessPrivate::Channel.
This function must be called in order: stdin, stdout, stderr
*/
bool QProcessPrivate::openChannel(Channel &channel)
{
Q_Q(QProcess);
// Handle forwarding of the process channels.
if (&channel == &stdinChannel) {
if (inputChannelMode == QProcess::ForwardedInputChannel)
return true;
} else {
switch (processChannelMode) {
case QProcess::ForwardedChannels:
return true;
case QProcess::ForwardedOutputChannel:
if (&channel == &stdoutChannel)
return true;
break;
case QProcess::ForwardedErrorChannel:
case QProcess::MergedChannels:
if (&channel == &stderrChannel)
return true;
break;
default:
break;
}
}
// Create pipes and handle redirections.
if (channel.type == Channel::Normal) {
// we're piping this channel to our own process
if (qt_create_pipe(channel.pipe) != 0)
@ -378,10 +353,7 @@ void QProcessPrivate::startProcess()
#endif
// Initialize pipes
if (!openChannel(stdinChannel) ||
!openChannel(stdoutChannel) ||
!openChannel(stderrChannel) ||
qt_create_pipe(childStartedPipe) != 0) {
if (!openChannels() || qt_create_pipe(childStartedPipe) != 0) {
setErrorAndEmit(QProcess::FailedToStart, qt_error_string(errno));
cleanup();
return;
@ -902,9 +874,7 @@ bool QProcessPrivate::startDetached(qint64 *pid)
return false;
}
if ((stdinChannel.type == Channel::Redirect && !openChannel(stdinChannel))
|| (stdoutChannel.type == Channel::Redirect && !openChannel(stdoutChannel))
|| (stderrChannel.type == Channel::Redirect && !openChannel(stderrChannel))) {
if (!openChannelsForDetached()) {
closeChannel(&stdinChannel);
closeChannel(&stdoutChannel);
closeChannel(&stderrChannel);

29
src/corelib/io/qprocess_win.cpp
View File

@ -180,40 +180,23 @@ static bool qt_create_pipe(Q_PIPE *pipe, bool isInputPipe)
/*
Create the pipes to a QProcessPrivate::Channel.
This function must be called in order: stdin, stdout, stderr
*/
bool QProcessPrivate::openChannel(Channel &channel)
{
Q_Q(QProcess);
if (&channel == &stderrChannel && processChannelMode == QProcess::MergedChannels)
return true;
switch (channel.type) {
case Channel::Normal: {
// we're piping this channel to our own process
if (&channel == &stdinChannel) {
return inputChannelMode == QProcess::ForwardedInputChannel
|| qt_create_pipe(channel.pipe, true);
}
if (&channel == &stdinChannel)
return qt_create_pipe(channel.pipe, true);
if (&channel == &stdoutChannel) {
if (processChannelMode == QProcess::ForwardedChannels
|| processChannelMode == QProcess::ForwardedOutputChannel) {
return true;
}
if (!stdoutChannel.reader) {
stdoutChannel.reader = new QWindowsPipeReader(q);
q->connect(stdoutChannel.reader, SIGNAL(readyRead()), SLOT(_q_canReadStandardOutput()));
}
} else /* if (&channel == &stderrChannel) */ {
if (processChannelMode == QProcess::ForwardedChannels
|| processChannelMode == QProcess::ForwardedErrorChannel) {
return true;
}
if (!stderrChannel.reader) {
stderrChannel.reader = new QWindowsPipeReader(q);
q->connect(stderrChannel.reader, SIGNAL(readyRead()), SLOT(_q_canReadStandardError()));
@ -545,9 +528,7 @@ void QProcessPrivate::startProcess()
q->setProcessState(QProcess::Starting);
if (!openChannel(stdinChannel) ||
!openChannel(stdoutChannel) ||
!openChannel(stderrChannel)) {
if (!openChannels()) {
QString errorString = QProcess::tr("Process failed to start: %1").arg(qt_error_string());
cleanup();
setErrorAndEmit(QProcess::FailedToStart, errorString);
@ -913,9 +894,7 @@ bool QProcessPrivate::startDetached(qint64 *pid)
{
static const DWORD errorElevationRequired = 740;
if ((stdinChannel.type == Channel::Redirect && !openChannel(stdinChannel))
|| (stdoutChannel.type == Channel::Redirect && !openChannel(stdoutChannel))
|| (stderrChannel.type == Channel::Redirect && !openChannel(stderrChannel))) {
if (!openChannelsForDetached()) {
closeChannel(&stdinChannel);
closeChannel(&stdoutChannel);
closeChannel(&stderrChannel);