diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/debugger/debugger.pri | 4 | ||||
-rw-r--r-- | src/qml/debugger/qv4profilerservice.cpp (renamed from src/qml/debugger/qv8profilerservice.cpp) | 79 | ||||
-rw-r--r-- | src/qml/debugger/qv4profilerservice_p.h (renamed from src/qml/debugger/qv8profilerservice_p.h) | 34 | ||||
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 6 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8profiler_p.h | 42 | ||||
-rw-r--r-- | src/qml/qml/v8/v8.pri | 1 |
7 files changed, 63 insertions, 107 deletions
diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri index c10f43c8c9..16785c48e3 100644 --- a/src/qml/debugger/debugger.pri +++ b/src/qml/debugger/debugger.pri @@ -3,7 +3,7 @@ SOURCES += \ $$PWD/qqmlprofilerservice.cpp \ $$PWD/qqmldebugserver.cpp \ $$PWD/qqmlinspectorservice.cpp \ - $$PWD/qv8profilerservice.cpp \ + $$PWD/qv4profilerservice.cpp \ $$PWD/qqmlenginedebugservice.cpp \ $$PWD/qdebugmessageservice.cpp \ $$PWD/qv4debugservice.cpp @@ -17,7 +17,7 @@ HEADERS += \ $$PWD/qqmldebugstatesdelegate_p.h \ $$PWD/qqmlinspectorservice_p.h \ $$PWD/qqmlinspectorinterface_p.h \ - $$PWD/qv8profilerservice_p.h \ + $$PWD/qv4profilerservice_p.h \ $$PWD/qqmlenginedebugservice_p.h \ $$PWD/qqmldebug.h \ $$PWD/qdebugmessageservice_p.h \ diff --git a/src/qml/debugger/qv8profilerservice.cpp b/src/qml/debugger/qv4profilerservice.cpp index 7b9331da66..50bec8ec25 100644 --- a/src/qml/debugger/qv8profilerservice.cpp +++ b/src/qml/debugger/qv4profilerservice.cpp @@ -39,9 +39,8 @@ ** ****************************************************************************/ -#include "qv8profilerservice_p.h" +#include "qv4profilerservice_p.h" #include "qqmldebugservice_p_p.h" -#include <private/qv8profiler_p.h> #include <QtCore/QHash> #include <QtCore/QMutex> @@ -49,7 +48,7 @@ QT_BEGIN_NAMESPACE -Q_GLOBAL_STATIC(QV8ProfilerService, v8ProfilerInstance) +Q_GLOBAL_STATIC(QV4ProfilerService, v4ProfilerInstance) #if 0 // ### FIXME: v4 @@ -63,7 +62,7 @@ public: { QByteArray data; QQmlDebugStream ds(&data, QIODevice::WriteOnly); - ds << QV8ProfilerService::V8SnapshotChunk << QByteArray(rawData, size); + ds << QV4ProfilerService::V4SnapshotChunk << QByteArray(rawData, size); messages.append(data); return kContinue; } @@ -72,7 +71,7 @@ public: #endif // convert to a QByteArray that can be sent to the debug client -QByteArray QV8ProfilerData::toByteArray() const +QByteArray QV4ProfilerData::toByteArray() const { QByteArray data; //### using QDataStream is relatively expensive @@ -82,12 +81,12 @@ QByteArray QV8ProfilerData::toByteArray() const return data; } -class QV8ProfilerServicePrivate : public QQmlDebugServicePrivate +class QV4ProfilerServicePrivate : public QQmlDebugServicePrivate { - Q_DECLARE_PUBLIC(QV8ProfilerService) + Q_DECLARE_PUBLIC(QV4ProfilerService) public: - QV8ProfilerServicePrivate() + QV4ProfilerServicePrivate() :initialized(false) { } @@ -97,7 +96,7 @@ public: // void printProfileTree(const v8::CpuProfileNode *node, int level = 0); // void sendMessages(); - QList<QV8ProfilerData> m_data; + QList<QV4ProfilerData> m_data; bool initialized; QMutex initializeMutex; @@ -105,10 +104,10 @@ public: QList<QString> m_ongoing; }; -QV8ProfilerService::QV8ProfilerService(QObject *parent) - : QQmlDebugService(*(new QV8ProfilerServicePrivate()), QStringLiteral("V8Profiler"), 1, parent) +QV4ProfilerService::QV4ProfilerService(QObject *parent) + : QQmlDebugService(*(new QV4ProfilerServicePrivate()), QStringLiteral("V8Profiler"), 1, parent) { - Q_D(QV8ProfilerService); + Q_D(QV4ProfilerService); QMutexLocker lock(&d->initializeMutex); @@ -119,24 +118,24 @@ QV8ProfilerService::QV8ProfilerService(QObject *parent) } } -QV8ProfilerService::~QV8ProfilerService() +QV4ProfilerService::~QV4ProfilerService() { } -QV8ProfilerService *QV8ProfilerService::instance() +QV4ProfilerService *QV4ProfilerService::instance() { - return v8ProfilerInstance(); + return v4ProfilerInstance(); } -void QV8ProfilerService::initialize() +void QV4ProfilerService::initialize() { // just make sure that the service is properly registered - v8ProfilerInstance(); + v4ProfilerInstance(); } -void QV8ProfilerService::stateAboutToBeChanged(QQmlDebugService::State newState) +void QV4ProfilerService::stateAboutToBeChanged(QQmlDebugService::State newState) { - Q_D(QV8ProfilerService); + Q_D(QV4ProfilerService); if (state() == newState) return; @@ -154,9 +153,9 @@ void QV8ProfilerService::stateAboutToBeChanged(QQmlDebugService::State newState) } } -void QV8ProfilerService::messageReceived(const QByteArray &message) +void QV4ProfilerService::messageReceived(const QByteArray &message) { - Q_D(QV8ProfilerService); + Q_D(QV4ProfilerService); QQmlDebugStream ds(message); QByteArray command; @@ -192,9 +191,9 @@ void QV8ProfilerService::messageReceived(const QByteArray &message) QQmlDebugService::messageReceived(message); } -void QV8ProfilerService::startProfiling(const QString &title) +void QV4ProfilerService::startProfiling(const QString &title) { - Q_D(QV8ProfilerService); + Q_D(QV4ProfilerService); // Start Profiling if (d->m_ongoing.contains(title)) @@ -209,14 +208,14 @@ void QV8ProfilerService::startProfiling(const QString &title) // indicate profiling started QByteArray data; QQmlDebugStream ds(&data, QIODevice::WriteOnly); - ds << (int)QV8ProfilerService::V8Started; + ds << (int)QV4ProfilerService::V4Started; sendMessage(data); } -void QV8ProfilerService::stopProfiling(const QString &title) +void QV4ProfilerService::stopProfiling(const QString &title) { - Q_D(QV8ProfilerService); + Q_D(QV4ProfilerService); // Stop profiling if (!d->m_ongoing.contains(title)) @@ -237,7 +236,7 @@ void QV8ProfilerService::stopProfiling(const QString &title) // indicate completion, even without data QByteArray data; QQmlDebugStream ds(&data, QIODevice::WriteOnly); - ds << (int)QV8ProfilerService::V8Complete; + ds << (int)QV4ProfilerService::V4Complete; sendMessage(data); #if 0 @@ -245,22 +244,22 @@ void QV8ProfilerService::stopProfiling(const QString &title) #endif } -void QV8ProfilerService::takeSnapshot() +void QV4ProfilerService::takeSnapshot() { -// Q_D(QV8ProfilerService); +// Q_D(QV4ProfilerService); // ### FIXME: v4 // d->takeSnapshot(v8::HeapSnapshot::kFull); } -void QV8ProfilerService::deleteSnapshots() +void QV4ProfilerService::deleteSnapshots() { // ### FIXME: v4 // v8::HeapProfiler::DeleteAllSnapshots(); } -void QV8ProfilerService::sendProfilingData() +void QV4ProfilerService::sendProfilingData() { -// Q_D(QV8ProfilerService); +// Q_D(QV4ProfilerService); // Send messages to client // ### FIXME: v4 // d->sendMessages(); @@ -268,14 +267,14 @@ void QV8ProfilerService::sendProfilingData() #if 0 // ### FIXME: v4 -void QV8ProfilerServicePrivate::printProfileTree(const v8::CpuProfileNode *node, int level) +void QV4ProfilerServicePrivate::printProfileTree(const v8::CpuProfileNode *node, int level) { for (int index = 0 ; index < node->GetChildrenCount() ; index++) { const v8::CpuProfileNode* childNode = node->GetChild(index); QString scriptResourceName = QJSConverter::toString(childNode->GetScriptResourceName()); if (scriptResourceName.length() > 0) { - QV8ProfilerData rd = {(int)QV8ProfilerService::V8Entry, scriptResourceName, + QV4ProfilerData rd = {(int)QV4ProfilerService::V4Entry, scriptResourceName, QJSConverter::toString(childNode->GetFunctionName()), childNode->GetLineNumber(), childNode->GetTotalTime(), childNode->GetSelfTime(), level}; m_data.append(rd); @@ -288,9 +287,9 @@ void QV8ProfilerServicePrivate::printProfileTree(const v8::CpuProfileNode *node, } } -void QV8ProfilerServicePrivate::takeSnapshot(v8::HeapSnapshot::Type snapshotType) +void QV4ProfilerServicePrivate::takeSnapshot(v8::HeapSnapshot::Type snapshotType) { - Q_Q(QV8ProfilerService); + Q_Q(QV4ProfilerService); v8::HandleScope scope; v8::Handle<v8::String> title = v8::String::New(""); @@ -303,15 +302,15 @@ void QV8ProfilerServicePrivate::takeSnapshot(v8::HeapSnapshot::Type snapshotType //indicate completion QByteArray data; QQmlDebugStream ds(&data, QIODevice::WriteOnly); - ds << (int)QV8ProfilerService::V8SnapshotComplete; + ds << (int)QV4ProfilerService::V4SnapshotComplete; messages.append(data); q->sendMessages(messages); } -void QV8ProfilerServicePrivate::sendMessages() +void QV4ProfilerServicePrivate::sendMessages() { - Q_Q(QV8ProfilerService); + Q_Q(QV4ProfilerService); QList<QByteArray> messages; for (int i = 0; i < m_data.count(); ++i) @@ -321,7 +320,7 @@ void QV8ProfilerServicePrivate::sendMessages() //indicate completion QByteArray data; QQmlDebugStream ds(&data, QIODevice::WriteOnly); - ds << (int)QV8ProfilerService::V8Complete; + ds << (int)QV4ProfilerService::V4Complete; messages.append(data); q->sendMessages(messages); diff --git a/src/qml/debugger/qv8profilerservice_p.h b/src/qml/debugger/qv4profilerservice_p.h index 60dc70f4db..252c154a68 100644 --- a/src/qml/debugger/qv8profilerservice_p.h +++ b/src/qml/debugger/qv4profilerservice_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QV8PROFILERSERVICE_P_H -#define QV8PROFILERSERVICE_P_H +#ifndef QV4PROFILERSERVICE_P_H +#define QV4PROFILERSERVICE_P_H // // W A R N I N G @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE -struct Q_AUTOTEST_EXPORT QV8ProfilerData +struct Q_AUTOTEST_EXPORT QV4ProfilerData { int messageType; QString filename; @@ -72,26 +72,26 @@ struct Q_AUTOTEST_EXPORT QV8ProfilerData }; class QQmlEngine; -class QV8ProfilerServicePrivate; +class QV4ProfilerServicePrivate; -class Q_AUTOTEST_EXPORT QV8ProfilerService : public QQmlDebugService +class Q_AUTOTEST_EXPORT QV4ProfilerService : public QQmlDebugService { Q_OBJECT public: enum MessageType { - V8Entry, - V8Complete, - V8SnapshotChunk, - V8SnapshotComplete, - V8Started, + V4Entry, + V4Complete, + V4SnapshotChunk, + V4SnapshotComplete, + V4Started, - V8MaximumMessage + V4MaximumMessage }; - QV8ProfilerService(QObject *parent = 0); - ~QV8ProfilerService(); + QV4ProfilerService(QObject *parent = 0); + ~QV4ProfilerService(); - static QV8ProfilerService *instance(); + static QV4ProfilerService *instance(); static void initialize(); public Q_SLOTS: @@ -107,10 +107,10 @@ protected: void messageReceived(const QByteArray &); private: - Q_DISABLE_COPY(QV8ProfilerService) - Q_DECLARE_PRIVATE(QV8ProfilerService) + Q_DISABLE_COPY(QV4ProfilerService) + Q_DECLARE_PRIVATE(QV4ProfilerService) }; QT_END_NAMESPACE -#endif // QV8PROFILERSERVICE_P_H +#endif // QV4PROFILERSERVICE_P_H diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 205034dfbb..965741241a 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -67,7 +67,7 @@ #include <private/qdebugmessageservice_p.h> #include "qqmlincubator.h" #include "qqmlabstracturlinterceptor.h" -#include <private/qv8profilerservice_p.h> +#include <private/qv4profilerservice_p.h> #include <private/qqmlboundsignal_p.h> #include <QtCore/qstandardpaths.h> @@ -815,7 +815,7 @@ void QQmlEnginePrivate::init() isDebugging = true; QQmlEngineDebugService::instance()->addEngine(q); QV4DebugService::instance()->addEngine(q); - QV8ProfilerService::initialize(); + QV4ProfilerService::initialize(); QQmlProfilerService::initialize(); QDebugMessageService::instance(); } diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 972e8cf2e3..26ef86836c 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -48,7 +48,7 @@ #include <private/qqmllocale_p.h> #include <private/qv8engine_p.h> -#include <private/qv8profilerservice_p.h> +#include <private/qv4profilerservice_p.h> #include <private/qqmlprofilerservice_p.h> #include <private/qqmlglobal_p.h> @@ -1435,7 +1435,7 @@ QV4::ReturnedValue ConsoleObject::method_profile(CallContext *ctx) if (!QQmlDebugService::isDebuggingEnabled()) { logger.warning("Cannot start profiling because debug service is disabled. Start with -qmljsdebugger=port:XXXXX."); } else if (QQmlProfilerService::startProfiling()) { - QV8ProfilerService::instance()->startProfiling(title); + QV4ProfilerService::instance()->startProfiling(title); logger.debug("Profiling started."); } else { @@ -1460,7 +1460,7 @@ QV4::ReturnedValue ConsoleObject::method_profileEnd(CallContext *ctx) QMessageLogger logger(baSource.constData(), frame.line, baFunction.constData()); if (QQmlProfilerService::stopProfiling()) { - QV8ProfilerService *profiler = QV8ProfilerService::instance(); + QV4ProfilerService *profiler = QV4ProfilerService::instance(); profiler->stopProfiling(title); QQmlProfilerService::sendProfilingData(); profiler->sendProfilingData(); diff --git a/src/qml/qml/v8/qv8profiler_p.h b/src/qml/qml/v8/qv8profiler_p.h deleted file mode 100644 index 39a87f2156..0000000000 --- a/src/qml/qml/v8/qv8profiler_p.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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. -** -** 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. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//#include <private/v8-profiler.h> diff --git a/src/qml/qml/v8/v8.pri b/src/qml/qml/v8/v8.pri index 2480848514..b4eb706574 100644 --- a/src/qml/qml/v8/v8.pri +++ b/src/qml/qml/v8/v8.pri @@ -1,6 +1,5 @@ HEADERS += \ $$PWD/qv8debug_p.h \ - $$PWD/qv8profiler_p.h \ $$PWD/qv8engine_p.h \ $$PWD/qv4domerrors_p.h \ $$PWD/qv4sqlerrors_p.h \ |