Commit 8f9a03bf authored by Mike McQuaid's avatar Mike McQuaid Committed by hjk
Browse files

Add libvalgrind.



Merge-request: 260
Reviewed-by: default avatarhjk <qtc-committer@nokia.com>
parent 83db0835
......@@ -16,6 +16,11 @@ SUBDIRS = \
qmleditorwidgets \
symbianutils
!win32 {
SUBDIRS += valgrind
}
# Windows: Compile Qt Creator CDB extension if Debugging tools can be detected.
win32 {
include(qtcreatorcdbext/cdb_detect.pri)
......
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Author: Milian Wolff, KDAB (milian.wolff@kdab.com)
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** No Commercial Usage
**
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#include "memcheckrunner.h"
#include <xmlprotocol/threadedparser.h>
#include <xmlprotocol/error.h>
#include <xmlprotocol/status.h>
#include <utils/qtcassert.h>
#include <QTcpServer>
#include <QTcpSocket>
#include <QEventLoop>
#include <QNetworkInterface>
using namespace Valgrind::Memcheck;
class MemcheckRunner::Private
{
public:
explicit Private()
: parser(0),
logSocket(0)
{
}
QTcpServer xmlServer;
XmlProtocol::ThreadedParser *parser;
QTcpServer logServer;
QTcpSocket *logSocket;
};
MemcheckRunner::MemcheckRunner(QObject *parent)
: ValgrindRunner(parent),
d(new Private)
{
}
MemcheckRunner::~MemcheckRunner()
{
if (d->parser->isRunning()) {
// make sure we don't delete the thread while it's still running
waitForFinished();
}
delete d;
d = 0;
}
QString MemcheckRunner::tool() const
{
return QString("memcheck");
}
void MemcheckRunner::setParser(XmlProtocol::ThreadedParser *parser)
{
QTC_ASSERT(!d->parser, qt_noop());
d->parser = parser;
}
void MemcheckRunner::start()
{
QTC_ASSERT(d->parser, return);
bool check = d->xmlServer.listen(QHostAddress(QHostAddress::LocalHost));
QTC_ASSERT(check, return);
d->xmlServer.setMaxPendingConnections(1);
const quint16 xmlPortNumber = d->xmlServer.serverPort();
connect(&d->xmlServer, SIGNAL(newConnection()), SLOT(xmlSocketConnected()));
check = d->logServer.listen(QHostAddress(QHostAddress::LocalHost));
QTC_ASSERT(check, return);
d->logServer.setMaxPendingConnections(1);
const quint16 logPortNumber = d->logServer.serverPort();
connect(&d->logServer, SIGNAL(newConnection()), SLOT(logSocketConnected()));
QStringList memcheckArguments;
memcheckArguments << QString("--xml=yes")
<< QString("--xml-socket=127.0.0.1:%1").arg(QString::number(xmlPortNumber))
<< QString("--child-silent-after-fork=yes")
<< QString("--log-socket=127.0.0.1:%1").arg(QString::number(logPortNumber))
<< valgrindArguments();
setValgrindArguments(memcheckArguments);
ValgrindRunner::start();
}
void MemcheckRunner::xmlSocketConnected()
{
QTcpSocket *socket = d->xmlServer.nextPendingConnection();
QTC_ASSERT(socket, return);
d->xmlServer.close();
d->parser->parse(socket);
}
void MemcheckRunner::logSocketConnected()
{
d->logSocket = d->logServer.nextPendingConnection();
QTC_ASSERT(d->logSocket, return);
connect(d->logSocket, SIGNAL(readyRead()),
this, SLOT(readLogSocket()));
d->logServer.close();
}
void MemcheckRunner::readLogSocket()
{
emit logMessageReceived(d->logSocket->readAll());
}
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Author: Milian Wolff, KDAB (milian.wolff@kdab.com)
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** No Commercial Usage
**
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#ifndef VALGRIND_PROTOCOL_MEMCHECKRUNNER_H
#define VALGRIND_PROTOCOL_MEMCHECKRUNNER_H
#include <valgrind/valgrind_global.h>
#include <valgrind/valgrindrunner.h>
QT_BEGIN_NAMESPACE
class QProcessEnvironment;
QT_END_NAMESPACE
namespace Utils {
class Environment;
}
namespace Valgrind {
namespace XmlProtocol{
class ThreadedParser;
}
namespace Memcheck {
class VALGRINDSHARED_EXPORT MemcheckRunner : public ValgrindRunner
{
Q_OBJECT
public:
explicit MemcheckRunner(QObject *parent = 0);
~MemcheckRunner();
void setParser(XmlProtocol::ThreadedParser *parser);
void start();
signals:
void logMessageReceived(const QByteArray &);
private slots:
void xmlSocketConnected();
void logSocketConnected();
void readLogSocket();
private:
QString tool() const;
Q_DISABLE_COPY(MemcheckRunner);
class Private;
Private *d;
};
}
}
#endif // VALGRIND_PROTOCOL_MEMCHECKRUNNER_H
LIBS *= -l$$qtLibraryName(Valgrind)
TEMPLATE = lib
TARGET = Valgrind
include(../../qtcreatorlibrary.pri)
include(../utils/utils.pri)
TEMPLATE = lib
DEFINES += VALGRIND_LIBRARY
QT += network
HEADERS += valgrind_global.h \
xmlprotocol/frame.h \
xmlprotocol/parser.h \
xmlprotocol/error.h \
xmlprotocol/status.h \
xmlprotocol/suppression.h \
xmlprotocol/threadedparser.h \
xmlprotocol/announcethread.h \
xmlprotocol/stack.h \
xmlprotocol/errorlistmodel.h \
xmlprotocol/stackmodel.h \
xmlprotocol/modelhelpers.h \
memcheck/memcheckrunner.h \
valgrindrunner.h \
valgrindprocess.h
SOURCES += xmlprotocol/error.cpp \
xmlprotocol/frame.cpp \
xmlprotocol/parser.cpp \
xmlprotocol/status.cpp \
xmlprotocol/suppression.cpp \
xmlprotocol/threadedparser.cpp \
xmlprotocol/announcethread.cpp \
xmlprotocol/stack.cpp \
xmlprotocol/errorlistmodel.cpp \
xmlprotocol/stackmodel.cpp \
xmlprotocol/modelhelpers.cpp \
memcheck/memcheckrunner.cpp \
valgrindrunner.cpp \
valgrindprocess.cpp
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Author: Nicolas Arnaud-Cormos, KDAB (nicolas.arnaud-cormos@kdab.com)
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** No Commercial Usage
**
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#ifndef VALGRIND_GLOBAL_H
#define VALGRIND_GLOBAL_H
#include <QtCore/qglobal.h>
#if defined(VALGRIND_LIBRARY)
# define VALGRINDSHARED_EXPORT Q_DECL_EXPORT
#else
# define VALGRINDSHARED_EXPORT Q_DECL_IMPORT
#endif
#endif // VALGRIND_GLOBAL_H
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Author: Milian Wolff, KDAB (milian.wolff@kdab.com)
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** No Commercial Usage
**
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#include "valgrindprocess.h"
#include <QDebug>
#include <QEventLoop>
#include <QFileInfo>
namespace Valgrind {
namespace Internal {
ValgrindProcess::ValgrindProcess(QObject *parent)
: QObject(parent)
{
}
ValgrindProcess::~ValgrindProcess()
{
}
////////////////////////
LocalValgrindProcess::LocalValgrindProcess(QObject *parent)
: ValgrindProcess(parent)
{
connect(&m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
this, SIGNAL(finished(int, QProcess::ExitStatus)));
connect(&m_process, SIGNAL(started()),
this, SIGNAL(started()));
connect(&m_process, SIGNAL(error(QProcess::ProcessError)),
this, SIGNAL(error(QProcess::ProcessError)));
connect(&m_process, SIGNAL(readyReadStandardError()),
this, SLOT(readyReadStandardError()));
connect(&m_process, SIGNAL(readyReadStandardOutput()),
this, SLOT(readyReadStandardOutput()));
}
LocalValgrindProcess::~LocalValgrindProcess()
{
}
void LocalValgrindProcess::setProcessChannelMode(QProcess::ProcessChannelMode mode)
{
m_process.setProcessChannelMode(mode);
}
void LocalValgrindProcess::setWorkingDirectory(const QString &path)
{
m_process.setWorkingDirectory(path);
}
bool LocalValgrindProcess::isRunning() const
{
return m_process.state() != QProcess::NotRunning;
}
void LocalValgrindProcess::setEnvironment(const Utils::Environment &environment)
{
m_process.setEnvironment(environment);
}
void LocalValgrindProcess::close()
{
m_process.close();
m_process.waitForFinished(-1);
}
void LocalValgrindProcess::run(const QString &valgrindExecutable, const QStringList &valgrindArguments,
const QString &debuggeeExecutable, const QString &debuggeeArguments)
{
QString arguments;
Utils::QtcProcess::addArgs(&arguments, valgrindArguments);
Utils::QtcProcess::addArg(&arguments, debuggeeExecutable);
Utils::QtcProcess::addArgs(&arguments, debuggeeArguments);
m_process.setCommand(valgrindExecutable, arguments);
m_process.start();
m_process.waitForStarted();
}
QString LocalValgrindProcess::errorString() const
{
return m_process.errorString();
}
QProcess::ProcessError LocalValgrindProcess::error() const
{
return m_process.error();
}
Q_PID LocalValgrindProcess::pid() const
{
return m_process.pid();
}
void LocalValgrindProcess::readyReadStandardError()
{
const QByteArray b = m_process.readAllStandardError();
if (!b.isEmpty())
emit standardErrorReceived(b);
}
void LocalValgrindProcess::readyReadStandardOutput()
{
const QByteArray b = m_process.readAllStandardOutput();
if (!b.isEmpty())
emit standardOutputReceived(b);
}
}
}
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Author: Milian Wolff, KDAB (milian.wolff@kdab.com)
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** No Commercial Usage
**
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#ifndef VALGRIND_RUNNER_P_H
#define VALGRIND_RUNNER_P_H
#include <utils/qtcprocess.h>
namespace Valgrind {
namespace Internal {
/**
* Abstract process that can be subclassed to supply local and remote valgrind runs
*/
class ValgrindProcess : public QObject
{
Q_OBJECT
public:
explicit ValgrindProcess(QObject *parent = 0);
virtual ~ValgrindProcess();
virtual bool isRunning() const = 0;
virtual void run(const QString &valgrindExecutable, const QStringList &valgrindArguments,
const QString &debuggeeExecutable, const QString &debuggeeArguments) = 0;
virtual void close() = 0;
virtual QString errorString() const = 0;
virtual QProcess::ProcessError error() const = 0;
virtual void setProcessChannelMode(QProcess::ProcessChannelMode mode) = 0;
virtual void setWorkingDirectory(const QString &path) = 0;
virtual void setEnvironment(const Utils::Environment &environment) = 0;
signals:
void started();
void finished(int, QProcess::ExitStatus);
void error(QProcess::ProcessError);
void standardOutputReceived(const QByteArray &);
void standardErrorReceived(const QByteArray &);
};
/**
* Run valgrind on the local machine
*/
class LocalValgrindProcess : public ValgrindProcess
{
Q_OBJECT
public:
explicit LocalValgrindProcess(QObject *parent = 0);
virtual ~LocalValgrindProcess();
virtual bool isRunning() const;
virtual void run(const QString &valgrindExecutable, const QStringList &valgrindArguments,
const QString &debuggeeExecutable, const QString &debuggeeArguments);
virtual void close();
virtual QString errorString() const;
QProcess::ProcessError error() const;
virtual void setProcessChannelMode(QProcess::ProcessChannelMode mode);
virtual void setWorkingDirectory(const QString &path);
virtual void setEnvironment(const Utils::Environment &environment);
Q_PID pid() const;
private slots:
void readyReadStandardError();
void readyReadStandardOutput();
private:
Utils::QtcProcess m_process;
};
// remote support will be supplied later
}
}
#endif // VALGRIND_RUNNER_P_H
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Author: Milian Wolff, KDAB (milian.wolff@kdab.com)
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** No Commercial Usage