<!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>[208538] trunk/Source/WebKit2</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/208538">208538</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-10 08:03:51 -0800 (Thu, 10 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Linux] Memory process values shown by the WebMemorySampler in linux are wrong
https://bugs.webkit.org/show_bug.cgi?id=164591
Reviewed by Michael Catanzaro.
It's parsing /proc/self/statm, and returning the values as if they were bytes, but they are number of pages, so
to get the bytes we need to take the page size into account. In <a href="http://trac.webkit.org/projects/webkit/changeset/208534">r208534</a> I added a method to get /proc/self/statm
values in bytes to Platform layer, so we can simply use that instead.
* Shared/linux/WebMemorySamplerLinux.cpp:
(WebKit::WebMemorySampler::sampleWebKit): Use currentProcessMemoryStatus() and update the descriptions to
clarify that values are in bytes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedlinuxWebMemorySamplerLinuxcpp">trunk/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208537 => 208538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-10 15:43:53 UTC (rev 208537)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-10 16:03:51 UTC (rev 208538)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-11-10 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [Linux] Memory process values shown by the WebMemorySampler in linux are wrong
+ https://bugs.webkit.org/show_bug.cgi?id=164591
+
+ Reviewed by Michael Catanzaro.
+
+ It's parsing /proc/self/statm, and returning the values as if they were bytes, but they are number of pages, so
+ to get the bytes we need to take the page size into account. In r208534 I added a method to get /proc/self/statm
+ values in bytes to Platform layer, so we can simply use that instead.
+
+ * Shared/linux/WebMemorySamplerLinux.cpp:
+ (WebKit::WebMemorySampler::sampleWebKit): Use currentProcessMemoryStatus() and update the descriptions to
+ clarify that values are in bytes.
+
</ins><span class="cx"> 2016-10-14 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> MemoryPressureHandler shouldn't know how to release WebCore memory
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedlinuxWebMemorySamplerLinuxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp (208537 => 208538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp 2016-11-10 15:43:53 UTC (rev 208537)
+++ trunk/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp 2016-11-10 16:03:51 UTC (rev 208538)
</span><span class="lines">@@ -28,10 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEMORY_SAMPLER)
</span><span class="cx">
</span><del>-#include "NotImplemented.h"
</del><span class="cx"> #include <JavaScriptCore/MemoryStatistics.h>
</span><ins>+#include <WebCore/CurrentProcessMemoryStatus.h>
+#include <WebCore/JSDOMWindow.h>
+#include <WebCore/NotImplemented.h>
</ins><span class="cx"> #include <runtime/JSCInlines.h>
</span><del>-#include <WebCore/JSDOMWindow.h>
</del><span class="cx"> #include <runtime/JSLock.h>
</span><span class="cx"> #include <string.h>
</span><span class="cx"> #include <sys/sysinfo.h>
</span><span class="lines">@@ -44,16 +45,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-struct ApplicationMemoryStats {
- size_t totalProgramSize;
- size_t residentSetSize;
- size_t sharedSize;
- size_t textSize;
- size_t librarySize;
- size_t dataStackSize;
- size_t dirtyPageSize;
-};
-
</del><span class="cx"> static const unsigned int maxBuffer = 128;
</span><span class="cx"> static const unsigned int maxProcessPath = 35;
</span><span class="cx">
</span><span class="lines">@@ -84,28 +75,6 @@
</span><span class="cx"> stats.values.append(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static ApplicationMemoryStats sampleMemoryAllocatedForApplication()
-{
- ApplicationMemoryStats applicationStats = {0, 0, 0, 0, 0, 0, 0};
- char processPath[maxProcessPath];
- snprintf(processPath, maxProcessPath, "/proc/self/statm");
- FILE* statmFileDescriptor = fopen(processPath, "r");
- if (!statmFileDescriptor)
- return applicationStats;
-
- applicationStats.totalProgramSize = nextToken(statmFileDescriptor).toInt();
- applicationStats.residentSetSize = nextToken(statmFileDescriptor).toInt();
- applicationStats.sharedSize = nextToken(statmFileDescriptor).toInt();
- applicationStats.textSize = nextToken(statmFileDescriptor).toInt();
- applicationStats.librarySize = nextToken(statmFileDescriptor).toInt();
- applicationStats.dataStackSize = nextToken(statmFileDescriptor).toInt();
- applicationStats.dirtyPageSize = nextToken(statmFileDescriptor).toInt();
-
- fclose(statmFileDescriptor);
-
- return applicationStats;
-}
-
</del><span class="cx"> String WebMemorySampler::processName() const
</span><span class="cx"> {
</span><span class="cx"> char processPath[maxProcessPath];
</span><span class="lines">@@ -130,15 +99,16 @@
</span><span class="cx">
</span><span class="cx"> appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Timestamp"), now);
</span><span class="cx">
</span><del>- ApplicationMemoryStats applicationStats = sampleMemoryAllocatedForApplication();
</del><ins>+ ProcessMemoryStatus processMemoryStatus;
+ currentProcessMemoryStatus(processMemoryStatus);
</ins><span class="cx">
</span><del>- appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Total Program Size"), applicationStats.totalProgramSize);
- appendKeyValuePair(webKitMemoryStats, ASCIILiteral("RSS"), applicationStats.residentSetSize);
- appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Shared"), applicationStats.sharedSize);
- appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Text"), applicationStats.textSize);
- appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Library"), applicationStats.librarySize);
- appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Data/Stack"), applicationStats.dataStackSize);
- appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Dirty"), applicationStats.dirtyPageSize);
</del><ins>+ appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Total Program Bytes"), processMemoryStatus.size);
+ appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Resident Set Bytes"), processMemoryStatus.resident);
+ appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Resident Shared Bytes"), processMemoryStatus.shared);
+ appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Text Bytes"), processMemoryStatus.text);
+ appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Library Bytes"), processMemoryStatus.lib);
+ appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Data + Stack Bytes"), processMemoryStatus.data);
+ appendKeyValuePair(webKitMemoryStats, ASCIILiteral("Dirty Bytes"), processMemoryStatus.dt);
</ins><span class="cx">
</span><span class="cx"> size_t totalBytesInUse = 0;
</span><span class="cx"> size_t totalBytesCommitted = 0;
</span></span></pre>
</div>
</div>
</body>
</html>