Attachment 358293 Details for Bug 193121 – Oh, let's be generous ... fix *all* the builds.

[patch] Oh, let's be generous ... fix *all* the builds.

bug-193121-20190103171615.patch (text/plain), 10.42 KB, created by Keith Rollin on 2019-01-03 17:16:16 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2019-01-03 17:16:16 PST

Size: 10.42 KB

patch

obsolete

>Subversion Revision: 239596
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index a4835ba42b6cfd6fdc471db3989d1a8e4f216af9..5721fdc4e71e527bd1f0864027c4a5ccd24b6e3f 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,31 @@
>+2019-01-03  Keith Rollin  <krollin@apple.com>
>+
>+        Bring back parent processID for logging
>+        https://bugs.webkit.org/show_bug.cgi?id=193121
>+        <rdar://problem/47031634>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Bug 192961 removes presentingApplicationPID from
>+        NetworkProcessCreationParameters because it was (a) stored in some
>+        global state, the use of which is being minimized, and (b) it was
>+        largely unused. However, it was actually still being used in some
>+        useful logging in order to tie together child processes with their
>+        parent process. Re-introduce this value in NetworkLoadParameters so
>+        that we can log it.
>+
>+        * NetworkProcess/NetworkLoadParameters.h:
>+        * NetworkProcess/NetworkResourceLoadParameters.cpp:
>+        (WebKit::NetworkResourceLoadParameters::encode const):
>+        (WebKit::NetworkResourceLoadParameters::decode):
>+        * NetworkProcess/NetworkResourceLoader.cpp:
>+        (WebKit::NetworkResourceLoader::start):
>+        * WebProcess/Network/WebLoaderStrategy.cpp:
>+        (WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess):
>+        (WebKit::WebLoaderStrategy::loadResourceSynchronously):
>+        (WebKit::WebLoaderStrategy::startPingLoad):
>+        (WebKit::WebLoaderStrategy::preconnectTo):
>+
> 2019-01-03  Brent Fulgham  <bfulgham@apple.com>
> 
>         Remove logic handling DNT header during redirects
>diff --git a/Source/WebKit/NetworkProcess/NetworkLoadParameters.h b/Source/WebKit/NetworkProcess/NetworkLoadParameters.h
>index cfc4b527f0d1f72f3d868583f9d48b873de351ce..c56e8ebbacff47044040ac3fb529ae6c98c7285e 100644
>--- a/Source/WebKit/NetworkProcess/NetworkLoadParameters.h
>+++ b/Source/WebKit/NetworkProcess/NetworkLoadParameters.h
>@@ -30,6 +30,7 @@
> #include <WebCore/ResourceLoaderOptions.h>
> #include <WebCore/ResourceRequest.h>
> #include <pal/SessionID.h>
>+#include <wtf/ProcessID.h>
> 
> namespace WebKit {
> 
>@@ -39,6 +40,7 @@ class NetworkLoadParameters {
> public:
>     uint64_t webPageID { 0 };
>     uint64_t webFrameID { 0 };
>+    WTF::ProcessID parentPID { 0 };
>     PAL::SessionID sessionID { PAL::SessionID::emptySessionID() };
>     WebCore::ResourceRequest request;
>     WebCore::ContentSniffingPolicy contentSniffingPolicy { WebCore::ContentSniffingPolicy::SniffContent };
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>index 80b70aaab2279107ce0bda67a6eca21075a2beda..cfe58e1ce9f7b2e23fe87ec70aae6b3b49c9c58f 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>@@ -36,6 +36,7 @@ void NetworkResourceLoadParameters::encode(IPC::Encoder& encoder) const
>     encoder << identifier;
>     encoder << webPageID;
>     encoder << webFrameID;
>+    encoder << parentPID;
>     encoder << sessionID;
>     encoder << request;
> 
>@@ -113,6 +114,9 @@ bool NetworkResourceLoadParameters::decode(IPC::Decoder& decoder, NetworkResourc
>     if (!decoder.decode(result.webFrameID))
>         return false;
> 
>+    if (!decoder.decode(result.parentPID))
>+        return false;
>+
>     if (!decoder.decode(result.sessionID))
>         return false;
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>index 97f1396c8505ba8bf2e7d4d7f14398773a5892d7..b85245a932d40878f7d70f171168c5f49e9f030d 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>@@ -171,7 +171,7 @@ void NetworkResourceLoader::start()
>     m_networkActivityTracker = m_connection->startTrackingResourceLoad(m_parameters.webPageID, m_parameters.identifier, isMainResource(), sessionID());
> 
>     if (m_defersLoading) {
>-        RELEASE_LOG_IF_ALLOWED("start: Loading is deferred (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous());
>+        RELEASE_LOG_IF_ALLOWED("start: Loading is deferred (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d, parentPID = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous(), m_parameters.parentPID);
>         return;
>     }
> 
>@@ -182,17 +182,18 @@ void NetworkResourceLoader::start()
>         m_networkLoadChecker->check(ResourceRequest { originalRequest() }, this, [this] (auto&& result) {
>             WTF::switchOn(result,
>                 [this] (ResourceError& error) {
>+                    RELEASE_LOG_IF_ALLOWED("start: error checking (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d, parentPID = %d, error.domain = %{public}s, error.code = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, this->isMainResource(), this->isSynchronous(), m_parameters.parentPID, error.domain().utf8().data(), error.errorCode());
>                     if (!error.isCancellation())
>                         this->didFailLoading(error);
>                 },
>                 [this] (NetworkLoadChecker::RedirectionTriplet& triplet) {
>                     this->m_isWaitingContinueWillSendRequestForCachedRedirect = true;
>                     this->willSendRedirectedRequest(WTFMove(triplet.request), WTFMove(triplet.redirectRequest), WTFMove(triplet.redirectResponse));
>-                    RELEASE_LOG_IF_ALLOWED("NetworkResourceLoader: synthetic redirect sent because request URL was modified.");
>+                    RELEASE_LOG_IF_ALLOWED("start: synthetic redirect sent because request URL was modified (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d, parentPID = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, this->isMainResource(), this->isSynchronous(), m_parameters.parentPID);
>                 },
>                 [this] (ResourceRequest& request) {
>                     if (this->canUseCache(request)) {
>-                        RELEASE_LOG_IF_ALLOWED("start: Checking cache for resource (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, this->isMainResource(), this->isSynchronous());
>+                        RELEASE_LOG_IF_ALLOWED("start: Checking cache for resource (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d, parentPID = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, this->isMainResource(), this->isSynchronous(), m_parameters.parentPID);
>                         this->retrieveCacheEntry(request);
>                         return;
>                     }
>@@ -205,7 +206,7 @@ void NetworkResourceLoader::start()
>     }
>     // FIXME: Remove that code path once m_networkLoadChecker is used for all network loads.
>     if (canUseCache(originalRequest())) {
>-        RELEASE_LOG_IF_ALLOWED("start: Checking cache for resource (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous());
>+        RELEASE_LOG_IF_ALLOWED("start: Checking cache for resource (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d, parentPID = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous(), m_parameters.parentPID);
>         retrieveCacheEntry(originalRequest());
>         return;
>     }
>diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>index f9857c94ad4620cbeff88e3a9df0c5f8c0b0d99e..ba01c1bda4ad2949204852044395a562dbdf85a6 100644
>--- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>+++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>@@ -268,6 +268,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
>     loadParameters.identifier = identifier;
>     loadParameters.webPageID = trackingParameters.pageID;
>     loadParameters.webFrameID = trackingParameters.frameID;
>+    loadParameters.parentPID = getCurrentProcessID();
>     loadParameters.sessionID = sessionID;
>     loadParameters.request = request;
>     loadParameters.contentSniffingPolicy = contentSniffingPolicy;
>@@ -531,6 +532,7 @@ void WebLoaderStrategy::loadResourceSynchronously(FrameLoader& frameLoader, unsi
>     loadParameters.identifier = resourceLoadIdentifier;
>     loadParameters.webPageID = pageID;
>     loadParameters.webFrameID = frameID;
>+    loadParameters.parentPID = getCurrentProcessID();
>     loadParameters.sessionID = sessionID;
>     loadParameters.request = request;
>     loadParameters.contentSniffingPolicy = ContentSniffingPolicy::SniffContent;
>@@ -585,6 +587,7 @@ void WebLoaderStrategy::startPingLoad(Frame& frame, ResourceRequest& request, co
>     loadParameters.identifier = generateLoadIdentifier();
>     loadParameters.request = request;
>     loadParameters.sourceOrigin = &document->securityOrigin();
>+    loadParameters.parentPID = getCurrentProcessID();
>     loadParameters.sessionID = frame.page() ? frame.page()->sessionID() : PAL::SessionID::defaultSessionID();
>     loadParameters.storedCredentialsPolicy = options.credentials == FetchOptions::Credentials::Omit ? StoredCredentialsPolicy::DoNotUse : StoredCredentialsPolicy::Use;
>     loadParameters.options = options;
>@@ -644,6 +647,7 @@ void WebLoaderStrategy::preconnectTo(FrameLoader& frameLoader, const URL& url, S
>     parameters.request = ResourceRequest { url };
>     parameters.webPageID = webPage ? webPage->pageID() : 0;
>     parameters.webFrameID = webFrame ? webFrame->frameID() : 0;
>+    parameters.parentPID = getCurrentProcessID();
>     parameters.sessionID = webPage ? webPage->sessionID() : PAL::SessionID::defaultSessionID();
>     parameters.storedCredentialsPolicy = storedCredentialsPolicy;
>     parameters.shouldPreconnectOnly = PreconnectOnly::Yes;

Actions: View | Formatted Diff | Diff

Attachments on bug 193121: 358287 | 358292 | 358293 | 358334