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

ValgrindRunner: Add setupValgrindProcess() helper

Browse Source 
Move all process related setup there.

Change-Id: I26943a844bef5411ee018cc2b1d390aa33b4c257
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-08-16 14:38:00 +02:00
parent e02de2ddde
commit 62ed7f7c39
1 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/plugins/valgrind/valgrindrunner.cpp
View File

@@ -26,21 +26,6 @@ class ValgrindRunner::Private : public QObject
{ {
public: public:
Private(ValgrindRunner *owner) : q(owner) { Private(ValgrindRunner *owner) : q(owner) {
connect(&m_process, &Process::started, this, [this] {
emit q->valgrindStarted(m_process.processId());
});
connect(&m_process, &Process::done, this, [this] {
if (m_process.result() != ProcessResult::FinishedWithSuccess)
emit q->processErrorReceived(m_process.errorString(), m_process.error());
emit q->finished();
});
connect(&m_process, &Process::readyReadStandardOutput, this, [this] {
emit q->appendMessage(m_process.readAllStandardOutput(), StdOutFormat);
});
connect(&m_process, &Process::readyReadStandardError, this, [this] {
emit q->appendMessage(m_process.readAllStandardError(), StdErrFormat);
});
connect(&m_xmlServer, &QTcpServer::newConnection, this, [this] { connect(&m_xmlServer, &QTcpServer::newConnection, this, [this] {
QTcpSocket *socket = m_xmlServer.nextPendingConnection(); QTcpSocket *socket = m_xmlServer.nextPendingConnection();
QTC_ASSERT(socket, return); QTC_ASSERT(socket, return);
@@ -65,6 +50,44 @@ public:
}); });
} }
void setupValgrindProcess(Process *process, const CommandLine &command) const {
CommandLine cmd = command;
cmd.addArgs(m_valgrindCommand.arguments(), CommandLine::Raw);
// consider appending our options last so they override any interfering user-supplied
// options -q as suggested by valgrind manual
if (cmd.executable().osType() == OsTypeMac) {
// May be slower to start but without it we get no filenames for symbols.
cmd.addArg("--dsymutil=yes");
}
cmd.addCommandLineAsArgs(m_debuggee.command);
emit q->appendMessage(cmd.toUserOutput(), NormalMessageFormat);
process->setCommand(cmd);
process->setWorkingDirectory(m_debuggee.workingDirectory);
process->setEnvironment(m_debuggee.environment);
process->setProcessChannelMode(m_channelMode);
process->setTerminalMode(m_useTerminal ? TerminalMode::Run : TerminalMode::Off);
connect(process, &Process::started, this, [this, process] {
emit q->valgrindStarted(process->processId());
});
connect(process, &Process::done, this, [this, process] {
if (process->result() != ProcessResult::FinishedWithSuccess)
emit q->processErrorReceived(process->errorString(), process->error());
emit q->finished();
});
connect(process, &Process::readyReadStandardOutput, this, [this, process] {
emit q->appendMessage(process->readAllStandardOutput(), StdOutFormat);
});
connect(process, &Process::readyReadStandardError, this, [this, process] {
emit q->appendMessage(process->readAllStandardError(), StdErrFormat);
});
}
bool startServers(); bool startServers();
bool run(); bool run();
@@ -137,25 +160,7 @@ bool ValgrindRunner::Private::run()
if (enableXml) if (enableXml)
cmd.addArg("--xml=yes"); cmd.addArg("--xml=yes");
} }
cmd.addArgs(m_valgrindCommand.arguments(), CommandLine::Raw); setupValgrindProcess(&m_process, cmd);
// consider appending our options last so they override any interfering user-supplied options
// -q as suggested by valgrind manual
if (cmd.executable().osType() == OsTypeMac) {
// May be slower to start but without it we get no filenames for symbols.
cmd.addArg("--dsymutil=yes");
}
cmd.addCommandLineAsArgs(m_debuggee.command);
emit q->appendMessage(cmd.toUserOutput(), NormalMessageFormat);
m_process.setCommand(cmd);
m_process.setWorkingDirectory(m_debuggee.workingDirectory);
m_process.setEnvironment(m_debuggee.environment);
m_process.setProcessChannelMode(m_channelMode);
m_process.setTerminalMode(m_useTerminal ? TerminalMode::Run : TerminalMode::Off);
m_process.start(); m_process.start();
return true; return true;
} }