227017 2021-06-15 00:44:02 -0700 [GLib] Rewrite NetworkCache::Data::adoptMap without FileSystem::MappedFileData::leakHandle and munmap 2021-06-22 12:49:17 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 227011 1 fujii fujii benjamin cdumez cgarcia cmarcelo ews-watchlist kkinnunen webkit-bug-importer oldest_to_newest 1769715 0 fujii 2021-06-15 00:44:02 -0700 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. 1769718 1 431411 fujii 2021-06-15 00:52:03 -0700 Created attachment 431411 WIP patch 1769806 2 431411 cdumez 2021-06-15 08:32:06 -0700 Comment on attachment 431411 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. 1769922 3 431411 fujii 2021-06-15 12:58:30 -0700 Comment on attachment 431411 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. 1769924 4 cdumez 2021-06-15 12:59:33 -0700 (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. 1769925 5 fujii 2021-06-15 13:01:17 -0700 OK. Thank you. 1771475 6 fujii 2021-06-21 14:58:19 -0700 Reopened. I'm going to fix only NetworkCacheDataGLib.cpp. 1771556 7 431935 fujii 2021-06-21 17:57:45 -0700 Created attachment 431935 Patch 1771755 8 431935 fujii 2021-06-22 12:48:13 -0700 Comment on attachment 431935 Patch Clearing flags on attachment: 431935 Committed r279137 (239049@main): <https://commits.webkit.org/239049@main> 1771756 9 fujii 2021-06-22 12:48:17 -0700 All reviewed patches have been landed. Closing bug. 1771757 10 webkit-bug-importer 2021-06-22 12:49:17 -0700 <rdar://problem/79628816> 431411 2021-06-15 00:52:03 -0700 2021-06-21 17:57:39 -0700 WIP patch a.diff text/plain 2896 fujii ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0Nh Y2hlRGF0YUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3 b3JrQ2FjaGVEYXRhQ29jb2EubW0KaW5kZXggNWJmZmY0MWFlNjkyLi4yYmY2MDJlNTk4ZmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl RGF0YUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlRGF0YUNvY29hLm1tCkBAIC05NSwxMiArOTUsMTMgQEAgRGF0YSBjb25jYXRlbmF0 ZShjb25zdCBEYXRhJiBhLCBjb25zdCBEYXRhJiBiKQogRGF0YSBEYXRhOjphZG9wdE1hcChGaWxl U3lzdGVtOjpNYXBwZWRGaWxlRGF0YSYmIG1hcHBlZEZpbGUsIEZpbGVTeXN0ZW06OlBsYXRmb3Jt RmlsZUhhbmRsZSBmZCkKIHsKICAgICBzaXplX3Qgc2l6ZSA9IG1hcHBlZEZpbGUuc2l6ZSgpOwot ICAgIHZvaWQqIG1hcCA9IG1hcHBlZEZpbGUubGVha0hhbmRsZSgpOworICAgIGNvbnN0IHZvaWQq IG1hcCA9IG1hcHBlZEZpbGUuZGF0YSgpOwogICAgIEFTU0VSVChtYXApOwogICAgIEFTU0VSVCht YXAgIT0gTUFQX0ZBSUxFRCk7CiAgICAgRmlsZVN5c3RlbTo6Y2xvc2VGaWxlKGZkKTsKLSAgICBh dXRvIGJvZHlNYXAgPSBhZG9wdE9TT2JqZWN0KGRpc3BhdGNoX2RhdGFfY3JlYXRlKG1hcCwgc2l6 ZSwgZGlzcGF0Y2hfZ2V0X2dsb2JhbF9xdWV1ZShESVNQQVRDSF9RVUVVRV9QUklPUklUWV9ERUZB VUxULCAwKSwgW21hcCwgc2l6ZV0gewotICAgICAgICBtdW5tYXAobWFwLCBzaXplKTsKKyAgICBh dXRvIHByb3RlY3RlZE1hcHBlZEZpbGUgPSBuZXcgRmlsZVN5c3RlbTo6TWFwcGVkRmlsZURhdGEo V1RGTW92ZShtYXBwZWRGaWxlKSk7CisgICAgYXV0byBib2R5TWFwID0gYWRvcHRPU09iamVjdChk aXNwYXRjaF9kYXRhX2NyZWF0ZShtYXAsIHNpemUsIGRpc3BhdGNoX2dldF9nbG9iYWxfcXVldWUo RElTUEFUQ0hfUVVFVUVfUFJJT1JJVFlfREVGQVVMVCwgMCksIFsgcHJvdGVjdGVkTWFwcGVkRmls ZSBdIHsKKyAgICAgICAgZGVsZXRlIHByb3RlY3RlZE1hcHBlZEZpbGU7CiAgICAgfSkpOwogICAg IHJldHVybiB7IFdURk1vdmUoYm9keU1hcCksIERhdGE6OkJhY2tpbmc6Ok1hcCB9OwogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVE YXRhR0xpYi5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtD YWNoZURhdGFHTGliLmNwcAppbmRleCA5NDE0MDU1ZDVkNjkuLmU1ZTM4MGM4M2I3YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVEYXRh R0xpYi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3Jr Q2FjaGVEYXRhR0xpYi5jcHAKQEAgLTExMCwzMyArMTEwLDIwIEBAIERhdGEgY29uY2F0ZW5hdGUo Y29uc3QgRGF0YSYgYSwgY29uc3QgRGF0YSYgYikKICAgICByZXR1cm4geyBhZG9wdEdSZWYoZ19i eXRlc19uZXdfd2l0aF9mcmVlX2Z1bmMoZGF0YSwgc2l6ZSwgZmFzdEZyZWUsIGRhdGEpKSB9Owog fQogCi1zdHJ1Y3QgTWFwV3JhcHBlciB7Ci0gICAgV1RGX01BS0VfU1RSVUNUX0ZBU1RfQUxMT0NB VEVEOwotCi0gICAgfk1hcFdyYXBwZXIoKQotICAgIHsKLSAgICAgICAgbXVubWFwKG1hcCwgc2l6 ZSk7Ci0gICAgICAgIEZpbGVTeXN0ZW06OmNsb3NlRmlsZShmaWxlRGVzY3JpcHRvcik7Ci0gICAg fQotCi0gICAgdm9pZCogbWFwOwotICAgIHNpemVfdCBzaXplOwotICAgIEZpbGVTeXN0ZW06OlBs YXRmb3JtRmlsZUhhbmRsZSBmaWxlRGVzY3JpcHRvcjsKLX07Ci0KLXN0YXRpYyB2b2lkIGRlbGV0 ZU1hcFdyYXBwZXIoTWFwV3JhcHBlciogd3JhcHBlcikKK3N0YXRpYyB2b2lkIGRlbGV0ZU1hcHBl ZEZpbGVEYXRhKEZpbGVTeXN0ZW06Ok1hcHBlZEZpbGVEYXRhKiBtYXBwZWRGaWxlKQogewotICAg IGRlbGV0ZSB3cmFwcGVyOworICAgIGRlbGV0ZSBtYXBwZWRGaWxlOwogfQogCiBEYXRhIERhdGE6 OmFkb3B0TWFwKEZpbGVTeXN0ZW06Ok1hcHBlZEZpbGVEYXRhJiYgbWFwcGVkRmlsZSwgRmlsZVN5 c3RlbTo6UGxhdGZvcm1GaWxlSGFuZGxlIGZkKQogewogICAgIHNpemVfdCBzaXplID0gbWFwcGVk RmlsZS5zaXplKCk7Ci0gICAgdm9pZCogbWFwID0gbWFwcGVkRmlsZS5sZWFrSGFuZGxlKCk7Cisg ICAgdm9pZCogbWFwID0gbWFwcGVkRmlsZS5kYXRhKCk7CiAgICAgQVNTRVJUKG1hcCk7CiAgICAg QVNTRVJUKG1hcCAhPSBNQVBfRkFJTEVEKTsKLSAgICBNYXBXcmFwcGVyKiB3cmFwcGVyID0gbmV3 IE1hcFdyYXBwZXIgeyBtYXAsIHNpemUsIGZkIH07Ci0gICAgcmV0dXJuIHsgYWRvcHRHUmVmKGdf Ynl0ZXNfbmV3X3dpdGhfZnJlZV9mdW5jKG1hcCwgc2l6ZSwgcmVpbnRlcnByZXRfY2FzdDxHRGVz dHJveU5vdGlmeT4oZGVsZXRlTWFwV3JhcHBlciksIHdyYXBwZXIpKSwgZmQgfTsKKyAgICBGaWxl U3lzdGVtOjpjbG9zZUZpbGUoZmlsZURlc2NyaXB0b3IpOworICAgIGF1dG8qIHByb3RlY3RlZE1h cHBlZEZpbGUgPSBuZXcgRmlsZVN5c3RlbTo6TWFwcGVkRmlsZURhdGEoV1RGTW92ZShtYXBwZWRG aWxlKSk7CisgICAgcmV0dXJuIHsgYWRvcHRHUmVmKGdfYnl0ZXNfbmV3X3dpdGhfZnJlZV9mdW5j KG1hcCwgc2l6ZSwgcmVpbnRlcnByZXRfY2FzdDxHRGVzdHJveU5vdGlmeT4oZGVsZXRlTWFwcGVk RmlsZURhdGEpLCBwcm90ZWN0ZWRNYXBwZWRGaWxlKSksIGZkIH07CiB9CiAKIFJlZlB0cjxTaGFy ZWRNZW1vcnk+IERhdGE6OnRyeUNyZWF0ZVNoYXJlZE1lbW9yeSgpIGNvbnN0Cg== 431935 2021-06-21 17:57:45 -0700 2021-06-22 12:48:13 -0700 Patch bug-227017-20210622095744.patch text/plain 3477 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDI5NDM1OGVkMmNkNDNjMGUwMzE3Mzg2 NjZlMGRjOWNhOThlYjRmMWQuLmZlYzJjMDAxOGY0N2MwY2MwZDhmZDUyYzc0ZmJhYTI2NDk5N2Jk NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDYtMjEgIEZ1amlpIEhpcm9ub3JpICA8SGly b25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW0dMaWJdIFJld3JpdGUgTmV0d29ya0Nh Y2hlOjpEYXRhOjphZG9wdE1hcCB3aXRob3V0IEZpbGVTeXN0ZW06Ok1hcHBlZEZpbGVEYXRhOjps ZWFrSGFuZGxlIGFuZCBtdW5tYXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyNzAxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogd3RmL0ZpbGVTeXN0ZW0uaDogTWFwcGVkRmlsZURhdGE6OmxlYWtIYW5k bGUgaXMgdXNlZCBvbmx5IGlmIFBMQVRGT1JNKENPQ09BKSBub3cuCisKIDIwMjEtMDYtMjEgIEZ1 amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgW1dpbkNh aXJvXSBUdXJuIEVOQUJMRV9TSEFSRUFCTEVfUkVTT1VSQ0Ugb24KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggM2QxOGQ1 NWM5YjZjY2E0MDRmN2U3YThhYWQ3ZWI4ZDJiNWRhMzNlOC4uODZhNGZkYWQ0NWRmYjcxODU5ZmI3 ZmM0NmNmNjVjOWY2MjE1OTk0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMS0wNi0y MSAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KKworICAgICAgICBb R0xpYl0gUmV3cml0ZSBOZXR3b3JrQ2FjaGU6OkRhdGE6OmFkb3B0TWFwIHdpdGhvdXQgRmlsZVN5 c3RlbTo6TWFwcGVkRmlsZURhdGE6OmxlYWtIYW5kbGUgYW5kIG11bm1hcAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MDE3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRmlsZVN5c3RlbTo6TWFwcGVkRmls ZURhdGEgY2xhc3Mgd3JhcHMgZmlsZSBtYXBwaW5nIEFQSXMgbGlrZSBtbWFwCisgICAgICAgIGFu ZCBtdW5tYXAgaW4gY3Jvc3MtcGxhdGZvcm0gbWFubmVyLiBOZXR3b3JrQ2FjaGU6OkRhdGE6OmFk b3B0TWFwCisgICAgICAgIHNob3VsZG4ndCB1c2UgRmlsZVN5c3RlbTo6TWFwcGVkRmlsZURhdGE6 OmxlYWtIYW5kbGUgYW5kIG11bm1hcC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZURhdGFHTGliLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hl OjpNYXBXcmFwcGVyOjp+TWFwV3JhcHBlcik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNo ZTo6RGF0YTo6YWRvcHRNYXApOgorCiAyMDIxLTA2LTIxICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1t YXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IEFwcGxlIGludGVybmFsIGJ1aWxkCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmggYi9Tb3VyY2UvV1RGL3d0Zi9G aWxlU3lzdGVtLmgKaW5kZXggM2U4MTU5N2UxNzU4ZjE2MzdmMDk4OWQyODY4ZmNmMDAwNmQzMjFm Ny4uN2NlYTcwYTNmNDU4ZDM2YjA3OTA0ODBmNmE0OGFlYmZiOWYxOTFlZiAxMDA2NDQKLS0tIGEv U291cmNlL1dURi93dGYvRmlsZVN5c3RlbS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0 ZW0uaApAQCAtMjI1LDcgKzIyNSw3IEBAIHB1YmxpYzoKICAgICBjb25zdCB2b2lkKiBkYXRhKCkg Y29uc3QgeyByZXR1cm4gbV9maWxlRGF0YTsgfQogICAgIHVuc2lnbmVkIHNpemUoKSBjb25zdCB7 IHJldHVybiBtX2ZpbGVTaXplOyB9CiAKLSNpZiAhT1MoV0lORE9XUykKKyNpZiBQTEFURk9STShD T0NPQSkKICAgICB2b2lkKiBsZWFrSGFuZGxlKCkgeyByZXR1cm4gc3RkOjpleGNoYW5nZShtX2Zp bGVEYXRhLCBudWxscHRyKTsgfQogI2VuZGlmCiAjaWYgT1MoV0lORE9XUykKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRGF0YUdMaWIu Y3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVEYXRh R0xpYi5jcHAKaW5kZXggOTQxNDA1NWQ1ZDY5YTNlNWVhZWEwOGE5ZWYyY2I1NDVmYmQwMDRhYi4u YWRjMmFmZWQxMzA4MTIxOGRjYjc5YmZkZGU2MTlmMjY0ZjZiMGRjZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVEYXRhR0xpYi5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVEYXRh R0xpYi5jcHAKQEAgLTExNSwxMiArMTE1LDEwIEBAIHN0cnVjdCBNYXBXcmFwcGVyIHsKIAogICAg IH5NYXBXcmFwcGVyKCkKICAgICB7Ci0gICAgICAgIG11bm1hcChtYXAsIHNpemUpOwogICAgICAg ICBGaWxlU3lzdGVtOjpjbG9zZUZpbGUoZmlsZURlc2NyaXB0b3IpOwogICAgIH0KIAotICAgIHZv aWQqIG1hcDsKLSAgICBzaXplX3Qgc2l6ZTsKKyAgICBGaWxlU3lzdGVtOjpNYXBwZWRGaWxlRGF0 YSBtYXBwZWRGaWxlOwogICAgIEZpbGVTeXN0ZW06OlBsYXRmb3JtRmlsZUhhbmRsZSBmaWxlRGVz Y3JpcHRvcjsKIH07CiAKQEAgLTEzMiwxMCArMTMwLDEwIEBAIHN0YXRpYyB2b2lkIGRlbGV0ZU1h cFdyYXBwZXIoTWFwV3JhcHBlciogd3JhcHBlcikKIERhdGEgRGF0YTo6YWRvcHRNYXAoRmlsZVN5 c3RlbTo6TWFwcGVkRmlsZURhdGEmJiBtYXBwZWRGaWxlLCBGaWxlU3lzdGVtOjpQbGF0Zm9ybUZp bGVIYW5kbGUgZmQpCiB7CiAgICAgc2l6ZV90IHNpemUgPSBtYXBwZWRGaWxlLnNpemUoKTsKLSAg ICB2b2lkKiBtYXAgPSBtYXBwZWRGaWxlLmxlYWtIYW5kbGUoKTsKKyAgICBjb25zdCB2b2lkKiBt YXAgPSBtYXBwZWRGaWxlLmRhdGEoKTsKICAgICBBU1NFUlQobWFwKTsKICAgICBBU1NFUlQobWFw ICE9IE1BUF9GQUlMRUQpOwotICAgIE1hcFdyYXBwZXIqIHdyYXBwZXIgPSBuZXcgTWFwV3JhcHBl ciB7IG1hcCwgc2l6ZSwgZmQgfTsKKyAgICBNYXBXcmFwcGVyKiB3cmFwcGVyID0gbmV3IE1hcFdy YXBwZXIgeyBXVEZNb3ZlKG1hcHBlZEZpbGUpLCBmZCB9OwogICAgIHJldHVybiB7IGFkb3B0R1Jl ZihnX2J5dGVzX25ld193aXRoX2ZyZWVfZnVuYyhtYXAsIHNpemUsIHJlaW50ZXJwcmV0X2Nhc3Q8 R0Rlc3Ryb3lOb3RpZnk+KGRlbGV0ZU1hcFdyYXBwZXIpLCB3cmFwcGVyKSksIGZkIH07CiB9CiAK