<!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>[167377] 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/167377">167377</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-16 12:54:03 -0700 (Wed, 16 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[curl] Add WEB_TIMING support
https://bugs.webkit.org/show_bug.cgi?id=127555
Patch by Robert Sipka <sipka@inf.u-szeged.hu> on 2014-04-16
Reviewed by Brent Fulgham.
Access timing information related to navigation.
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::milisecondsSinceRequest):
(WebCore::calculateWebTimingInformations):
(WebCore::sockoptfunction):
(WebCore::headerCallback):
(WebCore::ResourceHandleManager::downloadTimerCallback):
(WebCore::ResourceHandleManager::dispatchSynchronousJob):
(WebCore::ResourceHandleManager::initializeHandle):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp">trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167376 => 167377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-16 19:37:34 UTC (rev 167376)
+++ trunk/Source/WebCore/ChangeLog 2014-04-16 19:54:03 UTC (rev 167377)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-16 Robert Sipka <sipka@inf.u-szeged.hu>
+
+ [curl] Add WEB_TIMING support
+ https://bugs.webkit.org/show_bug.cgi?id=127555
+
+ Reviewed by Brent Fulgham.
+
+ Access timing information related to navigation.
+
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::milisecondsSinceRequest):
+ (WebCore::calculateWebTimingInformations):
+ (WebCore::sockoptfunction):
+ (WebCore::headerCallback):
+ (WebCore::ResourceHandleManager::downloadTimerCallback):
+ (WebCore::ResourceHandleManager::dispatchSynchronousJob):
+ (WebCore::ResourceHandleManager::initializeHandle):
+
</ins><span class="cx"> 2014-04-16 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> Cleanup header includes in ShapeOutsideInfo.h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (167376 => 167377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2014-04-16 19:37:34 UTC (rev 167376)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2014-04-16 19:54:03 UTC (rev 167377)
</span><span class="lines">@@ -61,6 +61,9 @@
</span><span class="cx">
</span><span class="cx"> #include <errno.h>
</span><span class="cx"> #include <stdio.h>
</span><ins>+#if ENABLE(WEB_TIMING)
+#include <wtf/CurrentTime.h>
+#endif
</ins><span class="cx"> #if USE(CF)
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -147,6 +150,53 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(WEB_TIMING)
+static int milisecondsSinceRequest(double requestTime)
+{
+ return static_cast<int>((monotonicallyIncreasingTime() - requestTime) * 1000.0);
+}
+
+static void calculateWebTimingInformations(ResourceHandleInternal* d)
+{
+ double startTransfertTime;
+ double preTransferTime;
+ double dnslookupTime;
+ double connectTime;
+ double appConnectTime;
+
+ curl_easy_getinfo(d->m_handle, CURLINFO_NAMELOOKUP_TIME, &dnslookupTime);
+ curl_easy_getinfo(d->m_handle, CURLINFO_CONNECT_TIME, &connectTime);
+ curl_easy_getinfo(d->m_handle, CURLINFO_APPCONNECT_TIME, &appConnectTime);
+ curl_easy_getinfo(d->m_handle, CURLINFO_STARTTRANSFER_TIME, &startTransfertTime);
+ curl_easy_getinfo(d->m_handle, CURLINFO_PRETRANSFER_TIME, &preTransferTime);
+
+ d->m_response.resourceLoadTiming()->dnsStart = 0;
+ d->m_response.resourceLoadTiming()->dnsEnd = static_cast<int>(dnslookupTime * 1000);
+
+ d->m_response.resourceLoadTiming()->connectStart = static_cast<int>(dnslookupTime * 1000);
+ d->m_response.resourceLoadTiming()->connectEnd = static_cast<int>(connectTime * 1000);
+
+ d->m_response.resourceLoadTiming()->sendStart = static_cast<int>(connectTime *1000);
+ d->m_response.resourceLoadTiming()->sendEnd =static_cast<int>(preTransferTime * 1000);
+
+ if (appConnectTime) {
+ d->m_response.resourceLoadTiming()->sslStart = static_cast<int>(connectTime * 1000);
+ d->m_response.resourceLoadTiming()->sslEnd = static_cast<int>(appConnectTime *1000);
+ }
+}
+
+static int sockoptfunction(void* data, curl_socket_t /*curlfd*/, curlsocktype /*purpose*/)
+{
+ ResourceHandle* job = static_cast<ResourceHandle*>(data);
+ ResourceHandleInternal* d = job->getInternal();
+
+ if (d->m_response.resourceLoadTiming())
+ d->m_response.resourceLoadTiming()->requestTime = monotonicallyIncreasingTime();
+
+ return 0;
+}
+#endif
+
</ins><span class="cx"> // libcurl does not implement its own thread synchronization primitives.
</span><span class="cx"> // these two functions provide mutexes for cookies, and for the global DNS
</span><span class="cx"> // cache.
</span><span class="lines">@@ -449,6 +499,11 @@
</span><span class="cx"> d->m_multipartHandle = MultipartHandle::create(job, boundary);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(WEB_TIMING)
+ if (d->m_response.resourceLoadTiming() && d->m_response.resourceLoadTiming()->requestTime)
+ d->m_response.resourceLoadTiming()->receiveHeadersEnd = milisecondsSinceRequest(d->m_response.resourceLoadTiming()->requestTime);
+#endif
+
</ins><span class="cx"> // HTTP redirection
</span><span class="cx"> if (isHttpRedirect(httpCode)) {
</span><span class="cx"> String location = d->m_response.httpHeaderField("location");
</span><span class="lines">@@ -476,10 +531,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (client) {
- client->didReceiveResponse(job, d->m_response);
</del><ins>+ if (client)
</ins><span class="cx"> CurlCacheManager::getInstance().didReceiveResponse(job, d->m_response);
</span><del>- }
</del><ins>+
</ins><span class="cx"> d->m_response.setResponseFired(true);
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="lines">@@ -612,7 +666,12 @@
</span><span class="cx"> if (CURLMSG_DONE != msg->msg)
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> if (CURLE_OK == msg->data.result) {
</span><ins>+
+#if ENABLE(WEB_TIMING)
+ calculateWebTimingInformations(d);
+#endif
</ins><span class="cx"> if (!d->m_response.responseFired()) {
</span><span class="cx"> handleLocalReceiveResponse(d->m_handle, job, d);
</span><span class="cx"> if (d->m_cancelled) {
</span><span class="lines">@@ -625,6 +684,7 @@
</span><span class="cx"> d->m_multipartHandle->contentEnded();
</span><span class="cx">
</span><span class="cx"> if (d->client()) {
</span><ins>+ d->client()->didReceiveResponse(job, d->m_response);
</ins><span class="cx"> d->client()->didFinishLoading(job, 0);
</span><span class="cx"> CurlCacheManager::getInstance().didFinishLoading(job->firstRequest().url().string());
</span><span class="cx"> }
</span><span class="lines">@@ -854,8 +914,16 @@
</span><span class="cx"> ResourceError error(String(handle->m_url), ret, String(handle->m_url), String(curl_easy_strerror(ret)));
</span><span class="cx"> error.setSSLErrors(handle->m_sslErrors);
</span><span class="cx"> handle->client()->didFail(job, error);
</span><ins>+ } else {
+ if (handle->client())
+ handle->client()->didReceiveResponse(job, handle->m_response);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+
+#if ENABLE(WEB_TIMING)
+ calculateWebTimingInformations(handle);
+#endif
+
</ins><span class="cx"> curl_easy_cleanup(handle->m_handle);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1051,6 +1119,11 @@
</span><span class="cx"> curl_easy_setopt(d->m_handle, CURLOPT_PROXY, m_proxy.utf8().data());
</span><span class="cx"> curl_easy_setopt(d->m_handle, CURLOPT_PROXYTYPE, m_proxyType);
</span><span class="cx"> }
</span><ins>+#if ENABLE(WEB_TIMING)
+ curl_easy_setopt(d->m_handle, CURLOPT_SOCKOPTFUNCTION, sockoptfunction);
+ curl_easy_setopt(d->m_handle, CURLOPT_SOCKOPTDATA, job);
+ d->m_response.setResourceLoadTiming(ResourceLoadTiming::create());
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceHandleManager::initCookieSession()
</span></span></pre>
</div>
</div>
</body>
</html>