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

QmlDesigner: Add logging to NodeInstanceView

Browse Source 
Change-Id: I95f9f2e089f2d66ba9cf27b631d2478d54b18085
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2017-03-01 15:11:46 +01:00
committed by Tim Jenssen
parent 80d1a6ed42
commit 513209cf1f
4 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h
View File

@@ -78,6 +78,9 @@ public:
virtual void token(const TokenCommand &command) = 0; virtual void token(const TokenCommand &command) = 0;
virtual void removeSharedMemory(const RemoveSharedMemoryCommand &command) = 0; virtual void removeSharedMemory(const RemoveSharedMemoryCommand &command) = 0;
virtual void benchmark(const QString &)
{}
static void registerCommands(); static void registerCommands();
}; };

16
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
View File

@@ -73,6 +73,7 @@
#include <QLocalServer> #include <QLocalServer>
#include <QLocalSocket> #include <QLocalSocket>
#include <QLoggingCategory>
#include <QProcess> #include <QProcess>
#include <QCoreApplication> #include <QCoreApplication>
#include <QUuid> #include <QUuid>
@@ -84,6 +85,8 @@
namespace QmlDesigner { namespace QmlDesigner {
static Q_LOGGING_CATEGORY(instanceViewBenchmark, "qtc.nodeinstances.init")
void NodeInstanceServerProxy::showCannotConnectToPuppetWarningAndSwitchToEditMode() void NodeInstanceServerProxy::showCannotConnectToPuppetWarningAndSwitchToEditMode()
{ {
#ifndef QMLDESIGNER_TEST #ifndef QMLDESIGNER_TEST
@@ -114,6 +117,9 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
m_runModus(runModus), m_runModus(runModus),
m_synchronizeId(-1) m_synchronizeId(-1)
{ {
if (instanceViewBenchmark().isInfoEnabled())
m_benchmarkTimer.start();
QString socketToken(QUuid::createUuid().toString()); QString socketToken(QUuid::createUuid().toString());
m_localServer->listen(socketToken); m_localServer->listen(socketToken);
m_localServer->setMaxPendingConnections(3); m_localServer->setMaxPendingConnections(3);
@@ -147,6 +153,7 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
if (m_qmlPuppetEditorProcess->waitForStarted(waitConstant)) { if (m_qmlPuppetEditorProcess->waitForStarted(waitConstant)) {
connect(m_qmlPuppetEditorProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), connect(m_qmlPuppetEditorProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
m_qmlPuppetEditorProcess.data(), &QProcess::deleteLater); m_qmlPuppetEditorProcess.data(), &QProcess::deleteLater);
qCInfo(instanceViewBenchmark) << "puppets started:" << m_benchmarkTimer.elapsed();
if (runModus == NormalModus) { if (runModus == NormalModus) {
m_qmlPuppetPreviewProcess->waitForStarted(waitConstant / 2); m_qmlPuppetPreviewProcess->waitForStarted(waitConstant / 2);
@@ -178,6 +185,7 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
if (!m_localServer->hasPendingConnections()) if (!m_localServer->hasPendingConnections())
connectedToPuppet = m_localServer->waitForNewConnection(waitConstant / 4); connectedToPuppet = m_localServer->waitForNewConnection(waitConstant / 4);
qCInfo(instanceViewBenchmark) << "puppets connected:" << m_benchmarkTimer.elapsed();
if (connectedToPuppet) { if (connectedToPuppet) {
m_thirdSocket = m_localServer->nextPendingConnection(); m_thirdSocket = m_localServer->nextPendingConnection();
connect(m_thirdSocket.data(), SIGNAL(readyRead()), this, SLOT(readThirdDataStream())); connect(m_thirdSocket.data(), SIGNAL(readyRead()), this, SLOT(readThirdDataStream()));
@@ -272,6 +280,7 @@ void NodeInstanceServerProxy::dispatchCommand(const QVariant &command, PuppetStr
static const int debugOutputCommandType = QMetaType::type("DebugOutputCommand"); static const int debugOutputCommandType = QMetaType::type("DebugOutputCommand");
static const int puppetAliveCommandType = QMetaType::type("PuppetAliveCommand"); static const int puppetAliveCommandType = QMetaType::type("PuppetAliveCommand");
qCInfo(instanceViewBenchmark) << "dispatching command" << command.userType() << command.typeName();
if (command.userType() == informationChangedCommandType) { if (command.userType() == informationChangedCommandType) {
nodeInstanceClient()->informationChanged(command.value<InformationChangedCommand>()); nodeInstanceClient()->informationChanged(command.value<InformationChangedCommand>());
} else if (command.userType() == valuesChangedCommandType) { } else if (command.userType() == valuesChangedCommandType) {
@@ -295,6 +304,7 @@ void NodeInstanceServerProxy::dispatchCommand(const QVariant &command, PuppetStr
m_synchronizeId = synchronizeCommand.synchronizeId(); m_synchronizeId = synchronizeCommand.synchronizeId();
} else } else
Q_ASSERT(false); Q_ASSERT(false);
qCInfo(instanceViewBenchmark) << "dispatching command" << "done" << command.userType();
} }
NodeInstanceClientInterface *NodeInstanceServerProxy::nodeInstanceClient() const NodeInstanceClientInterface *NodeInstanceServerProxy::nodeInstanceClient() const
@@ -588,6 +598,7 @@ void NodeInstanceServerProxy::changeFileUrl(const ChangeFileUrlCommand &command)
void NodeInstanceServerProxy::createScene(const CreateSceneCommand &command) void NodeInstanceServerProxy::createScene(const CreateSceneCommand &command)
{ {
qCInfo(instanceViewBenchmark) << Q_FUNC_INFO << m_benchmarkTimer.elapsed();
writeCommand(QVariant::fromValue(command)); writeCommand(QVariant::fromValue(command));
} }
@@ -656,4 +667,9 @@ void NodeInstanceServerProxy::removeSharedMemory(const RemoveSharedMemoryCommand
writeCommand(QVariant::fromValue(command)); writeCommand(QVariant::fromValue(command));
} }
void NodeInstanceServerProxy::benchmark(const QString &message)
{
qCInfo(instanceViewBenchmark) << message << m_benchmarkTimer.elapsed();
}
} // namespace QmlDesigner } // namespace QmlDesigner

3
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h
View File

@@ -30,6 +30,7 @@
#include <QPointer> #include <QPointer>
#include <QProcess> #include <QProcess>
#include <QFile> #include <QFile>
#include <QTime>
#include <QTimer> #include <QTimer>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@@ -81,6 +82,7 @@ public:
void changeNodeSource(const ChangeNodeSourceCommand &command); void changeNodeSource(const ChangeNodeSourceCommand &command);
void token(const TokenCommand &command); void token(const TokenCommand &command);
void removeSharedMemory(const RemoveSharedMemoryCommand &command); void removeSharedMemory(const RemoveSharedMemoryCommand &command);
void benchmark(const QString &message) override;
protected: protected:
void writeCommand(const QVariant &command); void writeCommand(const QVariant &command);
@@ -125,6 +127,7 @@ private:
quint32 m_thirdLastReadCommandCounter; quint32 m_thirdLastReadCommandCounter;
RunModus m_runModus; RunModus m_runModus;
int m_synchronizeId; int m_synchronizeId;
QTime m_benchmarkTimer;
}; };
} // namespace QmlDesigner } // namespace QmlDesigner

6
src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
View File

@@ -1129,6 +1129,8 @@ void NodeInstanceView::pixmapChanged(const PixmapChangedCommand &command)
} }
} }
m_nodeInstanceServer->benchmark(Q_FUNC_INFO + QString::number(renderImageChangeSet.count()));
if (!renderImageChangeSet.isEmpty()) if (!renderImageChangeSet.isEmpty())
emitInstancesRenderImageChanged(renderImageChangeSet.toList().toVector()); emitInstancesRenderImageChanged(renderImageChangeSet.toList().toVector());
} }
@@ -1158,6 +1160,8 @@ void NodeInstanceView::informationChanged(const InformationChangedCommand &comma
QMultiHash<ModelNode, InformationName> informationChangeHash = informationChanged(command.informations()); QMultiHash<ModelNode, InformationName> informationChangeHash = informationChanged(command.informations());
m_nodeInstanceServer->benchmark(Q_FUNC_INFO + QString::number(informationChangeHash.count()));
if (!informationChangeHash.isEmpty()) if (!informationChangeHash.isEmpty())
emitInstanceInformationsChange(informationChangeHash); emitInstanceInformationsChange(informationChangeHash);
} }
@@ -1222,6 +1226,8 @@ void NodeInstanceView::componentCompleted(const ComponentCompletedCommand &comma
nodeVector.append(modelNodeForInternalId(instanceId)); nodeVector.append(modelNodeForInternalId(instanceId));
} }
m_nodeInstanceServer->benchmark(Q_FUNC_INFO + QString::number(nodeVector.count()));
if (!nodeVector.isEmpty()) if (!nodeVector.isEmpty())
emitInstancesCompleted(nodeVector); emitInstancesCompleted(nodeVector);
} }