<!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>[188946] trunk/Source/WebInspectorUI</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/188946">188946</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2015-08-25 23:29:48 -0700 (Tue, 25 Aug 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: message dispatch metrics should use high-resolution timing data
https://bugs.webkit.org/show_bug.cgi?id=135467

Reviewed by Timothy Hatcher.

Use performance.now if it's available, otherwise fallback to Date.now().
Format timestamps with fixed decimal point, and sprinkle some ES6.

* UserInterface/Base/Utilities.js:
(timestamp): Added.
* UserInterface/Protocol/InspectorBackend.js:
(InspectorBackendClass):
(InspectorBackendClass.prototype._sendCommandToBackendWithCallback):
(InspectorBackendClass.prototype._dispatchEvent):
* UserInterface/Protocol/MessageDispatcher.js:
(WebInspector.dispatchNextQueuedMessageFromBackend):
(WebInspector.dispatchMessageFromBackend): Be consistent about using `this`.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorBackendjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolMessageDispatcherjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/MessageDispatcher.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (188945 => 188946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2015-08-26 05:47:59 UTC (rev 188945)
+++ trunk/Source/WebInspectorUI/ChangeLog        2015-08-26 06:29:48 UTC (rev 188946)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-08-25  Brian Burg  &lt;bburg@apple.com&gt;
+
+        Web Inspector: message dispatch metrics should use high-resolution timing data
+        https://bugs.webkit.org/show_bug.cgi?id=135467
+
+        Reviewed by Timothy Hatcher.
+
+        Use performance.now if it's available, otherwise fallback to Date.now().
+        Format timestamps with fixed decimal point, and sprinkle some ES6.
+
+        * UserInterface/Base/Utilities.js:
+        (timestamp): Added.
+        * UserInterface/Protocol/InspectorBackend.js:
+        (InspectorBackendClass):
+        (InspectorBackendClass.prototype._sendCommandToBackendWithCallback):
+        (InspectorBackendClass.prototype._dispatchEvent):
+        * UserInterface/Protocol/MessageDispatcher.js:
+        (WebInspector.dispatchNextQueuedMessageFromBackend):
+        (WebInspector.dispatchMessageFromBackend): Be consistent about using `this`.
+
</ins><span class="cx"> 2015-08-25  Matt Baker  &lt;mattbaker@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Rendering Frames pie chart should use the needsLayout/updateLayout idiom
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (188945 => 188946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js        2015-08-26 05:47:59 UTC (rev 188945)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js        2015-08-26 06:29:48 UTC (rev 188946)
</span><span class="lines">@@ -1124,3 +1124,9 @@
</span><span class="cx"> 
</span><span class="cx">     return new Blob(byteArrays, {type: mimeType});
</span><span class="cx"> }
</span><ins>+
+// FIXME: This can be removed when WEB_TIMING is enabled for all platforms.
+function timestamp()
+{
+    return window.performance ? performance.now() : Date.now();
+}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorBackendjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js (188945 => 188946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js        2015-08-26 05:47:59 UTC (rev 188945)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js        2015-08-26 06:29:48 UTC (rev 188946)
</span><span class="lines">@@ -135,9 +135,8 @@
</span><span class="cx"> 
</span><span class="cx">         let responseData = {command, callback};
</span><span class="cx"> 
</span><del>-        // FIXME: &lt;https://webkit.org/b/135467&gt; use performance.now() where available.
</del><span class="cx">         if (this.dumpInspectorTimeStats)
</span><del>-            responseData.sendRequestTime = Date.now();
</del><ins>+            responseData.sendRequestTimestamp = timestamp();
</ins><span class="cx"> 
</span><span class="cx">         this._pendingResponses.set(sequenceId, responseData);
</span><span class="cx">         this._sendMessageToBackend(messageObject);
</span><span class="lines">@@ -157,9 +156,8 @@
</span><span class="cx"> 
</span><span class="cx">         let responseData = {command};
</span><span class="cx"> 
</span><del>-        // FIXME: &lt;https://webkit.org/b/135467&gt; use performance.now() where available.
</del><span class="cx">         if (this.dumpInspectorTimeStats)
</span><del>-            responseData.sendRequestTime = Date.now();
</del><ins>+            responseData.sendRequestTimestamp = timestamp();
</ins><span class="cx"> 
</span><span class="cx">         let responsePromise = new Promise(function(resolve, reject) {
</span><span class="cx">             responseData.promise = {resolve, reject};
</span><span class="lines">@@ -195,9 +193,9 @@
</span><span class="cx">         let responseData = this._pendingResponses.take(sequenceId);
</span><span class="cx">         let {command, callback, promise} = responseData;
</span><span class="cx"> 
</span><del>-        var processingStartTime;
</del><ins>+        var processingStartTimestamp;
</ins><span class="cx">         if (this.dumpInspectorTimeStats)
</span><del>-            processingStartTime = Date.now();
</del><ins>+            processingStartTimestamp = timestamp();
</ins><span class="cx"> 
</span><span class="cx">         if (typeof callback === &quot;function&quot;)
</span><span class="cx">             this._dispatchResponseToCallback(command, messageObject, callback);
</span><span class="lines">@@ -206,12 +204,14 @@
</span><span class="cx">         else
</span><span class="cx">             console.error(&quot;Received a command response without a corresponding callback or promise.&quot;, messageObject, command);
</span><span class="cx"> 
</span><del>-        var processingDuration = Date.now() - processingStartTime;
</del><ins>+        let processingDuration = (timestamp() - processingStartTimestamp).toFixed(3);
</ins><span class="cx">         if (this.warnForLongMessageHandling &amp;&amp; processingDuration &gt; this.longMessageHandlingThreshold)
</span><del>-            console.warn(&quot;InspectorBackend: took &quot; + processingDuration + &quot;ms to handle response for command: &quot; + command.qualifiedName);
</del><ins>+            console.warn(`InspectorBackend: took ${processingDuration}ms to handle response for command: ${command.qualifiedName}`);
</ins><span class="cx"> 
</span><del>-        if (this.dumpInspectorTimeStats)
-            console.log(&quot;time-stats: Handling: &quot; + processingDuration + &quot;ms; RTT: &quot; + (processingStartTime - responseData.sendRequestTime) + &quot;ms; (command &quot; + command.qualifiedName + &quot;)&quot;);
</del><ins>+        if (this.dumpInspectorTimeStats) {
+            let roundTripDuration = (processingStartTimestamp - responseData.sendRequestTimestamp).toFixed(3);
+            console.log(`time-stats: Handling: ${processingDuration}ms; RTT: ${roundTripDuration}ms; (command ${command.qualifiedName})`);
+        }
</ins><span class="cx"> 
</span><span class="cx">         if (this._deferredScripts.length &amp;&amp; !this._pendingResponses.size)
</span><span class="cx">             this._flushPendingScripts();
</span><span class="lines">@@ -271,9 +271,9 @@
</span><span class="cx">                 eventArguments.push(messageObject[&quot;params&quot;][parameterNames[i]]);
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        var processingStartTime;
</del><ins>+        var processingStartTimestamp;
</ins><span class="cx">         if (this.dumpInspectorTimeStats)
</span><del>-            processingStartTime = Date.now();
</del><ins>+            processingStartTimestamp = timestamp();
</ins><span class="cx"> 
</span><span class="cx">         try {
</span><span class="cx">             agent.dispatchEvent(eventName, eventArguments);
</span><span class="lines">@@ -281,12 +281,12 @@
</span><span class="cx">             console.error(&quot;Uncaught exception in inspector page while handling event &quot; + qualifiedName + &quot;: &quot;, e, e.stack);
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        var processingDuration = Date.now() - processingStartTime;
</del><ins>+        let processingDuration = (timestamp() - processingStartTimestamp).toFixed(3);
</ins><span class="cx">         if (this.warnForLongMessageHandling &amp;&amp; processingDuration &gt; this.longMessageHandlingThreshold)
</span><del>-            console.warn(&quot;InspectorBackend: took &quot; + processingDuration + &quot;ms to handle event: &quot; + messageObject[&quot;method&quot;]);
</del><ins>+            console.warn(`InspectorBackend: took ${processingDuration}ms to handle event: ${messageObject.method}`);
</ins><span class="cx"> 
</span><span class="cx">         if (this.dumpInspectorTimeStats)
</span><del>-            console.log(&quot;time-stats: Handling: &quot; + processingDuration + &quot;ms (event &quot; + messageObject[&quot;method&quot;] + &quot;)&quot;);
</del><ins>+            console.log(`time-stats: Handling: ${processingDuration}ms (event ${messageObject.method})`);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     _reportProtocolError(messageObject)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolMessageDispatcherjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/MessageDispatcher.js (188945 => 188946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/MessageDispatcher.js        2015-08-26 05:47:59 UTC (rev 188945)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/MessageDispatcher.js        2015-08-26 06:29:48 UTC (rev 188946)
</span><span class="lines">@@ -28,15 +28,15 @@
</span><span class="cx"> 
</span><span class="cx"> WebInspector.dispatchNextQueuedMessageFromBackend = function()
</span><span class="cx"> {
</span><del>-    var startCount = WebInspector._messagesToDispatch.length;
-    var startTime = Date.now();
-    var timeLimitPerRunLoop = 10; // milliseconds
</del><ins>+    const startCount = WebInspector._messagesToDispatch.length;
+    const startTimestamp = timestamp();
+    const timeLimitPerRunLoop = 10; // milliseconds
</ins><span class="cx"> 
</span><del>-    var i = 0;
</del><ins>+    let i = 0;
</ins><span class="cx">     for (; i &lt; WebInspector._messagesToDispatch.length; ++i) {
</span><span class="cx">         // Defer remaining messages if we have taken too long. In practice, single
</span><span class="cx">         // messages like Page.getResourceContent blow through the time budget.
</span><del>-        if (Date.now() - startTime &gt; timeLimitPerRunLoop)
</del><ins>+        if (timestamp() - startTimestamp &gt; timeLimitPerRunLoop)
</ins><span class="cx">             break;
</span><span class="cx"> 
</span><span class="cx">         InspectorBackend.dispatch(WebInspector._messagesToDispatch[i]);
</span><span class="lines">@@ -50,8 +50,12 @@
</span><span class="cx">         WebInspector._dispatchTimeout = setTimeout(WebInspector.dispatchNextQueuedMessageFromBackend, 0);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (InspectorBackend.dumpInspectorTimeStats)
-        console.log(&quot;time-stats: --- RunLoop duration: &quot; + (Date.now() - startTime) + &quot;ms; dispatched: &quot; + (startCount - WebInspector._messagesToDispatch.length) + &quot;; remaining: &quot; + WebInspector._messagesToDispatch.length);
</del><ins>+    if (InspectorBackend.dumpInspectorTimeStats) {
+        let messageDuration = (timestamp() - startTimestamp).toFixed(3);
+        let dispatchedCount = startCount - WebInspector._messagesToDispatch.length;
+        let remainingCount = WebInspector._messagesToDispatch.length;
+        console.log(`time-stats: --- RunLoop duration: ${messageDuration}ms; dispatched: ${dispatchedCount}; remaining: ${remainingCount}`);
+    }
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> WebInspector.dispatchMessageFromBackend = function(message)
</span><span class="lines">@@ -59,10 +63,10 @@
</span><span class="cx">     // Enforce asynchronous interaction between the backend and the frontend by queueing messages.
</span><span class="cx">     // The messages are dequeued on a zero delay timeout.
</span><span class="cx"> 
</span><del>-    WebInspector._messagesToDispatch.push(message);
</del><ins>+    this._messagesToDispatch.push(message);
</ins><span class="cx"> 
</span><span class="cx">     if (this._dispatchTimeout)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    this._dispatchTimeout = setTimeout(WebInspector.dispatchNextQueuedMessageFromBackend, 0);
</del><ins>+    this._dispatchTimeout = setTimeout(this.dispatchNextQueuedMessageFromBackend, 0);
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>