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

Add valgrind and memcheck remote running support.

Browse Source 
Merge-request: 284
Reviewed-by: hjk <qtc-committer@nokia.com>
This commit is contained in:
Mike McQuaid
2011-04-04 14:39:27 +02:00
committed by hjk
parent 885bb6ad83
commit 472833ebbd
6 changed files with 407 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/libs/valgrind/valgrindrunner.cpp
View File

@@ -39,6 +39,8 @@
#include <utils/qtcassert.h>
#include <utils/environment.h>
#include <utils/ssh/sshconnection.h>
#include <utils/ssh/sshremoteprocess.h>
#include <QtCore/QEventLoop>
@@ -51,19 +53,17 @@ public:
: q(qq),
process(0),
channelMode(QProcess::SeparateChannels),
finished(false),
lastPid(0)
finished(false)
{
}
void run(Internal::ValgrindProcess *process);
void run(ValgrindProcess *process);
ValgrindRunner *q;
Internal::ValgrindProcess *process;
ValgrindProcess *process;
Utils::Environment environment;
QProcess::ProcessChannelMode channelMode;
bool finished;
Q_PID lastPid;
QString valgrindExecutable;
QStringList valgrindArguments;
QString debuggeeExecutable;
@@ -71,7 +71,7 @@ public:
QString workingdir;
};
void ValgrindRunner::Private::run(Internal::ValgrindProcess *_process)
void ValgrindRunner::Private::run(ValgrindProcess *_process)
{
if (process && process->isRunning()) {
process->close();
@@ -79,7 +79,6 @@ void ValgrindRunner::Private::run(Internal::ValgrindProcess *_process)
process->deleteLater();
}
lastPid = 0;
QTC_ASSERT(_process, return);
process = _process;
@@ -94,6 +93,11 @@ void ValgrindRunner::Private::run(Internal::ValgrindProcess *_process)
QStringList valgrindArgs = valgrindArguments;
valgrindArgs << QString("--tool=%1").arg(q->tool());
#ifdef Q_OS_MAC
// May be slower to start but without it we get no filenames for symbols.
valgrindArgs << QLatin1String("--dsymutil=yes");
#endif
QObject::connect(process, SIGNAL(standardOutputReceived(QByteArray)),
q, SIGNAL(standardOutputReceived(QByteArray)));
QObject::connect(process, SIGNAL(standardErrorReceived(QByteArray)),
@@ -196,7 +200,12 @@ void ValgrindRunner::waitForFinished() const
void ValgrindRunner::start()
{
d->run(new Internal::LocalValgrindProcess(this));
d->run(new LocalValgrindProcess(this));
}
void ValgrindRunner::startRemotely(const Utils::SshConnectionParameters &sshParams)
{
d->run(new RemoteValgrindProcess(sshParams, this));
}
void ValgrindRunner::processError(QProcess::ProcessError e)
@@ -227,17 +236,9 @@ void ValgrindRunner::processFinished(int ret, QProcess::ExitStatus status)
void ValgrindRunner::processStarted()
{
if (Internal::LocalValgrindProcess *process = dynamic_cast<Internal::LocalValgrindProcess *>(d->process))
d->lastPid = process->pid();
emit started();
}
Q_PID ValgrindRunner::lastPid() const
{
return d->lastPid;
}
QString ValgrindRunner::errorString() const
{
if (d->process)
@@ -251,3 +252,8 @@ void ValgrindRunner::stop()
if (d->process)
d->process->close();
}
ValgrindProcess *ValgrindRunner::valgrindProcess() const
{
return d->process;
}