From aae3dd6ee06e94ee366c788ca79c0dde67f426ac Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Fri, 25 Nov 2011 13:34:35 +0100 Subject: [PATCH] DeclarativeDebugServices: Cleanup Code Removed addEngine and removeEngine methods from services that do not use the functions of QDeclarativeEngine. Change-Id: Id2ddcbe8cf5706d1e4ca4b59011c7e3574cfdba8 Reviewed-by: Christiaan Janssen --- .../debugger/qdeclarativedebugtrace.cpp | 9 +----- .../debugger/qdeclarativedebugtrace_p.h | 3 +- src/declarative/debugger/qv8debugservice.cpp | 24 +++------------- src/declarative/debugger/qv8debugservice_p.h | 4 +-- src/declarative/debugger/qv8profilerservice.cpp | 28 +++++-------------- src/declarative/debugger/qv8profilerservice_p.h | 4 +-- src/declarative/qml/qdeclarativeengine.cpp | 9 ++---- 7 files changed, 21 insertions(+), 60 deletions(-) diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp index 661dd55..c28a612 100644 --- a/src/declarative/debugger/qdeclarativedebugtrace.cpp +++ b/src/declarative/debugger/qdeclarativedebugtrace.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -Q_GLOBAL_STATIC(QDeclarativeDebugTrace, traceInstance); +Q_GLOBAL_STATIC(QDeclarativeDebugTrace, traceInstance) // convert to a QByteArray that can be sent to the debug client // use of QDataStream can skew results @@ -92,17 +92,12 @@ QDeclarativeDebugTrace::~QDeclarativeDebugTrace() { } -void QDeclarativeDebugTrace::addEngine(QDeclarativeEngine *) +void QDeclarativeDebugTrace::initialize() { // just make sure that the service is properly registered traceInstance(); } -void QDeclarativeDebugTrace::removeEngine(QDeclarativeEngine *) -{ - -} - void QDeclarativeDebugTrace::addEvent(EventType t) { if (QDeclarativeDebugService::isDebuggingEnabled()) diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativedebugtrace_p.h index 07af000..bcea4d0 100644 --- a/src/declarative/debugger/qdeclarativedebugtrace_p.h +++ b/src/declarative/debugger/qdeclarativedebugtrace_p.h @@ -117,8 +117,7 @@ public: MaximumRangeType }; - static void addEngine(QDeclarativeEngine *engine); - static void removeEngine(QDeclarativeEngine *engine); + static void initialize(); static void addEvent(EventType); diff --git a/src/declarative/debugger/qv8debugservice.cpp b/src/declarative/debugger/qv8debugservice.cpp index 8741dd8..da2389a 100644 --- a/src/declarative/debugger/qv8debugservice.cpp +++ b/src/declarative/debugger/qv8debugservice.cpp @@ -42,11 +42,11 @@ #include "qv8debugservice_p.h" #include "qdeclarativedebugservice_p_p.h" #include -#include #include #include #include +#include #define DEBUGGER_SCRIPT "(function(){"\ "var DebuggerScript = {};"\ @@ -120,8 +120,7 @@ void DebugMessageHandler(const v8::Debug::Message& message) return; } - const QString response(QV8Engine::toStringStatic( - message.GetJSON())); + const QString response(QJSConverter::toString(message.GetJSON())); v8ServiceInstancePtr->debugMessageHandler(response, message.WillStartRunning()); @@ -168,7 +167,6 @@ public: // keep messageReceived() from running until initialize() has finished QMutex initializeMutex; - QList engines; bool isRunning; QHash sourcePath; QHash requestCache; @@ -203,22 +201,10 @@ QV8DebugService *QV8DebugService::instance() return v8ServiceInstance(); } -void QV8DebugService::addEngine(QDeclarativeEngine *engine) +void QV8DebugService::initialize() { - Q_D(QV8DebugService); - Q_ASSERT(engine); - Q_ASSERT(!d->engines.contains(engine)); - - d->engines.append(engine); -} - -void QV8DebugService::removeEngine(QDeclarativeEngine *engine) -{ - Q_D(QV8DebugService); - Q_ASSERT(engine); - Q_ASSERT(d->engines.contains(engine)); - - d->engines.removeAll(engine); + // just make sure that the service is properly registered + v8ServiceInstance(); } void QV8DebugService::debugMessageHandler(const QString &message, bool willStartRunning) diff --git a/src/declarative/debugger/qv8debugservice_p.h b/src/declarative/debugger/qv8debugservice_p.h index 2d06390..754ae53 100644 --- a/src/declarative/debugger/qv8debugservice_p.h +++ b/src/declarative/debugger/qv8debugservice_p.h @@ -73,9 +73,7 @@ public: ~QV8DebugService(); static QV8DebugService *instance(); - - void addEngine(QDeclarativeEngine *); - void removeEngine(QDeclarativeEngine *); + static void initialize(); void debugMessageHandler(const QString &message, bool willStartRunning); diff --git a/src/declarative/debugger/qv8profilerservice.cpp b/src/declarative/debugger/qv8profilerservice.cpp index 279992a..6e844b4 100644 --- a/src/declarative/debugger/qv8profilerservice.cpp +++ b/src/declarative/debugger/qv8profilerservice.cpp @@ -41,7 +41,7 @@ #include "qv8profilerservice_p.h" #include "qdeclarativedebugservice_p_p.h" -#include +#include "private/qjsconverter_impl_p.h" #include #include @@ -96,7 +96,6 @@ public: QList m_data; bool initialized; - QList engines; v8::Isolate *isolate; }; @@ -121,22 +120,10 @@ QV8ProfilerService *QV8ProfilerService::instance() return v8ProfilerInstance(); } -void QV8ProfilerService::addEngine(QDeclarativeEngine *engine) +void QV8ProfilerService::initialize() { - Q_D(QV8ProfilerService); - Q_ASSERT(engine); - Q_ASSERT(!d->engines.contains(engine)); - - d->engines.append(engine); -} - -void QV8ProfilerService::removeEngine(QDeclarativeEngine *engine) -{ - Q_D(QV8ProfilerService); - Q_ASSERT(engine); - Q_ASSERT(d->engines.contains(engine)); - - d->engines.removeOne(engine); + // just make sure that the service is properly registered + v8ProfilerInstance(); } void QV8ProfilerService::messageReceived(const QByteArray &message) @@ -212,10 +199,11 @@ void QV8ProfilerServicePrivate::printProfileTree(const v8::CpuProfileNode *node, { for (int index = 0 ; index < node->GetChildrenCount() ; index++) { const v8::CpuProfileNode* childNode = node->GetChild(index); - if (QV8Engine::toStringStatic(childNode->GetScriptResourceName()).length() > 0) { + QString scriptResourceName = QJSConverter::toString(childNode->GetScriptResourceName()); + if (scriptResourceName.length() > 0) { - QV8ProfilerData rd = {(int)QV8ProfilerService::V8Entry, QV8Engine::toStringStatic(childNode->GetScriptResourceName()), - QV8Engine::toStringStatic(childNode->GetFunctionName()), + QV8ProfilerData rd = {(int)QV8ProfilerService::V8Entry, scriptResourceName, + QJSConverter::toString(childNode->GetFunctionName()), childNode->GetLineNumber(), childNode->GetTotalTime(), childNode->GetSelfTime(), level}; m_data.append(rd); diff --git a/src/declarative/debugger/qv8profilerservice_p.h b/src/declarative/debugger/qv8profilerservice_p.h index 95b48f9..f8d6417 100644 --- a/src/declarative/debugger/qv8profilerservice_p.h +++ b/src/declarative/debugger/qv8profilerservice_p.h @@ -93,9 +93,7 @@ public: ~QV8ProfilerService(); static QV8ProfilerService *instance(); - - void addEngine(QDeclarativeEngine *); - void removeEngine(QDeclarativeEngine *); + static void initialize(); void startProfiling(const QString &title); void stopProfiling(const QString &title); diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 93d2fa9..5de1e57 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -451,9 +451,9 @@ void QDeclarativeEnginePrivate::init() QDeclarativeEngineDebugService::isDebuggingEnabled()) { isDebugging = true; QDeclarativeEngineDebugService::instance()->addEngine(q); - QV8DebugService::instance()->addEngine(q); - QV8ProfilerService::instance()->addEngine(q); - QDeclarativeDebugTrace::addEngine(q); + QV8DebugService::initialize(); + QV8ProfilerService::initialize(); + QDeclarativeDebugTrace::initialize(); } } @@ -518,9 +518,6 @@ QDeclarativeEngine::~QDeclarativeEngine() Q_D(QDeclarativeEngine); if (d->isDebugging) { QDeclarativeEngineDebugService::instance()->remEngine(this); - QV8DebugService::instance()->removeEngine(this); - QV8ProfilerService::instance()->removeEngine(this); - QDeclarativeDebugTrace::removeEngine(this); } // if we are the parent of any of the qobject module api instances, -- 1.7.2.5