<!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>[212043] 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/212043">212043</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-02-09 21:26:08 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve IOSurfacePool logging
https://bugs.webkit.org/show_bug.cgi?id=168098
Reviewed by Tim Horton.
Pass a string to DUMP_POOL_STATISTICS so we can tell what's triggering the
logging.
* platform/graphics/cg/IOSurfacePool.cpp:
(WebCore::IOSurfacePool::takeSurface):
(WebCore::IOSurfacePool::addSurface):
(WebCore::IOSurfacePool::evict):
(WebCore::IOSurfacePool::collectionTimerFired):
(WebCore::IOSurfacePool::showPoolStatistics):
* platform/graphics/cg/IOSurfacePool.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgIOSurfacePoolcpp">trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgIOSurfacePoolh">trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212042 => 212043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-10 05:08:59 UTC (rev 212042)
+++ trunk/Source/WebCore/ChangeLog 2017-02-10 05:26:08 UTC (rev 212043)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-02-09 Simon Fraser <simon.fraser@apple.com>
+
+ Improve IOSurfacePool logging
+ https://bugs.webkit.org/show_bug.cgi?id=168098
+
+ Reviewed by Tim Horton.
+
+ Pass a string to DUMP_POOL_STATISTICS so we can tell what's triggering the
+ logging.
+
+ * platform/graphics/cg/IOSurfacePool.cpp:
+ (WebCore::IOSurfacePool::takeSurface):
+ (WebCore::IOSurfacePool::addSurface):
+ (WebCore::IOSurfacePool::evict):
+ (WebCore::IOSurfacePool::collectionTimerFired):
+ (WebCore::IOSurfacePool::showPoolStatistics):
+ * platform/graphics/cg/IOSurfacePool.h:
+
</ins><span class="cx"> 2017-02-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r212040.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgIOSurfacePoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp (212042 => 212043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp 2017-02-10 05:08:59 UTC (rev 212042)
+++ trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp 2017-02-10 05:26:08 UTC (rev 212043)
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx"> // they can't be immediately returned when requested (but will be freed up in the future).
</span><span class="cx"> const size_t maximumInUseBytes = defaultMaximumBytesCached / 2;
</span><span class="cx">
</span><del>-#define ENABLE_IOSURFACE_POOL_STATISTICS false
</del><ins>+#define ENABLE_IOSURFACE_POOL_STATISTICS 0
</ins><span class="cx"> #if ENABLE_IOSURFACE_POOL_STATISTICS
</span><del>-#define DUMP_POOL_STATISTICS() do { showPoolStatistics(); } while (0);
</del><ins>+#define DUMP_POOL_STATISTICS(reason) do { showPoolStatistics(reason); } while (0);
</ins><span class="cx"> #else
</span><del>-#define DUMP_POOL_STATISTICS() ((void)0)
</del><ins>+#define DUMP_POOL_STATISTICS(reason) ((void)0)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> CachedSurfaceMap::iterator mapIter = m_cachedSurfaces.find(size);
</span><span class="cx">
</span><span class="cx"> if (mapIter == m_cachedSurfaces.end()) {
</span><del>- DUMP_POOL_STATISTICS();
</del><ins>+ DUMP_POOL_STATISTICS("takeSurface - none with matching size");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx">
</span><span class="cx"> surface->setIsVolatile(false);
</span><span class="cx">
</span><del>- DUMP_POOL_STATISTICS();
</del><ins>+ DUMP_POOL_STATISTICS("takeSurface - taking");
</ins><span class="cx"> return surface;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -151,11 +151,11 @@
</span><span class="cx">
</span><span class="cx"> surface->setIsVolatile(false);
</span><span class="cx">
</span><del>- DUMP_POOL_STATISTICS();
</del><ins>+ DUMP_POOL_STATISTICS("takeSurface - taking in-use");
</ins><span class="cx"> return surface;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- DUMP_POOL_STATISTICS();
</del><ins>+ DUMP_POOL_STATISTICS("takeSurface - failing");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -184,12 +184,12 @@
</span><span class="cx"> if (surfaceIsInUse) {
</span><span class="cx"> m_inUseSurfaces.prepend(WTFMove(surface));
</span><span class="cx"> scheduleCollectionTimer();
</span><del>- DUMP_POOL_STATISTICS();
</del><ins>+ DUMP_POOL_STATISTICS("addSurface - in-use");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> insertSurfaceIntoPool(WTFMove(surface));
</span><del>- DUMP_POOL_STATISTICS();
</del><ins>+ DUMP_POOL_STATISTICS("addSurface");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IOSurfacePool::insertSurfaceIntoPool(std::unique_ptr<IOSurface> surface)
</span><span class="lines">@@ -240,8 +240,11 @@
</span><span class="cx">
</span><span class="cx"> void IOSurfacePool::evict(size_t additionalSize)
</span><span class="cx"> {
</span><ins>+ DUMP_POOL_STATISTICS("before evict");
+
</ins><span class="cx"> if (additionalSize >= m_maximumBytesCached) {
</span><span class="cx"> discardAllSurfaces();
</span><ins>+ DUMP_POOL_STATISTICS("after evict all");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -261,6 +264,8 @@
</span><span class="cx">
</span><span class="cx"> while (m_inUseBytesCached > maximumInUseBytes || m_bytesCached > targetSize)
</span><span class="cx"> tryEvictInUseSurface();
</span><ins>+
+ DUMP_POOL_STATISTICS("after evict");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IOSurfacePool::collectInUseSurfaces()
</span><span class="lines">@@ -310,7 +315,7 @@
</span><span class="cx"> m_collectionTimer.stop();
</span><span class="cx">
</span><span class="cx"> platformGarbageCollectNow();
</span><del>- DUMP_POOL_STATISTICS();
</del><ins>+ DUMP_POOL_STATISTICS("collectionTimerFired");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IOSurfacePool::scheduleCollectionTimer()
</span><span class="lines">@@ -331,10 +336,10 @@
</span><span class="cx"> platformGarbageCollectNow();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IOSurfacePool::showPoolStatistics()
</del><ins>+void IOSurfacePool::showPoolStatistics(const char* reason)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE_IOSURFACE_POOL_STATISTICS
</span><del>- WTFLogAlways("IOSurfacePool Statistics\n");
</del><ins>+ WTFLogAlways("IOSurfacePool Statistics: %s\n", reason);
</ins><span class="cx"> unsigned totalSurfaces = 0;
</span><span class="cx"> size_t totalSize = 0;
</span><span class="cx"> size_t totalPurgeableSize = 0;
</span><span class="lines">@@ -356,7 +361,7 @@
</span><span class="cx"> totalSize += queueSize;
</span><span class="cx"> totalPurgeableSize += queuePurgeableSize;
</span><span class="cx">
</span><del>- WTFLogAlways(" %d x %d: %zu surfaces for %zd KB (%zd KB purgeable)", keyAndSurfaces.key.width(), keyAndSurfaces.key.height(), keyAndSurfaces.value.size(), queueSize / 1024, queuePurgeableSize / 1024);
</del><ins>+ WTFLogAlways(" %d x %d: %zu surfaces for %.2f MB (%.2f MB purgeable)", keyAndSurfaces.key.width(), keyAndSurfaces.key.height(), keyAndSurfaces.value.size(), queueSize / (1024.0 * 1024.0), queuePurgeableSize / (1024.0 * 1024.0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t inUseSize = 0;
</span><span class="lines">@@ -366,13 +371,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> totalSize += inUseSize;
</span><del>- WTFLogAlways(" IN USE: %zu surfaces for %zd KB", m_inUseSurfaces.size(), inUseSize / 1024);
</del><ins>+ WTFLogAlways(" IN USE: %zu surfaces for %.2f MB", m_inUseSurfaces.size(), inUseSize / (1024.0 * 1024.0));
</ins><span class="cx">
</span><span class="cx"> // FIXME: Should move consistency checks elsewhere, and always perform them in debug builds.
</span><span class="cx"> ASSERT(m_bytesCached == totalSize);
</span><span class="cx"> ASSERT(m_bytesCached <= m_maximumBytesCached);
</span><span class="cx">
</span><del>- WTFLogAlways(" TOTAL: %d surfaces for %zd KB (%zd KB purgeable)\n", totalSurfaces, totalSize / 1024, totalPurgeableSize / 1024);
</del><ins>+ WTFLogAlways(" TOTAL: %d surfaces for %.2f MB (%.2f MB purgeable)\n", totalSurfaces, totalSize / (1024.0 * 1024.0), totalPurgeableSize / (1024.0 * 1024.0));
+#else
+ UNUSED_PARAM(reason);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgIOSurfacePoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h (212042 => 212043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h 2017-02-10 05:08:59 UTC (rev 212042)
+++ trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h 2017-02-10 05:26:08 UTC (rev 212043)
</span><span class="lines">@@ -53,8 +53,6 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setPoolSize(size_t);
</span><span class="cx">
</span><del>- void showPoolStatistics();
-
</del><span class="cx"> private:
</span><span class="cx"> IOSurfacePool();
</span><span class="cx">
</span><span class="lines">@@ -92,6 +90,8 @@
</span><span class="cx">
</span><span class="cx"> void platformGarbageCollectNow();
</span><span class="cx">
</span><ins>+ void showPoolStatistics(const char*);
+
</ins><span class="cx"> Timer m_collectionTimer;
</span><span class="cx"> CachedSurfaceMap m_cachedSurfaces;
</span><span class="cx"> CachedSurfaceQueue m_inUseSurfaces;
</span></span></pre>
</div>
</div>
</body>
</html>