feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Refactor openMode/keepWriteChannelOpen/closeWriteChannel

Browse Source 
Change-Id: I4090533875ce1da864b6f8554ce59dbc1392a142
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2021-08-06 16:20:47 +02:00
parent 2b820cc42d
commit 25f585227f
15 changed files with 207 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/utils/launchersocket.cpp
View File

@@ -314,7 +314,7 @@ void LauncherHandle::cancel()
m_processState = QProcess::NotRunning;
}
void LauncherHandle::start(const QString &program, const QStringList &arguments, QIODevice::OpenMode mode)
void LauncherHandle::start(const QString &program, const QStringList &arguments, const QByteArray &writeData)
{
QMutexLocker locker(&m_mutex);
@@ -328,7 +328,7 @@ void LauncherHandle::start(const QString &program, const QStringList &arguments,
// TODO: check if state is not running
// TODO: check if m_canceled is not true
m_processState = QProcess::Starting;
m_openMode = mode;
m_writeData = writeData;
if (LauncherInterface::socket()->isReady())
doStart();
}
@@ -405,7 +405,8 @@ void LauncherHandle::doStart()
p.arguments = m_arguments;
p.env = m_environment.toStringList();
p.workingDir = m_workingDirectory;
p.openMode = m_openMode;
p.processMode = m_processMode;
p.writeData = m_writeData;
p.channelMode = m_channelMode;
p.standardInputFile = m_standardInputFile;
sendPacket(p);
@@ -427,13 +428,13 @@ void LauncherSocket::sendData(const QByteArray &data)
QMetaObject::invokeMethod(this, &LauncherSocket::handleRequests);
}
LauncherHandle *LauncherSocket::registerHandle(quintptr token)
LauncherHandle *LauncherSocket::registerHandle(quintptr token, ProcessMode mode)
{
QMutexLocker locker(&m_mutex);
if (m_handles.contains(token))
return nullptr; // TODO: issue a warning
LauncherHandle *handle = new LauncherHandle(token);
LauncherHandle *handle = new LauncherHandle(token, mode);
handle->moveToThread(thread());
// Call it after moving LauncherHandle to the launcher's thread.
// Since this method is invoked from caller's thread, CallerHandle will live in caller's thread.