From ebb65bc084d44cfc96efb29abf0607616095f757 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 2 Feb 2012 12:06:06 +0100 Subject: Debugger: Rename QDeclarativeDebugTrace to QDeclarativeProfilerService This avoids naming confusion with QDeclarativeTrace + makes it in line with QV8ProfilerService. Change-Id: Ifd801655044cff3ffdb2a9695ffc9868eeb51663 Reviewed-by: Christiaan Janssen --- src/declarative/debugger/debugger.pri | 4 +- .../debugger/qdeclarativedebugtrace.cpp | 343 --------------------- .../debugger/qdeclarativedebugtrace_p.h | 181 ----------- .../debugger/qdeclarativeprofilerservice.cpp | 343 +++++++++++++++++++++ .../debugger/qdeclarativeprofilerservice_p.h | 181 +++++++++++ 5 files changed, 526 insertions(+), 526 deletions(-) delete mode 100644 src/declarative/debugger/qdeclarativedebugtrace.cpp delete mode 100644 src/declarative/debugger/qdeclarativedebugtrace_p.h create mode 100644 src/declarative/debugger/qdeclarativeprofilerservice.cpp create mode 100644 src/declarative/debugger/qdeclarativeprofilerservice_p.h (limited to 'src/declarative/debugger') diff --git a/src/declarative/debugger/debugger.pri b/src/declarative/debugger/debugger.pri index 34e88ae1b5..8e29e9fdf6 100644 --- a/src/declarative/debugger/debugger.pri +++ b/src/declarative/debugger/debugger.pri @@ -3,7 +3,7 @@ SOURCES += \ $$PWD/qdeclarativedebugservice.cpp \ $$PWD/qdeclarativedebugclient.cpp \ $$PWD/qdeclarativeenginedebug.cpp \ - $$PWD/qdeclarativedebugtrace.cpp \ + $$PWD/qdeclarativeprofilerservice.cpp \ $$PWD/qdeclarativedebughelper.cpp \ $$PWD/qdeclarativedebugserver.cpp \ $$PWD/qdeclarativeinspectorservice.cpp \ @@ -18,7 +18,7 @@ HEADERS += \ $$PWD/qdeclarativedebugservice_p_p.h \ $$PWD/qdeclarativedebugclient_p.h \ $$PWD/qdeclarativeenginedebug_p.h \ - $$PWD/qdeclarativedebugtrace_p.h \ + $$PWD/qdeclarativeprofilerservice_p.h \ $$PWD/qdeclarativedebughelper_p.h \ $$PWD/qdeclarativedebugserver_p.h \ $$PWD/qdeclarativedebugserverconnection_p.h \ diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp deleted file mode 100644 index 3c718604d8..0000000000 --- a/src/declarative/debugger/qdeclarativedebugtrace.cpp +++ /dev/null @@ -1,343 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qdeclarativedebugtrace_p.h" - -#include -#include -#include -#include -#include - -// this contains QUnifiedTimer -#include - -QT_BEGIN_NAMESPACE - -Q_GLOBAL_STATIC(QDeclarativeDebugTrace, traceInstance) - -QDeclarativeBindingProfiler::QDeclarativeBindingProfiler(const QString &url, int line, int column) -{ - QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::Binding); - QDeclarativeDebugTrace::rangeLocation(QDeclarativeDebugTrace::Binding, url, line, column); -} - -QDeclarativeBindingProfiler::~QDeclarativeBindingProfiler() -{ - QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::Binding); -} - -void QDeclarativeBindingProfiler::addDetail(const QString &details) -{ - QDeclarativeDebugTrace::rangeData(QDeclarativeDebugTrace::Binding, details); -} - -// convert to a QByteArray that can be sent to the debug client -// use of QDataStream can skew results -// (see tst_qdeclarativedebugtrace::trace() benchmark) -QByteArray QDeclarativeDebugData::toByteArray() const -{ - QByteArray data; - //### using QDataStream is relatively expensive - QDataStream ds(&data, QIODevice::WriteOnly); - ds << time << messageType << detailType; - if (messageType == (int)QDeclarativeDebugTrace::RangeData) - ds << detailData; - if (messageType == (int)QDeclarativeDebugTrace::RangeLocation) - ds << detailData << line << column; - if (messageType == (int)QDeclarativeDebugTrace::Event && - detailType == (int)QDeclarativeDebugTrace::AnimationFrame) - ds << framerate << animationcount; - return data; -} - -QDeclarativeDebugTrace::QDeclarativeDebugTrace() - : QDeclarativeDebugService(QLatin1String("CanvasFrameRate"), 1), - m_enabled(false), m_messageReceived(false) -{ - m_timer.start(); - - if (registerService() == Enabled) { - // wait for first message indicating whether to trace or not - while (!m_messageReceived) - waitForMessage(); - - QUnifiedTimer::instance()->registerProfilerCallback( &animationFrame ); - } -} - -QDeclarativeDebugTrace::~QDeclarativeDebugTrace() -{ -} - -void QDeclarativeDebugTrace::initialize() -{ - // just make sure that the service is properly registered - traceInstance(); -} - -bool QDeclarativeDebugTrace::startProfiling() -{ - return traceInstance()->startProfilingImpl(); -} - -bool QDeclarativeDebugTrace::stopProfiling() -{ - return traceInstance()->stopProfilingImpl(); -} - -void QDeclarativeDebugTrace::addEvent(EventType t) -{ - traceInstance()->addEventImpl(t); -} - -void QDeclarativeDebugTrace::startRange(RangeType t) -{ - traceInstance()->startRangeImpl(t); -} - -void QDeclarativeDebugTrace::rangeData(RangeType t, const QString &data) -{ - traceInstance()->rangeDataImpl(t, data); -} - -void QDeclarativeDebugTrace::rangeData(RangeType t, const QUrl &data) -{ - traceInstance()->rangeDataImpl(t, data); -} - -void QDeclarativeDebugTrace::rangeLocation(RangeType t, const QString &fileName, int line, int column) -{ - traceInstance()->rangeLocationImpl(t, fileName, line, column); -} - -void QDeclarativeDebugTrace::rangeLocation(RangeType t, const QUrl &fileName, int line, int column) -{ - traceInstance()->rangeLocationImpl(t, fileName, line, column); -} - -void QDeclarativeDebugTrace::endRange(RangeType t) -{ - traceInstance()->endRangeImpl(t); -} - -void QDeclarativeDebugTrace::animationFrame(qint64 delta) -{ - traceInstance()->animationFrameImpl(delta); -} - -void QDeclarativeDebugTrace::sendProfilingData() -{ - traceInstance()->sendMessages(); -} - -bool QDeclarativeDebugTrace::startProfilingImpl() -{ - bool success = false; - if (!profilingEnabled()) { - setProfilingEnabled(true); - addEventImpl(StartTrace); - success = true; - } - return success; -} - -bool QDeclarativeDebugTrace::stopProfilingImpl() -{ - bool success = false; - if (profilingEnabled()) { - addEventImpl(EndTrace); - setProfilingEnabled(false); - success = true; - } - return success; -} - -void QDeclarativeDebugTrace::addEventImpl(EventType event) -{ - if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) - return; - - QDeclarativeDebugData ed = {m_timer.nsecsElapsed(), (int)Event, (int)event, QString(), -1, -1, 0, 0}; - processMessage(ed); -} - -void QDeclarativeDebugTrace::startRangeImpl(RangeType range) -{ - if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) - return; - - QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeStart, (int)range, QString(), -1, -1, 0, 0}; - processMessage(rd); -} - -void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QString &rData) -{ - if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) - return; - - QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData, -1, -1, 0, 0}; - processMessage(rd); -} - -void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QUrl &rData) -{ - if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) - return; - - QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData.toString(QUrl::FormattingOption(0x100)), -1, -1, 0, 0}; - processMessage(rd); -} - -void QDeclarativeDebugTrace::rangeLocationImpl(RangeType range, const QString &fileName, int line, int column) -{ - if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) - return; - - QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName, line, column, 0, 0}; - processMessage(rd); -} - -void QDeclarativeDebugTrace::rangeLocationImpl(RangeType range, const QUrl &fileName, int line, int column) -{ - if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) - return; - - QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName.toString(QUrl::FormattingOption(0x100)), line, column, 0, 0}; - processMessage(rd); -} - -void QDeclarativeDebugTrace::endRangeImpl(RangeType range) -{ - if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) - return; - - QDeclarativeDebugData rd = {m_timer.nsecsElapsed(), (int)RangeEnd, (int)range, QString(), -1, -1, 0, 0}; - processMessage(rd); -} - -void QDeclarativeDebugTrace::animationFrameImpl(qint64 delta) -{ - Q_ASSERT(QDeclarativeDebugService::isDebuggingEnabled()); - if (!m_enabled) - return; - - int animCount = QUnifiedTimer::instance()->runningAnimationCount(); - - if (animCount > 0 && delta > 0) { - // trim fps to integer - int fps = 1000 / delta; - QDeclarativeDebugData ed = {m_timer.nsecsElapsed(), (int)Event, (int)AnimationFrame, QString(), -1, -1, fps, animCount}; - processMessage(ed); - } -} - -/* - Either send the message directly, or queue up - a list of messages to send later (via sendMessages) -*/ -void QDeclarativeDebugTrace::processMessage(const QDeclarativeDebugData &message) -{ - QMutexLocker locker(&m_mutex); - m_data.append(message); -} - -bool QDeclarativeDebugTrace::profilingEnabled() -{ - return m_enabled; -} - -void QDeclarativeDebugTrace::setProfilingEnabled(bool enable) -{ - m_enabled = enable; -} - -/* - Send the messages queued up by processMessage -*/ -void QDeclarativeDebugTrace::sendMessages() -{ - QMutexLocker locker(&m_mutex); - QList messages; - for (int i = 0; i < m_data.count(); ++i) - messages << m_data.at(i).toByteArray(); - m_data.clear(); - - //indicate completion - QByteArray data; - QDataStream ds(&data, QIODevice::WriteOnly); - ds << (qint64)-1 << (int)Complete; - messages << data; - - QDeclarativeDebugService::sendMessages(messages); -} - -void QDeclarativeDebugTrace::stateAboutToBeChanged(QDeclarativeDebugService::State newState) -{ - if (state() == newState) - return; - - if (state() == Enabled - && m_enabled) { - stopProfilingImpl(); - sendMessages(); - } -} - -void QDeclarativeDebugTrace::messageReceived(const QByteArray &message) -{ - QByteArray rwData = message; - QDataStream stream(&rwData, QIODevice::ReadOnly); - - bool enabled; - stream >> enabled; - - m_messageReceived = true; - - if (enabled) { - startProfilingImpl(); - } else { - if (stopProfilingImpl()) - sendMessages(); - } -} - -QT_END_NAMESPACE diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativedebugtrace_p.h deleted file mode 100644 index 7e2db4dbad..0000000000 --- a/src/declarative/debugger/qdeclarativedebugtrace_p.h +++ /dev/null @@ -1,181 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QDECLARATIVEDEBUGTRACE_P_H -#define QDECLARATIVEDEBUGTRACE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include -#include -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -struct Q_AUTOTEST_EXPORT QDeclarativeDebugData -{ - qint64 time; - int messageType; - int detailType; - - //### - QString detailData; //used by RangeData and RangeLocation - int line; //used by RangeLocation - int column; //used by RangeLocation - int framerate; //used by animation events - int animationcount; //used by animation events - - QByteArray toByteArray() const; -}; - -Q_DECLARE_TYPEINFO(QDeclarativeDebugData, Q_MOVABLE_TYPE); - -class QUrl; -class QDeclarativeEngine; - -// RAII -class Q_AUTOTEST_EXPORT QDeclarativeBindingProfiler { -public: - QDeclarativeBindingProfiler(const QString &url, int line, int column); - ~QDeclarativeBindingProfiler(); - void addDetail(const QString &details); -}; - -class Q_DECLARATIVE_EXPORT QDeclarativeDebugTrace : public QDeclarativeDebugService -{ -public: - enum Message { - Event, - RangeStart, - RangeData, - RangeLocation, - RangeEnd, - Complete, // end of transmission - - MaximumMessage - }; - - enum EventType { - FramePaint, - Mouse, - Key, - AnimationFrame, - EndTrace, - StartTrace, - - MaximumEventType - }; - - enum RangeType { - Painting, - Compiling, - Creating, - Binding, //running a binding - HandlingSignal, //running a signal handler - - MaximumRangeType - }; - - static void initialize(); - - static bool startProfiling(); - static bool stopProfiling(); - static void addEvent(EventType); - static void startRange(RangeType); - static void rangeData(RangeType, const QString &); - static void rangeData(RangeType, const QUrl &); - static void rangeLocation(RangeType, const QString &, int, int); - static void rangeLocation(RangeType, const QUrl &, int, int); - static void endRange(RangeType); - static void animationFrame(qint64); - - static void sendProfilingData(); - - QDeclarativeDebugTrace(); - ~QDeclarativeDebugTrace(); - -protected: - virtual void stateAboutToBeChanged(State state); - virtual void messageReceived(const QByteArray &); - -private: - bool startProfilingImpl(); - bool stopProfilingImpl(); - void addEventImpl(EventType); - void startRangeImpl(RangeType); - void rangeDataImpl(RangeType, const QString &); - void rangeDataImpl(RangeType, const QUrl &); - void rangeLocationImpl(RangeType, const QString &, int, int); - void rangeLocationImpl(RangeType, const QUrl &, int, int); - void endRangeImpl(RangeType); - void animationFrameImpl(qint64); - - bool profilingEnabled(); - void setProfilingEnabled(bool enable); - void sendMessages(); - void processMessage(const QDeclarativeDebugData &); - -private: - QElapsedTimer m_timer; - bool m_enabled; - bool m_messageReceived; - QVector m_data; - QMutex m_mutex; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QDECLARATIVEDEBUGTRACE_P_H - diff --git a/src/declarative/debugger/qdeclarativeprofilerservice.cpp b/src/declarative/debugger/qdeclarativeprofilerservice.cpp new file mode 100644 index 0000000000..c5b6b65031 --- /dev/null +++ b/src/declarative/debugger/qdeclarativeprofilerservice.cpp @@ -0,0 +1,343 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qdeclarativeprofilerservice_p.h" + +#include +#include +#include +#include +#include + +// this contains QUnifiedTimer +#include + +QT_BEGIN_NAMESPACE + +Q_GLOBAL_STATIC(QDeclarativeProfilerService, profilerInstance) + +QDeclarativeBindingProfiler::QDeclarativeBindingProfiler(const QString &url, int line, int column) +{ + QDeclarativeProfilerService::startRange(QDeclarativeProfilerService::Binding); + QDeclarativeProfilerService::rangeLocation(QDeclarativeProfilerService::Binding, url, line, column); +} + +QDeclarativeBindingProfiler::~QDeclarativeBindingProfiler() +{ + QDeclarativeProfilerService::endRange(QDeclarativeProfilerService::Binding); +} + +void QDeclarativeBindingProfiler::addDetail(const QString &details) +{ + QDeclarativeProfilerService::rangeData(QDeclarativeProfilerService::Binding, details); +} + +// convert to a QByteArray that can be sent to the debug client +// use of QDataStream can skew results +// (see tst_qdeclarativedebugtrace::trace() benchmark) +QByteArray QDeclarativeProfilerData::toByteArray() const +{ + QByteArray data; + //### using QDataStream is relatively expensive + QDataStream ds(&data, QIODevice::WriteOnly); + ds << time << messageType << detailType; + if (messageType == (int)QDeclarativeProfilerService::RangeData) + ds << detailData; + if (messageType == (int)QDeclarativeProfilerService::RangeLocation) + ds << detailData << line << column; + if (messageType == (int)QDeclarativeProfilerService::Event && + detailType == (int)QDeclarativeProfilerService::AnimationFrame) + ds << framerate << animationcount; + return data; +} + +QDeclarativeProfilerService::QDeclarativeProfilerService() + : QDeclarativeDebugService(QLatin1String("CanvasFrameRate"), 1), + m_enabled(false), m_messageReceived(false) +{ + m_timer.start(); + + if (registerService() == Enabled) { + // wait for first message indicating whether to trace or not + while (!m_messageReceived) + waitForMessage(); + + QUnifiedTimer::instance()->registerProfilerCallback( &animationFrame ); + } +} + +QDeclarativeProfilerService::~QDeclarativeProfilerService() +{ +} + +void QDeclarativeProfilerService::initialize() +{ + // just make sure that the service is properly registered + profilerInstance(); +} + +bool QDeclarativeProfilerService::startProfiling() +{ + return profilerInstance()->startProfilingImpl(); +} + +bool QDeclarativeProfilerService::stopProfiling() +{ + return profilerInstance()->stopProfilingImpl(); +} + +void QDeclarativeProfilerService::addEvent(EventType t) +{ + profilerInstance()->addEventImpl(t); +} + +void QDeclarativeProfilerService::startRange(RangeType t) +{ + profilerInstance()->startRangeImpl(t); +} + +void QDeclarativeProfilerService::rangeData(RangeType t, const QString &data) +{ + profilerInstance()->rangeDataImpl(t, data); +} + +void QDeclarativeProfilerService::rangeData(RangeType t, const QUrl &data) +{ + profilerInstance()->rangeDataImpl(t, data); +} + +void QDeclarativeProfilerService::rangeLocation(RangeType t, const QString &fileName, int line, int column) +{ + profilerInstance()->rangeLocationImpl(t, fileName, line, column); +} + +void QDeclarativeProfilerService::rangeLocation(RangeType t, const QUrl &fileName, int line, int column) +{ + profilerInstance()->rangeLocationImpl(t, fileName, line, column); +} + +void QDeclarativeProfilerService::endRange(RangeType t) +{ + profilerInstance()->endRangeImpl(t); +} + +void QDeclarativeProfilerService::animationFrame(qint64 delta) +{ + profilerInstance()->animationFrameImpl(delta); +} + +void QDeclarativeProfilerService::sendProfilingData() +{ + profilerInstance()->sendMessages(); +} + +bool QDeclarativeProfilerService::startProfilingImpl() +{ + bool success = false; + if (!profilingEnabled()) { + setProfilingEnabled(true); + addEventImpl(StartTrace); + success = true; + } + return success; +} + +bool QDeclarativeProfilerService::stopProfilingImpl() +{ + bool success = false; + if (profilingEnabled()) { + addEventImpl(EndTrace); + setProfilingEnabled(false); + success = true; + } + return success; +} + +void QDeclarativeProfilerService::addEventImpl(EventType event) +{ + if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) + return; + + QDeclarativeProfilerData ed = {m_timer.nsecsElapsed(), (int)Event, (int)event, QString(), -1, -1, 0, 0}; + processMessage(ed); +} + +void QDeclarativeProfilerService::startRangeImpl(RangeType range) +{ + if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) + return; + + QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeStart, (int)range, QString(), -1, -1, 0, 0}; + processMessage(rd); +} + +void QDeclarativeProfilerService::rangeDataImpl(RangeType range, const QString &rData) +{ + if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) + return; + + QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData, -1, -1, 0, 0}; + processMessage(rd); +} + +void QDeclarativeProfilerService::rangeDataImpl(RangeType range, const QUrl &rData) +{ + if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) + return; + + QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData.toString(QUrl::FormattingOption(0x100)), -1, -1, 0, 0}; + processMessage(rd); +} + +void QDeclarativeProfilerService::rangeLocationImpl(RangeType range, const QString &fileName, int line, int column) +{ + if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) + return; + + QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName, line, column, 0, 0}; + processMessage(rd); +} + +void QDeclarativeProfilerService::rangeLocationImpl(RangeType range, const QUrl &fileName, int line, int column) +{ + if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) + return; + + QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName.toString(QUrl::FormattingOption(0x100)), line, column, 0, 0}; + processMessage(rd); +} + +void QDeclarativeProfilerService::endRangeImpl(RangeType range) +{ + if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled) + return; + + QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeEnd, (int)range, QString(), -1, -1, 0, 0}; + processMessage(rd); +} + +void QDeclarativeProfilerService::animationFrameImpl(qint64 delta) +{ + Q_ASSERT(QDeclarativeDebugService::isDebuggingEnabled()); + if (!m_enabled) + return; + + int animCount = QUnifiedTimer::instance()->runningAnimationCount(); + + if (animCount > 0 && delta > 0) { + // trim fps to integer + int fps = 1000 / delta; + QDeclarativeProfilerData ed = {m_timer.nsecsElapsed(), (int)Event, (int)AnimationFrame, QString(), -1, -1, fps, animCount}; + processMessage(ed); + } +} + +/* + Either send the message directly, or queue up + a list of messages to send later (via sendMessages) +*/ +void QDeclarativeProfilerService::processMessage(const QDeclarativeProfilerData &message) +{ + QMutexLocker locker(&m_mutex); + m_data.append(message); +} + +bool QDeclarativeProfilerService::profilingEnabled() +{ + return m_enabled; +} + +void QDeclarativeProfilerService::setProfilingEnabled(bool enable) +{ + m_enabled = enable; +} + +/* + Send the messages queued up by processMessage +*/ +void QDeclarativeProfilerService::sendMessages() +{ + QMutexLocker locker(&m_mutex); + QList messages; + for (int i = 0; i < m_data.count(); ++i) + messages << m_data.at(i).toByteArray(); + m_data.clear(); + + //indicate completion + QByteArray data; + QDataStream ds(&data, QIODevice::WriteOnly); + ds << (qint64)-1 << (int)Complete; + messages << data; + + QDeclarativeDebugService::sendMessages(messages); +} + +void QDeclarativeProfilerService::stateAboutToBeChanged(QDeclarativeDebugService::State newState) +{ + if (state() == newState) + return; + + if (state() == Enabled + && m_enabled) { + stopProfilingImpl(); + sendMessages(); + } +} + +void QDeclarativeProfilerService::messageReceived(const QByteArray &message) +{ + QByteArray rwData = message; + QDataStream stream(&rwData, QIODevice::ReadOnly); + + bool enabled; + stream >> enabled; + + m_messageReceived = true; + + if (enabled) { + startProfilingImpl(); + } else { + if (stopProfilingImpl()) + sendMessages(); + } +} + +QT_END_NAMESPACE diff --git a/src/declarative/debugger/qdeclarativeprofilerservice_p.h b/src/declarative/debugger/qdeclarativeprofilerservice_p.h new file mode 100644 index 0000000000..f5ca8ec294 --- /dev/null +++ b/src/declarative/debugger/qdeclarativeprofilerservice_p.h @@ -0,0 +1,181 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QDECLARATIVEPROFILERSERVICE_P_H +#define QDECLARATIVEPROFILERSERVICE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +struct Q_AUTOTEST_EXPORT QDeclarativeProfilerData +{ + qint64 time; + int messageType; + int detailType; + + //### + QString detailData; //used by RangeData and RangeLocation + int line; //used by RangeLocation + int column; //used by RangeLocation + int framerate; //used by animation events + int animationcount; //used by animation events + + QByteArray toByteArray() const; +}; + +Q_DECLARE_TYPEINFO(QDeclarativeProfilerData, Q_MOVABLE_TYPE); + +class QUrl; +class QDeclarativeEngine; + +// RAII +class Q_AUTOTEST_EXPORT QDeclarativeBindingProfiler { +public: + QDeclarativeBindingProfiler(const QString &url, int line, int column); + ~QDeclarativeBindingProfiler(); + void addDetail(const QString &details); +}; + +class Q_DECLARATIVE_EXPORT QDeclarativeProfilerService : public QDeclarativeDebugService +{ +public: + enum Message { + Event, + RangeStart, + RangeData, + RangeLocation, + RangeEnd, + Complete, // end of transmission + + MaximumMessage + }; + + enum EventType { + FramePaint, + Mouse, + Key, + AnimationFrame, + EndTrace, + StartTrace, + + MaximumEventType + }; + + enum RangeType { + Painting, + Compiling, + Creating, + Binding, //running a binding + HandlingSignal, //running a signal handler + + MaximumRangeType + }; + + static void initialize(); + + static bool startProfiling(); + static bool stopProfiling(); + static void addEvent(EventType); + static void startRange(RangeType); + static void rangeData(RangeType, const QString &); + static void rangeData(RangeType, const QUrl &); + static void rangeLocation(RangeType, const QString &, int, int); + static void rangeLocation(RangeType, const QUrl &, int, int); + static void endRange(RangeType); + static void animationFrame(qint64); + + static void sendProfilingData(); + + QDeclarativeProfilerService(); + ~QDeclarativeProfilerService(); + +protected: + virtual void stateAboutToBeChanged(State state); + virtual void messageReceived(const QByteArray &); + +private: + bool startProfilingImpl(); + bool stopProfilingImpl(); + void addEventImpl(EventType); + void startRangeImpl(RangeType); + void rangeDataImpl(RangeType, const QString &); + void rangeDataImpl(RangeType, const QUrl &); + void rangeLocationImpl(RangeType, const QString &, int, int); + void rangeLocationImpl(RangeType, const QUrl &, int, int); + void endRangeImpl(RangeType); + void animationFrameImpl(qint64); + + bool profilingEnabled(); + void setProfilingEnabled(bool enable); + void sendMessages(); + void processMessage(const QDeclarativeProfilerData &); + +private: + QElapsedTimer m_timer; + bool m_enabled; + bool m_messageReceived; + QVector m_data; + QMutex m_mutex; +}; + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QDECLARATIVEPROFILERSERVICE_P_H + -- cgit v1.2.3