Changeset 134934 in webkit

Timestamp:

Nov 16, 2012 5:19:56 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[V8] Increment the amount of externally allocated memory for the receiving V8 isolate when transferring ArrayBuffer
​https://bugs.webkit.org/show_bug.cgi?id=94463

Patch by Ulan Degenbaev <​ulan@chromium.org> on 2012-11-16
Reviewed by Kentaro Hara.

Call AdjustAmountOfExternalAllocatedMemory when V8ArrayBuffer is deserialized and transferred.

.:

• ManualTests/typed-array-memory.html:

Source/WebCore:

Test: ManualTests/typed-array-memory.html

• bindings/v8/SerializedScriptValue.cpp:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• ManualTests/typed-array-memory.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/v8/SerializedScriptValue.cpp (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2012-11-16  Ulan Degenbaev  <ulan@chromium.org>
+
+        [V8] Increment the amount of externally allocated memory for the receiving V8 isolate when transferring ArrayBuffer
+        https://bugs.webkit.org/show_bug.cgi?id=94463
+
+        Reviewed by Kentaro Hara.
+
+        Call AdjustAmountOfExternalAllocatedMemory when V8ArrayBuffer is deserialized and transferred.
+
+        * ManualTests/typed-array-memory.html:
+
 2012-11-16  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/ManualTests/typed-array-memory.html

@@ -137 +137 @@
 "    return getV8Statistics().amount_of_external_allocated_memory;\n" +
 "}\n" +
-"function collectGarbage() {\n" +
-"    for (var i = 0; i < 10; i++) gc();\n" +
-"}\n" +
-"var before = externalMemory();\n" +
+"var KB = 1024;\n" +
+"var MB = KB * KB;\n" +
+"var noise = KB;\n" +
 "self.onmessage = function(e) {\n" +
-"    var now = externalMemory();\n" +
-"    e.data = null;\n" +
-"    collectGarbage();\n" +
+"    var before = externalMemory();\n" +
+"    e.data;\n" +
 "    var after = externalMemory();\n" +
-"    self.postMessage(before + ' ' + now + ' ' + after);\n" +
+"    if (after > before + MB - noise) {\n" +
+"      self.postMessage('PASS: Amount of external memory increased.');\n" +
+"    } else {\n" +
+"      self.postMessage('FAIL: Amount of external memory did not increase.');\n" +
+"    }\n" +
 "}\n";
 
@@ -159 +161 @@
         try {
             var before = externalMemory();
-            worker.webkitPostMessage(buffer, [buffer]);
+            worker.postMessage(buffer, [buffer]);
             var now = externalMemory();
             if (now > before - MB + noise) {

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-16  Ulan Degenbaev  <ulan@chromium.org>
+
+        [V8] Increment the amount of externally allocated memory for the receiving V8 isolate when transferring ArrayBuffer
+        https://bugs.webkit.org/show_bug.cgi?id=94463
+
+        Reviewed by Kentaro Hara.
+
+        Call AdjustAmountOfExternalAllocatedMemory when V8ArrayBuffer is deserialized and transferred.
+
+        Test: ManualTests/typed-array-memory.html
+
+        * bindings/v8/SerializedScriptValue.cpp:
+
 2012-11-16  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/bindings/v8/SerializedScriptValue.cpp

@@ -42 +42 @@
 #include "SharedBuffer.h"
 #include "V8ArrayBuffer.h"
+#include "V8ArrayBufferCustom.h"
 #include "V8ArrayBufferView.h"
 #include "V8Binding.h"
@@ -1648 +1649 @@
         const void* bufferStart = m_buffer + m_position;
         RefPtr<ArrayBuffer> arrayBuffer = ArrayBuffer::create(bufferStart, byteLength);
+        arrayBuffer->setDeallocationObserver(V8ArrayBufferDeallocationObserver::instance());
+        v8::V8::AdjustAmountOfExternalAllocatedMemory(arrayBuffer->byteLength());
         m_position += byteLength;
         return arrayBuffer.release();
@@ -2035 +2038 @@
         v8::Handle<v8::Object> result = m_arrayBuffers.at(index);
         if (result.IsEmpty()) {
-            result = toV8Object(ArrayBuffer::create(m_arrayBufferContents->at(index)).get(), v8::Handle<v8::Object>(), m_reader.getIsolate());
+            RefPtr<ArrayBuffer> buffer = ArrayBuffer::create(m_arrayBufferContents->at(index));
+            buffer->setDeallocationObserver(V8ArrayBufferDeallocationObserver::instance());
+            v8::V8::AdjustAmountOfExternalAllocatedMemory(buffer->byteLength());
+            result = toV8Object(buffer.get(), v8::Handle<v8::Object>(), m_reader.getIsolate());
             m_arrayBuffers[index] = result;
         }