Changeset 56689 in webkit

Timestamp:

Mar 28, 2010 3:43:05 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-28 Kent Hansen <​kent.hansen@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Add API for reporting additional memory cost of JavaScript objects
​https://bugs.webkit.org/show_bug.cgi?id=36650

• qt/api/qscriptengine.cpp: (QScriptEngine::reportAdditionalMemoryCost):
• qt/api/qscriptengine.h:
• qt/api/qscriptengine_p.h: (QScriptEnginePrivate::reportAdditionalMemoryCost):
• qt/tests/qscriptengine/tst_qscriptengine.cpp: (tst_QScriptEngine::reportAdditionalMemoryCost):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• qt/api/qscriptengine.cpp (modified) (1 diff)
• qt/api/qscriptengine.h (modified) (1 diff)
• qt/api/qscriptengine_p.h (modified) (3 diffs)
• qt/tests/qscriptengine/tst_qscriptengine.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-03-28  Kent Hansen  <kent.hansen@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Add API for reporting additional memory cost of JavaScript objects
+        https://bugs.webkit.org/show_bug.cgi?id=36650
+
+        * qt/api/qscriptengine.cpp:
+        (QScriptEngine::reportAdditionalMemoryCost):
+        * qt/api/qscriptengine.h:
+        * qt/api/qscriptengine_p.h:
+        (QScriptEnginePrivate::reportAdditionalMemoryCost):
+        * qt/tests/qscriptengine/tst_qscriptengine.cpp:
+        (tst_QScriptEngine::reportAdditionalMemoryCost):
+
 2010-03-28  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
 

trunk/JavaScriptCore/qt/api/qscriptengine.cpp

@@ -106 +106 @@
     have been created). However, you can call this function to explicitly request that garbage
     collection should be performed as soon as possible.
+
+    \sa reportAdditionalMemoryCost()
 */
 void QScriptEngine::collectGarbage()
 {
     d_ptr->collectGarbage();
+}
+
+/*!
+  Reports an additional memory cost of the given \a size, measured in
+  bytes, to the garbage collector.
+
+  This function can be called to indicate that a JavaScript object has
+  memory associated with it that isn't managed by Qt Script itself.
+  Reporting the additional cost makes it more likely that the garbage
+  collector will be triggered.
+
+  Note that if the additional memory is shared with objects outside
+  the scripting environment, the cost should not be reported, since
+  collecting the JavaScript object would not cause the memory to be
+  freed anyway.
+
+  Negative \a size values are ignored, i.e. this function can't be
+  used to report that the additional memory has been deallocated.
+
+  \sa collectGarbage()
+*/
+void QScriptEngine::reportAdditionalMemoryCost(int cost)
+{
+    d_ptr->reportAdditionalMemoryCost(cost);
 }
 

trunk/JavaScriptCore/qt/api/qscriptengine.h

@@ -42 +42 @@
     QScriptValue evaluate(const QString& program, const QString& fileName = QString(), int lineNumber = 1);
     QScriptValue evaluate(const QScriptProgram& program);
+
     void collectGarbage();
+    void reportAdditionalMemoryCost(int cost);
 
     QScriptString toStringHandle(const QString& str);

trunk/JavaScriptCore/qt/api/qscriptengine_p.h

@@ -27 +27 @@
 #include "qscriptvalue.h"
 #include <JavaScriptCore/JavaScript.h>
+#include <JSBasePrivate.h>
 #include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
@@ -45 +46 @@
     QScriptValuePrivate* evaluate(const QScriptProgramPrivate* program);
     inline JSValueRef evaluate(JSStringRef program, JSStringRef fileName, int lineNumber);
+
     inline void collectGarbage();
+    inline void reportAdditionalMemoryCost(int cost);
 
     inline JSValueRef makeJSValue(double number) const;
@@ -77 +80 @@
 {
     JSGarbageCollect(m_context);
+}
+
+void QScriptEnginePrivate::reportAdditionalMemoryCost(int cost)
+{
+    if (cost > 0)
+        JSReportExtraMemoryCost(m_context, cost);
 }
 

trunk/JavaScriptCore/qt/tests/qscriptengine/tst_qscriptengine.cpp

@@ -39 +39 @@
     void evaluate();
     void collectGarbage();
+    void reportAdditionalMemoryCost();
     void nullValue();
     void undefinedValue();
@@ -73 +74 @@
     engine.collectGarbage();
     QCOMPARE(foo.call().toString(), QString::fromAscii("pong"));
+}
+
+void tst_QScriptEngine::reportAdditionalMemoryCost()
+{
+    // There isn't any easy way to test the responsiveness of the GC;
+    // just try to call the function a few times with various sizes.
+    QScriptEngine eng;
+    for (int i = 0; i < 100; ++i) {
+        eng.reportAdditionalMemoryCost(0);
+        eng.reportAdditionalMemoryCost(10);
+        eng.reportAdditionalMemoryCost(1000);
+        eng.reportAdditionalMemoryCost(10000);
+        eng.reportAdditionalMemoryCost(100000);
+        eng.reportAdditionalMemoryCost(1000000);
+        eng.reportAdditionalMemoryCost(10000000);
+        eng.reportAdditionalMemoryCost(-1);
+        eng.reportAdditionalMemoryCost(-1000);
+        QScriptValue obj = eng.evaluate("new Object");
+        eng.collectGarbage();
+    }
 }