Changeset 194057 in webkit

Timestamp:

Dec 14, 2015 1:36:27 PM (8 years ago)

Author:

akling@apple.com

Message:

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):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/heap/GCActivityCallback.cpp (modified) (2 diffs)
• JavaScriptCore/heap/GCActivityCallback.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/ResourceUsageOverlay.h (modified) (1 diff)
• WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm (modified) (6 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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:
+
 2015-12-14  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/heap/GCActivityCallback.cpp

@@ -96 +96 @@
     double delta = m_delay - newDelay;
     m_delay = newDelay;
+    m_nextFireTime = WTF::currentTime() + newDelay;
     CFRunLoopTimerSetNextFireDate(m_timer.get(), CFRunLoopTimerGetNextFireDate(m_timer.get()) - delta);
 }
@@ -102 +103 @@
 {
     m_delay = s_decade;
+    m_nextFireTime = 0;
     CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + s_decade);
 }

trunk/Source/JavaScriptCore/heap/GCActivityCallback.h

@@ -62 +62 @@
     static bool s_shouldCreateGCTimer;
 
+#if USE(CF) || PLATFORM(EFL)
+    double nextFireTime() const { return m_nextFireTime; }
+#endif
+
 protected:
     virtual double lastGCLength() = 0;
@@ -110 +114 @@
 private:
     double m_delay;
+    double m_nextFireTime { 0 };
 #endif
 };

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2015-12-14  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/page/ResourceUsageOverlay.h

@@ -60 +60 @@
 
     static const int normalWidth = 570;
-    static const int normalHeight = 130;
+    static const int normalHeight = 160;
 
 private:

trunk/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm

@@ -33 +33 @@
 #include "PlatformCALayer.h"
 #include <CoreGraphics/CGContext.h>
+#include <JavaScriptCore/GCActivityCallback.h>
 #include <QuartzCore/CALayer.h>
 #include <QuartzCore/CATransaction.h>
@@ -186 +187 @@
     HashSet<CALayer *> overlayLayers;
     JSC::VM* vm { nullptr };
+
+    double timeOfNextEdenCollection { 0 };
+    double timeOfNextFullCollection { 0 };
 };
 
@@ -422 +426 @@
 {
     if (number >= 1024 * 1048576)
-        return String::format("%.3f GB", static_cast<double>(number) / 1024 * 1048576);
+        return String::format("%.3f GB", static_cast<double>(number) / (1024 * 1048576));
     if (number >= 1048576)
         return String::format("%.2f MB", static_cast<double>(number) / 1048576);
@@ -428 +432 @@
         return String::format("%.1f kB", static_cast<double>(number) / 1024);
     return String::format("%lu", number);
+}
+
+static String gcTimerString(double timerFireDate, double now)
+{
+    if (!timerFireDate)
+        return ASCIILiteral("[not scheduled]");
+    return String::format("%g", timerFireDate - now);
 }
 
@@ -461 +472 @@
         y += 10;
     }
+
+    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()));
 
     drawCpuHistory(context, viewBounds.size.width - 70, 0, viewBounds.size.height, data.cpuHistory);
@@ -610 +625 @@
             // FIXME: Handle running with bmalloc disabled.
             data.categories[MemoryCategory::bmalloc].history.last() -= currentGCHeapCapacity + currentGCOwned;
+
+            data.timeOfNextEdenCollection = data.vm->heap.edenActivityCallback()->nextFireTime();
+            data.timeOfNextFullCollection = data.vm->heap.fullActivityCallback()->nextFireTime();
         }