Title: [202993] trunk/Source/WebKit2
Revision
202993
Author
[email protected]
Date
2016-07-08 10:54:39 -0700 (Fri, 08 Jul 2016)

Log Message

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

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (202992 => 202993)


--- 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)
@@ -1,3 +1,28 @@
+2016-07-08  Keith Rollin  <[email protected]>
+
+        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:]):
+
 2016-07-08  Brady Eidson  <[email protected]>
 
         Clearing LocalStorage doesn't also delete -wal and -shm files.

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (202992 => 202993)


--- 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)
@@ -41,10 +41,13 @@
 
 using namespace WebCore;
 
+#define DOWNLOAD_LOG_ALWAYS(...) LOG_ALWAYS(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
+#define DOWNLOAD_LOG_ALWAYS_ERROR(...) LOG_ALWAYS_ERROR(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
+
 namespace WebKit {
 
 #if USE(NETWORK_SESSION) && PLATFORM(COCOA)
-Download::Download(DownloadManager& downloadManager, DownloadID downloadID, NSURLSessionDownloadTask* download, const String& suggestedName)
+Download::Download(DownloadManager& downloadManager, DownloadID downloadID, NSURLSessionDownloadTask* download, const WebCore::SessionID& sessionID, const String& suggestedName)
 #else
 Download::Download(DownloadManager& downloadManager, DownloadID downloadID, const ResourceRequest& request, const String& suggestedName)
 #endif
@@ -55,6 +58,7 @@
 #endif
 #if USE(NETWORK_SESSION) && PLATFORM(COCOA)
     , m_download(download)
+    , m_sessionID(sessionID)
 #endif
     , m_suggestedName(suggestedName)
 {
@@ -86,11 +90,18 @@
 
 void Download::didReceiveResponse(const ResourceResponse& response)
 {
+    DOWNLOAD_LOG_ALWAYS("Download task (%llu) created", downloadID().downloadID());
+
     send(Messages::DownloadProxy::DidReceiveResponse(response));
 }
 
 void Download::didReceiveData(uint64_t length)
 {
+    if (!m_hasReceivedData) {
+        DOWNLOAD_LOG_ALWAYS("Download task (%llu) started receiving data", downloadID().downloadID());
+        m_hasReceivedData = true;
+    }
+
     send(Messages::DownloadProxy::DidReceiveData(length));
 }
 
@@ -126,6 +137,8 @@
 
 void Download::didFinish()
 {
+    DOWNLOAD_LOG_ALWAYS("Download task (%llu) finished", downloadID().downloadID());
+
     platformDidFinish();
 
     send(Messages::DownloadProxy::DidFinish());
@@ -140,6 +153,9 @@
 
 void Download::didFail(const ResourceError& error, const IPC::DataReference& resumeData)
 {
+    DOWNLOAD_LOG_ALWAYS("Download task (%llu) failed, isTimeout = %d, isCancellation = %d, errCode = %d",
+        downloadID().downloadID(), error.isTimeout(), error.isCancellation(), error.errorCode());
+
     send(Messages::DownloadProxy::DidFail(error, resumeData));
 
     if (m_sandboxExtension) {
@@ -151,6 +167,8 @@
 
 void Download::didCancel(const IPC::DataReference& resumeData)
 {
+    DOWNLOAD_LOG_ALWAYS("Download task (%llu) canceled", downloadID().downloadID());
+
     send(Messages::DownloadProxy::DidCancel(resumeData));
 
     if (m_sandboxExtension) {
@@ -170,4 +188,13 @@
     return m_downloadID.downloadID();
 }
 
+bool Download::isAlwaysOnLoggingAllowed() const
+{
+#if USE(NETWORK_SESSION) && PLATFORM(COCOA)
+    return m_sessionID.isAlwaysOnLoggingAllowed();
+#else
+    return false;
+#endif
+}
+
 } // namespace WebKit

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (202992 => 202993)


--- 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)
@@ -30,6 +30,7 @@
 #include "MessageSender.h"
 #include "SandboxExtension.h"
 #include <WebCore/ResourceRequest.h>
+#include <WebCore/SessionID.h>
 #include <wtf/Noncopyable.h>
 
 #if PLATFORM(COCOA)
@@ -76,7 +77,7 @@
     WTF_MAKE_NONCOPYABLE(Download); WTF_MAKE_FAST_ALLOCATED;
 public:
 #if USE(NETWORK_SESSION) && PLATFORM(COCOA)
-    Download(DownloadManager&, DownloadID, NSURLSessionDownloadTask*, const String& suggestedFilename = { });
+    Download(DownloadManager&, DownloadID, NSURLSessionDownloadTask*, const WebCore::SessionID& sessionID, const String& suggestedFilename = { });
 #else
     Download(DownloadManager&, DownloadID, const WebCore::ResourceRequest&, const String& suggestedFilename = { });
 #endif
@@ -120,6 +121,8 @@
 
     void platformInvalidate();
 
+    bool isAlwaysOnLoggingAllowed() const;
+
     DownloadManager& m_downloadManager;
     DownloadID m_downloadID;
 #if !USE(NETWORK_SESSION)
@@ -131,6 +134,7 @@
 #if PLATFORM(COCOA)
 #if USE(NETWORK_SESSION)
     RetainPtr<NSURLSessionDownloadTask> m_download;
+    WebCore::SessionID m_sessionID;
 #else
     RetainPtr<NSURLDownload> m_nsURLDownload;
     RetainPtr<WKDownloadAsDelegate> m_delegate;
@@ -145,6 +149,7 @@
     RefPtr<WebCore::ResourceHandle> m_resourceHandle;
 #endif
     String m_suggestedName;
+    bool m_hasReceivedData { false };
 };
 
 } // namespace WebKit

Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (202992 => 202993)


--- 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)
@@ -297,7 +297,7 @@
     if (auto* networkDataTask = _session->dataTaskForIdentifier([dataTask taskIdentifier], storedCredentials)) {
         auto downloadID = networkDataTask->pendingDownloadID();
         auto& downloadManager = WebKit::NetworkProcess::singleton().downloadManager();
-        auto download = std::make_unique<WebKit::Download>(downloadManager, downloadID, downloadTask);
+        auto download = std::make_unique<WebKit::Download>(downloadManager, downloadID, downloadTask, _session->sessionID());
         networkDataTask->transferSandboxExtensionToDownload(*download);
         ASSERT(WebCore::fileExists(networkDataTask->pendingDownloadLocation()));
         download->didCreateDestination(networkDataTask->pendingDownloadLocation());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to