2012-10-02 09:12:39 +02:00
|
|
|
/****************************************************************************
|
2011-03-25 09:25:17 +01:00
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
|
|
|
** Contact: http://www.qt-project.org/legal
|
2011-03-25 09:25:17 +01:00
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
** This file is part of Qt Creator.
|
2011-03-25 09:25:17 +01:00
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
** 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.
|
2011-03-25 09:25:17 +01:00
|
|
|
**
|
|
|
|
** GNU Lesser General Public License Usage
|
2012-10-02 09:12:39 +02:00
|
|
|
** 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
|
2011-03-25 09:25:17 +01:00
|
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
****************************************************************************/
|
2011-03-25 09:25:17 +01:00
|
|
|
|
2011-03-11 12:22:57 +01:00
|
|
|
#include "qmlprofilertool.h"
|
2012-02-24 10:47:17 +01:00
|
|
|
#include "qmlprofilerstatemanager.h"
|
2011-03-11 12:22:57 +01:00
|
|
|
#include "qmlprofilerengine.h"
|
2011-04-04 15:03:31 +02:00
|
|
|
#include "qmlprofilerconstants.h"
|
|
|
|
#include "qmlprofilerattachdialog.h"
|
2012-02-24 10:47:17 +01:00
|
|
|
#include "qmlprofilerviewmanager.h"
|
|
|
|
#include "qmlprofilerclientmanager.h"
|
|
|
|
#include "qmlprofilerdatamodel.h"
|
|
|
|
#include "qmlprofilerdetailsrewriter.h"
|
|
|
|
#include "timelinerenderer.h"
|
2011-03-11 12:22:57 +01:00
|
|
|
|
|
|
|
#include <analyzerbase/analyzermanager.h>
|
2011-09-14 13:12:25 +02:00
|
|
|
#include <analyzerbase/analyzerruncontrol.h>
|
2011-03-11 12:22:57 +01:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
#include "canvas/qdeclarativecontext2d_p.h"
|
2011-10-28 16:22:45 +02:00
|
|
|
#include "canvas/qmlprofilercanvas.h"
|
2011-03-11 12:22:57 +01:00
|
|
|
|
|
|
|
#include <qmlprojectmanager/qmlprojectrunconfiguration.h>
|
2011-05-20 12:43:29 +02:00
|
|
|
#include <utils/fancymainwindow.h>
|
2011-03-11 12:22:57 +01:00
|
|
|
#include <utils/fileinprojectfinder.h>
|
2011-04-14 17:19:28 +02:00
|
|
|
#include <utils/qtcassert.h>
|
2011-03-11 12:22:57 +01:00
|
|
|
#include <projectexplorer/projectexplorer.h>
|
|
|
|
#include <projectexplorer/project.h>
|
2011-04-01 13:48:10 +02:00
|
|
|
#include <projectexplorer/target.h>
|
2011-10-28 16:32:34 +02:00
|
|
|
#include <projectexplorer/session.h>
|
2011-12-27 22:41:31 +01:00
|
|
|
#include <projectexplorer/applicationrunconfiguration.h>
|
|
|
|
|
|
|
|
#include <remotelinux/remotelinuxrunconfiguration.h>
|
2012-07-27 13:31:13 +02:00
|
|
|
#include <remotelinux/linuxdevice.h>
|
2011-03-11 12:22:57 +01:00
|
|
|
|
2011-04-04 15:03:31 +02:00
|
|
|
#include <coreplugin/coreconstants.h>
|
2011-03-11 12:22:57 +01:00
|
|
|
#include <coreplugin/editormanager/editormanager.h>
|
2011-04-04 15:03:31 +02:00
|
|
|
#include <coreplugin/icore.h>
|
2011-07-27 11:49:39 +02:00
|
|
|
#include <coreplugin/messagemanager.h>
|
2011-09-14 13:26:19 +02:00
|
|
|
#include <coreplugin/helpmanager.h>
|
2011-11-16 17:06:00 +01:00
|
|
|
#include <coreplugin/modemanager.h>
|
|
|
|
#include <coreplugin/imode.h>
|
|
|
|
#include <coreplugin/actionmanager/command.h>
|
|
|
|
#include <coreplugin/actionmanager/actionmanager.h>
|
|
|
|
#include <coreplugin/actionmanager/actioncontainer.h>
|
2011-03-11 12:22:57 +01:00
|
|
|
|
2012-09-03 18:31:44 +02:00
|
|
|
#include <qtsupport/qtkitinformation.h>
|
2012-04-24 15:49:09 +02:00
|
|
|
|
2012-02-15 10:42:41 +01:00
|
|
|
#include <QApplication>
|
|
|
|
#include <QHBoxLayout>
|
|
|
|
#include <QLabel>
|
|
|
|
#include <QToolButton>
|
|
|
|
#include <QMessageBox>
|
|
|
|
#include <QFileDialog>
|
|
|
|
#include <QMenu>
|
2012-02-24 10:47:17 +01:00
|
|
|
#include <QTimer>
|
|
|
|
#include <QTime>
|
2011-04-08 13:05:39 +02:00
|
|
|
|
2011-11-16 17:06:00 +01:00
|
|
|
using namespace Core;
|
|
|
|
using namespace Core::Constants;
|
2011-03-11 12:22:57 +01:00
|
|
|
using namespace Analyzer;
|
2011-11-16 17:06:00 +01:00
|
|
|
using namespace Analyzer::Constants;
|
2011-03-25 09:21:00 +01:00
|
|
|
using namespace QmlProfiler::Internal;
|
2012-02-24 10:47:17 +01:00
|
|
|
using namespace QmlProfiler::Constants;
|
2012-04-18 12:06:10 +02:00
|
|
|
using namespace QmlDebug;
|
2011-09-14 13:12:25 +02:00
|
|
|
using namespace ProjectExplorer;
|
2011-12-27 22:41:31 +01:00
|
|
|
using namespace QmlProjectManager;
|
|
|
|
using namespace RemoteLinux;
|
2011-03-11 12:22:57 +01:00
|
|
|
|
|
|
|
class QmlProfilerTool::QmlProfilerToolPrivate
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
QmlProfilerToolPrivate(QmlProfilerTool *qq) : q(qq) {}
|
|
|
|
~QmlProfilerToolPrivate() {}
|
|
|
|
|
|
|
|
QmlProfilerTool *q;
|
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
QmlProfilerStateManager *m_profilerState;
|
|
|
|
QmlProfilerClientManager *m_profilerConnections;
|
|
|
|
QmlProfilerDataModel *m_profilerDataModel;
|
|
|
|
QmlProfilerDetailsRewriter *m_detailsRewriter;
|
|
|
|
|
|
|
|
QmlProfilerViewManager *m_viewContainer;
|
2011-04-01 13:48:10 +02:00
|
|
|
Utils::FileInProjectFinder m_projectFinder;
|
2011-09-14 13:12:25 +02:00
|
|
|
RunConfiguration *m_runConfiguration;
|
2011-04-06 12:26:19 +02:00
|
|
|
QToolButton *m_recordButton;
|
2011-06-24 18:19:08 +02:00
|
|
|
QToolButton *m_clearButton;
|
2012-02-24 10:47:17 +01:00
|
|
|
|
|
|
|
// elapsed time display
|
|
|
|
QTimer m_recordingTimer;
|
|
|
|
QTime m_recordingElapsedTime;
|
|
|
|
QLabel *m_timeLabel;
|
|
|
|
|
|
|
|
// save and load actions
|
2011-11-16 17:06:00 +01:00
|
|
|
QAction *m_saveQmlTrace;
|
2012-02-24 10:47:17 +01:00
|
|
|
QAction *m_loadQmlTrace;
|
2011-03-11 12:22:57 +01:00
|
|
|
};
|
|
|
|
|
2011-06-30 18:55:48 +02:00
|
|
|
QmlProfilerTool::QmlProfilerTool(QObject *parent)
|
2011-03-11 12:22:57 +01:00
|
|
|
: IAnalyzerTool(parent), d(new QmlProfilerToolPrivate(this))
|
|
|
|
{
|
2012-11-26 21:18:13 +02:00
|
|
|
setObjectName(QLatin1String("QmlProfilerTool"));
|
2011-05-20 13:36:16 +02:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_profilerState = 0;
|
|
|
|
d->m_viewContainer = 0;
|
|
|
|
d->m_runConfiguration = 0;
|
2011-06-30 13:44:22 +02:00
|
|
|
|
2011-10-28 16:22:45 +02:00
|
|
|
qmlRegisterType<QmlProfilerCanvas>("Monitor", 1, 0, "Canvas2D");
|
2011-06-30 13:44:22 +02:00
|
|
|
qmlRegisterType<Context2D>();
|
|
|
|
qmlRegisterType<CanvasGradient>();
|
2012-02-24 10:47:17 +01:00
|
|
|
qmlRegisterType<TimelineRenderer>("Monitor", 1, 0,"TimelineRenderer");
|
|
|
|
|
|
|
|
d->m_profilerState = new QmlProfilerStateManager(this);
|
|
|
|
connect(d->m_profilerState, SIGNAL(stateChanged()), this, SLOT(profilerStateChanged()));
|
|
|
|
connect(d->m_profilerState, SIGNAL(clientRecordingChanged()), this, SLOT(clientRecordingChanged()));
|
|
|
|
connect(d->m_profilerState, SIGNAL(serverRecordingChanged()), this, SLOT(serverRecordingChanged()));
|
|
|
|
|
|
|
|
d->m_profilerConnections = new QmlProfilerClientManager(this);
|
|
|
|
d->m_profilerConnections->registerProfilerStateManager(d->m_profilerState);
|
2012-05-08 15:14:11 +02:00
|
|
|
connect(d->m_profilerConnections, SIGNAL(connectionClosed()), this, SLOT(clientsDisconnected()));
|
2012-02-24 10:47:17 +01:00
|
|
|
|
|
|
|
d->m_profilerDataModel = new QmlProfilerDataModel(this);
|
|
|
|
connect(d->m_profilerDataModel, SIGNAL(stateChanged()), this, SLOT(profilerDataModelStateChanged()));
|
|
|
|
connect(d->m_profilerDataModel, SIGNAL(error(QString)), this, SLOT(showErrorDialog(QString)));
|
2012-05-02 17:53:50 +02:00
|
|
|
connect(d->m_profilerConnections,
|
|
|
|
SIGNAL(addRangedEvent(int,int,qint64,qint64,QStringList,QmlDebug::QmlEventLocation)),
|
|
|
|
d->m_profilerDataModel,
|
|
|
|
SLOT(addRangedEvent(int,int,qint64,qint64,QStringList,QmlDebug::QmlEventLocation)));
|
|
|
|
connect(d->m_profilerConnections,
|
|
|
|
SIGNAL(addV8Event(int,QString,QString,int,double,double)),
|
|
|
|
d->m_profilerDataModel,
|
|
|
|
SLOT(addV8Event(int,QString,QString,int,double,double)));
|
2012-02-24 10:47:17 +01:00
|
|
|
connect(d->m_profilerConnections, SIGNAL(addFrameEvent(qint64,int,int)), d->m_profilerDataModel, SLOT(addFrameEvent(qint64,int,int)));
|
|
|
|
connect(d->m_profilerConnections, SIGNAL(traceStarted(qint64)), d->m_profilerDataModel, SLOT(setTraceStartTime(qint64)));
|
|
|
|
connect(d->m_profilerConnections, SIGNAL(traceFinished(qint64)), d->m_profilerDataModel, SLOT(setTraceEndTime(qint64)));
|
|
|
|
connect(d->m_profilerConnections, SIGNAL(dataReadyForProcessing()), d->m_profilerDataModel, SLOT(complete()));
|
|
|
|
|
|
|
|
|
2012-05-10 11:46:59 +02:00
|
|
|
d->m_detailsRewriter = new QmlProfilerDetailsRewriter(this, &d->m_projectFinder);
|
2012-04-18 12:06:10 +02:00
|
|
|
connect(d->m_profilerDataModel, SIGNAL(requestDetailsForLocation(int,QmlDebug::QmlEventLocation)),
|
|
|
|
d->m_detailsRewriter, SLOT(requestDetailsForLocation(int,QmlDebug::QmlEventLocation)));
|
|
|
|
connect(d->m_detailsRewriter, SIGNAL(rewriteDetailsString(int,QmlDebug::QmlEventLocation,QString)),
|
|
|
|
d->m_profilerDataModel, SLOT(rewriteDetailsString(int,QmlDebug::QmlEventLocation,QString)));
|
2012-02-24 10:47:17 +01:00
|
|
|
connect(d->m_detailsRewriter, SIGNAL(eventDetailsChanged()), d->m_profilerDataModel, SLOT(finishedRewritingDetails()));
|
|
|
|
connect(d->m_profilerDataModel, SIGNAL(reloadDocumentsForDetails()), d->m_detailsRewriter, SLOT(reloadDocuments()));
|
2011-11-16 17:06:00 +01:00
|
|
|
|
|
|
|
Command *command = 0;
|
|
|
|
const Context globalContext(C_GLOBAL);
|
|
|
|
|
2012-05-24 13:49:06 +02:00
|
|
|
ActionContainer *menu = Core::ActionManager::actionContainer(M_DEBUG_ANALYZER);
|
|
|
|
ActionContainer *options = Core::ActionManager::createMenu(M_DEBUG_ANALYZER_QML_OPTIONS);
|
2011-11-16 17:06:00 +01:00
|
|
|
options->menu()->setTitle(tr("QML Profiler Options"));
|
|
|
|
menu->addMenu(options, G_ANALYZER_OPTIONS);
|
|
|
|
options->menu()->setEnabled(true);
|
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
QAction *act = d->m_loadQmlTrace = new QAction(tr("Load QML Trace"), options);
|
2012-05-24 13:49:06 +02:00
|
|
|
command = Core::ActionManager::registerAction(act, "Analyzer.Menu.StartAnalyzer.QMLProfilerOptions.LoadQMLTrace", globalContext);
|
2011-11-16 17:06:00 +01:00
|
|
|
connect(act, SIGNAL(triggered()), this, SLOT(showLoadDialog()));
|
|
|
|
options->addAction(command);
|
|
|
|
|
|
|
|
act = d->m_saveQmlTrace = new QAction(tr("Save QML Trace"), options);
|
|
|
|
d->m_saveQmlTrace->setEnabled(false);
|
2012-05-24 13:49:06 +02:00
|
|
|
command = Core::ActionManager::registerAction(act, "Analyzer.Menu.StartAnalyzer.QMLProfilerOptions.SaveQMLTrace", globalContext);
|
2011-11-16 17:06:00 +01:00
|
|
|
connect(act, SIGNAL(triggered()), this, SLOT(showSaveDialog()));
|
|
|
|
options->addAction(command);
|
2012-02-24 10:47:17 +01:00
|
|
|
|
|
|
|
d->m_recordingTimer.setInterval(100);
|
|
|
|
connect(&d->m_recordingTimer, SIGNAL(timeout()), this, SLOT(updateTimeDisplay()));
|
2011-03-11 12:22:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
QmlProfilerTool::~QmlProfilerTool()
|
|
|
|
{
|
|
|
|
delete d;
|
|
|
|
}
|
|
|
|
|
2011-11-11 12:16:20 +01:00
|
|
|
Core::Id QmlProfilerTool::id() const
|
2011-03-11 12:22:57 +01:00
|
|
|
{
|
2012-11-20 07:18:01 +02:00
|
|
|
return Core::Id("QmlProfiler");
|
2011-03-11 12:22:57 +01:00
|
|
|
}
|
|
|
|
|
2012-01-10 19:17:24 +01:00
|
|
|
RunMode QmlProfilerTool::runMode() const
|
|
|
|
{
|
|
|
|
return QmlProfilerRunMode;
|
|
|
|
}
|
|
|
|
|
2011-03-11 12:22:57 +01:00
|
|
|
QString QmlProfilerTool::displayName() const
|
|
|
|
{
|
2011-06-30 18:55:48 +02:00
|
|
|
return tr("QML Profiler");
|
2011-03-11 12:22:57 +01:00
|
|
|
}
|
|
|
|
|
2011-06-28 19:14:08 +02:00
|
|
|
QString QmlProfilerTool::description() const
|
|
|
|
{
|
|
|
|
return tr("The QML Profiler can be used to find performance bottlenecks in "
|
|
|
|
"applications using QML.");
|
|
|
|
}
|
|
|
|
|
2011-07-01 14:19:12 +02:00
|
|
|
IAnalyzerTool::ToolMode QmlProfilerTool::toolMode() const
|
2011-03-11 12:22:57 +01:00
|
|
|
{
|
2011-05-03 16:44:41 +02:00
|
|
|
return AnyMode;
|
2011-03-11 12:22:57 +01:00
|
|
|
}
|
|
|
|
|
2011-04-04 14:39:28 +02:00
|
|
|
IAnalyzerEngine *QmlProfilerTool::createEngine(const AnalyzerStartParameters &sp,
|
2011-09-14 13:12:25 +02:00
|
|
|
RunConfiguration *runConfiguration)
|
2011-03-11 12:22:57 +01:00
|
|
|
{
|
2011-09-14 13:12:25 +02:00
|
|
|
QmlProfilerEngine *engine = new QmlProfilerEngine(this, sp, runConfiguration);
|
2011-06-10 17:09:45 +02:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
engine->registerProfilerStateManager(d->m_profilerState);
|
|
|
|
|
|
|
|
bool isTcpConnection = true;
|
2011-06-09 14:34:26 +02:00
|
|
|
|
2011-09-14 13:12:25 +02:00
|
|
|
if (runConfiguration) {
|
|
|
|
// Check minimum Qt Version. We cannot really be sure what the Qt version
|
|
|
|
// at runtime is, but guess that the active build configuraiton has been used.
|
|
|
|
QtSupport::QtVersionNumber minimumVersion(4, 7, 4);
|
2012-09-03 18:31:44 +02:00
|
|
|
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(runConfiguration->target()->kit());
|
2012-04-24 15:49:09 +02:00
|
|
|
if (version) {
|
|
|
|
if (version->isValid() && version->qtVersion() < minimumVersion) {
|
2011-09-14 13:12:25 +02:00
|
|
|
int result = QMessageBox::warning(QApplication::activeWindow(), tr("QML Profiler"),
|
|
|
|
tr("The QML profiler requires Qt 4.7.4 or newer.\n"
|
|
|
|
"The Qt version configured in your active build configuration is too old.\n"
|
|
|
|
"Do you want to continue?"), QMessageBox::Yes, QMessageBox::No);
|
|
|
|
if (result == QMessageBox::No)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2011-06-09 14:34:26 +02:00
|
|
|
}
|
|
|
|
|
2011-07-05 12:14:41 +02:00
|
|
|
// FIXME: Check that there's something sensible in sp.connParams
|
Remove braces for single lines of conditions
#!/usr/bin/env ruby
Dir.glob('**/*.cpp') { |file|
# skip ast (excluding paste, astpath, and canv'ast'imer)
next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
s = File.read(file)
next if s.include?('qlalr')
orig = s.dup
s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
res = $&
if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
res
else
res.gsub!('} else', 'else')
res.gsub!(/\n +} *\n/m, "\n")
res.gsub(/ *{$/, '')
end
}
s.gsub!(/ *$/, '')
File.open(file, 'wb').write(s) if s != orig
}
Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 03:32:53 +02:00
|
|
|
if (isTcpConnection)
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_profilerConnections->setTcpConnection(sp.connParams.host, sp.connParams.port);
|
2011-04-14 15:44:43 +02:00
|
|
|
|
2011-04-04 15:03:31 +02:00
|
|
|
d->m_runConfiguration = runConfiguration;
|
2011-09-14 13:12:25 +02:00
|
|
|
|
2011-10-28 16:32:34 +02:00
|
|
|
//
|
|
|
|
// Initialize m_projectFinder
|
|
|
|
//
|
|
|
|
|
|
|
|
QString projectDirectory;
|
|
|
|
if (d->m_runConfiguration) {
|
|
|
|
Project *project = d->m_runConfiguration->target()->project();
|
|
|
|
projectDirectory = project->projectDirectory();
|
|
|
|
}
|
2011-09-14 13:12:25 +02:00
|
|
|
|
2012-05-10 11:46:59 +02:00
|
|
|
populateFileFinder(projectDirectory, sp.sysroot);
|
2011-10-15 11:32:55 +02:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
connect(engine, SIGNAL(processRunning(quint16)), d->m_profilerConnections, SLOT(connectClient(quint16)));
|
|
|
|
connect(d->m_profilerConnections, SIGNAL(connectionFailed()), engine, SLOT(cancelProcess()));
|
2011-03-11 12:22:57 +01:00
|
|
|
|
|
|
|
return engine;
|
|
|
|
}
|
|
|
|
|
2012-01-10 19:17:24 +01:00
|
|
|
bool QmlProfilerTool::canRun(RunConfiguration *runConfiguration, RunMode mode) const
|
2011-12-27 22:41:31 +01:00
|
|
|
{
|
|
|
|
if (qobject_cast<QmlProjectRunConfiguration *>(runConfiguration)
|
|
|
|
|| qobject_cast<RemoteLinuxRunConfiguration *>(runConfiguration)
|
2012-08-22 13:27:25 +02:00
|
|
|
|| qobject_cast<LocalApplicationRunConfiguration *>(runConfiguration))
|
2012-01-10 19:17:24 +01:00
|
|
|
return mode == runMode();
|
2011-12-27 22:41:31 +01:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2012-05-10 14:30:32 +02:00
|
|
|
static QString sysroot(RunConfiguration *runConfig)
|
|
|
|
{
|
|
|
|
QTC_ASSERT(runConfig, return QString());
|
2012-09-03 18:31:44 +02:00
|
|
|
ProjectExplorer::Kit *k = runConfig->target()->kit();
|
|
|
|
if (k && ProjectExplorer::SysRootKitInformation::hasSysRoot(k))
|
|
|
|
return ProjectExplorer::SysRootKitInformation::sysRoot(runConfig->target()->kit()).toString();
|
2012-05-10 14:30:32 +02:00
|
|
|
return QString();
|
|
|
|
}
|
|
|
|
|
2012-01-10 19:17:24 +01:00
|
|
|
AnalyzerStartParameters QmlProfilerTool::createStartParameters(RunConfiguration *runConfiguration, RunMode mode) const
|
2011-12-27 22:41:31 +01:00
|
|
|
{
|
|
|
|
Q_UNUSED(mode);
|
|
|
|
|
|
|
|
AnalyzerStartParameters sp;
|
|
|
|
sp.startMode = StartQml; // FIXME: The parameter struct is not needed/not used.
|
|
|
|
|
|
|
|
// FIXME: This is only used to communicate the connParams settings.
|
|
|
|
if (QmlProjectRunConfiguration *rc1 =
|
|
|
|
qobject_cast<QmlProjectRunConfiguration *>(runConfiguration)) {
|
|
|
|
// This is a "plain" .qmlproject.
|
|
|
|
sp.environment = rc1->environment();
|
|
|
|
sp.workingDirectory = rc1->workingDirectory();
|
|
|
|
sp.debuggee = rc1->observerPath();
|
|
|
|
sp.debuggeeArgs = rc1->viewerArguments();
|
|
|
|
sp.displayName = rc1->displayName();
|
|
|
|
sp.connParams.host = QLatin1String("localhost");
|
2012-02-17 19:05:11 +01:00
|
|
|
sp.connParams.port = rc1->debuggerAspect()->qmlDebugServerPort();
|
2011-12-27 22:41:31 +01:00
|
|
|
} else if (LocalApplicationRunConfiguration *rc2 =
|
|
|
|
qobject_cast<LocalApplicationRunConfiguration *>(runConfiguration)) {
|
|
|
|
sp.environment = rc2->environment();
|
|
|
|
sp.workingDirectory = rc2->workingDirectory();
|
|
|
|
sp.debuggee = rc2->executable();
|
|
|
|
sp.debuggeeArgs = rc2->commandLineArguments();
|
|
|
|
sp.displayName = rc2->displayName();
|
|
|
|
sp.connParams.host = QLatin1String("localhost");
|
2012-02-17 19:05:11 +01:00
|
|
|
sp.connParams.port = rc2->debuggerAspect()->qmlDebugServerPort();
|
2011-12-27 22:41:31 +01:00
|
|
|
} else if (RemoteLinux::RemoteLinuxRunConfiguration *rc3 =
|
|
|
|
qobject_cast<RemoteLinux::RemoteLinuxRunConfiguration *>(runConfiguration)) {
|
|
|
|
sp.debuggee = rc3->remoteExecutableFilePath();
|
|
|
|
sp.debuggeeArgs = rc3->arguments();
|
2012-09-03 18:31:44 +02:00
|
|
|
sp.connParams = ProjectExplorer::DeviceKitInformation::device(rc3->target()->kit())->sshParameters();
|
2011-12-27 22:41:31 +01:00
|
|
|
sp.analyzerCmdPrefix = rc3->commandPrefix();
|
|
|
|
sp.displayName = rc3->displayName();
|
2012-05-10 14:30:32 +02:00
|
|
|
sp.sysroot = sysroot(rc3);
|
2011-12-27 22:41:31 +01:00
|
|
|
} else {
|
|
|
|
// What could that be?
|
|
|
|
QTC_ASSERT(false, return sp);
|
|
|
|
}
|
|
|
|
return sp;
|
|
|
|
}
|
|
|
|
|
2011-07-06 16:52:14 +02:00
|
|
|
QWidget *QmlProfilerTool::createWidgets()
|
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
QTC_ASSERT(!d->m_viewContainer, return 0);
|
2011-04-08 13:05:39 +02:00
|
|
|
|
2011-09-27 14:38:22 +02:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_viewContainer = new QmlProfilerViewManager(this,
|
|
|
|
this,
|
|
|
|
d->m_profilerDataModel,
|
|
|
|
d->m_profilerState);
|
|
|
|
connect(d->m_viewContainer, SIGNAL(gotoSourceLocation(QString,int,int)),
|
|
|
|
this, SLOT(gotoSourceLocation(QString,int,int)));
|
2011-07-06 14:13:04 +02:00
|
|
|
|
2011-07-06 16:52:14 +02:00
|
|
|
//
|
|
|
|
// Toolbar
|
|
|
|
//
|
2011-03-24 12:42:15 +01:00
|
|
|
QWidget *toolbarWidget = new QWidget;
|
|
|
|
toolbarWidget->setObjectName(QLatin1String("QmlProfilerToolBarWidget"));
|
|
|
|
|
|
|
|
QHBoxLayout *layout = new QHBoxLayout;
|
|
|
|
layout->setMargin(0);
|
|
|
|
layout->setSpacing(0);
|
|
|
|
|
2011-04-06 12:26:19 +02:00
|
|
|
d->m_recordButton = new QToolButton(toolbarWidget);
|
|
|
|
d->m_recordButton->setCheckable(true);
|
|
|
|
|
2012-02-13 15:26:57 +01:00
|
|
|
connect(d->m_recordButton,SIGNAL(clicked(bool)), this, SLOT(recordingButtonChanged(bool)));
|
2011-04-06 12:26:19 +02:00
|
|
|
d->m_recordButton->setChecked(true);
|
2012-02-24 10:47:17 +01:00
|
|
|
setRecording(d->m_profilerState->clientRecording());
|
2011-04-06 12:26:19 +02:00
|
|
|
layout->addWidget(d->m_recordButton);
|
|
|
|
|
2011-06-24 18:19:08 +02:00
|
|
|
d->m_clearButton = new QToolButton(toolbarWidget);
|
|
|
|
d->m_clearButton->setIcon(QIcon(QLatin1String(":/qmlprofiler/clean_pane_small.png")));
|
2011-07-05 16:40:26 +02:00
|
|
|
d->m_clearButton->setToolTip(tr("Discard data"));
|
2012-02-24 10:47:17 +01:00
|
|
|
|
|
|
|
connect(d->m_clearButton,SIGNAL(clicked()), this, SLOT(clearData()));
|
|
|
|
|
2011-06-24 18:19:08 +02:00
|
|
|
layout->addWidget(d->m_clearButton);
|
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_timeLabel = new QLabel();
|
|
|
|
QPalette palette = d->m_timeLabel->palette();
|
2011-03-24 12:42:15 +01:00
|
|
|
palette.setColor(QPalette::WindowText, Qt::white);
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_timeLabel->setPalette(palette);
|
|
|
|
d->m_timeLabel->setIndent(10);
|
|
|
|
updateTimeDisplay();
|
|
|
|
layout->addWidget(d->m_timeLabel);
|
2011-06-24 18:19:08 +02:00
|
|
|
|
2011-03-24 12:42:15 +01:00
|
|
|
toolbarWidget->setLayout(layout);
|
|
|
|
|
2012-05-10 11:46:59 +02:00
|
|
|
// When the widgets are requested we assume that the session data
|
|
|
|
// is available, then we can populate the file finder
|
|
|
|
populateFileFinder();
|
|
|
|
|
2011-03-24 12:42:15 +01:00
|
|
|
return toolbarWidget;
|
2011-03-11 12:22:57 +01:00
|
|
|
}
|
|
|
|
|
2012-05-10 11:46:59 +02:00
|
|
|
void QmlProfilerTool::populateFileFinder(QString projectDirectory, QString activeSysroot)
|
|
|
|
{
|
|
|
|
// Initialize filefinder with some sensible default
|
|
|
|
QStringList sourceFiles;
|
|
|
|
SessionManager *sessionManager = ProjectExplorerPlugin::instance()->session();
|
|
|
|
QList<Project *> projects = sessionManager->projects();
|
|
|
|
if (Project *startupProject = ProjectExplorerPlugin::instance()->startupProject()) {
|
|
|
|
// startup project first
|
|
|
|
projects.removeOne(ProjectExplorerPlugin::instance()->startupProject());
|
|
|
|
projects.insert(0, startupProject);
|
|
|
|
}
|
|
|
|
foreach (Project *project, projects)
|
|
|
|
sourceFiles << project->files(Project::ExcludeGeneratedFiles);
|
|
|
|
|
|
|
|
if (!projects.isEmpty()) {
|
Remove braces for single lines of conditions
#!/usr/bin/env ruby
Dir.glob('**/*.cpp') { |file|
# skip ast (excluding paste, astpath, and canv'ast'imer)
next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
s = File.read(file)
next if s.include?('qlalr')
orig = s.dup
s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
res = $&
if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
res
else
res.gsub!('} else', 'else')
res.gsub!(/\n +} *\n/m, "\n")
res.gsub(/ *{$/, '')
end
}
s.gsub!(/ *$/, '')
File.open(file, 'wb').write(s) if s != orig
}
Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 03:32:53 +02:00
|
|
|
if (projectDirectory.isEmpty())
|
2012-05-10 11:46:59 +02:00
|
|
|
projectDirectory = projects.first()->projectDirectory();
|
|
|
|
|
|
|
|
if (activeSysroot.isEmpty()) {
|
|
|
|
if (Target *target = projects.first()->activeTarget())
|
|
|
|
if (RunConfiguration *rc = target->activeRunConfiguration())
|
|
|
|
activeSysroot = sysroot(rc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
d->m_projectFinder.setProjectDirectory(projectDirectory);
|
|
|
|
d->m_projectFinder.setProjectFiles(sourceFiles);
|
|
|
|
d->m_projectFinder.setSysroot(activeSysroot);
|
|
|
|
}
|
|
|
|
|
2012-02-13 15:26:57 +01:00
|
|
|
void QmlProfilerTool::recordingButtonChanged(bool recording)
|
2011-04-06 12:26:19 +02:00
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_profilerState->setClientRecording(recording);
|
2012-02-13 15:26:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void QmlProfilerTool::setRecording(bool recording)
|
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
// update display
|
2012-02-13 15:26:57 +01:00
|
|
|
d->m_recordButton->setToolTip( recording ? tr("Disable profiling") : tr("Enable profiling"));
|
|
|
|
d->m_recordButton->setIcon(QIcon(recording ? QLatin1String(":/qmlprofiler/recordOn.png") :
|
|
|
|
QLatin1String(":/qmlprofiler/recordOff.png")));
|
|
|
|
|
|
|
|
d->m_recordButton->setChecked(recording);
|
2011-03-11 12:22:57 +01:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
// manage timer
|
|
|
|
if (d->m_profilerState->currentState() == QmlProfilerStateManager::AppRunning) {
|
|
|
|
if (recording) {
|
|
|
|
d->m_recordingTimer.start();
|
|
|
|
d->m_recordingElapsedTime.start();
|
|
|
|
} else {
|
|
|
|
d->m_recordingTimer.stop();
|
|
|
|
}
|
|
|
|
}
|
2011-08-25 16:30:36 +02:00
|
|
|
}
|
|
|
|
|
2012-01-12 16:36:40 +01:00
|
|
|
void QmlProfilerTool::gotoSourceLocation(const QString &fileUrl, int lineNumber, int columnNumber)
|
2011-03-11 12:22:57 +01:00
|
|
|
{
|
2011-04-01 13:57:49 +02:00
|
|
|
if (lineNumber < 0 || fileUrl.isEmpty())
|
2011-03-11 12:22:57 +01:00
|
|
|
return;
|
|
|
|
|
2011-07-19 17:48:57 +02:00
|
|
|
const QString projectFileName = d->m_projectFinder.findFile(fileUrl);
|
2011-03-11 12:22:57 +01:00
|
|
|
|
2011-11-09 11:01:03 +01:00
|
|
|
QFileInfo fileInfo(projectFileName);
|
|
|
|
if (!fileInfo.exists() || !fileInfo.isReadable())
|
|
|
|
return;
|
|
|
|
|
2012-05-08 09:43:14 +02:00
|
|
|
IEditor *editor = EditorManager::openEditor(projectFileName);
|
2011-03-11 12:22:57 +01:00
|
|
|
TextEditor::ITextEditor *textEditor = qobject_cast<TextEditor::ITextEditor*>(editor);
|
|
|
|
|
|
|
|
if (textEditor) {
|
2012-05-08 09:43:14 +02:00
|
|
|
EditorManager::instance()->addCurrentPositionToNavigationHistory();
|
2012-05-10 12:32:41 +02:00
|
|
|
// textEditor counts columns starting with 0, but the ASTs store the
|
|
|
|
// location starting with 1, therefore the -1 in the call to gotoLine
|
|
|
|
textEditor->gotoLine(lineNumber, columnNumber - 1);
|
2011-03-11 12:22:57 +01:00
|
|
|
textEditor->widget()->setFocus();
|
|
|
|
}
|
|
|
|
}
|
2011-03-24 12:42:15 +01:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
void QmlProfilerTool::updateTimeDisplay()
|
2011-11-28 16:30:30 +01:00
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
double seconds = 0;
|
|
|
|
if (d->m_profilerState->serverRecording() &&
|
|
|
|
d->m_profilerState->currentState() == QmlProfilerStateManager::AppRunning) {
|
|
|
|
seconds = d->m_recordingElapsedTime.elapsed() / 1000.0;
|
|
|
|
} else if (d->m_profilerDataModel->currentState() != QmlProfilerDataModel::Empty ) {
|
|
|
|
seconds = (d->m_profilerDataModel->traceEndTime() - d->m_profilerDataModel->traceStartTime()) / 1.0e9;
|
|
|
|
}
|
2011-11-28 16:30:30 +01:00
|
|
|
QString timeString = QString::number(seconds,'f',1);
|
2012-02-24 10:47:17 +01:00
|
|
|
QString profilerTimeStr = QmlProfilerTool::tr("%1 s").arg(timeString, 6);
|
|
|
|
d->m_timeLabel->setText(tr("Elapsed: %1").arg(profilerTimeStr));
|
2011-11-28 16:30:30 +01:00
|
|
|
}
|
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
void QmlProfilerTool::clearData()
|
2011-11-28 16:30:30 +01:00
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_profilerDataModel->clear();
|
2012-03-26 16:20:09 +02:00
|
|
|
d->m_profilerConnections->discardPendingData();
|
2011-03-24 12:42:15 +01:00
|
|
|
}
|
2011-04-01 13:48:10 +02:00
|
|
|
|
2011-04-06 16:04:18 +02:00
|
|
|
void QmlProfilerTool::clearDisplay()
|
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_profilerConnections->clearBufferedData();
|
|
|
|
d->m_viewContainer->clear();
|
|
|
|
updateTimeDisplay();
|
2011-04-06 16:04:18 +02:00
|
|
|
}
|
|
|
|
|
2011-09-14 13:12:25 +02:00
|
|
|
static void startRemoteTool(IAnalyzerTool *tool, StartMode mode)
|
2011-04-04 15:03:31 +02:00
|
|
|
{
|
2011-09-14 13:12:25 +02:00
|
|
|
Q_UNUSED(tool);
|
2011-10-15 11:52:03 +02:00
|
|
|
|
|
|
|
QString host;
|
|
|
|
quint16 port;
|
2011-10-17 16:44:41 +02:00
|
|
|
QString sysroot;
|
2011-10-15 11:52:03 +02:00
|
|
|
|
|
|
|
{
|
2012-01-24 15:36:40 +01:00
|
|
|
QSettings *settings = ICore::settings();
|
2011-10-15 11:52:03 +02:00
|
|
|
|
|
|
|
host = settings->value(QLatin1String("AnalyzerQmlAttachDialog/host"), QLatin1String("localhost")).toString();
|
|
|
|
port = settings->value(QLatin1String("AnalyzerQmlAttachDialog/port"), 3768).toInt();
|
2011-10-17 17:18:34 +02:00
|
|
|
sysroot = settings->value(QLatin1String("AnalyzerQmlAttachDialog/sysroot")).toString();
|
2011-10-15 11:52:03 +02:00
|
|
|
|
|
|
|
QmlProfilerAttachDialog dialog;
|
|
|
|
|
|
|
|
dialog.setAddress(host);
|
|
|
|
dialog.setPort(port);
|
2011-10-17 17:18:34 +02:00
|
|
|
dialog.setSysroot(sysroot);
|
2011-10-15 11:52:03 +02:00
|
|
|
|
|
|
|
if (dialog.exec() != QDialog::Accepted)
|
|
|
|
return;
|
|
|
|
|
|
|
|
host = dialog.address();
|
|
|
|
port = dialog.port();
|
2011-10-17 16:44:41 +02:00
|
|
|
sysroot = dialog.sysroot();
|
2011-10-15 11:52:03 +02:00
|
|
|
|
|
|
|
settings->setValue(QLatin1String("AnalyzerQmlAttachDialog/host"), host);
|
|
|
|
settings->setValue(QLatin1String("AnalyzerQmlAttachDialog/port"), port);
|
2011-10-17 17:18:34 +02:00
|
|
|
settings->setValue(QLatin1String("AnalyzerQmlAttachDialog/sysroot"), sysroot);
|
2011-10-15 11:52:03 +02:00
|
|
|
}
|
2011-04-04 15:03:31 +02:00
|
|
|
|
2011-09-14 13:12:25 +02:00
|
|
|
AnalyzerStartParameters sp;
|
|
|
|
sp.toolId = tool->id();
|
|
|
|
sp.startMode = mode;
|
2011-10-15 11:52:03 +02:00
|
|
|
sp.connParams.host = host;
|
|
|
|
sp.connParams.port = port;
|
2011-10-17 16:44:41 +02:00
|
|
|
sp.sysroot = sysroot;
|
2011-04-04 15:03:31 +02:00
|
|
|
|
2011-09-14 13:12:25 +02:00
|
|
|
AnalyzerRunControl *rc = new AnalyzerRunControl(tool, sp, 0);
|
|
|
|
QObject::connect(AnalyzerManager::stopAction(), SIGNAL(triggered()), rc, SLOT(stopIt()));
|
2011-04-04 15:03:31 +02:00
|
|
|
|
2012-01-10 19:17:24 +01:00
|
|
|
ProjectExplorerPlugin::instance()->startRunControl(rc, tool->runMode());
|
2011-04-04 15:03:31 +02:00
|
|
|
}
|
2011-04-04 15:56:34 +02:00
|
|
|
|
2011-07-04 18:33:47 +02:00
|
|
|
void QmlProfilerTool::startTool(StartMode mode)
|
|
|
|
{
|
2011-07-04 19:11:08 +02:00
|
|
|
using namespace ProjectExplorer;
|
|
|
|
|
|
|
|
// Make sure mode is shown.
|
|
|
|
AnalyzerManager::showMode();
|
|
|
|
|
2011-09-14 13:12:25 +02:00
|
|
|
if (mode == StartLocal) {
|
|
|
|
ProjectExplorerPlugin *pe = ProjectExplorerPlugin::instance();
|
|
|
|
// ### not sure if we're supposed to check if the RunConFiguration isEnabled
|
|
|
|
Project *pro = pe->startupProject();
|
2012-01-10 19:17:24 +01:00
|
|
|
pe->runProject(pro, runMode());
|
2011-09-14 13:12:25 +02:00
|
|
|
} else if (mode == StartRemote) {
|
|
|
|
startRemoteTool(this, mode);
|
|
|
|
}
|
2011-07-04 18:33:47 +02:00
|
|
|
}
|
2011-07-27 11:49:39 +02:00
|
|
|
|
|
|
|
void QmlProfilerTool::logStatus(const QString &msg)
|
|
|
|
{
|
2011-11-16 17:06:00 +01:00
|
|
|
MessageManager *messageManager = MessageManager::instance();
|
2011-07-27 11:49:39 +02:00
|
|
|
messageManager->printToOutputPane(msg, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
void QmlProfilerTool::logError(const QString &msg)
|
|
|
|
{
|
2011-11-16 17:06:00 +01:00
|
|
|
MessageManager *messageManager = MessageManager::instance();
|
2011-07-27 11:49:39 +02:00
|
|
|
messageManager->printToOutputPane(msg, true);
|
|
|
|
}
|
2011-07-26 13:56:14 +02:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
void QmlProfilerTool::showErrorDialog(const QString &error)
|
|
|
|
{
|
|
|
|
QMessageBox *errorDialog = new QMessageBox(Core::ICore::mainWindow());
|
|
|
|
errorDialog->setIcon(QMessageBox::Warning);
|
|
|
|
errorDialog->setWindowTitle(tr("QML Profiler"));
|
|
|
|
errorDialog->setText(error);
|
|
|
|
errorDialog->setStandardButtons(QMessageBox::Ok);
|
|
|
|
errorDialog->setDefaultButton(QMessageBox::Ok);
|
|
|
|
errorDialog->setModal(false);
|
|
|
|
errorDialog->show();
|
|
|
|
}
|
|
|
|
|
2011-11-16 17:06:00 +01:00
|
|
|
void QmlProfilerTool::showSaveOption()
|
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_saveQmlTrace->setEnabled(!d->m_profilerDataModel->isEmpty());
|
2011-11-16 17:06:00 +01:00
|
|
|
}
|
|
|
|
|
2011-07-26 13:56:14 +02:00
|
|
|
void QmlProfilerTool::showSaveDialog()
|
|
|
|
{
|
2012-11-26 21:18:13 +02:00
|
|
|
QString filename = QFileDialog::getSaveFileName(Core::ICore::mainWindow(), tr("Save QML Trace"), QString(),
|
|
|
|
tr("QML traces (*%1)").arg(QLatin1String(TraceFileExtension)));
|
2011-07-26 13:56:14 +02:00
|
|
|
if (!filename.isEmpty()) {
|
2011-08-22 16:01:50 +02:00
|
|
|
if (!filename.endsWith(QLatin1String(TraceFileExtension)))
|
|
|
|
filename += QLatin1String(TraceFileExtension);
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_profilerDataModel->save(filename);
|
2011-07-26 13:56:14 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void QmlProfilerTool::showLoadDialog()
|
|
|
|
{
|
2012-05-07 18:28:03 +02:00
|
|
|
if (ModeManager::currentMode()->id() != MODE_ANALYZE)
|
2011-11-16 17:06:00 +01:00
|
|
|
AnalyzerManager::showMode();
|
|
|
|
|
|
|
|
if (AnalyzerManager::currentSelectedTool() != this)
|
|
|
|
AnalyzerManager::selectTool(this, StartRemote);
|
|
|
|
|
2012-11-26 21:18:13 +02:00
|
|
|
QString filename = QFileDialog::getOpenFileName(Core::ICore::mainWindow(), tr("Load QML Trace"), QString(),
|
|
|
|
tr("QML traces (*%1)").arg(QLatin1String(TraceFileExtension)));
|
2011-07-26 13:56:14 +02:00
|
|
|
|
|
|
|
if (!filename.isEmpty()) {
|
|
|
|
// delayed load (prevent graphical artifacts due to long load time)
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_profilerDataModel->setFilename(filename);
|
|
|
|
QTimer::singleShot(100, d->m_profilerDataModel, SLOT(load()));
|
2011-07-26 13:56:14 +02:00
|
|
|
}
|
|
|
|
}
|
2011-08-18 16:10:33 +02:00
|
|
|
|
2012-05-08 15:14:11 +02:00
|
|
|
void QmlProfilerTool::clientsDisconnected()
|
|
|
|
{
|
|
|
|
// If the application stopped by itself, check if we have all the data
|
|
|
|
if (d->m_profilerState->currentState() == QmlProfilerStateManager::AppDying) {
|
|
|
|
if (d->m_profilerDataModel->currentState() == QmlProfilerDataModel::AcquiringData)
|
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppKilled);
|
|
|
|
else
|
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppStopped);
|
|
|
|
|
|
|
|
// ... and return to the "base" state
|
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::Idle);
|
|
|
|
}
|
|
|
|
|
|
|
|
// If the connection is closed while the app is still running, no special action is needed
|
|
|
|
}
|
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
void QmlProfilerTool::profilerDataModelStateChanged()
|
2011-08-18 16:10:33 +02:00
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
switch (d->m_profilerDataModel->currentState()) {
|
|
|
|
case QmlProfilerDataModel::Empty :
|
|
|
|
clearDisplay();
|
|
|
|
break;
|
|
|
|
case QmlProfilerDataModel::AcquiringData :
|
|
|
|
case QmlProfilerDataModel::ProcessingData :
|
|
|
|
// nothing to be done for these two
|
|
|
|
break;
|
|
|
|
case QmlProfilerDataModel::Done :
|
|
|
|
if (d->m_profilerState->currentState() == QmlProfilerStateManager::AppStopRequested)
|
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppReadyToStop);
|
|
|
|
showSaveOption();
|
|
|
|
updateTimeDisplay();
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
QList <QAction *> QmlProfilerTool::profilerContextMenuActions() const
|
|
|
|
{
|
|
|
|
QList <QAction *> commonActions;
|
|
|
|
commonActions << d->m_loadQmlTrace << d->m_saveQmlTrace;
|
|
|
|
return commonActions;
|
|
|
|
}
|
|
|
|
|
|
|
|
void QmlProfilerTool::showNonmodalWarning(const QString &warningMsg)
|
|
|
|
{
|
|
|
|
QMessageBox *noExecWarning = new QMessageBox(Core::ICore::mainWindow());
|
|
|
|
noExecWarning->setIcon(QMessageBox::Warning);
|
|
|
|
noExecWarning->setWindowTitle(tr("QML Profiler"));
|
|
|
|
noExecWarning->setText(warningMsg);
|
|
|
|
noExecWarning->setStandardButtons(QMessageBox::Ok);
|
|
|
|
noExecWarning->setDefaultButton(QMessageBox::Ok);
|
|
|
|
noExecWarning->setModal(false);
|
|
|
|
noExecWarning->show();
|
|
|
|
}
|
|
|
|
|
|
|
|
QMessageBox *QmlProfilerTool::requestMessageBox()
|
|
|
|
{
|
|
|
|
return new QMessageBox(Core::ICore::mainWindow());
|
|
|
|
}
|
|
|
|
|
|
|
|
void QmlProfilerTool::handleHelpRequest(const QString &link)
|
|
|
|
{
|
|
|
|
HelpManager *helpManager = HelpManager::instance();
|
|
|
|
helpManager->handleHelpRequest(link);
|
2011-08-18 16:10:33 +02:00
|
|
|
}
|
2011-09-14 13:26:19 +02:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
void QmlProfilerTool::profilerStateChanged()
|
2011-09-14 13:26:19 +02:00
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
switch (d->m_profilerState->currentState()) {
|
2012-05-11 17:19:15 +02:00
|
|
|
case QmlProfilerStateManager::AppDying : {
|
|
|
|
// If already disconnected when dying, check again that all data was read
|
|
|
|
if (!d->m_profilerConnections->isConnected())
|
|
|
|
QTimer::singleShot(0, this, SLOT(clientsDisconnected()));
|
|
|
|
break;
|
|
|
|
}
|
2012-02-24 10:47:17 +01:00
|
|
|
case QmlProfilerStateManager::AppKilled : {
|
2012-08-28 13:18:50 +02:00
|
|
|
showNonmodalWarning(tr("Application finished before loading profiled data.\nPlease use the stop button instead."));
|
2012-10-16 14:52:35 +02:00
|
|
|
d->m_profilerDataModel->clear();
|
2011-09-14 13:26:19 +02:00
|
|
|
break;
|
|
|
|
}
|
2012-02-24 10:47:17 +01:00
|
|
|
case QmlProfilerStateManager::Idle :
|
|
|
|
// when the app finishes, set recording display to client status
|
|
|
|
setRecording(d->m_profilerState->clientRecording());
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
// no special action needed for other states
|
2011-09-14 13:26:19 +02:00
|
|
|
break;
|
|
|
|
}
|
2012-02-24 10:47:17 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void QmlProfilerTool::clientRecordingChanged()
|
|
|
|
{
|
|
|
|
// if application is running, display server record changes
|
|
|
|
// if application is stopped, display client record changes
|
Remove braces for single lines of conditions
#!/usr/bin/env ruby
Dir.glob('**/*.cpp') { |file|
# skip ast (excluding paste, astpath, and canv'ast'imer)
next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
s = File.read(file)
next if s.include?('qlalr')
orig = s.dup
s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
res = $&
if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
res
else
res.gsub!('} else', 'else')
res.gsub!(/\n +} *\n/m, "\n")
res.gsub(/ *{$/, '')
end
}
s.gsub!(/ *$/, '')
File.open(file, 'wb').write(s) if s != orig
}
Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 03:32:53 +02:00
|
|
|
if (d->m_profilerState->currentState() != QmlProfilerStateManager::AppRunning)
|
2012-02-24 10:47:17 +01:00
|
|
|
setRecording(d->m_profilerState->clientRecording());
|
2011-09-14 13:26:19 +02:00
|
|
|
}
|
2012-02-13 15:26:57 +01:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
void QmlProfilerTool::serverRecordingChanged()
|
2012-02-13 15:26:57 +01:00
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
if (d->m_profilerState->currentState() == QmlProfilerStateManager::AppRunning) {
|
|
|
|
setRecording(d->m_profilerState->serverRecording());
|
|
|
|
// clear the old data each time we start a new profiling session
|
|
|
|
if (d->m_profilerState->serverRecording()) {
|
|
|
|
clearData();
|
2012-10-16 14:52:35 +02:00
|
|
|
d->m_profilerDataModel->prepareForWriting();
|
2012-02-24 10:47:17 +01:00
|
|
|
}
|
2012-02-13 15:26:57 +01:00
|
|
|
}
|
|
|
|
}
|
2012-02-24 10:47:17 +01:00
|
|
|
|