File 0009-Do-not-leak-script-interfaces-and-their-sc... of Package ki18n

Overview Repositories Revisions Requests Users Attributes Meta

File 0009-Do-not-leak-script-interfaces-and-their-script-engin.patch of Package ki18n (Revision 9c0caec4e5128ca53acd9b3566b455c2)

Currently displaying revision 9c0caec4e5128ca53acd9b3566b455c2 , Show latest

From b0a60d0feb2dcac7af5f921be830bc4d9b9d3d18 Mon Sep 17 00:00:00 2001
From: Kevin Krammer <krammer@kde.org>
Date: Sun, 23 Feb 2014 22:44:56 +0100
Subject: [PATCH 9/9] Do not leak script interfaces and their script engines

Create the script engine as a QObject child of the interface and
delete all interfaces in KTranscriptImp's destructor.

REVIEW: 115983
---
 src/ktranscript.cpp | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/ktranscript.cpp b/src/ktranscript.cpp
index 1ce0d1a..44c8b63 100644
--- a/src/ktranscript.cpp
+++ b/src/ktranscript.cpp
@@ -89,7 +89,7 @@ class Scriptface : public QObject, public QScriptable
 {
     Q_OBJECT
 public:
-    explicit Scriptface(QScriptEngine *scriptEngine_, const TsConfigGroup &config, QObject *parent = 0);
+    explicit Scriptface(const TsConfigGroup &config, QObject *parent = 0);
     ~Scriptface();
 
     // Interface functions.
@@ -131,9 +131,8 @@ public:
 
     void put(const QString &propertyName, const QScriptValue &value);
 
-    // Link to its interpreter.
-    // FIXME: Probably accessible without the explicit link.
-    QScriptEngine *scriptEngine;
+    // Link to its script engine
+    QScriptEngine *const scriptEngine;
 
     // Current message data.
     const QString *msgcontext;
@@ -475,10 +474,7 @@ KTranscriptImp::KTranscriptImp()
 
 KTranscriptImp::~KTranscriptImp()
 {
-    // FIXME: vallgrind shows an afwul lot of "invalid read" in WTF:: stuff
-    // when deref is called... Are we leaking somewhere?
-    //foreach (Scriptface *sface, m_sface.values())
-    //    sface->jsi->deref();
+    qDeleteAll(m_sface);
 }
 
 QString KTranscriptImp::eval(const QList<QVariant> &argv,
@@ -680,33 +676,31 @@ void KTranscriptImp::loadModules(const QList<QStringList> &mods,
 #define SFNAME "Ts"
 void KTranscriptImp::setupInterpreter(const QString &lang)
 {
-    // Create new interpreter.
-    QScriptEngine *engine = new QScriptEngine;
-
-    // Add scripting interface into the interpreter.
+    // Add scripting interface
+    // Creates its own script engine and registers with it
     // NOTE: Config may not contain an entry for the language, in which case
     // it is automatically constructed as an empty hash. This is intended.
-    Scriptface *sface = new Scriptface(engine, config[lang], engine);
+    Scriptface *sface = new Scriptface(config[lang]);
+
+    // Store scriptface
+    m_sface[lang] = sface;
+
+    //dbgout("=====> Created interpreter for '%1'", lang);
+}
 
+Scriptface::Scriptface(const TsConfigGroup &config_, QObject *parent)
+    : QObject(parent), scriptEngine(new QScriptEngine(this)), fallbackRequest(0), config(config_)
+{
     QScriptEngine::QObjectWrapOptions wrapOptions;
     wrapOptions |= QScriptEngine::ExcludeSuperClassContents;
     wrapOptions |= QScriptEngine::ExcludeDeleteLater;
     wrapOptions |= QScriptEngine::ExcludeChildObjects;
     wrapOptions |= QScriptEngine::ExcludeSlots;
 
-    QScriptValue object = engine->newQObject(sface, QScriptEngine::QtOwnership, wrapOptions);
-    engine->globalObject().setProperty(SFNAME, object);
-
-    // Store scriptface
-    m_sface[lang] = sface;
-
-    //dbgout("=====> Created interpreter for '%1'", lang);
+    QScriptValue object = scriptEngine->newQObject(this, QScriptEngine::QtOwnership, wrapOptions);
+    scriptEngine->globalObject().setProperty(SFNAME, object);
 }
 
-Scriptface::Scriptface(QScriptEngine *scriptEngine_, const TsConfigGroup &config_, QObject *parent)
-    : QObject(parent), scriptEngine(scriptEngine_), fallbackRequest(0), config(config_)
-{}
-
 Scriptface::~Scriptface()
 {
     qDeleteAll(loadedPmapHandles);
-- 
1.8.5.2

Places

File 0009-Do-not-leak-script-interfaces-and-their-script-engin.patch of Package ki18n (Revision 9c0caec4e5128ca53acd9b3566b455c2)

Places