Bug 227017 – [GLib] Rewrite NetworkCache::Data::adoptMap without FileSystem::MappedFileData::leakHandle and munmap

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Fujii Hironori]

Rewrite NetworkCache::Data::adoptMap not to use FileSystem::MappedFileData::leakHandle

Bug 227011 is going to add a file mapping handle to
FileSystem::MappedFileData for Windows port create a SharedMemory
from a MappedFileData. Destruction of MappedFileData should be
done only by MappedFileData dtor.

[Fujii Hironori]

Created attachment 431411 [details]
WIP patch

[Chris Dumez]

Comment on attachment 431411 [details]
WIP patch

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

> Source/WebKit/NetworkProcess/cache/NetworkCacheDataCocoa.mm:98
> +    const void* map = mappedFile.data();

Which do you need to change Cocoa code? The new code is less efficient.

[Fujii Hironori]

Comment on attachment 431411 [details]
WIP patch

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

>> Source/WebKit/NetworkProcess/cache/NetworkCacheDataCocoa.mm:98
>> +    const void* map = mappedFile.data();
> 
> Which do you need to change Cocoa code? The new code is less efficient.

This change isn't technically a mandatory for Bug 227017.
I can keep FileSystem::MappedFileData::leakHande just for this.

Because Bug 227017 is going to add HANDLE of a file mapping to
MappedFileData, the combination of
FileSystem::MappedFileData::leakHande and
FileSystem::unmapViewOfFile is too problematic.
That's the reason I want to remove.

But, I can keep MappedFileData::leakHande by adding #if !OS(WINDOWS) if you like.

[Chris Dumez]

(In reply to Fujii Hironori from comment #3)
> Comment on attachment 431411 [details]
> WIP patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=431411&action=review
> 
> >> Source/WebKit/NetworkProcess/cache/NetworkCacheDataCocoa.mm:98
> >> +    const void* map = mappedFile.data();
> > 
> > Which do you need to change Cocoa code? The new code is less efficient.
> 
> This change isn't technically a mandatory for Bug 227017.
> I can keep FileSystem::MappedFileData::leakHande just for this.
> 
> Because Bug 227017 is going to add HANDLE of a file mapping to
> MappedFileData, the combination of
> FileSystem::MappedFileData::leakHande and
> FileSystem::unmapViewOfFile is too problematic.
> That's the reason I want to remove.
> 
> But, I can keep MappedFileData::leakHande by adding #if !OS(WINDOWS) if you
> like.

I think that would be good, since the replacement Cocoa code wouldn't be as efficient otherwise.

[Fujii Hironori]

OK. Thank you.

[Fujii Hironori]

Reopened. I'm going to fix only NetworkCacheDataGLib.cpp.

[Fujii Hironori]

Created attachment 431935 [details]
Patch

[Fujii Hironori]

Comment on attachment 431935 [details]
Patch

Clearing flags on attachment: 431935

Committed r279137 (239049@main): <https://commits.webkit.org/239049@main>

[Fujii Hironori]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/79628816>