Bug 141295 – Switch to file backed buffer when resource is cached to disk

• Component: Page Loading
• Status: RESOLVED FIXED

[Antti Koivisto]

Wire the mechanism used with CFNetwork cache to the new disk cache.

[Antti Koivisto]

Created attachment 246121 [details]
patch

[WebKit Commit Bot]

Attachment 246121 [details] did not pass style-queue:


ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp:284:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCache.h:73:  Extra space before ( in function call  [whitespace/parens] [4]
Total errors found: 2 in 6 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Chris Dumez]

Comment on attachment 246121 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=246121&action=review

> Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h:146
> +    typedef std::function<bool (std::unique_ptr<Entry>)> RetriveCompletionHandler;

"Retrieve"

> Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm:448
> +void NetworkCacheStorage::store(const NetworkCacheKey& key, const Entry& entry, StoreCompletionHandler completionHandler)

Since these std::function are passed by value, don't we want to WTF::move() them into the StoreOperation struct?

[Chris Dumez]

Comment on attachment 246121 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=246121&action=review

> Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp:342
> +            RefPtr<NetworkResourceLoader> loader(this);

Looks like this should be a Ref?

[Chris Dumez]

Comment on attachment 246121 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=246121&action=review

> Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm:257
> +    if (!map)

On failure mmap() returns MAP_FAILED which is (void*)-1, not 0.

[Chris Dumez]

Comment on attachment 246121 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=246121&action=review

r=me % a few comments.

>> Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm:448
>> +void NetworkCacheStorage::store(const NetworkCacheKey& key, const Entry& entry, StoreCompletionHandler completionHandler)
> 
> Since these std::function are passed by value, don't we want to WTF::move() them into the StoreOperation struct?

or pass them by const ref.

[Antti Koivisto]

> Looks like this should be a Ref?

Ref doesn't work with C++11 lambdas since it doesn't have copy-constructor.

[Antti Koivisto]

> On failure mmap() returns MAP_FAILED which is (void*)-1, not 0.

Good catch.

[Chris Dumez]

(In reply to comment #7)
> > Looks like this should be a Ref?
> 
> Ref doesn't work with C++11 lambdas since it doesn't have copy-constructor.

Right. never mind then.

[Chris Dumez]

(In reply to comment #5)
> Comment on attachment 246121 [details]
> patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=246121&action=review
> 
> > Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm:257
> > +    if (!map)
> 
> On failure mmap() returns MAP_FAILED which is (void*)-1, not 0.

BTW, it looks like we have the same bug in decodeEntry() already.

[Antti Koivisto]

https://trac.webkit.org/r179708