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

Analyzer: Re-introduce ValgrindTool level

Browse Source 
This partially reverts 1fb755bb42. It turns out that this is a better
place to have the valgrind specific startLocal/startRemote logic
shared by the valgrind tools.

Change-Id: I1638b6d7665db81227e0a1a9aeef1ce944449391
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
This commit is contained in:
hjk
2013-08-07 17:54:35 +02:00
parent 15caea1d26
commit 84331769f0
10 changed files with 245 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
src/plugins/analyzerbase/ianalyzertool.cpp
View File

@@ -30,149 +30,10 @@
#include "ianalyzertool.h" #include "ianalyzertool.h"
#include "analyzermanager.h"
#include "analyzerruncontrol.h"
#include "startremotedialog.h"
#include <coreplugin/icore.h>
#include <coreplugin/imode.h>
#include <coreplugin/modemanager.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/project.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/target.h>
#include <utils/qtcassert.h>
#include <utils/checkablemessagebox.h>
#include <QAction>
#include <QDialog>
#include <QDialogButtonBox>
#include <QSettings>
using namespace Core;
using namespace ProjectExplorer;
namespace Analyzer { namespace Analyzer {
IAnalyzerTool::IAnalyzerTool(QObject *parent) IAnalyzerTool::IAnalyzerTool(QObject *parent)
: QObject(parent) : QObject(parent)
{} {}
static bool buildTypeAccepted(IAnalyzerTool::ToolMode toolMode,
BuildConfiguration::BuildType buildType)
{
if (toolMode == IAnalyzerTool::AnyMode)
return true;
if (buildType == BuildConfiguration::Unknown)
return true;
if (buildType == BuildConfiguration::Debug
&& toolMode == IAnalyzerTool::DebugMode)
return true;
if (buildType == BuildConfiguration::Release
&& toolMode == IAnalyzerTool::ReleaseMode)
return true;
return false;
}
static void startLocalTool(IAnalyzerTool *tool)
{
// Make sure mode is shown.
AnalyzerManager::showMode();
ProjectExplorerPlugin *pe = ProjectExplorerPlugin::instance();
// ### not sure if we're supposed to check if the RunConFiguration isEnabled
Project *pro = pe->startupProject();
BuildConfiguration::BuildType buildType = BuildConfiguration::Unknown;
if (pro) {
if (const Target *target = pro->activeTarget()) {
// Build configuration is 0 for QML projects.
if (const BuildConfiguration *buildConfig = target->activeBuildConfiguration())
buildType = buildConfig->buildType();
}
}
// Check the project for whether the build config is in the correct mode
// if not, notify the user and urge him to use the correct mode.
if (!buildTypeAccepted(tool->toolMode(), buildType)) {
const QString currentMode = buildType == BuildConfiguration::Debug
? AnalyzerManager::tr("Debug")
: AnalyzerManager::tr("Release");
QSettings *settings = ICore::settings();
const QString configKey = QLatin1String("Analyzer.AnalyzeCorrectMode");
int ret;
if (settings->contains(configKey)) {
ret = settings->value(configKey, QDialog::Accepted).toInt();
} else {
QString toolModeString;
switch (tool->toolMode()) {
case IAnalyzerTool::DebugMode:
toolModeString = AnalyzerManager::tr("Debug");
break;
case IAnalyzerTool::ReleaseMode:
toolModeString = AnalyzerManager::tr("Release");
break;
default:
QTC_CHECK(false);
}
const QString toolName = tool->displayName();
const QString title = AnalyzerManager::tr("Run %1 in %2 Mode?").arg(toolName).arg(currentMode);
const QString message = AnalyzerManager::tr("<html><head/><body><p>You are trying "
"to run the tool \"%1\" on an application in %2 mode. "
"The tool is designed to be used in %3 mode.</p><p>"
"Debug and Release mode run-time characteristics differ "
"significantly, analytical findings for one mode may or "
"may not be relevant for the other.</p><p>"
"Do you want to continue and run the tool in %2 mode?</p></body></html>")
.arg(toolName).arg(currentMode).arg(toolModeString);
const QString checkBoxText = AnalyzerManager::tr("&Do not ask again");
bool checkBoxSetting = false;
const QDialogButtonBox::StandardButton button =
Utils::CheckableMessageBox::question(ICore::mainWindow(),
title, message, checkBoxText,
&checkBoxSetting, QDialogButtonBox::Yes|QDialogButtonBox::Cancel,
QDialogButtonBox::Cancel);
ret = button == QDialogButtonBox::Yes ? QDialog::Accepted : QDialog::Rejected;
if (checkBoxSetting && ret == QDialog::Accepted)
settings->setValue(configKey, ret);
}
if (ret == QDialog::Rejected)
return;
}
pe->runProject(pro, tool->runMode());
}
static void startRemoteTool(IAnalyzerTool *tool)
{
StartRemoteDialog dlg;
if (dlg.exec() != QDialog::Accepted)
return;
AnalyzerStartParameters sp;
sp.startMode = StartRemote;
sp.connParams = dlg.sshParams();
sp.debuggee = dlg.executable();
sp.debuggeeArgs = dlg.arguments();
sp.displayName = dlg.executable();
sp.workingDirectory = dlg.workingDirectory();
AnalyzerRunControl *rc = tool->createRunControl(sp, 0);
QObject::connect(AnalyzerManager::stopAction(), SIGNAL(triggered()), rc, SLOT(stopIt()));
ProjectExplorerPlugin::instance()->startRunControl(rc, tool->runMode());
}
void IAnalyzerTool::startTool(StartMode mode)
{
if (mode == StartLocal)
startLocalTool(this);
if (mode == StartRemote)
startRemoteTool(this);
}
} // namespace Analyzer } // namespace Analyzer

2
src/plugins/analyzerbase/ianalyzertool.h
View File

@@ -106,7 +106,7 @@ public:
virtual AnalyzerRunControl *createRunControl(const AnalyzerStartParameters &sp, virtual AnalyzerRunControl *createRunControl(const AnalyzerStartParameters &sp,
ProjectExplorer::RunConfiguration *runConfiguration = 0) = 0; ProjectExplorer::RunConfiguration *runConfiguration = 0) = 0;
virtual void startTool(StartMode mode); virtual void startTool(StartMode mode) = 0;
/// Called when tools gets selected. /// Called when tools gets selected.
virtual void toolSelected() const {} virtual void toolSelected() const {}

4
src/plugins/valgrind/callgrindtool.cpp
View File

@@ -502,7 +502,7 @@ static QToolButton *createToolButton(QAction *action)
} }
CallgrindTool::CallgrindTool(QObject *parent) CallgrindTool::CallgrindTool(QObject *parent)
: IAnalyzerTool(parent) : ValgrindTool(parent)
{ {
d = new CallgrindToolPrivate(this); d = new CallgrindToolPrivate(this);
setObjectName(QLatin1String("CallgrindTool")); setObjectName(QLatin1String("CallgrindTool"));
@@ -612,7 +612,7 @@ AnalyzerRunControl *CallgrindToolPrivate::createRunControl(const AnalyzerStartPa
void CallgrindTool::startTool(StartMode mode) void CallgrindTool::startTool(StartMode mode)
{ {
IAnalyzerTool::startTool(mode); ValgrindTool::startTool(mode);
d->setBusyCursor(true); d->setBusyCursor(true);
} }

4
src/plugins/valgrind/callgrindtool.h
View File

@@ -30,14 +30,14 @@
#ifndef CALLGRINDTOOL_H #ifndef CALLGRINDTOOL_H
#define CALLGRINDTOOL_H #define CALLGRINDTOOL_H
#include <analyzerbase/ianalyzertool.h> #include "valgrindtool.h"
namespace Valgrind { namespace Valgrind {
namespace Internal { namespace Internal {
class CallgrindToolPrivate; class CallgrindToolPrivate;
class CallgrindTool : public Analyzer::IAnalyzerTool class CallgrindTool : public ValgrindTool
{ {
Q_OBJECT Q_OBJECT

2
src/plugins/valgrind/memchecktool.cpp
View File

@@ -179,7 +179,7 @@ static void initKindFilterAction(QAction *action, const QList<int> &kinds)
} }
MemcheckTool::MemcheckTool(QObject *parent) MemcheckTool::MemcheckTool(QObject *parent)
: IAnalyzerTool(parent) : ValgrindTool(parent)
{ {
m_settings = 0; m_settings = 0;
m_errorModel = 0; m_errorModel = 0;

4
src/plugins/valgrind/memchecktool.h
View File

@@ -31,7 +31,7 @@
#ifndef MEMCHECKTOOL_H #ifndef MEMCHECKTOOL_H
#define MEMCHECKTOOL_H #define MEMCHECKTOOL_H
#include <analyzerbase/ianalyzertool.h> #include "valgrindtool.h"
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
@@ -77,7 +77,7 @@ private:
bool m_filterExternalIssues; bool m_filterExternalIssues;
}; };
class MemcheckTool : public Analyzer::IAnalyzerTool class MemcheckTool : public ValgrindTool
{ {
Q_OBJECT Q_OBJECT

4
src/plugins/valgrind/valgrind.pro
View File

@@ -24,7 +24,7 @@ HEADERS += \
callgrindengine.h \ callgrindengine.h \
workarounds.h \ workarounds.h \
callgrindtextmark.h \ callgrindtextmark.h \
\ valgrindtool.h \
memchecktool.h \ memchecktool.h \
memcheckengine.h \ memcheckengine.h \
memcheckerrorview.h \ memcheckerrorview.h \
@@ -38,7 +38,7 @@ SOURCES += \
valgrindsettings.cpp \ valgrindsettings.cpp \
valgrindrunner.cpp \ valgrindrunner.cpp \
valgrindprocess.cpp \ valgrindprocess.cpp \
\ valgrindtool.cpp \
callgrindcostdelegate.cpp \ callgrindcostdelegate.cpp \
callgrindcostview.cpp \ callgrindcostview.cpp \
callgrindhelper.cpp \ callgrindhelper.cpp \

2
src/plugins/valgrind/valgrind.qbs
View File

@@ -54,6 +54,8 @@ QtcPlugin {
"valgrindrunner.h", "valgrindrunner.h",
"valgrindsettings.cpp", "valgrindsettings.cpp",
"valgrindsettings.h", "valgrindsettings.h",
"valgrindtool.cpp",
"valgrindtool.h",
"workarounds.cpp", "workarounds.cpp",
"workarounds.h", "workarounds.h",
"callgrind/callgrindabstractmodel.h", "callgrind/callgrindabstractmodel.h",

181
src/plugins/valgrind/valgrindtool.cpp Normal file
View File

@@ -0,0 +1,181 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
** Author: Nicolas Arnaud-Cormos, KDAB (nicolas.arnaud-cormos@kdab.com)
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** 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, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include "valgrindtool.h"
#include <analyzerbase/analyzermanager.h>
#include <analyzerbase/analyzerruncontrol.h>
#include <analyzerbase/startremotedialog.h>
#include <coreplugin/icore.h>
#include <coreplugin/imode.h>
#include <coreplugin/modemanager.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/project.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/target.h>
#include <utils/qtcassert.h>
#include <utils/checkablemessagebox.h>
#include <QAction>
#include <QDialog>
#include <QDialogButtonBox>
#include <QSettings>
using namespace Analyzer;
using namespace Core;
using namespace ProjectExplorer;
namespace Valgrind {
namespace Internal {
ValgrindTool::ValgrindTool(QObject *parent)
: IAnalyzerTool(parent)
{}
static bool buildTypeAccepted(IAnalyzerTool::ToolMode toolMode,
BuildConfiguration::BuildType buildType)
{
if (toolMode == IAnalyzerTool::AnyMode)
return true;
if (buildType == BuildConfiguration::Unknown)
return true;
if (buildType == BuildConfiguration::Debug
&& toolMode == IAnalyzerTool::DebugMode)
return true;
if (buildType == BuildConfiguration::Release
&& toolMode == IAnalyzerTool::ReleaseMode)
return true;
return false;
}
static void startLocalTool(IAnalyzerTool *tool)
{
// Make sure mode is shown.
AnalyzerManager::showMode();
ProjectExplorerPlugin *pe = ProjectExplorerPlugin::instance();
// ### not sure if we're supposed to check if the RunConFiguration isEnabled
Project *pro = pe->startupProject();
BuildConfiguration::BuildType buildType = BuildConfiguration::Unknown;
if (pro) {
if (const Target *target = pro->activeTarget()) {
// Build configuration is 0 for QML projects.
if (const BuildConfiguration *buildConfig = target->activeBuildConfiguration())
buildType = buildConfig->buildType();
}
}
// Check the project for whether the build config is in the correct mode
// if not, notify the user and urge him to use the correct mode.
if (!buildTypeAccepted(tool->toolMode(), buildType)) {
const QString currentMode = buildType == BuildConfiguration::Debug
? AnalyzerManager::tr("Debug")
: AnalyzerManager::tr("Release");
QSettings *settings = ICore::settings();
const QString configKey = QLatin1String("Analyzer.AnalyzeCorrectMode");
int ret;
if (settings->contains(configKey)) {
ret = settings->value(configKey, QDialog::Accepted).toInt();
} else {
QString toolModeString;
switch (tool->toolMode()) {
case IAnalyzerTool::DebugMode:
toolModeString = AnalyzerManager::tr("Debug");
break;
case IAnalyzerTool::ReleaseMode:
toolModeString = AnalyzerManager::tr("Release");
break;
default:
QTC_CHECK(false);
}
const QString toolName = tool->displayName();
const QString title = AnalyzerManager::tr("Run %1 in %2 Mode?").arg(toolName).arg(currentMode);
const QString message = AnalyzerManager::tr("<html><head/><body><p>You are trying "
"to run the tool \"%1\" on an application in %2 mode. "
"The tool is designed to be used in %3 mode.</p><p>"
"Debug and Release mode run-time characteristics differ "
"significantly, analytical findings for one mode may or "
"may not be relevant for the other.</p><p>"
"Do you want to continue and run the tool in %2 mode?</p></body></html>")
.arg(toolName).arg(currentMode).arg(toolModeString);
const QString checkBoxText = AnalyzerManager::tr("&Do not ask again");
bool checkBoxSetting = false;
const QDialogButtonBox::StandardButton button =
Utils::CheckableMessageBox::question(ICore::mainWindow(),
title, message, checkBoxText,
&checkBoxSetting, QDialogButtonBox::Yes|QDialogButtonBox::Cancel,
QDialogButtonBox::Cancel);
ret = button == QDialogButtonBox::Yes ? QDialog::Accepted : QDialog::Rejected;
if (checkBoxSetting && ret == QDialog::Accepted)
settings->setValue(configKey, ret);
}
if (ret == QDialog::Rejected)
return;
}
pe->runProject(pro, tool->runMode());
}
static void startRemoteTool(IAnalyzerTool *tool)
{
StartRemoteDialog dlg;
if (dlg.exec() != QDialog::Accepted)
return;
AnalyzerStartParameters sp;
sp.startMode = StartRemote;
sp.connParams = dlg.sshParams();
sp.debuggee = dlg.executable();
sp.debuggeeArgs = dlg.arguments();
sp.displayName = dlg.executable();
sp.workingDirectory = dlg.workingDirectory();
AnalyzerRunControl *rc = tool->createRunControl(sp, 0);
QObject::connect(AnalyzerManager::stopAction(), SIGNAL(triggered()), rc, SLOT(stopIt()));
ProjectExplorerPlugin::instance()->startRunControl(rc, tool->runMode());
}
void ValgrindTool::startTool(StartMode mode)
{
if (mode == StartLocal)
startLocalTool(this);
if (mode == StartRemote)
startRemoteTool(this);
}
} // namespace Internal
} // namespace Valgrind

52
src/plugins/valgrind/valgrindtool.h Normal file
View File

@@ -0,0 +1,52 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
** Author: Nicolas Arnaud-Cormos, KDAB (nicolas.arnaud-cormos@kdab.com)
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** 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, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef VALGRINDTOOL_H
#define VALGRINDTOOL_H
#include <analyzerbase/ianalyzertool.h>
namespace Valgrind {
namespace Internal {
class ValgrindTool : public Analyzer::IAnalyzerTool
{
Q_OBJECT
public:
explicit ValgrindTool(QObject *parent = 0);
void startTool(Analyzer::StartMode mode);
};
} // namespace Internal
} // namespace Valgrind
#endif // VALGRIND_TOOL