Changeset 122920 in webkit

Timestamp:

Jul 17, 2012 10:58:49 PM (12 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: show loaders memory consumption on the memory chart.
​https://bugs.webkit.org/show_bug.cgi?id=90686

Reviewed by Pavel Feldman.

Size of FrameLoader, DocumentLoader, ResourceLoader and their resources should be shown on the memory pie chart.

It is covered by existing WebInspector performance tests infrastructure.

• WebCore.exp.in:
• dom/MemoryInstrumentation.h:

(MemoryInstrumentation):
(WebCore::MemoryInstrumentation::addRawBuffer):
(WebCore::MemoryInstrumentation::addInstrumentedMemberImpl):
(WebCore):
(WebCore::MemoryClassInfo::addInstrumentedHashSet):
(WebCore::MemoryClassInfo::addRawBuffer):
(WebCore::MemoryInstrumentation::addInstrumentedHashSet):
(WebCore::MemoryInstrumentation::addVector):

• inspector/InspectorMemoryAgent.cpp:

(WebCore):
(WebCore::domTreeInfo):

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::reportMemoryUsage):
(WebCore):

• loader/DocumentLoader.h:

(WebCore):
(DocumentLoader):

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::reportMemoryUsage):
(WebCore):

• loader/FrameLoader.h:

(WebCore):
(FrameLoader):

• loader/ResourceLoader.cpp:

(WebCore::ResourceLoader::reportMemoryUsage):
(WebCore):

• loader/ResourceLoader.h:

(WebCore):
(ResourceLoader):

• page/Frame.cpp:

(WebCore::Frame::reportMemoryUsage):
(WebCore):

• page/Frame.h:

(WebCore):
(Frame):

• platform/SharedBuffer.cpp:

(WebCore::SharedBuffer::reportMemoryUsage):
(WebCore):

• platform/SharedBuffer.h:

(WebCore):
(SharedBuffer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.exp.in (modified) (1 diff)
• dom/MemoryInstrumentation.h (modified) (10 diffs)
• inspector/InspectorMemoryAgent.cpp (modified) (2 diffs)
• loader/DocumentLoader.cpp (modified) (2 diffs)
• loader/DocumentLoader.h (modified) (2 diffs)
• loader/FrameLoader.cpp (modified) (2 diffs)
• loader/FrameLoader.h (modified) (2 diffs)
• loader/ResourceLoader.cpp (modified) (1 diff)
• loader/ResourceLoader.h (modified) (2 diffs)
• page/Frame.cpp (modified) (1 diff)
• page/Frame.h (modified) (2 diffs)
• platform/SharedBuffer.cpp (modified) (2 diffs)
• platform/SharedBuffer.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-17  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: show loaders memory consumption on the memory chart.
+        https://bugs.webkit.org/show_bug.cgi?id=90686
+
+        Reviewed by Pavel Feldman.
+
+        Size of FrameLoader, DocumentLoader, ResourceLoader and their resources should be shown on the memory pie chart.
+
+        It is covered by existing WebInspector performance tests infrastructure.
+
+        * WebCore.exp.in:
+        * dom/MemoryInstrumentation.h:
+        (MemoryInstrumentation):
+        (WebCore::MemoryInstrumentation::addRawBuffer):
+        (WebCore::MemoryInstrumentation::addInstrumentedMemberImpl):
+        (WebCore):
+        (WebCore::MemoryClassInfo::addInstrumentedHashSet):
+        (WebCore::MemoryClassInfo::addRawBuffer):
+        (WebCore::MemoryInstrumentation::addInstrumentedHashSet):
+        (WebCore::MemoryInstrumentation::addVector):
+        * inspector/InspectorMemoryAgent.cpp:
+        (WebCore):
+        (WebCore::domTreeInfo):
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::reportMemoryUsage):
+        (WebCore):
+        * loader/DocumentLoader.h:
+        (WebCore):
+        (DocumentLoader):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::reportMemoryUsage):
+        (WebCore):
+        * loader/FrameLoader.h:
+        (WebCore):
+        (FrameLoader):
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::reportMemoryUsage):
+        (WebCore):
+        * loader/ResourceLoader.h:
+        (WebCore):
+        (ResourceLoader):
+        * page/Frame.cpp:
+        (WebCore::Frame::reportMemoryUsage):
+        (WebCore):
+        * page/Frame.h:
+        (WebCore):
+        (Frame):
+        * platform/SharedBuffer.cpp:
+        (WebCore::SharedBuffer::reportMemoryUsage):
+        (WebCore):
+        * platform/SharedBuffer.h:
+        (WebCore):
+        (SharedBuffer):
+
 2012-07-17  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -251 +251 @@
 __ZN7WebCore14DocumentLoaderC2ERKNS_15ResourceRequestERKNS_14SubstituteDataE
 __ZN7WebCore14DocumentLoaderD2Ev
+__ZNK7WebCore14DocumentLoader17reportMemoryUsageEPNS_16MemoryObjectInfoE
 __ZN7WebCore14DocumentWriter11setEncodingERKN3WTF6StringEb
 __ZN7WebCore14FileIconLoader14notifyFinishedEN3WTF10PassRefPtrINS_4IconEEE

trunk/Source/WebCore/dom/MemoryInstrumentation.h

@@ -31 +31 @@
 #ifndef MemoryInstrumentation_h
 #define MemoryInstrumentation_h
+#include <stdio.h>
 
 #include <wtf/Assertions.h>
@@ -51 +52 @@
         CSS,
         Binding,
+        Loader,
         LastTypeEntry
     };
@@ -66 +68 @@
     template <typename HashMapType> void addHashMap(const HashMapType&, ObjectType, bool contentOnly = false);
     template <typename HashSetType> void addHashSet(const HashSetType&, ObjectType, bool contentOnly = false);
+    template <typename HashSetType> void addInstrumentedHashSet(const HashSetType&, ObjectType, bool contentOnly = false);
     template <typename ListHashSetType> void addListHashSet(const ListHashSetType&, ObjectType, bool contentOnly = false);
     template <typename VectorType> void addVector(const VectorType&, ObjectType, bool contentOnly = false);
+    void addRawBuffer(const void* const& buffer, ObjectType objectType, size_t size)
+    {
+        if (!buffer || visited(buffer))
+            return;
+        countObjectSize(objectType, size);
+    }
 
 protected:
@@ -87 +96 @@
     };
 
-    template <typename T>
-    void addInstrumentedMemberImpl(const T* const& object, OwningType owningType);
+    template <typename T> void addInstrumentedMemberImpl(const T* const&, OwningType);
+    template <typename T> void addInstrumentedMemberImpl(const OwnPtr<T>* const& object, MemoryInstrumentation::OwningType owningType) { addInstrumentedMemberImpl(object->get(), owningType); }
+    template <typename T> void addInstrumentedMemberImpl(const RefPtr<T>* const& object, MemoryInstrumentation::OwningType owningType) { addInstrumentedMemberImpl(object->get(), owningType); }
 
     template <typename T>
@@ -165 +175 @@
 template <> void MemoryInstrumentation::addMemberImpl<String>(const String* const&, MemoryInstrumentation::ObjectType, MemoryInstrumentation::OwningType);
 
+
 template <typename T>
 void MemoryInstrumentation::addInstrumentedMemberImpl(const T* const& object, MemoryInstrumentation::OwningType owningType)
@@ -176 +187 @@
         deferInstrumentedPointer(adoptPtr(new InstrumentedPointer<T>(object)));
 }
+
 
 template <typename T>
@@ -195 +207 @@
     template <typename HashMapType> void addHashMap(const HashMapType& map) { m_memoryInstrumentation->addHashMap(map, m_objectType, true); }
     template <typename HashSetType> void addHashSet(const HashSetType& set) { m_memoryInstrumentation->addHashSet(set, m_objectType, true); }
+    template <typename HashSetType> void addInstrumentedHashSet(const HashSetType& set) { m_memoryInstrumentation->addInstrumentedHashSet(set, m_objectType, true); }
     template <typename ListHashSetType> void addListHashSet(const ListHashSetType& set) { m_memoryInstrumentation->addListHashSet(set, m_objectType, true); }
     template <typename VectorType> void addVector(const VectorType& vector) { m_memoryInstrumentation->addVector(vector, m_objectType, true); }
+    void addRawBuffer(const void* const& buffer, size_t size) { m_memoryInstrumentation->addRawBuffer(buffer, m_objectType, size); }
 
     void addString(const String& string) { m_memoryInstrumentation->addString(string, m_objectType); }
@@ -221 +235 @@
 }
 
+template<typename HashSetType>
+void MemoryInstrumentation::addInstrumentedHashSet(const HashSetType& hashSet, ObjectType objectType, bool contentOnly)
+{
+    if (visited(&hashSet))
+        return;
+    countObjectSize(objectType, calculateContainerSize(hashSet, contentOnly));
+    for (typename HashSetType::const_iterator i = hashSet.begin(); i != hashSet.end(); ++i)
+        addInstrumentedMember(*i);
+}
+
 template<typename ListHashSetType>
 void MemoryInstrumentation::addListHashSet(const ListHashSetType& hashSet, ObjectType objectType, bool contentOnly)
@@ -233 +257 @@
 void MemoryInstrumentation::addVector(const VectorType& vector, ObjectType objectType, bool contentOnly)
 {
-    if (visited(vector.data()))
+    if (!vector.data() || visited(vector.data()))
         return;
     countObjectSize(objectType, calculateContainerSize(vector, contentOnly));
@@ -246 +270 @@
 }
 
+
 } // namespace WebCore
 

trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp

@@ -546 +546 @@
     }
 
+    void visitFrame(Frame* frame)
+    {
+        m_domMemoryUsage.addInstrumentedMember(frame);
+        m_domMemoryUsage.processDeferredInstrumentedPointers();
+    }
+
     void visitBindings()
     {
@@ -571 +577 @@
     // Make sure all documents reachable from the main frame are accounted.
     for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
-        if (Document* doc = frame->document())
+        if (Document* doc = frame->document()) {
             domTreesIterator.visitNode(doc);
+            domTreesIterator.visitFrame(frame);
+        }
     }
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -48 +48 @@
 #include "Logging.h"
 #include "MainResourceLoader.h"
+#include "MemoryInstrumentation.h"
 #include "Page.h"
 #include "PlatformString.h"
@@ -355 +356 @@
 }
 
+void DocumentLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+{
+    MemoryClassInfo<DocumentLoader> info(memoryObjectInfo, this, MemoryInstrumentation::Loader);
+    info.addInstrumentedMember(m_frame);
+    info.addInstrumentedMember(m_mainResourceLoader);
+    info.addInstrumentedHashSet(m_subresourceLoaders);
+    info.addInstrumentedHashSet(m_multipartSubresourceLoaders);
+    info.addInstrumentedHashSet(m_plugInStreamLoaders);
+    info.addString(m_pageTitle.string());
+    info.addString(m_overrideEncoding);
+    info.addVector(m_responses);
+    info.addHashMap(m_pendingSubstituteResources);
+    info.addHashSet(m_resourcesClientKnowsAbout);
+    info.addVector(m_resourcesLoadedFromMemoryCacheForClientNotification);
+    info.addString(m_clientRedirectSourceForHistory);
+    info.addInstrumentedMember(m_mainResourceData);
+}
+
 bool DocumentLoader::doesProgressiveLoad(const String& MIMEType) const
 {

trunk/Source/WebCore/loader/DocumentLoader.h

@@ -56 +56 @@
     class FrameLoader;
     class MainResourceLoader;
+    class MemoryObjectInfo;
     class Page;
     class ResourceLoader;
@@ -243 +244 @@
         ApplicationCacheHost* applicationCacheHost() const { return m_applicationCacheHost.get(); }
 
+        virtual void reportMemoryUsage(MemoryObjectInfo*) const;
+
     protected:
         DocumentLoader(const ResourceRequest&, const SubstituteData&);

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -78 +78 @@
 #include "MIMETypeRegistry.h"
 #include "MainResourceLoader.h"
+#include "MemoryInstrumentation.h"
 #include "Page.h"
 #include "PageCache.h"
@@ -3221 +3222 @@
 }
 
+void FrameLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+{
+    MemoryClassInfo<FrameLoader> info(memoryObjectInfo, this, MemoryInstrumentation::Loader);
+    info.addInstrumentedMember(m_documentLoader.get());
+    info.addInstrumentedMember(m_provisionalDocumentLoader.get());
+    info.addInstrumentedMember(m_policyDocumentLoader.get());
+    info.addString(m_outgoingReferrer);
+    info.addInstrumentedHashSet(m_openedFrames);
+}
+
 bool FrameLoaderClient::hasHTMLView() const
 {

trunk/Source/WebCore/loader/FrameLoader.h

@@ -62 +62 @@
 class FrameLoaderClient;
 class FrameNetworkingContext;
+class MemoryObjectInfo;
 class NavigationAction;
 class NetworkingContext;
@@ -284 +285 @@
     NetworkingContext* networkingContext() const;
 
+    void reportMemoryUsage(MemoryObjectInfo*) const;
+
 private:
     bool allChildrenAreComplete() const; // immediate children, not all descendants

trunk/Source/WebCore/loader/ResourceLoader.cpp

@@ -529 +529 @@
 #endif
 
-}
+void ResourceLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+{
+    MemoryClassInfo<ResourceLoader> info(memoryObjectInfo, this, MemoryInstrumentation::Loader);
+    info.addMember(m_handle.get());
+    info.addInstrumentedMember(m_frame);
+    info.addInstrumentedMember(m_documentLoader);
+    info.addMember(m_request);
+    info.addMember(m_originalRequest);
+    info.addInstrumentedMember(m_resourceData);
+    info.addMember(m_deferredRequest);
+    info.addMember(m_options);
+}
+
+}

trunk/Source/WebCore/loader/ResourceLoader.h

@@ -45 +45 @@
     class FrameLoader;
     class KURL;
+    class MemoryObjectInfo;
     class ResourceHandle;
     class SharedBuffer;
@@ -145 +146 @@
         void setShouldBufferData(DataBufferingPolicy);
 
+        virtual void reportMemoryUsage(MemoryObjectInfo*) const;
+
     protected:
         ResourceLoader(Frame*, ResourceLoaderOptions);

trunk/Source/WebCore/page/Frame.cpp

@@ -686 +686 @@
 #endif
 
+void Frame::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+{
+    MemoryClassInfo<Frame> info(memoryObjectInfo, this, MemoryInstrumentation::DOM);
+    info.addInstrumentedMember(m_doc.get());
+    info.addInstrumentedMember(m_loader);
+}
+
 DOMWindow* Frame::domWindow() const
 {

trunk/Source/WebCore/page/Frame.h

@@ -67 +67 @@
     class FrameView;
     class HTMLTableCellElement;
+    class MemoryObjectInfo;
     class RegularExpression;
     class RenderPart;
@@ -118 +119 @@
 #endif
 
+        void reportMemoryUsage(MemoryObjectInfo*) const;
+
     // ======== All public functions below this point are candidates to move out of Frame into another class. ========
 

trunk/Source/WebCore/platform/SharedBuffer.cpp

@@ -28 +28 @@
 #include "SharedBuffer.h"
 
+#include "MemoryInstrumentation.h"
 #include "PurgeableBuffer.h"
 #include <wtf/PassOwnPtr.h>
@@ -246 +247 @@
 }
 
+void SharedBuffer::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+{
+    MemoryClassInfo<SharedBuffer> info(memoryObjectInfo, this, MemoryInstrumentation::Other);
+    info.addVector(m_buffer);
+    info.addVector(m_segments);
+    for (unsigned i = 0; i < m_segments.size(); ++i)
+        info.addRawBuffer(m_segments[i], segmentSize);
+    info.addMember(m_purgeableBuffer.get());
+}
+
 unsigned SharedBuffer::getSomeData(const char*& someData, unsigned position) const
 {

trunk/Source/WebCore/platform/SharedBuffer.h

@@ -44 +44 @@
 namespace WebCore {
     
+class MemoryObjectInfo;
 class PurgeableBuffer;
 
@@ -115 +116 @@
     unsigned getSomeData(const char*& data, unsigned position = 0) const;
 
+    void reportMemoryUsage(MemoryObjectInfo*) const;
+
 private:
     SharedBuffer();