Changeset 118357 in webkit

Timestamp:

May 24, 2012 6:01:53 AM (12 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: add a command to InspectorMemoryAgent for getting process memory break down
​https://bugs.webkit.org/show_bug.cgi?id=87263

Reviewed by Pavel Feldman.

Source/WebCore:

Introduced new protocol command Memory.getProcessMemoryDistribution which returns
memory distribution for the inspected process. Currently only JS allocated and used
heap size is included.

• inspector/Inspector.json:
• inspector/InspectorMemoryAgent.cpp:

(WebCore::jsHeapInfo):
(WebCore):
(WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):

• inspector/InspectorMemoryAgent.h:

(InspectorMemoryAgent):

• platform/chromium/PlatformSupport.h:

(PlatformSupport):

Source/WebKit/chromium:

Added an API for retrieving render process private and shared memory in bytes.

• public/platform/WebKitPlatformSupport.h:

(WebKitPlatformSupport):
(WebKit::WebKitPlatformSupport::getProcessMemorySize):

• src/PlatformSupport.cpp:

(WebCore::PlatformSupport::getProcessMemorySize):
(WebCore):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/Inspector.json (modified) (2 diffs)
• WebCore/inspector/InspectorMemoryAgent.cpp (modified) (3 diffs)
• WebCore/inspector/InspectorMemoryAgent.h (modified) (1 diff)
• WebCore/inspector/InspectorTimelineAgent.cpp (modified) (1 diff)
• WebCore/platform/chromium/PlatformSupport.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/platform/WebKitPlatformSupport.h (modified) (1 diff)
• WebKit/chromium/src/PlatformSupport.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-23  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: add a command to InspectorMemoryAgent for getting process memory break down
+        https://bugs.webkit.org/show_bug.cgi?id=87263
+
+        Reviewed by Pavel Feldman.
+
+        Introduced new protocol command Memory.getProcessMemoryDistribution which returns
+        memory distribution for the inspected process. Currently only JS allocated and used
+        heap size is included.
+
+        * inspector/Inspector.json:
+        * inspector/InspectorMemoryAgent.cpp:
+        (WebCore::jsHeapInfo):
+        (WebCore):
+        (WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):
+        * inspector/InspectorMemoryAgent.h:
+        (InspectorMemoryAgent):
+        * platform/chromium/PlatformSupport.h:
+        (PlatformSupport):
+
 2012-05-24  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -88 +88 @@
                     { "name": "listenerCount", "type": "array", "items": { "$ref": "ListenerCount" }}
                 ]
+            },
+            {
+                "id": "MemoryBlock",
+                "type": "object",
+                "properties": [
+                    { "name": "size", "type": "integer", "optional":true, "description": "Size of the block in bytes if available" },
+                    { "name": "name", "type": "string", "description": "Unique name used to identify the component that allocated this block" },
+                    { "name": "children", "type": "array", "optional": true, "items": { "$ref": "MemoryBlock" }}
+                ]
             }
         ],
@@ -96 +105 @@
                     { "name": "domGroups", "type": "array", "items": { "$ref": "DOMGroup" }},
                     { "name": "strings", "$ref": "StringStatistics" }
+                ]
+            },
+            {
+                "name": "getProcessMemoryDistribution",
+                "returns": [
+                    { "name": "distribution", "$ref": "MemoryBlock", "description": "An object describing all memory allocated by the process"}
                 ]
             }

trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp

@@ -46 +46 @@
 #include "Node.h"
 #include "Page.h"
+#if PLATFORM(CHROMIUM)
+#include "PlatformSupport.h"
+#endif
+#include "ScriptGCEvent.h"
 #include "ScriptProfiler.h"
 #include "StyledElement.h"
@@ -53 +57 @@
 using WebCore::TypeBuilder::Memory::DOMGroup;
 using WebCore::TypeBuilder::Memory::ListenerCount;
+using WebCore::TypeBuilder::Memory::MemoryBlock;
 using WebCore::TypeBuilder::Memory::NodeCount;
 using WebCore::TypeBuilder::Memory::StringStatistics;
 
 namespace WebCore {
+
+namespace MemoryBlockName {
+static const char totalJsHeap[] = "TotalJSHeap";
+static const char processPrivateMemory[] = "ProcessPrivateMemory";
+static const char usedJsHeap[] = "UsedJSHeap";
+}
 
 namespace {
@@ -308 +319 @@
 }
 
+static PassRefPtr<MemoryBlock> jsHeapInfo()
+{
+    size_t usedJSHeapSize;
+    size_t totalJSHeapSize;
+    size_t jsHeapSizeLimit;
+    ScriptGCEvent::getHeapSize(usedJSHeapSize, totalJSHeapSize, jsHeapSizeLimit);
+
+    RefPtr<MemoryBlock> totalJsHeap = MemoryBlock::create().setName(MemoryBlockName::totalJsHeap);
+    totalJsHeap->setSize(totalJSHeapSize);
+
+    RefPtr<TypeBuilder::Array<MemoryBlock> > children = TypeBuilder::Array<MemoryBlock>::create();
+    RefPtr<MemoryBlock> usedJsHeap = MemoryBlock::create().setName(MemoryBlockName::usedJsHeap);
+    usedJsHeap->setSize(usedJSHeapSize);
+    children->addItem(usedJsHeap);
+
+    totalJsHeap->setChildren(children);
+    return totalJsHeap.release();
+}
+
+void InspectorMemoryAgent::getProcessMemoryDistribution(ErrorString*, RefPtr<MemoryBlock>& processMemory)
+{
+    size_t privateBytes = 0;
+#if PLATFORM(CHROMIUM)
+    size_t sharedBytes = 0;
+    PlatformSupport::getProcessMemorySize(&privateBytes, &sharedBytes);
+#endif
+    processMemory = MemoryBlock::create().setName(MemoryBlockName::processPrivateMemory);
+    processMemory->setSize(privateBytes);
+
+    RefPtr<TypeBuilder::Array<MemoryBlock> > children = TypeBuilder::Array<MemoryBlock>::create();
+    children->addItem(jsHeapInfo());
+    processMemory->setChildren(children);
+}
+
 InspectorMemoryAgent::InspectorMemoryAgent(InstrumentingAgents* instrumentingAgents, InspectorState* state, Page* page, InspectorDOMAgent* domAgent)
     : InspectorBaseAgent<InspectorMemoryAgent>("Memory", instrumentingAgents, state)

trunk/Source/WebCore/inspector/InspectorMemoryAgent.h

@@ -57 +57 @@
         return adoptPtr(new InspectorMemoryAgent(instrumentingAgents, state, page, domAgent));
     }
+    virtual ~InspectorMemoryAgent();
 
-    void getDOMNodeCount(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Memory::DOMGroup> >& domGroups, RefPtr<TypeBuilder::Memory::StringStatistics>& strings);
+    virtual void getDOMNodeCount(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Memory::DOMGroup> >& domGroups, RefPtr<TypeBuilder::Memory::StringStatistics>& strings);
+    virtual void getProcessMemoryDistribution(ErrorString*, RefPtr<TypeBuilder::Memory::MemoryBlock>& processMemory);
 
-    ~InspectorMemoryAgent();
 
 private:

trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp

@@ -57 +57 @@
 }
 
-// Must be kept in sync with TimelineAgent.js
+// Must be kept in sync with WebInspector.TimelineModel.RecordType in TimelineModel.js
 namespace TimelineRecordType {
 static const char EventDispatch[] = "EventDispatch";

trunk/Source/WebCore/platform/chromium/PlatformSupport.h

@@ -214 +214 @@
     static void setSharedTimerFireInterval(double);
 
+    // Returns private and shared usage, in bytes. Private bytes is the amount of
+    // memory currently allocated to this process that cannot be shared. Returns
+    // false on platform specific error conditions.
+    static bool getProcessMemorySize(size_t* privateBytes, size_t* sharedBytes);
     // Theming ------------------------------------------------------------
 #if OS(WINDOWS)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-05-23  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: add a command to InspectorMemoryAgent for getting process memory break down
+        https://bugs.webkit.org/show_bug.cgi?id=87263
+
+        Reviewed by Pavel Feldman.
+
+        Added an API for retrieving render process private and shared memory in bytes.
+
+        * public/platform/WebKitPlatformSupport.h:
+        (WebKitPlatformSupport):
+        (WebKit::WebKitPlatformSupport::getProcessMemorySize):
+        * src/PlatformSupport.cpp:
+        (WebCore::PlatformSupport::getProcessMemorySize):
+        (WebCore):
+
 2012-05-24  Hironori Bono  <hbono@chromium.org>
 

trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h

@@ -129 +129 @@
     virtual WebSharedWorkerRepository* sharedWorkerRepository() { return 0; }
 
+    // Returns private and shared usage, in bytes. Private bytes is the amount of
+    // memory currently allocated to this process that cannot be shared. Returns
+    // false on platform specific error conditions.
+    virtual bool getProcessMemorySize(size_t* privateBytes, size_t* sharedBytes) { return false; }
 
 protected:

trunk/Source/WebKit/chromium/src/PlatformSupport.cpp

@@ -838 +838 @@
 }
 
+bool PlatformSupport::getProcessMemorySize(size_t* privateBytes, size_t* sharedBytes)
+{
+    return webKitPlatformSupport()->getProcessMemorySize(privateBytes, sharedBytes);
+}
+
 int PlatformSupport::screenHorizontalDPI(Widget* widget)
 {