Changeset 118847 in webkit

Timestamp:

May 29, 2012 3:59:15 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Add malloc info to about:memory page
​https://bugs.webkit.org/show_bug.cgi?id=87676

Patch by Yong Li <​yoli@rim.com> on 2012-05-29
Reviewed by Rob Buis.

Detailed malloc info can tell us how much memory
in the heaps is being in use.

• WebCoreSupport/AboutData.cpp:

(WebCore::memoryPage):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/AboutData.cpp (modified) (3 diffs)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-05-29  Yong Li  <yoli@rim.com>
+
+        [BlackBerry] Add malloc info to about:memory page
+        https://bugs.webkit.org/show_bug.cgi?id=87676
+
+        Reviewed by Rob Buis.
+
+        Detailed malloc info can tell us how much memory
+        in the heaps is being in use.
+
+        * WebCoreSupport/AboutData.cpp:
+        (WebCore::memoryPage):
+
 2012-05-29  Arvid Nilsson  <anilsson@rim.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/AboutData.cpp

@@ -20 +20 @@
 #include "AboutData.h"
 
+#include "CString.h"
 #include "MemoryCache.h"
 #include "SurfacePool.h"
 #include "WebKitVersion.h"
 
+#include <process.h>
 #include <BlackBerryPlatformSettings.h>
+#include <sys/stat.h>
 #include <sys/utsname.h>
-#include <wtf/Platform.h>
 
 namespace WebCore {
@@ -196 +198 @@
     // generate cache information
     MemoryCache* cacheInc = memoryCache();
-    MemoryCache::Statistics stat = cacheInc->getStatistics();
+    MemoryCache::Statistics cacheStat = cacheInc->getStatistics();
 
     page += String("<h2>Cache Information</h2>")
@@ -202 +204 @@
 
     MemoryCache::TypeStatistic total;
-    total.count = stat.images.count + stat.cssStyleSheets.count
-            + stat.scripts.count + stat.xslStyleSheets.count + stat.fonts.count;
+    total.count = cacheStat.images.count + cacheStat.cssStyleSheets.count
+            + cacheStat.scripts.count + cacheStat.xslStyleSheets.count + cacheStat.fonts.count;
     total.size = cacheInc->totalSize();
-    total.liveSize = stat.images.liveSize + stat.cssStyleSheets.liveSize
-            + stat.scripts.liveSize + stat.xslStyleSheets.liveSize + stat.fonts.liveSize;
-    total.decodedSize = stat.images.decodedSize
-            + stat.cssStyleSheets.decodedSize + stat.scripts.decodedSize
-            + stat.xslStyleSheets.decodedSize + stat.fonts.decodedSize;
+    total.liveSize = cacheStat.images.liveSize + cacheStat.cssStyleSheets.liveSize
+            + cacheStat.scripts.liveSize + cacheStat.xslStyleSheets.liveSize + cacheStat.fonts.liveSize;
+    total.decodedSize = cacheStat.images.decodedSize
+            + cacheStat.cssStyleSheets.decodedSize + cacheStat.scripts.decodedSize
+            + cacheStat.xslStyleSheets.decodedSize + cacheStat.fonts.decodedSize;
 
     page += cacheTypeStatisticToHTMLTr("Total", total);
-    page += cacheTypeStatisticToHTMLTr("Images", stat.images);
-    page += cacheTypeStatisticToHTMLTr("CSS Style Sheets", stat.cssStyleSheets);
-    page += cacheTypeStatisticToHTMLTr("Scripts", stat.scripts);
+    page += cacheTypeStatisticToHTMLTr("Images", cacheStat.images);
+    page += cacheTypeStatisticToHTMLTr("CSS Style Sheets", cacheStat.cssStyleSheets);
+    page += cacheTypeStatisticToHTMLTr("Scripts", cacheStat.scripts);
 #if ENABLE(XSLT)
-    page += cacheTypeStatisticToHTMLTr("XSL Style Sheets", stat.xslStyleSheets);
-#endif
-    page += cacheTypeStatisticToHTMLTr("Fonts", stat.fonts);
-
-    page += "</table></body></html>";
+    page += cacheTypeStatisticToHTMLTr("XSL Style Sheets", cacheStat.xslStyleSheets);
+#endif
+    page += cacheTypeStatisticToHTMLTr("Fonts", cacheStat.fonts);
+
+    page += "</table>";
+
+#if !defined(PUBLIC_BUILD) || !PUBLIC_BUILD
+    struct mallinfo mallocInfo = mallinfo();
+
+    page += String("<h2>Malloc Information</h2>") + "<table align=\"center\" rules=\"all\">";
+
+    page += numberToHTMLTr("Total space in use", mallocInfo.usmblks + mallocInfo.uordblks);
+    page += numberToHTMLTr("Total space in free blocks", mallocInfo.fsmblks + mallocInfo.fordblks);
+    page += numberToHTMLTr("Size of the arena", mallocInfo.arena);
+    page += numberToHTMLTr("Number of big blocks in use", mallocInfo.ordblks);
+    page += numberToHTMLTr("Number of small blocks in use", mallocInfo.smblks);
+    page += numberToHTMLTr("Number of header blocks in use", mallocInfo.hblks);
+    page += numberToHTMLTr("Space in header block headers", mallocInfo.hblkhd);
+    page += numberToHTMLTr("Space in small blocks in use", mallocInfo.usmblks);
+    page += numberToHTMLTr("Memory in free small blocks", mallocInfo.fsmblks);
+    page += numberToHTMLTr("Space in big blocks in use", mallocInfo.uordblks);
+    page += numberToHTMLTr("Memory in free big blocks", mallocInfo.fordblks);
+
+    struct stat processInfo;
+    if (!stat(String::format("/proc/%u/as", getpid()).latin1().data(), &processInfo))
+        page += numberToHTMLTr("Process total mapped memory", processInfo.st_size);
+
+    page += "</table>";
+#endif
+
+    page += "</body></html>";
     return page;
 }