Changeset 212043 in webkit

Timestamp:

Feb 9, 2017 9:26:08 PM (7 years ago)

Author:

Simon Fraser

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/IOSurfacePool.cpp (modified) (12 diffs)
• platform/graphics/cg/IOSurfacePool.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2017-02-09  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp

@@ -42 +42 @@
 const size_t maximumInUseBytes = defaultMaximumBytesCached / 2;
 
-#define ENABLE_IOSURFACE_POOL_STATISTICS false
+#define ENABLE_IOSURFACE_POOL_STATISTICS 0
 #if ENABLE_IOSURFACE_POOL_STATISTICS
-#define DUMP_POOL_STATISTICS() do { showPoolStatistics(); } while (0);
+#define DUMP_POOL_STATISTICS(reason) do { showPoolStatistics(reason); } while (0);
 #else
-#define DUMP_POOL_STATISTICS() ((void)0)
+#define DUMP_POOL_STATISTICS(reason) ((void)0)
 #endif
 
@@ -113 +113 @@
 
     if (mapIter == m_cachedSurfaces.end()) {
-        DUMP_POOL_STATISTICS();
+        DUMP_POOL_STATISTICS("takeSurface - none with matching size");
         return nullptr;
     }
@@ -135 +135 @@
         surface->setIsVolatile(false);
 
-        DUMP_POOL_STATISTICS();
+        DUMP_POOL_STATISTICS("takeSurface - taking");
         return surface;
     }
@@ -152 +152 @@
         surface->setIsVolatile(false);
 
-        DUMP_POOL_STATISTICS();
+        DUMP_POOL_STATISTICS("takeSurface - taking in-use");
         return surface;
     }
 
-    DUMP_POOL_STATISTICS();
+    DUMP_POOL_STATISTICS("takeSurface - failing");
     return nullptr;
 }
@@ -185 +185 @@
         m_inUseSurfaces.prepend(WTFMove(surface));
         scheduleCollectionTimer();
-        DUMP_POOL_STATISTICS();
+        DUMP_POOL_STATISTICS("addSurface - in-use");
         return;
     }
 
     insertSurfaceIntoPool(WTFMove(surface));
-    DUMP_POOL_STATISTICS();
+    DUMP_POOL_STATISTICS("addSurface");
 }
 
@@ -241 +241 @@
 void IOSurfacePool::evict(size_t additionalSize)
 {
+    DUMP_POOL_STATISTICS("before evict");
+
     if (additionalSize >= m_maximumBytesCached) {
         discardAllSurfaces();
+        DUMP_POOL_STATISTICS("after evict all");
         return;
     }
@@ -262 +265 @@
     while (m_inUseBytesCached > maximumInUseBytes || m_bytesCached > targetSize)
         tryEvictInUseSurface();
+
+    DUMP_POOL_STATISTICS("after evict");
 }
 
@@ -311 +316 @@
 
     platformGarbageCollectNow();
-    DUMP_POOL_STATISTICS();
+    DUMP_POOL_STATISTICS("collectionTimerFired");
 }
 
@@ -332 +337 @@
 }
 
-void IOSurfacePool::showPoolStatistics()
+void IOSurfacePool::showPoolStatistics(const char* reason)
 {
 #if ENABLE_IOSURFACE_POOL_STATISTICS
-    WTFLogAlways("IOSurfacePool Statistics\n");
+    WTFLogAlways("IOSurfacePool Statistics: %s\n", reason);
     unsigned totalSurfaces = 0;
     size_t totalSize = 0;
@@ -357 +362 @@
         totalPurgeableSize += queuePurgeableSize;
 
-        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);
+        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));
     }
 
@@ -367 +372 @@
 
     totalSize += inUseSize;
-    WTFLogAlways("   IN USE: %zu surfaces for %zd KB", m_inUseSurfaces.size(), inUseSize / 1024);
+    WTFLogAlways("   IN USE: %zu surfaces for %.2f MB", m_inUseSurfaces.size(), inUseSize / (1024.0 * 1024.0));
 
     // FIXME: Should move consistency checks elsewhere, and always perform them in debug builds.
@@ -373 +378 @@
     ASSERT(m_bytesCached <= m_maximumBytesCached);
 
-    WTFLogAlways("   TOTAL: %d surfaces for %zd KB (%zd KB purgeable)\n", totalSurfaces, totalSize / 1024, totalPurgeableSize / 1024);
+    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);
 #endif
 }

trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h

@@ -54 +54 @@
     WEBCORE_EXPORT void setPoolSize(size_t);
 
-    void showPoolStatistics();
-
 private:
     IOSurfacePool();
@@ -93 +91 @@
     void platformGarbageCollectNow();
 
+    void showPoolStatistics(const char*);
+
     Timer m_collectionTimer;
     CachedSurfaceMap m_cachedSurfaces;