Changeset 182152 in webkit


Ignore:
Timestamp:
Mar 30, 2015, 2:09:14 PM (10 years ago)
Author:
Antti Koivisto
Message:

Don't cache resources that are very unlikely to be reused
​https://bugs.webkit.org/show_bug.cgi?id=143226
<rdar://problem/20347160>

Reviewed by Geoff Garen.

Source/WebCore:

Allow overriding resource load priorities via Internals for testing.

  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::addExtraFieldsToRequest):
(WebCore::FrameLoader::clearTestingOverrides):

  • loader/FrameLoader.h:

(WebCore::FrameLoader::setOverrideResourceLoadPriorityForTesting):
(WebCore::FrameLoader::clearOverrideCachePolicyForTesting): Deleted.

  • page/DiagnosticLoggingKeys.cpp:

(WebCore::DiagnosticLoggingKeys::unlikelyToReuseKey):

  • page/DiagnosticLoggingKeys.h:

Add a key.

  • testing/Internals.cpp:

(WebCore::Internals::resetToConsistentState):
(WebCore::stringToResourceLoadPriority):
(WebCore::Internals::setOverrideResourceLoadPriority):

  • testing/Internals.h:
  • testing/Internals.idl:

Source/WebKit2:

We are writing lots of resources to the cache that are never used again.

In browse-around-randomly test this reduced number of cache entries created by ~20% and bytes written by ~5%.

  • NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::makeUseDecision):
(WebKit::NetworkCache::makeRetrieveDecision):

Rename for clarity.

(WebKit::NetworkCache::makeStoreDecision):

Store only if the resource has non-zero expiration or has validation headers.

Very High priority resources (main resources) keep the existing policy to minimize impact
on back navigation and tab restore.

(WebKit::NetworkCache::Cache::retrieve):
(WebKit::NetworkCache::Cache::store):
(WebKit::NetworkCache::canUse): Deleted.
(WebKit::NetworkCache::canRetrieve): Deleted.
(WebKit::NetworkCache::canStore): Deleted.

  • NetworkProcess/cache/NetworkCache.h:
  • NetworkProcess/cache/NetworkCacheStatistics.cpp:

(WebKit::NetworkCache::storeDecisionToDiagnosticKey):

LayoutTests:

  • http/tests/cache/disk-cache/disk-cache-request-max-stale-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-request-max-stale-expected.html:

Keep max-age: 0 cacheable in this test by adding a validation header.

  • http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy.html:

Rebase and expand to cover the high priority resource case.

Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r182149 r182152  
     12015-03-30  Antti Koivisto  <antti@apple.com>
     2
     3        Don't cache resources that are very unlikely to be reused
     4        https://bugs.webkit.org/show_bug.cgi?id=143226
     5        <rdar://problem/20347160>
     6
     7        Reviewed by Geoff Garen.
     8
     9        * http/tests/cache/disk-cache/disk-cache-request-max-stale-expected.txt:
     10        * http/tests/cache/disk-cache/disk-cache-request-max-stale-expected.html:
     11
     12            Keep max-age: 0 cacheable in this test by adding a validation header.
     13
     14        * http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy-expected.txt:
     15        * http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy.html:
     16
     17            Rebase and expand to cover the high priority resource case.
     18
    1192015-03-30  Marcos Chavarría Teijeiro  <chavarria1991@gmail.com>
    220

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-request-max-stale-expected.txt

    r182145 r182152  
    66running 36 tests
    77
    8 response headers: {"Cache-control":"max-age=0"}
     8response headers: {"Cache-control":"max-age=0","ETag":"match"}
    99request headers: {"Cache-control":"max-stale=0"}
    10 response source: Network
     10response source: Disk cache after validation
    1111
    1212response headers: {"Cache-control":"max-age=100"}
    … …  
    1414response source: Disk cache
    1515
    16 response headers: {"Cache-control":"max-age=0","Age":"200"}
     16response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
    1717request headers: {"Cache-control":"max-stale=0"}
    18 response source: Network
     18response source: Disk cache after validation
    1919
    2020response headers: {"Cache-control":"max-age=100","Age":"200"}
    … …  
    2222response source: Network
    2323
    24 response headers: {"Cache-control":"max-age=0"}
     24response headers: {"Cache-control":"max-age=0","ETag":"match"}
    2525request headers: {"Cache-control":"max-stale"}
    2626response source: Disk cache
    … …  
    3030response source: Disk cache
    3131
    32 response headers: {"Cache-control":"max-age=0","Age":"200"}
     32response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
    3333request headers: {"Cache-control":"max-stale"}
    3434response source: Disk cache
    … …  
    3838response source: Disk cache
    3939
    40 response headers: {"Cache-control":"max-age=0"}
     40response headers: {"Cache-control":"max-age=0","ETag":"match"}
    4141request headers: {"Cache-control":"max-stale=100"}
    4242response source: Disk cache
    … …  
    4646response source: Disk cache
    4747
    48 response headers: {"Cache-control":"max-age=0","Age":"200"}
     48response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
    4949request headers: {"Cache-control":"max-stale=100"}
    50 response source: Network
     50response source: Disk cache after validation
    5151
    5252response headers: {"Cache-control":"max-age=100","Age":"200"}
    … …  
    5454response source: Network
    5555
    56 response headers: {"Cache-control":"max-age=0"}
     56response headers: {"Cache-control":"max-age=0","ETag":"match"}
    5757request headers: {"Cache-control":"max-stale=0, max-age=0"}
    58 response source: Network
     58response source: Disk cache after validation
    5959
    6060response headers: {"Cache-control":"max-age=100"}
    … …  
    6262response source: Network
    6363
    64 response headers: {"Cache-control":"max-age=0","Age":"200"}
     64response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
    6565request headers: {"Cache-control":"max-stale=0, max-age=0"}
    66 response source: Network
     66response source: Disk cache after validation
    6767
    6868response headers: {"Cache-control":"max-age=100","Age":"200"}
    … …  
    7070response source: Network
    7171
    72 response headers: {"Cache-control":"max-age=0"}
     72response headers: {"Cache-control":"max-age=0","ETag":"match"}
    7373request headers: {"Cache-control":"max-stale, max-age=0"}
    74 response source: Network
     74response source: Disk cache after validation
    7575
    7676response headers: {"Cache-control":"max-age=100"}
    … …  
    7878response source: Network
    7979
    80 response headers: {"Cache-control":"max-age=0","Age":"200"}
     80response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
    8181request headers: {"Cache-control":"max-stale, max-age=0"}
    82 response source: Network
     82response source: Disk cache after validation
    8383
    8484response headers: {"Cache-control":"max-age=100","Age":"200"}
    … …  
    8686response source: Network
    8787
    88 response headers: {"Cache-control":"max-age=0"}
     88response headers: {"Cache-control":"max-age=0","ETag":"match"}
    8989request headers: {"Cache-control":"max-stale=100, max-age=0"}
    90 response source: Network
     90response source: Disk cache after validation
    9191
    9292response headers: {"Cache-control":"max-age=100"}
    … …  
    9494response source: Network
    9595
    96 response headers: {"Cache-control":"max-age=0","Age":"200"}
     96response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
    9797request headers: {"Cache-control":"max-stale=100, max-age=0"}
    98 response source: Network
     98response source: Disk cache after validation
    9999
    100100response headers: {"Cache-control":"max-age=100","Age":"200"}
    … …  
    102102response source: Network
    103103
    104 response headers: {"Cache-control":"max-age=0"}
     104response headers: {"Cache-control":"max-age=0","ETag":"match"}
    105105request headers: {"Cache-control":"max-stale=0, max-age=100"}
    106 response source: Network
     106response source: Disk cache after validation
    107107
    108108response headers: {"Cache-control":"max-age=100"}
    … …  
    110110response source: Disk cache
    111111
    112 response headers: {"Cache-control":"max-age=0","Age":"200"}
     112response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
    113113request headers: {"Cache-control":"max-stale=0, max-age=100"}
    114 response source: Network
     114response source: Disk cache after validation
    115115
    116116response headers: {"Cache-control":"max-age=100","Age":"200"}
    … …  
    118118response source: Network
    119119
    120 response headers: {"Cache-control":"max-age=0"}
     120response headers: {"Cache-control":"max-age=0","ETag":"match"}
    121121request headers: {"Cache-control":"max-stale, max-age=100"}
    122122response source: Disk cache
    … …  
    126126response source: Disk cache
    127127
    128 response headers: {"Cache-control":"max-age=0","Age":"200"}
     128response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
    129129request headers: {"Cache-control":"max-stale, max-age=100"}
    130130response source: Disk cache
    … …  
    134134response source: Disk cache
    135135
    136 response headers: {"Cache-control":"max-age=0"}
     136response headers: {"Cache-control":"max-age=0","ETag":"match"}
    137137request headers: {"Cache-control":"max-stale=100, max-age=100"}
    138138response source: Disk cache
    … …  
    142142response source: Disk cache
    143143
    144 response headers: {"Cache-control":"max-age=0","Age":"200"}
     144response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
    145145request headers: {"Cache-control":"max-stale=100, max-age=100"}
    146 response source: Network
     146response source: Disk cache after validation
    147147
    148148response headers: {"Cache-control":"max-age=100","Age":"200"}

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-request-max-stale.html

    r182145 r182152  
    77[
    88 [
    9   { responseHeaders: {'Cache-control': 'max-age=0' } },
     9  { responseHeaders: {'Cache-control': 'max-age=0', 'ETag': 'match' } },
    1010  { responseHeaders: {'Cache-control': 'max-age=100' } },
    1111  ],

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy-expected.txt

    r181894 r182152  
    77
    88response headers: undefined
    9 response source: Disk cache
     9response source: Network
    1010
    1111response headers: {"Cache-control":"max-age=0"}
    12 response source: Disk cache
     12response source: Network
    1313
    1414response headers: {"Cache-control":"max-age=100"}
    … …  
    2525
    2626response headers: {"Cache-control":"no-cache"}
    27 response source: Disk cache
     27response source: Network
    2828
    2929response headers: {"Cache-control":"max-age=0, no-cache"}
    30 response source: Disk cache
     30response source: Network
    3131
    3232response headers: {"Cache-control":"max-age=100, no-cache"}
    … …  
    8888
    8989response headers: {"Cache-control":"must-revalidate"}
    90 response source: Disk cache
     90response source: Network
    9191
    9292response headers: {"Cache-control":"max-age=0, must-revalidate"}
    93 response source: Disk cache
     93response source: Network
    9494
    9595response headers: {"Cache-control":"max-age=100, must-revalidate"}
    … …  
    106106
    107107response headers: {"Cache-control":"no-cache, must-revalidate"}
    108 response source: Disk cache
     108response source: Network
    109109
    110110response headers: {"Cache-control":"max-age=0, no-cache, must-revalidate"}
    111 response source: Disk cache
     111response source: Network
    112112
    113113response headers: {"Cache-control":"max-age=100, no-cache, must-revalidate"}
    … …  
    168168response source: Disk cache
    169169
     170Testing high priority resources
     171
     172response headers: undefined
     173response source: Disk cache
     174
     175response headers: {"Cache-control":"max-age=0"}
     176response source: Disk cache
     177
     178response headers: {"Cache-control":"max-age=100"}
     179response source: Disk cache
     180
     181response headers: {"Cache-control":"no-store"}
     182response source: Network
     183
     184response headers: {"Cache-control":"max-age=0, no-store"}
     185response source: Network
     186
     187response headers: {"Cache-control":"max-age=100, no-store"}
     188response source: Network
     189
     190response headers: {"Cache-control":"no-cache"}
     191response source: Disk cache
     192
     193response headers: {"Cache-control":"max-age=0, no-cache"}
     194response source: Disk cache
     195
     196response headers: {"Cache-control":"max-age=100, no-cache"}
     197response source: Disk cache
     198
     199response headers: {"ETag":"match"}
     200response source: Disk cache
     201
     202response headers: {"Cache-control":"max-age=0","ETag":"match"}
     203response source: Disk cache
     204
     205response headers: {"Cache-control":"max-age=100","ETag":"match"}
     206response source: Disk cache
     207
     208response headers: {"Cache-control":"no-store","ETag":"match"}
     209response source: Network
     210
     211response headers: {"Cache-control":"max-age=0, no-store","ETag":"match"}
     212response source: Network
     213
     214response headers: {"Cache-control":"max-age=100, no-store","ETag":"match"}
     215response source: Network
     216
     217response headers: {"Cache-control":"no-cache","ETag":"match"}
     218response source: Disk cache
     219
     220response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match"}
     221response source: Disk cache
     222
     223response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match"}
     224response source: Disk cache
     225
     226response headers: {"ETag":"nomatch"}
     227response source: Disk cache
     228
     229response headers: {"Cache-control":"max-age=0","ETag":"nomatch"}
     230response source: Disk cache
     231
     232response headers: {"Cache-control":"max-age=100","ETag":"nomatch"}
     233response source: Disk cache
     234
     235response headers: {"Cache-control":"no-store","ETag":"nomatch"}
     236response source: Network
     237
     238response headers: {"Cache-control":"max-age=0, no-store","ETag":"nomatch"}
     239response source: Network
     240
     241response headers: {"Cache-control":"max-age=100, no-store","ETag":"nomatch"}
     242response source: Network
     243
     244response headers: {"Cache-control":"no-cache","ETag":"nomatch"}
     245response source: Disk cache
     246
     247response headers: {"Cache-control":"max-age=0, no-cache","ETag":"nomatch"}
     248response source: Disk cache
     249
     250response headers: {"Cache-control":"max-age=100, no-cache","ETag":"nomatch"}
     251response source: Disk cache
     252
     253response headers: {"Cache-control":"must-revalidate"}
     254response source: Disk cache
     255
     256response headers: {"Cache-control":"max-age=0, must-revalidate"}
     257response source: Disk cache
     258
     259response headers: {"Cache-control":"max-age=100, must-revalidate"}
     260response source: Disk cache
     261
     262response headers: {"Cache-control":"no-store, must-revalidate"}
     263response source: Network
     264
     265response headers: {"Cache-control":"max-age=0, no-store, must-revalidate"}
     266response source: Network
     267
     268response headers: {"Cache-control":"max-age=100, no-store, must-revalidate"}
     269response source: Network
     270
     271response headers: {"Cache-control":"no-cache, must-revalidate"}
     272response source: Disk cache
     273
     274response headers: {"Cache-control":"max-age=0, no-cache, must-revalidate"}
     275response source: Disk cache
     276
     277response headers: {"Cache-control":"max-age=100, no-cache, must-revalidate"}
     278response source: Disk cache
     279
     280response headers: {"ETag":"match","Cache-control":"must-revalidate"}
     281response source: Disk cache
     282
     283response headers: {"Cache-control":"max-age=0, must-revalidate","ETag":"match"}
     284response source: Disk cache
     285
     286response headers: {"Cache-control":"max-age=100, must-revalidate","ETag":"match"}
     287response source: Disk cache
     288
     289response headers: {"Cache-control":"no-store, must-revalidate","ETag":"match"}
     290response source: Network
     291
     292response headers: {"Cache-control":"max-age=0, no-store, must-revalidate","ETag":"match"}
     293response source: Network
     294
     295response headers: {"Cache-control":"max-age=100, no-store, must-revalidate","ETag":"match"}
     296response source: Network
     297
     298response headers: {"Cache-control":"no-cache, must-revalidate","ETag":"match"}
     299response source: Disk cache
     300
     301response headers: {"Cache-control":"max-age=0, no-cache, must-revalidate","ETag":"match"}
     302response source: Disk cache
     303
     304response headers: {"Cache-control":"max-age=100, no-cache, must-revalidate","ETag":"match"}
     305response source: Disk cache
     306
     307response headers: {"ETag":"nomatch","Cache-control":"must-revalidate"}
     308response source: Disk cache
     309
     310response headers: {"Cache-control":"max-age=0, must-revalidate","ETag":"nomatch"}
     311response source: Disk cache
     312
     313response headers: {"Cache-control":"max-age=100, must-revalidate","ETag":"nomatch"}
     314response source: Disk cache
     315
     316response headers: {"Cache-control":"no-store, must-revalidate","ETag":"nomatch"}
     317response source: Network
     318
     319response headers: {"Cache-control":"max-age=0, no-store, must-revalidate","ETag":"nomatch"}
     320response source: Network
     321
     322response headers: {"Cache-control":"max-age=100, no-store, must-revalidate","ETag":"nomatch"}
     323response source: Network
     324
     325response headers: {"Cache-control":"no-cache, must-revalidate","ETag":"nomatch"}
     326response source: Disk cache
     327
     328response headers: {"Cache-control":"max-age=0, no-cache, must-revalidate","ETag":"nomatch"}
     329response source: Disk cache
     330
     331response headers: {"Cache-control":"max-age=100, no-cache, must-revalidate","ETag":"nomatch"}
     332response source: Disk cache
     333
    170334PASS successfullyParsed is true
    171335

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy.html

    r181894 r182152  
    3737debug("");
    3838
    39 runTests(tests);
     39runTests(tests, function () {
     40    debug("Testing high priority resources");
     41    debug("");
     42    internals.setOverrideResourceLoadPriority("ResourceLoadPriorityVeryHigh");
     43    runTests(tests);
     44});
    4045
    4146</script>

  • trunk/Source/WebCore/ChangeLog

    r182147 r182152  
     12015-03-30  Antti Koivisto  <antti@apple.com>
     2
     3        Don't cache resources that are very unlikely to be reused
     4        https://bugs.webkit.org/show_bug.cgi?id=143226
     5        <rdar://problem/20347160>
     6
     7        Reviewed by Geoff Garen.
     8
     9        Allow overriding resource load priorities via Internals for testing.
     10
     11        * loader/FrameLoader.cpp:
     12        (WebCore::FrameLoader::addExtraFieldsToRequest):
     13        (WebCore::FrameLoader::clearTestingOverrides):
     14        * loader/FrameLoader.h:
     15        (WebCore::FrameLoader::setOverrideResourceLoadPriorityForTesting):
     16        (WebCore::FrameLoader::clearOverrideCachePolicyForTesting): Deleted.
     17        * page/DiagnosticLoggingKeys.cpp:
     18        (WebCore::DiagnosticLoggingKeys::unlikelyToReuseKey):
     19        * page/DiagnosticLoggingKeys.h:
     20
     21            Add a key.
     22
     23        * testing/Internals.cpp:
     24        (WebCore::Internals::resetToConsistentState):
     25        (WebCore::stringToResourceLoadPriority):
     26        (WebCore::Internals::setOverrideResourceLoadPriority):
     27        * testing/Internals.h:
     28        * testing/Internals.idl:
     29
    1302015-03-30  Javier Fernandez  <jfernandez@igalia.com>
    231

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r181804 r182152  
    25622562    if (m_overrideCachePolicyForTesting)
    25632563        request.setCachePolicy(m_overrideCachePolicyForTesting.value());
     2564    if (m_overrideResourceLoadPriorityForTesting)
     2565        request.setPriority(m_overrideResourceLoadPriorityForTesting.value());
    25642566
    25652567    if (request.cachePolicy() == ReloadIgnoringCacheData) {
    … …  
    34143416}
    34153417
     3418void FrameLoader::clearTestingOverrides()
     3419{
     3420    m_overrideCachePolicyForTesting = Nullopt;
     3421    m_overrideResourceLoadPriorityForTesting = Nullopt;
     3422}
     3423
    34163424bool FrameLoaderClient::hasHTMLView() const
    34173425{

  • trunk/Source/WebCore/loader/FrameLoader.h

    r181728 r182152  
    291291
    292292    void setOverrideCachePolicyForTesting(ResourceRequestCachePolicy policy) { m_overrideCachePolicyForTesting = policy; }
    293     void clearOverrideCachePolicyForTesting() { m_overrideCachePolicyForTesting = Nullopt; }
     293    void setOverrideResourceLoadPriorityForTesting(ResourceLoadPriority priority) { m_overrideResourceLoadPriorityForTesting = priority; }
     294    WEBCORE_EXPORT void clearTestingOverrides();
    294295
    295296private:
    … …  
    443444
    444445    Optional<ResourceRequestCachePolicy> m_overrideCachePolicyForTesting;
     446    Optional<ResourceLoadPriority> m_overrideResourceLoadPriorityForTesting;
    445447
    446448    URL m_previousURL;

  • trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp

    r181766 r182152  
    384384}
    385385
     386String DiagnosticLoggingKeys::unlikelyToReuseKey()
     387{
     388    return ASCIILiteral("unlikelyToReuse");
     389}
     390
    386391String DiagnosticLoggingKeys::unsupportedHTTPMethodKey()
    387392{

  • trunk/Source/WebCore/page/DiagnosticLoggingKeys.h

    r181766 r182152  
    109109    static String svgDocumentKey();
    110110    WEBCORE_EXPORT static String uncacheableStatusCodeKey();
     111    WEBCORE_EXPORT static String unlikelyToReuseKey();
    111112    WEBCORE_EXPORT static String unsupportedHTTPMethodKey();
    112113    static String unsuspendableDOMObjectKey();

  • trunk/Source/WebCore/testing/Internals.cpp

    r182141 r182152  
    309309    if (page->mainFrame().editor().isOverwriteModeEnabled())
    310310        page->mainFrame().editor().toggleOverwriteModeEnabled();
    311     page->mainFrame().loader().clearOverrideCachePolicyForTesting();
     311    page->mainFrame().loader().clearTestingOverrides();
    312312    ApplicationCacheStorage::singleton().setDefaultOriginQuota(ApplicationCacheStorage::noQuota());
    313313#if ENABLE(VIDEO)
    … …  
    444444{
    445445    frame()->loader().setOverrideCachePolicyForTesting(stringToResourceRequestCachePolicy(policy));
     446}
     447
     448static ResourceLoadPriority stringToResourceLoadPriority(const String& policy)
     449{
     450    if (policy == "ResourceLoadPriorityVeryLow")
     451        return ResourceLoadPriorityVeryLow;
     452    if (policy == "ResourceLoadPriorityLow")
     453        return ResourceLoadPriorityLow;
     454    if (policy == "ResourceLoadPriorityMedium")
     455        return ResourceLoadPriorityMedium;
     456    if (policy == "ResourceLoadPriorityHigh")
     457        return ResourceLoadPriorityHigh;
     458    if (policy == "ResourceLoadPriorityVeryHigh")
     459        return ResourceLoadPriorityVeryHigh;
     460    ASSERT_NOT_REACHED();
     461    return ResourceLoadPriorityLow;
     462}
     463
     464void Internals::setOverrideResourceLoadPriority(const String& priority)
     465{
     466    frame()->loader().setOverrideResourceLoadPriorityForTesting(stringToResourceLoadPriority(priority));
    446467}
    447468

  • trunk/Source/WebCore/testing/Internals.h

    r181728 r182152  
    9191    String xhrResponseSource(XMLHttpRequest*);
    9292    void setOverrideCachePolicy(const String&);
     93    void setOverrideResourceLoadPriority(const String&);
    9394
    9495    void clearMemoryCache();

  • trunk/Source/WebCore/testing/Internals.idl

    r181728 r182152  
    3838};
    3939
     40enum ResourceLoadPriority {
     41    "ResourceLoadPriorityVeryLow",
     42    "ResourceLoadPriorityLow",
     43    "ResourceLoadPriorityMedium",
     44    "ResourceLoadPriorityHigh",
     45    "ResourceLoadPriorityVeryHigh"
     46};
    4047
    4148[
    … …  
    5764    long memoryCacheSize();
    5865    void setOverrideCachePolicy(CachePolicy policy);
     66    void setOverrideResourceLoadPriority(ResourceLoadPriority priority);
    5967
    6068    void clearPageCache();

  • trunk/Source/WebKit2/ChangeLog

    r182150 r182152  
     12015-03-30  Antti Koivisto  <antti@apple.com>
     2
     3        Don't cache resources that are very unlikely to be reused
     4        https://bugs.webkit.org/show_bug.cgi?id=143226
     5        <rdar://problem/20347160>
     6
     7        Reviewed by Geoff Garen.
     8
     9        We are writing lots of resources to the cache that are never used again.
     10
     11        In browse-around-randomly test this reduced number of cache entries created by ~20% and bytes written by ~5%.
     12
     13        * NetworkProcess/cache/NetworkCache.cpp:
     14        (WebKit::NetworkCache::makeUseDecision):
     15        (WebKit::NetworkCache::makeRetrieveDecision):
     16
     17            Rename for clarity.
     18
     19        (WebKit::NetworkCache::makeStoreDecision):
     20
     21            Store only if the resource has non-zero expiration or has validation headers.
     22
     23            Very High priority resources (main resources) keep the existing policy to minimize impact
     24            on back navigation and tab restore.
     25
     26        (WebKit::NetworkCache::Cache::retrieve):
     27        (WebKit::NetworkCache::Cache::store):
     28        (WebKit::NetworkCache::canUse): Deleted.
     29        (WebKit::NetworkCache::canRetrieve): Deleted.
     30        (WebKit::NetworkCache::canStore): Deleted.
     31        * NetworkProcess/cache/NetworkCache.h:
     32        * NetworkProcess/cache/NetworkCacheStatistics.cpp:
     33        (WebKit::NetworkCache::storeDecisionToDiagnosticKey):
     34
    1352015-03-30  Tim Horton  <timothy_horton@apple.com>
    236

  • trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp

    r182145 r182152  
    183183}
    184184
    185 static UseDecision canUse(const Entry& entry, const WebCore::ResourceRequest& request)
    186 {
    187     if (!verifyVaryingRequestHeaders(entry.varyingRequestHeaders(), request)) {
    188         LOG(NetworkCache, "(NetworkProcess) varying header mismatch\n");
     185static UseDecision makeUseDecision(const Entry& entry, const WebCore::ResourceRequest& request)
     186{
     187    if (!verifyVaryingRequestHeaders(entry.varyingRequestHeaders(), request))
    189188        return UseDecision::NoDueToVaryingHeaderMismatch;
    190     }
    191189
    192190    // We never revalidate in the case of a history navigation.
    … …  
    197195        return UseDecision::Use;
    198196
    199     bool hasValidatorFields = entry.response().hasCacheValidatorFields();
    200     LOG(NetworkCache, "(NetworkProcess) needsRevalidation hasValidatorFields=%d", hasValidatorFields);
    201     if (!hasValidatorFields)
     197    if (!entry.response().hasCacheValidatorFields())
    202198        return UseDecision::NoDueToMissingValidatorFields;
    203199
    … …  
    205201}
    206202
    207 static RetrieveDecision canRetrieve(const WebCore::ResourceRequest& request)
     203static RetrieveDecision makeRetrieveDecision(const WebCore::ResourceRequest& request)
    208204{
    209205    // FIXME: Support HEAD requests.
    … …  
    217213
    218214    return RetrieveDecision::Yes;
    219 }
    220 
    221 void Cache::retrieve(const WebCore::ResourceRequest& originalRequest, uint64_t webPageID, std::function<void (std::unique_ptr<Entry>)> completionHandler)
    222 {
    223     ASSERT(isEnabled());
    224     ASSERT(originalRequest.url().protocolIsInHTTPFamily());
    225 
    226     LOG(NetworkCache, "(NetworkProcess) retrieving %s priority %u", originalRequest.url().string().ascii().data(), originalRequest.priority());
    227 
    228     if (m_statistics)
    229         m_statistics->recordRetrievalRequest(webPageID);
    230 
    231     Key storageKey = makeCacheKey(originalRequest);
    232     RetrieveDecision retrieveDecision = canRetrieve(originalRequest);
    233     if (retrieveDecision != RetrieveDecision::Yes) {
    234         if (m_statistics)
    235             m_statistics->recordNotUsingCacheForRequest(webPageID, storageKey, originalRequest, retrieveDecision);
    236 
    237         completionHandler(nullptr);
    238         return;
    239     }
    240 
    241     auto startTime = std::chrono::system_clock::now();
    242     unsigned priority = originalRequest.priority();
    243 
    244     m_storage->retrieve(storageKey, priority, [this, originalRequest, completionHandler, startTime, storageKey, webPageID](std::unique_ptr<Storage::Record> record) {
    245         if (!record) {
    246             LOG(NetworkCache, "(NetworkProcess) not found in storage");
    247 
    248             if (m_statistics)
    249                 m_statistics->recordRetrievalFailure(webPageID, storageKey, originalRequest);
    250 
    251             completionHandler(nullptr);
    252             return false;
    253         }
    254 
    255         ASSERT(record->key == storageKey);
    256 
    257         auto entry = Entry::decodeStorageRecord(*record);
    258 
    259         auto useDecision = entry ? canUse(*entry, originalRequest) : UseDecision::NoDueToDecodeFailure;
    260         switch (useDecision) {
    261         case UseDecision::Use:
    262             break;
    263         case UseDecision::Validate:
    264             entry->setNeedsValidation();
    265             break;
    266         default:
    267             entry = nullptr;
    268         };
    269 
    270 #if !LOG_DISABLED
    271         auto elapsedMS = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime).count();
    272         LOG(NetworkCache, "(NetworkProcess) retrieve complete useDecision=%d priority=%u time=%lldms", useDecision, originalRequest.priority(), elapsedMS);
    273 #endif
    274         completionHandler(WTF::move(entry));
    275 
    276         if (m_statistics)
    277             m_statistics->recordRetrievedCachedEntry(webPageID, storageKey, originalRequest, useDecision);
    278         return useDecision != UseDecision::NoDueToDecodeFailure;
    279     });
    280215}
    281216
    … …  
    318253}
    319254
    320 static StoreDecision canStore(const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceResponse& response)
     255static StoreDecision makeStoreDecision(const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceResponse& response)
    321256{
    322257    if (!originalRequest.url().protocolIsInHTTPFamily() || !response.isHTTP())
    … …  
    333268        return StoreDecision::NoDueToNoStoreResponse;
    334269
    335     if (isStatusCodeCacheableByDefault(response.httpStatusCode()))
    336         return StoreDecision::Yes;
    337 
    338     if (isStatusCodePotentiallyCacheable(response.httpStatusCode())) {
    339         // Check for expiration headers allowing us to cache.
     270    if (!isStatusCodeCacheableByDefault(response.httpStatusCode())) {
    340271        // http://tools.ietf.org/html/rfc7234#section-4.3.2
    341         if (std::isfinite(response.expires()) || std::isfinite(response.cacheControlMaxAge()))
    342             return StoreDecision::Yes;
    343     }
    344 
    345     LOG(NetworkCache, "(NetworkProcess) status code %d not cacheable by default and no explicit expiration headers", response.httpStatusCode());
    346 
    347     return StoreDecision::NoDueToHTTPStatusCode;
     272        bool hasExpirationHeaders = std::isfinite(response.expires()) || std::isfinite(response.cacheControlMaxAge());
     273        bool expirationHeadersAllowCaching = isStatusCodePotentiallyCacheable(response.httpStatusCode()) && hasExpirationHeaders;
     274        if (!expirationHeadersAllowCaching)
     275            return StoreDecision::NoDueToHTTPStatusCode;
     276    }
     277
     278    // Main resource has ResourceLoadPriorityVeryHigh.
     279    bool storeUnconditionallyForHistoryNavigation = originalRequest.priority() == WebCore::ResourceLoadPriorityVeryHigh;
     280    if (!storeUnconditionallyForHistoryNavigation) {
     281        auto currentTime = std::chrono::duration<double>(std::chrono::system_clock::now().time_since_epoch());
     282        bool hasNonZeroLifetime = WebCore::computeFreshnessLifetimeForHTTPFamily(response, currentTime.count()) > 0;
     283
     284        bool possiblyReusable = response.hasCacheValidatorFields() || hasNonZeroLifetime;
     285        if (!possiblyReusable)
     286            return StoreDecision::NoDueToUnlikelyToReuse;
     287    }
     288
     289    return StoreDecision::Yes;
     290}
     291
     292void Cache::retrieve(const WebCore::ResourceRequest& originalRequest, uint64_t webPageID, std::function<void (std::unique_ptr<Entry>)> completionHandler)
     293{
     294    ASSERT(isEnabled());
     295    ASSERT(originalRequest.url().protocolIsInHTTPFamily());
     296
     297    LOG(NetworkCache, "(NetworkProcess) retrieving %s priority %u", originalRequest.url().string().ascii().data(), originalRequest.priority());
     298
     299    if (m_statistics)
     300        m_statistics->recordRetrievalRequest(webPageID);
     301
     302    Key storageKey = makeCacheKey(originalRequest);
     303    auto retrieveDecision = makeRetrieveDecision(originalRequest);
     304    if (retrieveDecision != RetrieveDecision::Yes) {
     305        if (m_statistics)
     306            m_statistics->recordNotUsingCacheForRequest(webPageID, storageKey, originalRequest, retrieveDecision);
     307
     308        completionHandler(nullptr);
     309        return;
     310    }
     311
     312    auto startTime = std::chrono::system_clock::now();
     313    unsigned priority = originalRequest.priority();
     314
     315    m_storage->retrieve(storageKey, priority, [this, originalRequest, completionHandler, startTime, storageKey, webPageID](std::unique_ptr<Storage::Record> record) {
     316        if (!record) {
     317            LOG(NetworkCache, "(NetworkProcess) not found in storage");
     318
     319            if (m_statistics)
     320                m_statistics->recordRetrievalFailure(webPageID, storageKey, originalRequest);
     321
     322            completionHandler(nullptr);
     323            return false;
     324        }
     325
     326        ASSERT(record->key == storageKey);
     327
     328        auto entry = Entry::decodeStorageRecord(*record);
     329
     330        auto useDecision = entry ? makeUseDecision(*entry, originalRequest) : UseDecision::NoDueToDecodeFailure;
     331        switch (useDecision) {
     332        case UseDecision::Use:
     333            break;
     334        case UseDecision::Validate:
     335            entry->setNeedsValidation();
     336            break;
     337        default:
     338            entry = nullptr;
     339        };
     340
     341#if !LOG_DISABLED
     342        auto elapsedMS = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime).count();
     343        LOG(NetworkCache, "(NetworkProcess) retrieve complete useDecision=%d priority=%u time=%lldms", useDecision, originalRequest.priority(), elapsedMS);
     344#endif
     345        completionHandler(WTF::move(entry));
     346
     347        if (m_statistics)
     348            m_statistics->recordRetrievedCachedEntry(webPageID, storageKey, originalRequest, useDecision);
     349        return useDecision != UseDecision::NoDueToDecodeFailure;
     350    });
    348351}
    349352
    … …  
    355358    LOG(NetworkCache, "(NetworkProcess) storing %s, partition %s", originalRequest.url().string().latin1().data(), originalRequest.cachePartition().latin1().data());
    356359
    357     StoreDecision storeDecision = canStore(originalRequest, response);
     360    StoreDecision storeDecision = makeStoreDecision(originalRequest, response);
     361
    358362    if (storeDecision != StoreDecision::Yes) {
    359363        LOG(NetworkCache, "(NetworkProcess) didn't store, storeDecision=%d", storeDecision);

  • trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h

    r182059 r182152  
    6363};
    6464
     65// FIXME: This enum is used in the Statistics code in a way that prevents removing or reordering anything.
    6566enum class StoreDecision {
    6667    Yes,
    6768    NoDueToProtocol,
    6869    NoDueToHTTPMethod,
    69     NoDueToAttachmentResponse,
     70    NoDueToAttachmentResponse, // Unused.
    7071    NoDueToNoStoreResponse,
    7172    NoDueToHTTPStatusCode,
    72     NoDueToNoStoreRequest
     73    NoDueToNoStoreRequest,
     74    NoDueToUnlikelyToReuse
    7375};
    7476

  • trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp

    r182090 r182152  
    239239    case StoreDecision::NoDueToHTTPStatusCode:
    240240        return WebCore::DiagnosticLoggingKeys::uncacheableStatusCodeKey();
     241    case StoreDecision::NoDueToUnlikelyToReuse:
     242        return WebCore::DiagnosticLoggingKeys::unlikelyToReuseKey();
    241243    case StoreDecision::Yes:
    242244        // It was stored but could not be retrieved so it must have been pruned from the cache.
Note: See TracChangeset for help on using the changeset viewer.