<!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>[194057] trunk/Source</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/194057">194057</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-12-14 13:36:27 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ResourceUsageOverlay should show GC timers.
<https://webkit.org/b/152151>
Reviewed by Darin Adler.
Source/JavaScriptCore:
Expose the next fire time (in WTF timestamp style) of a GCActivityCallback.
* heap/GCActivityCallback.cpp:
(JSC::GCActivityCallback::scheduleTimer):
(JSC::GCActivityCallback::cancelTimer):
* heap/GCActivityCallback.h:
Source/WebCore:
Add countdowns until next Eden and Full GC to the overlay. It also shows if there
is no garbage collection scheduled. This will be helpful in understanding why GC
sometimes takes a very long time to happen.
* page/ResourceUsageOverlay.h:
* page/cocoa/ResourceUsageOverlayCocoa.mm:
(WebCore::formatByteNumber): Drive-by silly math fix. :|
(WebCore::gcTimerString):
(WebCore::ResourceUsageOverlay::platformDraw):
(WebCore::nextFireTimeForGCTimer):
(WebCore::runSamplerThread):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCActivityCallbackcpp">trunk/Source/JavaScriptCore/heap/GCActivityCallback.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCActivityCallbackh">trunk/Source/JavaScriptCore/heap/GCActivityCallback.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageResourceUsageOverlayh">trunk/Source/WebCore/page/ResourceUsageOverlay.h</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="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194056 => 194057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-14 21:30:31 UTC (rev 194056)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-14 21:36:27 UTC (rev 194057)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-12-14 Andreas Kling <akling@apple.com>
+
+ ResourceUsageOverlay should show GC timers.
+ <https://webkit.org/b/152151>
+
+ Reviewed by Darin Adler.
+
+ Expose the next fire time (in WTF timestamp style) of a GCActivityCallback.
+
+ * heap/GCActivityCallback.cpp:
+ (JSC::GCActivityCallback::scheduleTimer):
+ (JSC::GCActivityCallback::cancelTimer):
+ * heap/GCActivityCallback.h:
+
</ins><span class="cx"> 2015-12-14 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix merge issue in a test.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCActivityCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCActivityCallback.cpp (194056 => 194057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCActivityCallback.cpp 2015-12-14 21:30:31 UTC (rev 194056)
+++ trunk/Source/JavaScriptCore/heap/GCActivityCallback.cpp 2015-12-14 21:36:27 UTC (rev 194057)
</span><span class="lines">@@ -95,12 +95,14 @@
</span><span class="cx"> return;
</span><span class="cx"> double delta = m_delay - newDelay;
</span><span class="cx"> m_delay = newDelay;
</span><ins>+ m_nextFireTime = WTF::currentTime() + newDelay;
</ins><span class="cx"> CFRunLoopTimerSetNextFireDate(m_timer.get(), CFRunLoopTimerGetNextFireDate(m_timer.get()) - delta);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GCActivityCallback::cancelTimer()
</span><span class="cx"> {
</span><span class="cx"> m_delay = s_decade;
</span><ins>+ m_nextFireTime = 0;
</ins><span class="cx"> CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + s_decade);
</span><span class="cx"> }
</span><span class="cx"> #elif PLATFORM(EFL)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCActivityCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCActivityCallback.h (194056 => 194057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCActivityCallback.h 2015-12-14 21:30:31 UTC (rev 194056)
+++ trunk/Source/JavaScriptCore/heap/GCActivityCallback.h 2015-12-14 21:36:27 UTC (rev 194057)
</span><span class="lines">@@ -61,6 +61,10 @@
</span><span class="cx">
</span><span class="cx"> static bool s_shouldCreateGCTimer;
</span><span class="cx">
</span><ins>+#if USE(CF) || PLATFORM(EFL)
+ double nextFireTime() const { return m_nextFireTime; }
+#endif
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual double lastGCLength() = 0;
</span><span class="cx"> virtual double gcTimeSlice(size_t bytes) = 0;
</span><span class="lines">@@ -109,6 +113,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> double m_delay;
</span><ins>+ double m_nextFireTime { 0 };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194056 => 194057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-14 21:30:31 UTC (rev 194056)
+++ trunk/Source/WebCore/ChangeLog 2015-12-14 21:36:27 UTC (rev 194057)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-12-14 Andreas Kling <akling@apple.com>
+
+ ResourceUsageOverlay should show GC timers.
+ <https://webkit.org/b/152151>
+
+ Reviewed by Darin Adler.
+
+ Add countdowns until next Eden and Full GC to the overlay. It also shows if there
+ is no garbage collection scheduled. This will be helpful in understanding why GC
+ sometimes takes a very long time to happen.
+
+ * page/ResourceUsageOverlay.h:
+ * page/cocoa/ResourceUsageOverlayCocoa.mm:
+ (WebCore::formatByteNumber): Drive-by silly math fix. :|
+ (WebCore::gcTimerString):
+ (WebCore::ResourceUsageOverlay::platformDraw):
+ (WebCore::nextFireTimeForGCTimer):
+ (WebCore::runSamplerThread):
+
</ins><span class="cx"> 2015-12-14 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: iOS: Text field variations do not have the correct traits
</span></span></pre></div>
<a id="trunkSourceWebCorepageResourceUsageOverlayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ResourceUsageOverlay.h (194056 => 194057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ResourceUsageOverlay.h 2015-12-14 21:30:31 UTC (rev 194056)
+++ trunk/Source/WebCore/page/ResourceUsageOverlay.h 2015-12-14 21:36:27 UTC (rev 194057)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static const int normalWidth = 570;
</span><del>- static const int normalHeight = 130;
</del><ins>+ static const int normalHeight = 160;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void pageOverlayDestroyed(PageOverlay&) override { }
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaResourceUsageOverlayCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm (194056 => 194057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm 2015-12-14 21:30:31 UTC (rev 194056)
+++ trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm 2015-12-14 21:36:27 UTC (rev 194057)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "MachVMSPI.h"
</span><span class="cx"> #include "PlatformCALayer.h"
</span><span class="cx"> #include <CoreGraphics/CGContext.h>
</span><ins>+#include <JavaScriptCore/GCActivityCallback.h>
</ins><span class="cx"> #include <QuartzCore/CALayer.h>
</span><span class="cx"> #include <QuartzCore/CATransaction.h>
</span><span class="cx"> #include <array>
</span><span class="lines">@@ -185,6 +186,9 @@
</span><span class="cx">
</span><span class="cx"> HashSet<CALayer *> overlayLayers;
</span><span class="cx"> JSC::VM* vm { nullptr };
</span><ins>+
+ double timeOfNextEdenCollection { 0 };
+ double timeOfNextFullCollection { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ResourceUsageData::ResourceUsageData()
</span><span class="lines">@@ -421,7 +425,7 @@
</span><span class="cx"> static String formatByteNumber(size_t number)
</span><span class="cx"> {
</span><span class="cx"> if (number >= 1024 * 1048576)
</span><del>- return String::format("%.3f GB", static_cast<double>(number) / 1024 * 1048576);
</del><ins>+ return String::format("%.3f GB", static_cast<double>(number) / (1024 * 1048576));
</ins><span class="cx"> if (number >= 1048576)
</span><span class="cx"> return String::format("%.2f MB", static_cast<double>(number) / 1048576);
</span><span class="cx"> if (number >= 1024)
</span><span class="lines">@@ -429,6 +433,13 @@
</span><span class="cx"> return String::format("%lu", number);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static String gcTimerString(double timerFireDate, double now)
+{
+ if (!timerFireDate)
+ return ASCIILiteral("[not scheduled]");
+ return String::format("%g", timerFireDate - now);
+}
+
</ins><span class="cx"> void ResourceUsageOverlay::platformDraw(CGContextRef context)
</span><span class="cx"> {
</span><span class="cx"> auto& data = sharedData();
</span><span class="lines">@@ -461,6 +472,10 @@
</span><span class="cx"> y += 10;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ double now = WTF::currentTime();
+ showText(context, 10, y + 10, colorForLabels, String::format(" Eden GC: %s", gcTimerString(data.timeOfNextEdenCollection, now).ascii().data()));
+ showText(context, 10, y + 20, colorForLabels, String::format(" Full GC: %s", gcTimerString(data.timeOfNextFullCollection, now).ascii().data()));
+
</ins><span class="cx"> drawCpuHistory(context, viewBounds.size.width - 70, 0, viewBounds.size.height, data.cpuHistory);
</span><span class="cx"> drawGCHistory(context, viewBounds.size.width - 140, 0, viewBounds.size.height, data.gcHeapSizeHistory, data.categories[MemoryCategory::GCHeap].history);
</span><span class="cx"> drawMemHistory(context, viewBounds.size.width - 210, 0, viewBounds.size.height, data);
</span><span class="lines">@@ -609,6 +624,9 @@
</span><span class="cx"> // Subtract known subchunks from the bmalloc bucket.
</span><span class="cx"> // FIXME: Handle running with bmalloc disabled.
</span><span class="cx"> data.categories[MemoryCategory::bmalloc].history.last() -= currentGCHeapCapacity + currentGCOwned;
</span><ins>+
+ data.timeOfNextEdenCollection = data.vm->heap.edenActivityCallback()->nextFireTime();
+ data.timeOfNextFullCollection = data.vm->heap.fullActivityCallback()->nextFireTime();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> [CATransaction begin];
</span></span></pre>
</div>
</div>
</body>
</html>