<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193757] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193757">193757</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-12-08 09:50:48 -0800 (Tue, 08 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] ResourceUsageOverlay should query kernel for VM page size.
<https://webkit.org/b/151920>
Reviewed by Andy Estes.
Read the vm.pagesize sysctl to find the correct page size for memory usage calculations.
This fixes broken math on systems that have different hw.pagesize and vm.pagesize.
* page/cocoa/ResourceUsageOverlayCocoa.mm:
(WebCore::vmPageSize):
(WebCore::pagesPerVMTag):
(WebCore::runSamplerThread):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagecocoaResourceUsageOverlayCocoamm">trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (193756 => 193757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-08 17:39:46 UTC (rev 193756)
+++ trunk/Source/WebCore/ChangeLog 2015-12-08 17:50:48 UTC (rev 193757)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-12-08 Andreas Kling <akling@apple.com>
+
+ [Cocoa] ResourceUsageOverlay should query kernel for VM page size.
+ <https://webkit.org/b/151920>
+
+ Reviewed by Andy Estes.
+
+ Read the vm.pagesize sysctl to find the correct page size for memory usage calculations.
+ This fixes broken math on systems that have different hw.pagesize and vm.pagesize.
+
+ * page/cocoa/ResourceUsageOverlayCocoa.mm:
+ (WebCore::vmPageSize):
+ (WebCore::pagesPerVMTag):
+ (WebCore::runSamplerThread):
+
</ins><span class="cx"> 2015-12-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add diagnostic logging to measure speculative revalidation accuracy
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaResourceUsageOverlayCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm (193756 => 193757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm 2015-12-08 17:39:46 UTC (rev 193756)
+++ trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm 2015-12-08 17:50:48 UTC (rev 193757)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include <mach/mach.h>
</span><span class="cx"> #include <mach/vm_statistics.h>
</span><span class="cx"> #include <runtime/JSLock.h>
</span><ins>+#include <sys/sysctl.h>
</ins><span class="cx"> #include <thread>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -69,6 +70,19 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static size_t vmPageSize()
+{
+ static size_t pageSize;
+ static std::once_flag onceFlag;
+ std::call_once(onceFlag, [&] {
+ size_t outputSize = sizeof(pageSize);
+ int status = sysctlbyname("vm.pagesize", &pageSize, &outputSize, nullptr, 0);
+ ASSERT_UNUSED(status, status != -1);
+ ASSERT(pageSize);
+ });
+ return pageSize;
+}
+
</ins><span class="cx"> template<typename T, size_t size = 70>
</span><span class="cx"> class RingBuffer {
</span><span class="cx"> public:
</span><span class="lines">@@ -459,8 +473,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (purgeableState == VM_PURGABLE_EMPTY) {
</span><del>- static size_t vmPageSize = getpagesize();
- tags[info.user_tag].reclaimable += size / vmPageSize;
</del><ins>+ tags[info.user_tag].reclaimable += size / vmPageSize();
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -533,7 +546,6 @@
</span><span class="cx">
</span><span class="cx"> NO_RETURN void runSamplerThread(void*)
</span><span class="cx"> {
</span><del>- static size_t vmPageSize = getpagesize();
</del><span class="cx"> auto& data = sharedData();
</span><span class="cx"> while (1) {
</span><span class="cx"> float cpu = cpuUsage();
</span><span class="lines">@@ -556,10 +568,10 @@
</span><span class="cx"> for (auto& category : data.categories) {
</span><span class="cx"> if (category.isSubcategory) // Only do automatic tallying for top-level categories.
</span><span class="cx"> continue;
</span><del>- category.history.append(pagesPerCategory[category.type].dirty * vmPageSize);
- category.reclaimableHistory.append(pagesPerCategory[category.type].reclaimable * vmPageSize);
</del><ins>+ category.history.append(pagesPerCategory[category.type].dirty * vmPageSize());
+ category.reclaimableHistory.append(pagesPerCategory[category.type].reclaimable * vmPageSize());
</ins><span class="cx"> }
</span><del>- data.totalDirty.append(totalDirtyPages * vmPageSize);
</del><ins>+ data.totalDirty.append(totalDirtyPages * vmPageSize());
</ins><span class="cx">
</span><span class="cx"> copyToVector(data.overlayLayers, layers);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>