Support debugging and profiling for pure QJSEngines

The engines will register themselves with the debug server whenever
they are created without a private object. The assumption is that we
get the latest possible registration like this. They try to deregister
in all dtors, but they check if a different engine has done the same
first.

Change-Id: Ife7d7532d1de2e4a6ee21d9f7e673fcdfff2387b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 24 insertions, 0 deletions

diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp
index 5ccbccebad..80dce129c7 100644
--- a/src/qml/jsapi/qjsengine.cpp
+++ b/src/qml/jsapi/qjsengine.cpp
@@ -43,6 +43,7 @@
 #include "private/qv4script_p.h"
 #include "private/qv4runtime_p.h"
 #include <private/qqmlbuiltinfunctions_p.h>
+#include <private/qqmldebugconnector_p.h>
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qmetaobject.h>
@@ -251,6 +252,7 @@ QJSEngine::QJSEngine()
     : QObject(*new QJSEnginePrivate, 0)
     , d(new QV8Engine(this))
 {
+    QJSEnginePrivate::addToDebugServer(this);
 }
 
 /*!
@@ -264,6 +266,7 @@ QJSEngine::QJSEngine(QObject *parent)
     : QObject(*new QJSEnginePrivate, parent)
     , d(new QV8Engine(this))
 {
+    QJSEnginePrivate::addToDebugServer(this);
 }
 
 /*!
@@ -284,6 +287,7 @@ QJSEngine::QJSEngine(QJSEnginePrivate &dd, QObject *parent)
 */
 QJSEngine::~QJSEngine()
 {
+    QJSEnginePrivate::removeFromDebugServer(this);
     delete d;
 }
 
@@ -671,6 +675,26 @@ QJSEnginePrivate::~QJSEnginePrivate()
         (*iter)->release();
 }
 
+void QJSEnginePrivate::addToDebugServer(QJSEngine *q)
+{
+    if (QCoreApplication::instance()->thread() != q->thread())
+        return;
+
+    QQmlDebugConnector *server = QQmlDebugConnector::instance();
+    if (!server || server->hasEngine(q))
+        return;
+
+    server->open();
+    server->addEngine(q);
+}
+
+void QJSEnginePrivate::removeFromDebugServer(QJSEngine *q)
+{
+    QQmlDebugConnector *server = QQmlDebugConnector::instance();
+    if (server && server->hasEngine(q))
+        server->removeEngine(q);
+}
+
 QQmlPropertyCache *QJSEnginePrivate::createCache(const QMetaObject *mo)
 {
     if (!mo->superClass()) {