Changeset 121658 in webkit

Timestamp:

Jul 2, 2012 12:04:41 AM (12 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: add v8 bindings memory info to the native memory graph
​https://bugs.webkit.org/show_bug.cgi?id=90149

Reviewed by Pavel Feldman.

Size of V8 binding maps is now reported on the memory chart.

• bindings/js/ScriptProfiler.h:

(WebCore::ScriptProfiler::collectBindingMemoryInfo):

• bindings/v8/DOMDataStore.cpp:

(WebCore::DOMDataStore::reportMemoryUsage):
(WebCore):

• bindings/v8/DOMDataStore.h:

(WebCore):
(DOMDataStore):

• bindings/v8/IntrusiveDOMWrapperMap.h:

(WebCore::ChunkedTable::reportMemoryUsage):
(ChunkedTable):

• bindings/v8/ScriptProfiler.cpp:

(WebCore::ScriptProfiler::collectBindingMemoryInfo):
(WebCore):

• bindings/v8/ScriptProfiler.h:

(WebCore):
(ScriptProfiler):

• bindings/v8/V8Binding.cpp:

(WebCore::V8BindingPerIsolateData::reportMemoryUsage):
(WebCore):
(WebCore::StringCache::reportMemoryUsage):

• bindings/v8/V8Binding.h:

(WebCore):
(StringCache):
(V8BindingPerIsolateData):

• bindings/v8/V8DOMMap.h:

(WebCore):
(AbstractWeakReferenceMap):

• dom/MemoryInstrumentation.h:

(MemoryInstrumentation):
(WebCore):
(WebCore::MemoryInstrumentation::reportHashMap): added a method for reporting
size of a HashMap.

• inspector/InspectorMemoryAgent.cpp:

(MemoryBlockName):
(WebCore):
(WebCore::domTreeInfo):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/ScriptProfiler.h (modified) (2 diffs)
• bindings/v8/DOMDataStore.cpp (modified) (2 diffs)
• bindings/v8/DOMDataStore.h (modified) (2 diffs)
• bindings/v8/IntrusiveDOMWrapperMap.h (modified) (3 diffs)
• bindings/v8/ScriptProfiler.cpp (modified) (2 diffs)
• bindings/v8/ScriptProfiler.h (modified) (2 diffs)
• bindings/v8/V8Binding.cpp (modified) (3 diffs)
• bindings/v8/V8Binding.h (modified) (3 diffs)
• bindings/v8/V8DOMMap.h (modified) (4 diffs)
• dom/MemoryInstrumentation.h (modified) (3 diffs)
• inspector/InspectorMemoryAgent.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-28  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: add v8 bindings memory info to the native memory graph
+        https://bugs.webkit.org/show_bug.cgi?id=90149
+
+        Reviewed by Pavel Feldman.
+
+        Size of V8 binding maps is now reported on the memory chart.
+
+        * bindings/js/ScriptProfiler.h:
+        (WebCore::ScriptProfiler::collectBindingMemoryInfo):
+        * bindings/v8/DOMDataStore.cpp:
+        (WebCore::DOMDataStore::reportMemoryUsage):
+        (WebCore):
+        * bindings/v8/DOMDataStore.h:
+        (WebCore):
+        (DOMDataStore):
+        * bindings/v8/IntrusiveDOMWrapperMap.h:
+        (WebCore::ChunkedTable::reportMemoryUsage):
+        (ChunkedTable):
+        * bindings/v8/ScriptProfiler.cpp:
+        (WebCore::ScriptProfiler::collectBindingMemoryInfo):
+        (WebCore):
+        * bindings/v8/ScriptProfiler.h:
+        (WebCore):
+        (ScriptProfiler):
+        * bindings/v8/V8Binding.cpp:
+        (WebCore::V8BindingPerIsolateData::reportMemoryUsage):
+        (WebCore):
+        (WebCore::StringCache::reportMemoryUsage):
+        * bindings/v8/V8Binding.h:
+        (WebCore):
+        (StringCache):
+        (V8BindingPerIsolateData):
+        * bindings/v8/V8DOMMap.h:
+        (WebCore):
+        (AbstractWeakReferenceMap):
+        * dom/MemoryInstrumentation.h:
+        (MemoryInstrumentation):
+        (WebCore):
+        (WebCore::MemoryInstrumentation::reportHashMap): added a method for reporting
+        size of a HashMap.
+        * inspector/InspectorMemoryAgent.cpp:
+        (MemoryBlockName):
+        (WebCore):
+        (WebCore::domTreeInfo):
+
 2012-07-01  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebCore/bindings/js/ScriptProfiler.h

@@ -39 +39 @@
 class ExternalArrayVisitor;
 class ExternalStringVisitor;
+class MemoryInstrumentation;
 class NodeWrapperVisitor;
 class Page;
@@ -76 +77 @@
     // FIXME: Implement this counter for JSC. See bug 73936 for more details.
     static void visitNodeWrappers(NodeWrapperVisitor*) { }
+    // FIXME: Support these methods for JSC. See bug 90358.
     static void visitExternalStrings(ExternalStringVisitor*) { }
     static void visitExternalArrays(ExternalArrayVisitor*) { }
+    static void collectBindingMemoryInfo(MemoryInstrumentation*) { }
     static size_t profilerSnapshotsSize() { return 0; }
 };

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

@@ -33 +33 @@
 
 #include "DOMData.h"
+#include "MemoryInstrumentation.h"
 #include "V8Binding.h"
 #include <wtf/MainThread.h>
@@ -119 +120 @@
 }
 
+void DOMDataStore::reportMemoryUsage(MemoryInstrumentation* instrumentation)
+{
+    instrumentation->reportPointer(this, MemoryInstrumentation::Binding);
+    domNodeMap().reportMemoryUsage(instrumentation);
+    activeDomNodeMap().reportMemoryUsage(instrumentation);
+    domObjectMap().reportMemoryUsage(instrumentation);
+    activeDomObjectMap().reportMemoryUsage(instrumentation);
+}
+
 // Called when the object is near death (not reachable from JS roots).
 // It is time to remove the entry from the table and dispose the handle.

trunk/Source/WebCore/bindings/v8/DOMDataStore.h

@@ -48 +48 @@
     class DOMData;
     class DOMDataStore;
+    class MemoryInstrumentation;
 
     typedef WTF::Vector<DOMDataStore*> DOMDataList;
@@ -87 +88 @@
         static void weakNodeCallback(v8::Persistent<v8::Value> v8Object, void* domObject);
 
+        void reportMemoryUsage(MemoryInstrumentation*);
+
     protected:
         static void weakDOMObjectCallback(v8::Persistent<v8::Value> v8Object, void* domObject);

trunk/Source/WebCore/bindings/v8/IntrusiveDOMWrapperMap.h

@@ -33 +33 @@
 
 #include "DOMDataStore.h"
+#include "MemoryInstrumentation.h"
 #include "V8Node.h"
 
@@ -102 +103 @@
     }
 
+    void reportMemoryUsage(MemoryInstrumentation* instrumentation)
+    {
+        for (Chunk* chunk = m_chunks; chunk; chunk = chunk->m_previous)
+            instrumentation->reportPointer(chunk, MemoryInstrumentation::Binding);
+    }
+
   private:
     struct Chunk {
@@ -177 +184 @@
     }
 
+    virtual void reportMemoryUsage(MemoryInstrumentation* instrumentation) OVERRIDE
+    {
+        instrumentation->reportPointer(this, MemoryInstrumentation::Binding);
+        m_table.reportMemoryUsage(instrumentation);
+    }
+
 private:
     static int const numberOfEntries = (1 << 10) - 1;

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

@@ -34 +34 @@
 
 #include "BindingVisitors.h"
+#include "MemoryInstrumentation.h"
 #include "RetainedDOMInfo.h"
 #include "ScriptObject.h"
@@ -220 +221 @@
 }
 
+void ScriptProfiler::collectBindingMemoryInfo(MemoryInstrumentation* instrumentation)
+{
+    V8BindingPerIsolateData* data = V8BindingPerIsolateData::current();
+    if (!data)
+        return;
+    data->reportMemoryUsage(instrumentation);
+}
+
 size_t ScriptProfiler::profilerSnapshotsSize()
 {

trunk/Source/WebCore/bindings/v8/ScriptProfiler.h

@@ -43 +43 @@
 class ExternalArrayVisitor;
 class ExternalStringVisitor;
+class MemoryInstrumentation;
 class NodeWrapperVisitor;
 class Page;
@@ -82 +83 @@
     static void visitExternalStrings(ExternalStringVisitor*);
     static void visitExternalArrays(ExternalArrayVisitor*);
+    static void collectBindingMemoryInfo(MemoryInstrumentation*);
     static size_t profilerSnapshotsSize();
 };

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

@@ -35 +35 @@
 #include "DOMStringList.h"
 #include "Element.h"
+#include "MemoryInstrumentation.h"
 #include "PlatformString.h"
 #include "QualifiedName.h"
@@ -90 +91 @@
 }
 
-
+void V8BindingPerIsolateData::reportMemoryUsage(MemoryInstrumentation* instrumentation)
+{
+    instrumentation->reportPointer(this, MemoryInstrumentation::Binding);
+    instrumentation->reportHashMap(m_rawTemplates, MemoryInstrumentation::Binding);
+    instrumentation->reportHashMap(m_templates, MemoryInstrumentation::Binding);
+    m_stringCache.reportMemoryUsage(instrumentation);
+
+    for (size_t i = 0; i < m_domDataList.size(); i++)
+        m_domDataList[i]->reportMemoryUsage(instrumentation);
+}
 
 // WebCoreStringResource is a helper class for v8ExternalString. It is used
@@ -577 +587 @@
     return toStringTemplate;
 }
+
+void StringCache::reportMemoryUsage(MemoryInstrumentation* instrumentation)
+{
+    instrumentation->reportHashMap(m_stringCache, MemoryInstrumentation::Binding);
+}
     
 PassRefPtr<DOMStringList> v8ValueToWebCoreDOMStringList(v8::Handle<v8::Value> value)

trunk/Source/WebCore/bindings/v8/V8Binding.h

@@ -50 +50 @@
     class EventTarget;
     class ExternalStringVisitor;
+    class MemoryInstrumentation;
 
     // FIXME: Remove V8Binding.
@@ -78 +79 @@
 
         void remove(StringImpl*);
+
+        void reportMemoryUsage(MemoryInstrumentation*);
 
     private:
@@ -214 +217 @@
 
         GCEventData& gcEventData() { return m_gcEventData; }
+
+        void reportMemoryUsage(MemoryInstrumentation*);
 
     private:

trunk/Source/WebCore/bindings/v8/V8DOMMap.h

@@ -32 +32 @@
 #define V8DOMMap_h
 
+#include "MemoryInstrumentation.h"
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
@@ -39 +40 @@
     class DOMDataStore;
     class Node;
+    class MemoryInstrumentation;
 
     template <class KeyType, class ValueType> class AbstractWeakReferenceMap {
@@ -62 +64 @@
 
         v8::WeakReferenceCallback weakReferenceCallback() { return m_weakReferenceCallback; }
+
+        virtual void reportMemoryUsage(MemoryInstrumentation*) = 0;
+
     private:
         v8::WeakReferenceCallback m_weakReferenceCallback;
@@ -130 +135 @@
         }
 
+        virtual void reportMemoryUsage(MemoryInstrumentation* instrumentation) OVERRIDE
+        {
+            instrumentation->reportHashMap(m_map, MemoryInstrumentation::Binding);
+        }
+
     protected:
         HashMap<KeyType*, ValueType*> m_map;

trunk/Source/WebCore/dom/MemoryInstrumentation.h

@@ -48 +48 @@
         DOM,
         CSS,
+        Binding,
         LastTypeEntry
     };
@@ -60 +61 @@
         countObjectSize(objectType, sizeof(T));
     }
+    template <typename HashMapType> void reportHashMap(const HashMapType&, ObjectType);
 
 private:
@@ -140 +142 @@
 }
 
+
+template<typename HashMapType>
+void MemoryInstrumentation::reportHashMap(const HashMapType& hashMap, ObjectType objectType)
+{
+    size_t size = sizeof(HashMapType) + hashMap.capacity() * sizeof(typename HashMapType::ValueType);
+    countObjectSize(objectType, size);
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp

@@ -91 +91 @@
 static const char domTreeDOM[] = "DOMTreeDOM";
 static const char domTreeCSS[] = "DOMTreeCSS";
+static const char domTreeBinding[] = "DOMTreeBinding";
 }
 
@@ -448 +449 @@
         addMemoryBlockFor(domChildren.get(), m_totalSizes[DOM], MemoryBlockName::domTreeDOM);
         addMemoryBlockFor(domChildren.get(), m_totalSizes[CSS], MemoryBlockName::domTreeCSS);
+        addMemoryBlockFor(domChildren.get(), m_totalSizes[Binding], MemoryBlockName::domTreeBinding);
 
         RefPtr<InspectorMemoryBlock> dom = InspectorMemoryBlock::create().setName(MemoryBlockName::dom);
@@ -493 +495 @@
     }
 
+    void visitBindings()
+    {
+        ScriptProfiler::collectBindingMemoryInfo(&m_domMemoryUsage);
+    }
+
     PassRefPtr<InspectorMemoryBlock> dumpStatistics() { return m_domMemoryUsage.dumpStatistics(); }
 
@@ -512 +519 @@
             domTreesIterator.visitNode(doc);
     }
+
+    domTreesIterator.visitBindings();
 
     return domTreesIterator.dumpStatistics();