Title: [207812] trunk/Source/WebKit2
Revision
207812
Author
[email protected]
Date
2016-10-25 01:22:19 -0700 (Tue, 25 Oct 2016)

Log Message

Add support for introducing simulated latency in network process
https://bugs.webkit.org/show_bug.cgi?id=163902

Reviewed by Alex Christensen.

For testing purposes it is useful to have a mechanism for simulating high latency.
This patch adds a basic mechanism that introduces a delay to each response in network
process. In Safari it can be used with

     defaults write com.apple.Safari WebKitNetworkLoadThrottleLatencyMilliseconds 200

Setting the delay to 0 disables the feature.

* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::Throttle::Throttle):
(WebKit::NetworkLoad::didReceiveResponseNetworkSession):
(WebKit::NetworkLoad::notifyDidReceiveResponse):
(WebKit::NetworkLoad::didReceiveData):
(WebKit::NetworkLoad::didCompleteWithError):
(WebKit::NetworkLoad::throttleDelayCompleted):
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::initializeNetworkProcess):
* NetworkProcess/NetworkProcess.h:
(WebKit::NetworkProcess::loadThrottleLatency):
* NetworkProcess/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode):
(WebKit::NetworkProcessCreationParameters::decode):
* NetworkProcess/NetworkProcessCreationParameters.h:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeNetworkProcess):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (207811 => 207812)


--- trunk/Source/WebKit2/ChangeLog	2016-10-25 07:01:57 UTC (rev 207811)
+++ trunk/Source/WebKit2/ChangeLog	2016-10-25 08:22:19 UTC (rev 207812)
@@ -1,3 +1,37 @@
+2016-10-25  Antti Koivisto  <[email protected]>
+
+        Add support for introducing simulated latency in network process
+        https://bugs.webkit.org/show_bug.cgi?id=163902
+
+        Reviewed by Alex Christensen.
+
+        For testing purposes it is useful to have a mechanism for simulating high latency.
+        This patch adds a basic mechanism that introduces a delay to each response in network
+        process. In Safari it can be used with
+
+             defaults write com.apple.Safari WebKitNetworkLoadThrottleLatencyMilliseconds 200
+
+        Setting the delay to 0 disables the feature.
+
+        * NetworkProcess/NetworkLoad.cpp:
+        (WebKit::NetworkLoad::Throttle::Throttle):
+        (WebKit::NetworkLoad::didReceiveResponseNetworkSession):
+        (WebKit::NetworkLoad::notifyDidReceiveResponse):
+        (WebKit::NetworkLoad::didReceiveData):
+        (WebKit::NetworkLoad::didCompleteWithError):
+        (WebKit::NetworkLoad::throttleDelayCompleted):
+        * NetworkProcess/NetworkLoad.h:
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::initializeNetworkProcess):
+        * NetworkProcess/NetworkProcess.h:
+        (WebKit::NetworkProcess::loadThrottleLatency):
+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::encode):
+        (WebKit::NetworkProcessCreationParameters::decode):
+        * NetworkProcess/NetworkProcessCreationParameters.h:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+
 2016-10-24  Dan Bernstein  <[email protected]>
 
         REGRESSION (r206410): Sandbox violations beneath WebProcessProxy::platformIsBeingDebugged

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (207811 => 207812)


--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp	2016-10-25 07:01:57 UTC (rev 207811)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp	2016-10-25 08:22:19 UTC (rev 207812)
@@ -45,6 +45,19 @@
 
 #if USE(NETWORK_SESSION)
 
+struct NetworkLoad::Throttle {
+    Throttle(NetworkLoad& load, std::chrono::milliseconds delay, ResourceResponse&& response, ResponseCompletionHandler&& handler)
+        : timer(load, &NetworkLoad::throttleDelayCompleted)
+        , response(WTFMove(response))
+        , responseCompletionHandler(WTFMove(handler))
+    {
+        timer.startOneShot(delay);
+    }
+    Timer timer;
+    ResourceResponse response;
+    ResponseCompletionHandler responseCompletionHandler;
+};
+
 NetworkLoad::NetworkLoad(NetworkLoadClient& client, NetworkLoadParameters&& parameters, NetworkSession& networkSession)
     : m_client(client)
     , m_parameters(WTFMove(parameters))
@@ -271,16 +284,37 @@
 void NetworkLoad::didReceiveResponseNetworkSession(ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
 {
     ASSERT(isMainThread());
-    if (m_task && m_task->isDownload())
+    ASSERT(!m_throttle);
+
+    if (m_task && m_task->isDownload()) {
         NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), WTFMove(completionHandler), response);
-    else if (sharedDidReceiveResponse(WTFMove(response)) == NetworkLoadClient::ShouldContinueDidReceiveResponse::Yes)
-        completionHandler(PolicyUse);
-    else
+        return;
+    }
+
+    auto delay = NetworkProcess::singleton().loadThrottleLatency();
+    if (delay > 0ms) {
+        m_throttle = std::make_unique<Throttle>(*this, delay, WTFMove(response), WTFMove(completionHandler));
+        return;
+    }
+
+    notifyDidReceiveResponse(WTFMove(response), WTFMove(completionHandler));
+}
+
+void NetworkLoad::notifyDidReceiveResponse(ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
+{
+    ASSERT(isMainThread());
+
+    if (sharedDidReceiveResponse(WTFMove(response)) == NetworkLoadClient::ShouldContinueDidReceiveResponse::No) {
         m_responseCompletionHandler = WTFMove(completionHandler);
+        return;
+    }
+    completionHandler(PolicyUse);
 }
 
 void NetworkLoad::didReceiveData(Ref<SharedBuffer>&& buffer)
 {
+    ASSERT(!m_throttle);
+
     // FIXME: This should be the encoded data length, not the decoded data length.
     auto size = buffer->size();
     m_client.didReceiveBuffer(WTFMove(buffer), size);
@@ -288,6 +322,8 @@
 
 void NetworkLoad::didCompleteWithError(const ResourceError& error)
 {
+    ASSERT(!m_throttle);
+
     if (error.isNull())
         m_client.didFinishLoading(WTF::monotonicallyIncreasingTime());
     else
@@ -294,6 +330,15 @@
         m_client.didFailLoading(error);
 }
 
+void NetworkLoad::throttleDelayCompleted()
+{
+    ASSERT(m_throttle);
+
+    auto throttle = WTFMove(m_throttle);
+
+    notifyDidReceiveResponse(WTFMove(throttle->response), WTFMove(throttle->responseCompletionHandler));
+}
+
 void NetworkLoad::didBecomeDownload()
 {
     m_client.didBecomeDownload();

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (207811 => 207812)


--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h	2016-10-25 07:01:57 UTC (rev 207811)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h	2016-10-25 08:22:19 UTC (rev 207812)
@@ -124,6 +124,9 @@
     void wasBlocked() final;
     void cannotShowURL() final;
 
+    void notifyDidReceiveResponse(WebCore::ResourceResponse&&, ResponseCompletionHandler&&);
+    void throttleDelayCompleted();
+
     void completeAuthenticationChallenge(ChallengeCompletionHandler&&);
 #endif
 
@@ -137,6 +140,9 @@
 #endif
     ResponseCompletionHandler m_responseCompletionHandler;
     RedirectCompletionHandler m_redirectCompletionHandler;
+    
+    struct Throttle;
+    std::unique_ptr<Throttle> m_throttle;
 #else
     bool m_waitingForContinueCanAuthenticateAgainstProtectionSpace { false };
     RefPtr<RemoteNetworkingContext> m_networkingContext;

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (207811 => 207812)


--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp	2016-10-25 07:01:57 UTC (rev 207811)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp	2016-10-25 08:22:19 UTC (rev 207812)
@@ -205,6 +205,7 @@
     WTF::setCurrentThreadIsUserInitiated();
 
     m_suppressMemoryPressureHandler = parameters.shouldSuppressMemoryPressureHandler;
+    m_loadThrottleLatency = parameters.loadThrottleLatency;
     if (!m_suppressMemoryPressureHandler) {
         auto& memoryPressureHandler = MemoryPressureHandler::singleton();
 #if OS(LINUX)

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (207811 => 207812)


--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h	2016-10-25 07:01:57 UTC (rev 207811)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h	2016-10-25 08:22:19 UTC (rev 207812)
@@ -120,6 +120,8 @@
 
     void grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler);
 
+    std::chrono::milliseconds loadThrottleLatency() const { return m_loadThrottleLatency; }
+
 private:
     NetworkProcess();
     ~NetworkProcess();
@@ -210,6 +212,7 @@
     bool m_suppressMemoryPressureHandler { false };
     bool m_diskCacheIsDisabledForTesting;
     bool m_canHandleHTTPSServerTrustEvaluation;
+    std::chrono::milliseconds m_loadThrottleLatency;
 
     typedef HashMap<const char*, std::unique_ptr<NetworkProcessSupplement>, PtrHash<const char*>> NetworkProcessSupplementMap;
     NetworkProcessSupplementMap m_supplements;

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp (207811 => 207812)


--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp	2016-10-25 07:01:57 UTC (rev 207811)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp	2016-10-25 08:22:19 UTC (rev 207812)
@@ -64,6 +64,7 @@
     encoder << shouldSuppressMemoryPressureHandler;
     encoder << shouldUseTestingNetworkSession;
     encoder << urlParserEnabled;
+    encoder << loadThrottleLatency;
     encoder << urlSchemesRegisteredForCustomProtocols;
 #if PLATFORM(COCOA)
     encoder << parentProcessName;
@@ -136,6 +137,8 @@
         return false;
     if (!decoder.decode(result.urlParserEnabled))
         return false;
+    if (!decoder.decode(result.loadThrottleLatency))
+        return false;
     if (!decoder.decode(result.urlSchemesRegisteredForCustomProtocols))
         return false;
 #if PLATFORM(COCOA)

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h (207811 => 207812)


--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h	2016-10-25 07:01:57 UTC (rev 207811)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h	2016-10-25 08:22:19 UTC (rev 207812)
@@ -73,6 +73,7 @@
     bool shouldSuppressMemoryPressureHandler { false };
     bool shouldUseTestingNetworkSession;
     bool urlParserEnabled { false };
+    std::chrono::milliseconds loadThrottleLatency;
 
     Vector<String> urlSchemesRegisteredForCustomProtocols;
 

Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (207811 => 207812)


--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2016-10-25 07:01:57 UTC (rev 207811)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2016-10-25 08:22:19 UTC (rev 207812)
@@ -83,6 +83,7 @@
 #endif
 
 static NSString * const WebKitSuppressMemoryPressureHandlerDefaultsKey = @"WebKitSuppressMemoryPressureHandler";
+static NSString * const WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey = @"WebKitNetworkLoadThrottleLatencyMilliseconds";
 
 static NSString * const WebKitVariationFontsEnabledDefaultsKey = @"ExperimentalVariationFontsEnabled";
 
@@ -252,6 +253,7 @@
 #endif
 
     parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];
+    parameters.loadThrottleLatency = std::chrono::milliseconds([defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey]);
 
 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     RetainPtr<CFDataRef> cookieStorageData = adoptCF(CFHTTPCookieStorageCreateIdentifyingData(kCFAllocatorDefault, [[NSHTTPCookieStorage sharedHTTPCookieStorage] _cookieStorage]));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to