Title: [122745] trunk/Source/WebKit/blackberry
- Revision
- 122745
- Author
- commit-qu...@webkit.org
- Date
- 2012-07-16 11:59:27 -0700 (Mon, 16 Jul 2012)
Log Message
[BlackBerry] Improve about:memory page
https://bugs.webkit.org/show_bug.cgi?id=87676
Patch by Yong Li <y...@rim.com> on 2012-07-16
Reviewed by Rob Buis.
Add a table for process memory usage summary for easy read.
* WebCoreSupport/AboutData.cpp:
(WebCore::memoryPage):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (122744 => 122745)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-07-16 18:40:42 UTC (rev 122744)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-07-16 18:59:27 UTC (rev 122745)
@@ -1,3 +1,15 @@
+2012-07-16 Yong Li <y...@rim.com>
+
+ [BlackBerry] Improve about:memory page
+ https://bugs.webkit.org/show_bug.cgi?id=87676
+
+ Reviewed by Rob Buis.
+
+ Add a table for process memory usage summary for easy read.
+
+ * WebCoreSupport/AboutData.cpp:
+ (WebCore::memoryPage):
+
2012-07-16 Kihong Kwon <kihong.k...@samsung.com>
Remove setController from BatteryClient
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutData.cpp (122744 => 122745)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/AboutData.cpp 2012-07-16 18:40:42 UTC (rev 122744)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/AboutData.cpp 2012-07-16 18:59:27 UTC (rev 122745)
@@ -241,6 +241,19 @@
OwnPtr<JSC::TypeCountSet> objectTypeCounts = mainHeap.objectTypeCounts();
OwnPtr<JSC::TypeCountSet> protectedObjectTypeCounts = mainHeap.protectedObjectTypeCounts();
+ // Malloc info.
+ struct mallinfo mallocInfo = mallinfo();
+
+ page += "<div class='box'><div class='box-title'>Process memory usage summary</div><table class='fixed-table'><col width=75%><col width=25%>";
+
+ page += numberToHTMLTr("Total memory usage (malloc + JSC)", mallocInfo.arena + jscMemoryStat.stackBytes + jscMemoryStat.JITBytes + mainHeap.capacity());
+
+ struct stat processInfo;
+ if (!stat(String::format("/proc/%u/as", getpid()).latin1().data(), &processInfo))
+ page += numberToHTMLTr("Total mapped memory", processInfo.st_size);
+
+ page += "</table></div><br>";
+
page += "<div class='box'><div class='box-title'>JS engine memory usage</div><table class='fixed-table'><col width=75%><col width=25%>";
page += numberToHTMLTr("Stack size", jscMemoryStat.stackBytes);
@@ -254,17 +267,14 @@
page += "</table></div><br>";
- page += "<div class='box'><div class='box-title'>Object type counts</div><table class='fixed-table'><col width=75%><col width=25%>";
+ page += "<div class='box'><div class='box-title'>JS object type counts</div><table class='fixed-table'><col width=75%><col width=25%>";
dumpJSCTypeCountSetToTableHTML(page, objectTypeCounts.get());
page += "</table></div><br>";
- page += "<div class='box'><div class='box-title'>Protected object type counts</div><table class='fixed-table'><col width=75%><col width=25%>";
+ page += "<div class='box'><div class='box-title'>JS protected object type counts</div><table class='fixed-table'><col width=75%><col width=25%>";
dumpJSCTypeCountSetToTableHTML(page, protectedObjectTypeCounts.get());
page += "</table></div><br>";
- // Malloc info.
- struct mallinfo mallocInfo = mallinfo();
-
page += "<div class='box'><div class='box-title'>Malloc Information</div><table class='fixed-table'><col width=75%><col width=25%>";
page += numberToHTMLTr("Total space in use", mallocInfo.usmblks + mallocInfo.uordblks);
@@ -279,10 +289,6 @@
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></div>";
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
