<!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>[202993] trunk/Source/WebKit2</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/202993">202993</a></dd>
<dt>Author</dt> <dd>krollin@apple.com</dd>
<dt>Date</dt> <dd>2016-07-08 10:54:39 -0700 (Fri, 08 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add always-on logging for downloads
https://bugs.webkit.org/show_bug.cgi?id=159521
<rdar://problem/26630645>
Reviewed by Alex Christensen.
Add logging statements that track when a download starts, when it
first receives data, and when the download is done (due to completion,
cancelation, or failure).
* NetworkProcess/Downloads/Download.cpp:
(WebKit::Download::Download):
(WebKit::Download::didReceiveResponse):
(WebKit::Download::didReceiveData):
(WebKit::Download::didFinish):
(WebKit::Download::didFail):
(WebKit::Download::didCancel):
(WebKit::Download::isAlwaysOnLoggingAllowed):
* NetworkProcess/Downloads/Download.h:
(WebKit::Download::Download):
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadh">trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202992 => 202993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-08 17:54:38 UTC (rev 202992)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-08 17:54:39 UTC (rev 202993)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-07-08 Keith Rollin <krollin@apple.com>
+
+ Add always-on logging for downloads
+ https://bugs.webkit.org/show_bug.cgi?id=159521
+ <rdar://problem/26630645>
+
+ Reviewed by Alex Christensen.
+
+ Add logging statements that track when a download starts, when it
+ first receives data, and when the download is done (due to completion,
+ cancelation, or failure).
+
+ * NetworkProcess/Downloads/Download.cpp:
+ (WebKit::Download::Download):
+ (WebKit::Download::didReceiveResponse):
+ (WebKit::Download::didReceiveData):
+ (WebKit::Download::didFinish):
+ (WebKit::Download::didFail):
+ (WebKit::Download::didCancel):
+ (WebKit::Download::isAlwaysOnLoggingAllowed):
+ * NetworkProcess/Downloads/Download.h:
+ (WebKit::Download::Download):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):
+
</ins><span class="cx"> 2016-07-08 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Clearing LocalStorage doesn't also delete -wal and -shm files.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (202992 => 202993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-07-08 17:54:38 UTC (rev 202992)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-07-08 17:54:39 UTC (rev 202993)
</span><span class="lines">@@ -41,10 +41,13 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><ins>+#define DOWNLOAD_LOG_ALWAYS(...) LOG_ALWAYS(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
+#define DOWNLOAD_LOG_ALWAYS_ERROR(...) LOG_ALWAYS_ERROR(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION) && PLATFORM(COCOA)
</span><del>-Download::Download(DownloadManager& downloadManager, DownloadID downloadID, NSURLSessionDownloadTask* download, const String& suggestedName)
</del><ins>+Download::Download(DownloadManager& downloadManager, DownloadID downloadID, NSURLSessionDownloadTask* download, const WebCore::SessionID& sessionID, const String& suggestedName)
</ins><span class="cx"> #else
</span><span class="cx"> Download::Download(DownloadManager& downloadManager, DownloadID downloadID, const ResourceRequest& request, const String& suggestedName)
</span><span class="cx"> #endif
</span><span class="lines">@@ -55,6 +58,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(NETWORK_SESSION) && PLATFORM(COCOA)
</span><span class="cx"> , m_download(download)
</span><ins>+ , m_sessionID(sessionID)
</ins><span class="cx"> #endif
</span><span class="cx"> , m_suggestedName(suggestedName)
</span><span class="cx"> {
</span><span class="lines">@@ -86,11 +90,18 @@
</span><span class="cx">
</span><span class="cx"> void Download::didReceiveResponse(const ResourceResponse& response)
</span><span class="cx"> {
</span><ins>+ DOWNLOAD_LOG_ALWAYS("Download task (%llu) created", downloadID().downloadID());
+
</ins><span class="cx"> send(Messages::DownloadProxy::DidReceiveResponse(response));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Download::didReceiveData(uint64_t length)
</span><span class="cx"> {
</span><ins>+ if (!m_hasReceivedData) {
+ DOWNLOAD_LOG_ALWAYS("Download task (%llu) started receiving data", downloadID().downloadID());
+ m_hasReceivedData = true;
+ }
+
</ins><span class="cx"> send(Messages::DownloadProxy::DidReceiveData(length));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -126,6 +137,8 @@
</span><span class="cx">
</span><span class="cx"> void Download::didFinish()
</span><span class="cx"> {
</span><ins>+ DOWNLOAD_LOG_ALWAYS("Download task (%llu) finished", downloadID().downloadID());
+
</ins><span class="cx"> platformDidFinish();
</span><span class="cx">
</span><span class="cx"> send(Messages::DownloadProxy::DidFinish());
</span><span class="lines">@@ -140,6 +153,9 @@
</span><span class="cx">
</span><span class="cx"> void Download::didFail(const ResourceError& error, const IPC::DataReference& resumeData)
</span><span class="cx"> {
</span><ins>+ DOWNLOAD_LOG_ALWAYS("Download task (%llu) failed, isTimeout = %d, isCancellation = %d, errCode = %d",
+ downloadID().downloadID(), error.isTimeout(), error.isCancellation(), error.errorCode());
+
</ins><span class="cx"> send(Messages::DownloadProxy::DidFail(error, resumeData));
</span><span class="cx">
</span><span class="cx"> if (m_sandboxExtension) {
</span><span class="lines">@@ -151,6 +167,8 @@
</span><span class="cx">
</span><span class="cx"> void Download::didCancel(const IPC::DataReference& resumeData)
</span><span class="cx"> {
</span><ins>+ DOWNLOAD_LOG_ALWAYS("Download task (%llu) canceled", downloadID().downloadID());
+
</ins><span class="cx"> send(Messages::DownloadProxy::DidCancel(resumeData));
</span><span class="cx">
</span><span class="cx"> if (m_sandboxExtension) {
</span><span class="lines">@@ -170,4 +188,13 @@
</span><span class="cx"> return m_downloadID.downloadID();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Download::isAlwaysOnLoggingAllowed() const
+{
+#if USE(NETWORK_SESSION) && PLATFORM(COCOA)
+ return m_sessionID.isAlwaysOnLoggingAllowed();
+#else
+ return false;
+#endif
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (202992 => 202993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-07-08 17:54:38 UTC (rev 202992)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-07-08 17:54:39 UTC (rev 202993)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "MessageSender.h"
</span><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><ins>+#include <WebCore/SessionID.h>
</ins><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -76,7 +77,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(Download); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> #if USE(NETWORK_SESSION) && PLATFORM(COCOA)
</span><del>- Download(DownloadManager&, DownloadID, NSURLSessionDownloadTask*, const String& suggestedFilename = { });
</del><ins>+ Download(DownloadManager&, DownloadID, NSURLSessionDownloadTask*, const WebCore::SessionID& sessionID, const String& suggestedFilename = { });
</ins><span class="cx"> #else
</span><span class="cx"> Download(DownloadManager&, DownloadID, const WebCore::ResourceRequest&, const String& suggestedFilename = { });
</span><span class="cx"> #endif
</span><span class="lines">@@ -120,6 +121,8 @@
</span><span class="cx">
</span><span class="cx"> void platformInvalidate();
</span><span class="cx">
</span><ins>+ bool isAlwaysOnLoggingAllowed() const;
+
</ins><span class="cx"> DownloadManager& m_downloadManager;
</span><span class="cx"> DownloadID m_downloadID;
</span><span class="cx"> #if !USE(NETWORK_SESSION)
</span><span class="lines">@@ -131,6 +134,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> RetainPtr<NSURLSessionDownloadTask> m_download;
</span><ins>+ WebCore::SessionID m_sessionID;
</ins><span class="cx"> #else
</span><span class="cx"> RetainPtr<NSURLDownload> m_nsURLDownload;
</span><span class="cx"> RetainPtr<WKDownloadAsDelegate> m_delegate;
</span><span class="lines">@@ -145,6 +149,7 @@
</span><span class="cx"> RefPtr<WebCore::ResourceHandle> m_resourceHandle;
</span><span class="cx"> #endif
</span><span class="cx"> String m_suggestedName;
</span><ins>+ bool m_hasReceivedData { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (202992 => 202993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-07-08 17:54:38 UTC (rev 202992)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-07-08 17:54:39 UTC (rev 202993)
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> if (auto* networkDataTask = _session->dataTaskForIdentifier([dataTask taskIdentifier], storedCredentials)) {
</span><span class="cx"> auto downloadID = networkDataTask->pendingDownloadID();
</span><span class="cx"> auto& downloadManager = WebKit::NetworkProcess::singleton().downloadManager();
</span><del>- auto download = std::make_unique<WebKit::Download>(downloadManager, downloadID, downloadTask);
</del><ins>+ auto download = std::make_unique<WebKit::Download>(downloadManager, downloadID, downloadTask, _session->sessionID());
</ins><span class="cx"> networkDataTask->transferSandboxExtensionToDownload(*download);
</span><span class="cx"> ASSERT(WebCore::fileExists(networkDataTask->pendingDownloadLocation()));
</span><span class="cx"> download->didCreateDestination(networkDataTask->pendingDownloadLocation());
</span></span></pre>
</div>
</div>
</body>
</html>