Changeset 175982 in webkit

Timestamp:

Nov 11, 2014, 3:13:05 PM (12 years ago)

Author:

ap@apple.com

Message:

DRT and WKTR touch disk cache
​https://bugs.webkit.org/show_bug.cgi?id=138622

Reviewed by Geoffrey Garen.

Source/WebKit2:

Setting a cache model has a very strange behavior in WebKit2, where it ignores
sizes that were explicitly passed from UI process, and uses different ones. As
setCacheModel() is always called on launch, it always creates a non-empty disk cache.

The design needs to be improved one day, but for now, just make sure that we never
create a disk cache during testing.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::NetworkProcess):
(WebKit::NetworkProcess::initializeNetworkProcess):

• NetworkProcess/NetworkProcess.h:
• NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
(WebKit::NetworkProcess::platformSetCacheModel):

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess):
(WebKit::WebProcess::initializeWebProcess):

• WebProcess/WebProcess.h:
• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformSetCacheModel):
(WebKit::WebProcess::platformInitializeWebProcess):

Tools:

• DumpRenderTree/mac/DumpRenderTree.mm: (prepareConsistentTestingEnvironment):

Set a shared cache before calling -_switchNetworkLoaderToNewTestingSession, not after,
because this function uses the shared cache.

• WebKitTestRunner/mac/TestControllerMac.mm: (WTR::TestController::platformInitializeContext):

Create an empty shared cache to prevent a default one from being created on disk.

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/NetworkProcess/NetworkProcess.cpp (modified) (2 diffs)
• Source/WebKit2/NetworkProcess/NetworkProcess.h (modified) (1 diff)
• Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (modified) (2 diffs)
• Source/WebKit2/WebProcess/WebProcess.cpp (modified) (2 diffs)
• Source/WebKit2/WebProcess/WebProcess.h (modified) (1 diff)
• Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (1 diff)
• Tools/WebKitTestRunner/mac/TestControllerMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-11  Alexey Proskuryakov  <ap@apple.com>
+
+        DRT and WKTR touch disk cache
+        https://bugs.webkit.org/show_bug.cgi?id=138622
+
+        Reviewed by Geoffrey Garen.
+
+        Setting a cache model has a very strange behavior in WebKit2, where it ignores
+        sizes that were explicitly passed from UI process, and uses different ones. As
+        setCacheModel() is always called on launch, it always creates a non-empty disk cache.
+
+        The design needs to be improved one day, but for now, just make sure that we never
+        create a disk cache during testing.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::NetworkProcess):
+        (WebKit::NetworkProcess::initializeNetworkProcess):
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+        (WebKit::NetworkProcess::platformSetCacheModel):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::WebProcess):
+        (WebKit::WebProcess::initializeWebProcess):
+        * WebProcess/WebProcess.h:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformSetCacheModel):
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2014-11-11  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

@@ -68 +68 @@
     : m_hasSetCacheModel(false)
     , m_cacheModel(CacheModelDocumentViewer)
+    , m_diskCacheIsDisabledForTesting(false)
     , m_canHandleHTTPSServerTrustEvaluation(true)
 #if PLATFORM(COCOA)
@@ -162 +163 @@
     memoryPressureHandler().install();
 
+    m_diskCacheIsDisabledForTesting = parameters.shouldUseTestingNetworkSession;
     setCacheModel(static_cast<uint32_t>(parameters.cacheModel));
+
     setCanHandleHTTPSServerTrustEvaluation(parameters.canHandleHTTPSServerTrustEvaluation);
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h

@@ -138 +138 @@
     bool m_hasSetCacheModel;
     CacheModel m_cacheModel;
+    bool m_diskCacheIsDisabledForTesting;
     bool m_canHandleHTTPSServerTrustEvaluation;
 

trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm

@@ -68 +68 @@
     m_diskCacheDirectory = parameters.diskCacheDirectory;
 
+    // FIXME: Most of what this function does for cache size gets immediately overridden by setCacheModel().
+    // - memory cache size passed from UI process is always ignored;
+    // - disk cache size passed from UI process is effectively a minimum size.
+    // One non-obvious constraint is that we need to use -setSharedURLCache: even in testing mode, to prevent creating a default one on disk later, when some other code touches the cache.
+
+    ASSERT(!m_diskCacheIsDisabledForTesting || !parameters.nsURLCacheDiskCapacity);
+
     if (!m_diskCacheDirectory.isNull()) {
         SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
@@ -135 +142 @@
         pageCacheCapacity, urlCacheMemoryCapacity, urlCacheDiskCapacity);
 
-
     NSURLCache *nsurlCache = [NSURLCache sharedURLCache];
     [nsurlCache setMemoryCapacity:urlCacheMemoryCapacity];
-    [nsurlCache setDiskCapacity:std::max<unsigned long>(urlCacheDiskCapacity, [nsurlCache diskCapacity])]; // Don't shrink a big disk cache, since that would cause churn.
+    if (!m_diskCacheIsDisabledForTesting)
+        [nsurlCache setDiskCapacity:std::max<unsigned long>(urlCacheDiskCapacity, [nsurlCache diskCapacity])]; // Don't shrink a big disk cache, since that would cause churn.
 }
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -157 +157 @@
     , m_hasSetCacheModel(false)
     , m_cacheModel(CacheModelDocumentViewer)
+    , m_diskCacheIsDisabledForTesting(false)
 #if PLATFORM(COCOA)
     , m_compositingRenderServerPort(MACH_PORT_NULL)
@@ -307 +308 @@
         cacheStorage().setCacheDirectory(parameters.applicationCacheDirectory);
 
+    m_diskCacheIsDisabledForTesting = parameters.shouldUseTestingNetworkSession;
     setCacheModel(static_cast<uint32_t>(parameters.cacheModel));
 

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -316 +316 @@
     bool m_hasSetCacheModel;
     CacheModel m_cacheModel;
+    bool m_diskCacheIsDisabledForTesting;
 
 #if PLATFORM(COCOA)

trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm

@@ -122 +122 @@
 
     [nsurlCache setMemoryCapacity:urlCacheMemoryCapacity];
-    [nsurlCache setDiskCapacity:std::max<unsigned long>(urlCacheDiskCapacity, [nsurlCache diskCapacity])]; // Don't shrink a big disk cache, since that would cause churn.
+    if (!m_diskCacheIsDisabledForTesting)
+        [nsurlCache setDiskCapacity:std::max<unsigned long>(urlCacheDiskCapacity, [nsurlCache diskCapacity])]; // Don't shrink a big disk cache, since that would cause churn.
 }
 
@@ -168 +169 @@
 #endif
 #endif
+
+    // FIXME: Most of what this function does for cache size gets immediately overridden by setCacheModel().
+    // - memory cache size passed from UI process is always ignored;
+    // - disk cache size passed from UI process is effectively a minimum size.
+    // One non-obvious constraint is that we need to use -setSharedURLCache: even in testing mode, to prevent creating a default one on disk later, when some other code touches the cache.
+
+    ASSERT(!m_diskCacheIsDisabledForTesting || !parameters.nsURLCacheDiskCapacity);
 
 #if PLATFORM(IOS)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-11-11  Alexey Proskuryakov  <ap@apple.com>
+
+        DRT and WKTR touch disk cache
+        https://bugs.webkit.org/show_bug.cgi?id=138622
+
+        Reviewed by Geoffrey Garen.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm: (prepareConsistentTestingEnvironment):
+        Set a shared cache before calling -_switchNetworkLoaderToNewTestingSession, not after,
+        because this function uses the shared cache.
+
+        * WebKitTestRunner/mac/TestControllerMac.mm: (WTR::TestController::platformInitializeContext):
+        Create an empty shared cache to prevent a default one from being created on disk.
+
 2014-10-07  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -1089 +1089 @@
 
 #if !PLATFORM(IOS)
-    // FIXME: We'd like to start with a clean state for every test, but this function can't be used more than once yet.
+    // +[WebPreferences _switchNetworkLoaderToNewTestingSession] calls +[NSURLCache sharedURLCache], which initializes a default cache on disk.
+    // Making the shared cache memory-only avoids touching the file system.
+    RetainPtr<NSURLCache> sharedCache =
+        adoptNS([[NSURLCache alloc] initWithMemoryCapacity:1024 * 1024
+                                      diskCapacity:0
+                                          diskPath:nil]);
+    [NSURLCache setSharedURLCache:sharedCache.get()];
+
     [WebPreferences _switchNetworkLoaderToNewTestingSession];
-
-    NSURLCache *sharedCache =
-        [[NSURLCache alloc] initWithMemoryCapacity:1024 * 1024
-                                      diskCapacity:0
-                                          diskPath:[libraryPathForDumpRenderTree() stringByAppendingPathComponent:@"URLCache"]];
-    [NSURLCache setSharedURLCache:sharedCache];
-    [sharedCache release];
 
     adjustFonts();

trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm

@@ -107 +107 @@
 void TestController::platformInitializeContext()
 {
+    // Testing uses a private session, which is memory only. However creating one instantiates a shared NSURLCache,
+    // and if we haven't created one yet, the default one will be created on disk.
+    // Making the shared cache memory-only avoids touching the file system.
+    RetainPtr<NSURLCache> sharedCache =
+        adoptNS([[NSURLCache alloc] initWithMemoryCapacity:1024 * 1024
+                                      diskCapacity:0
+                                          diskPath:nil]);
+    [NSURLCache setSharedURLCache:sharedCache.get()];
 }