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

Make access to LauncherSocket thread safe

Browse Source 
Instead of returning a pointer to LauncherSocket instance,
which might get deleted in meantime of just after,
route all calls to the LauncherSocket through the LauncherInterface.
Make all calls to LauncherInterface secured by the
instance mutex.

Change-Id: I751228de5f4263112471098ee08cc73a5245147e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2021-08-30 18:21:41 +02:00
parent 236074423c
commit 99cf99579e
4 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,7 +283,7 @@ void CallerHandle::cancel()
m_errorString = QCoreApplication::translate("Utils::LauncherHandle",
"Process canceled before it was started.");
m_error = QProcess::FailedToStart;
if (LauncherInterface::socket()->isReady()) // TODO: race condition with m_processState???
if (LauncherInterface::isReady()) // TODO: race condition with m_processState???
sendPacket(StopProcessPacket(m_token));
else
emit errorOccurred(m_error);
@@ -367,7 +367,7 @@ void CallerHandle::start(const QString &program, const QStringList &arguments, c
p->lowPriority = m_lowPriority;
p->unixTerminalDisabled = m_unixTerminalDisabled;
m_startPacket.reset(p);
if (LauncherInterface::socket()->isReady())
if (LauncherInterface::isReady())
doStart();
}
@@ -391,7 +391,7 @@ void CallerHandle::doStart()
// Called from caller's or launcher's thread.
void CallerHandle::sendPacket(const Internal::LauncherPacket &packet)
{
LauncherInterface::socket()->sendData(packet.serialize());
LauncherInterface::sendData(packet.serialize());
}
qint64 CallerHandle::write(const QByteArray &data)