141378 2015-02-08 16:59:00 -0800 Measure cache size more accurately 2015-02-09 03:36:07 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned cdumez oldest_to_newest 1067730 0 koivisto 2015-02-08 16:59:00 -0800 Currently we just estimate from the item count. 1067732 1 246253 koivisto 2015-02-08 17:15:51 -0800 Created attachment 246253 patch 1067733 2 koivisto 2015-02-08 17:16:39 -0800 rdar://problem/19760224 1067752 3 246253 cdumez 2015-02-08 19:33:41 -0800 Comment on attachment 246253 patch View in context: https://bugs.webkit.org/attachment.cgi?id=246253&action=review r=me with comments > Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm:458 > + m_approximateSize += bodyOffset + bodySize; Why are we adding an offset to the size here? Maybe it is just a naming issue but it looks wrong. > Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm:554 > + static const double deletionProbability { 0.25 }; Maybe a ASSERT(RunLoop::isMain()); before this? > Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm:572 > + bool shouldDelete = randomNumber() < deletionProbability; Is it safe to call randomNumber() from another thread? The implementation seems to call sharedRandomNumberGenerator() which is a singleton. 1067776 4 koivisto 2015-02-09 02:11:13 -0800 > Is it safe to call randomNumber() from another thread? The implementation > seems to call sharedRandomNumberGenerator() which is a singleton. sharedRandomNumberGenerator() is ARC4RandomNumberGenerator which is thread safe (internal mutex). 1067790 5 koivisto 2015-02-09 03:36:07 -0800 http://trac.webkit.org/changeset/179823 246253 2015-02-08 17:15:51 -0800 2015-02-08 19:33:41 -0800 patch disk-cache-size.patch text/plain 8628 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3OTgwOSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE1LTAyLTA4ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNZWFzdXJlIGNhY2hlIHNpemUg bW9yZSBhY2N1cmF0ZWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDEzNzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE5NzYwMjI0PgorCisgICAg ICAgIEVzdGltYXRlIHRoZSBjYWNoZSBkaXNrIHNwYWNlIHVzYWdlIGZyb20gYWN0dWFsIGVudHJ5 IHNpemVzIGluc3RlYWQgb2YgdGhlIGl0ZW0gY291bnQuCisgICAgICAgIFRoaXMgcHJldmVudHMg bGFyZ2UgY2FjaGUgaXRlbXMgZnJvbSBtYWtpbmcgdGhlIGNhY2hlIGdyb3cgYmV5b25kIGl0cyBi b3VuZHMuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9y YWdlLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFn ZUNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGVTdG9yYWdlOjppbml0aWFs aXplKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlU3RvcmFnZTo6cmVtb3ZlRW50cnkp OgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGVTdG9yYWdlOjpzdG9yZSk6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtDYWNoZVN0b3JhZ2U6OmNsZWFyKToKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya0NhY2hlU3RvcmFnZTo6c2hyaW5rSWZOZWVkZWQpOgorCiAyMDE1LTAyLTA4ICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBOdWxsIGRl cmVmIGluIF9jbGVhckltbWVkaWF0ZUFjdGlvblN0YXRlIHdoZW4gY2xvc2luZyBhIHZpZXcgd2l0 aCBhIERhdGFEZXRlY3RvcnMgcG9wb3ZlciBvcGVuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oCShy ZXZpc2lvbiAxNzk4MDkpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGVTdG9yYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDYgQEAKICNp ZiBFTkFCTEUoTkVUV09SS19DQUNIRSkKIAogI2luY2x1ZGUgIk5ldHdvcmtDYWNoZUtleS5oIgot I2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VSZXNwb25zZS5oPgogI2luY2x1ZGUgPHd0Zi9CbG9v bUZpbHRlci5oPgogI2luY2x1ZGUgPHd0Zi9EZXF1ZS5oPgogI2luY2x1ZGUgPHd0Zi9IYXNoU2V0 Lmg+CkBAIC00Niw4ICs0NSw2IEBAIGNsYXNzIEFyZ3VtZW50RGVjb2RlcjsKIAogbmFtZXNwYWNl IFdlYktpdCB7CiAKLWNsYXNzIFNoYXJlYWJsZVJlc291cmNlOwotCiAjaWYgUExBVEZPUk0oQ09D T0EpCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gY2xhc3MgRGlzcGF0Y2hQdHI7CiB0ZW1wbGF0ZSA8 dHlwZW5hbWUgVD4gRGlzcGF0Y2hQdHI8VD4gYWRvcHREaXNwYXRjaChUIGRpc3BhdGNoT2JqZWN0 KTsKQEAgLTE5Miw3ICsxODksNyBAQCBwcml2YXRlOgogICAgIHNpemVfdCBtX21heGltdW1TaXpl IHsgc3RkOjpudW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKSB9OwogCiAgICAgQmxvb21GaWx0 ZXI8MjA+IG1fY29udGVudHNGaWx0ZXI7Ci0gICAgc3RkOjphdG9taWM8c2l6ZV90PiBtX2FwcHJv eGltYXRlRW50cnlDb3VudCB7IDAgfTsKKyAgICBzdGQ6OmF0b21pYzxzaXplX3Q+IG1fYXBwcm94 aW1hdGVTaXplIHsgMCB9OwogICAgIHN0ZDo6YXRvbWljPGJvb2w+IG1fc2hyaW5rSW5Qcm9ncmVz cyB7IGZhbHNlIH07CiAKICAgICBzdGF0aWMgY29uc3QgaW50IG1heGltdW1SZXRyaWV2ZVByaW9y aXR5ID0gNDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZVN0b3JhZ2VDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlQ29jb2EubW0JKHJldmlzaW9uIDE3 OTgwOSkKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNo ZVN0b3JhZ2VDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzQsNiArMzQsNyBAQAogI2luY2x1 ZGUgPGRpc3BhdGNoL2Rpc3BhdGNoLmg+CiAjaW5jbHVkZSA8c3lzL21tYW4uaD4KICNpbmNsdWRl IDxzeXMvc3RhdC5oPgorI2luY2x1ZGUgPHd0Zi9SYW5kb21OdW1iZXIuaD4KICNpbmNsdWRlIDx3 dGYvUnVuTG9vcC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CkBAIC0xMDksMTEgKzExMCwxMCBAQCB2b2lkIE5ldHdv cmtDYWNoZVN0b3JhZ2U6OmluaXRpYWxpemUoKQogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4o KSk7CiAKICAgICBTdHJpbmdDYXB0dXJlIGNhY2hlUGF0aENhcHR1cmUobV9kaXJlY3RvcnlQYXRo KTsKLSAgICBhdXRvJiBlbnRyeUNvdW50ID0gbV9hcHByb3hpbWF0ZUVudHJ5Q291bnQ7CiAKLSAg ICBkaXNwYXRjaF9hc3luYyhtX2JhY2tncm91bmRJT1F1ZXVlLmdldCgpLCBbdGhpcywgY2FjaGVQ YXRoQ2FwdHVyZSwgJmVudHJ5Q291bnRdIHsKKyAgICBkaXNwYXRjaF9hc3luYyhtX2JhY2tncm91 bmRJT1F1ZXVlLmdldCgpLCBbdGhpcywgY2FjaGVQYXRoQ2FwdHVyZV0gewogICAgICAgICBTdHJp bmcgY2FjaGVQYXRoID0gY2FjaGVQYXRoQ2FwdHVyZS5zdHJpbmcoKTsKLSAgICAgICAgdHJhdmVy c2VDYWNoZUZpbGVzKGNhY2hlUGF0aCwgW3RoaXMsICZlbnRyeUNvdW50XShjb25zdCBTdHJpbmcm IGZpbGVOYW1lLCBjb25zdCBTdHJpbmcmKSB7CisgICAgICAgIHRyYXZlcnNlQ2FjaGVGaWxlcyhj YWNoZVBhdGgsIFt0aGlzXShjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBjb25zdCBTdHJpbmcmIHBh cnRpdGlvblBhdGgpIHsKICAgICAgICAgICAgIE5ldHdvcmtDYWNoZUtleTo6SGFzaFR5cGUgaGFz aDsKICAgICAgICAgICAgIGlmICghTmV0d29ya0NhY2hlS2V5OjpzdHJpbmdUb0hhc2goZmlsZU5h bWUsIGhhc2gpKQogICAgICAgICAgICAgICAgIHJldHVybjsKQEAgLTEyMSw3ICsxMjEsMTAgQEAg dm9pZCBOZXR3b3JrQ2FjaGVTdG9yYWdlOjppbml0aWFsaXplKCkKICAgICAgICAgICAgIGRpc3Bh dGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIFt0aGlzLCBzaG9ydEhhc2hdIHsK ICAgICAgICAgICAgICAgICBtX2NvbnRlbnRzRmlsdGVyLmFkZChzaG9ydEhhc2gpOwogICAgICAg ICAgICAgfSk7Ci0gICAgICAgICAgICArK2VudHJ5Q291bnQ7CisgICAgICAgICAgICBhdXRvIGZp bGVQYXRoID0gV2ViQ29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KHBhcnRpdGlvblBhdGgs IGZpbGVOYW1lKTsKKyAgICAgICAgICAgIGxvbmcgbG9uZyBmaWxlU2l6ZSA9IDA7CisgICAgICAg ICAgICBXZWJDb3JlOjpnZXRGaWxlU2l6ZShmaWxlUGF0aCwgZmlsZVNpemUpOworICAgICAgICAg ICAgbV9hcHByb3hpbWF0ZVNpemUgKz0gZmlsZVNpemU7CiAgICAgICAgIH0pOwogICAgIH0pOwog fQpAQCAtMzIzLDE0ICszMjYsMTUgQEAgdm9pZCBOZXR3b3JrQ2FjaGVTdG9yYWdlOjpyZW1vdmVF bnRyeShjbwogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAKKyAgICAvLyBGb3Ig c2ltcGxpY2l0eSB3ZSBkb24ndCByZWR1Y2UgbV9hcHByb3hpbWF0ZVNpemUgb24gcmVtb3ZhbHMg Y2F1c2VkIGJ5IGxvYWQgb3IgZGVjb2RlIGVycm9ycy4KKyAgICAvLyBUaGUgbmV4dCBjYWNoZSBz aHJpbmsgd2lsbCB1cGRhdGUgdGhlIHNpemUuCisKICAgICBpZiAobV9jb250ZW50c0ZpbHRlci5t YXlDb250YWluKGtleS5zaG9ydEhhc2goKSkpCiAgICAgICAgIG1fY29udGVudHNGaWx0ZXIucmVt b3ZlKGtleS5zaG9ydEhhc2goKSk7CiAKICAgICBTdHJpbmdDYXB0dXJlIGZpbGVQYXRoQ2FwdHVy ZShmaWxlUGF0aEZvcktleShrZXksIG1fZGlyZWN0b3J5UGF0aCkpOwotICAgIGRpc3BhdGNoX2Fz eW5jKG1faW9RdWV1ZS5nZXQoKSwgW3RoaXMsIGZpbGVQYXRoQ2FwdHVyZV0geworICAgIGRpc3Bh dGNoX2FzeW5jKG1fYmFja2dyb3VuZElPUXVldWUuZ2V0KCksIFt0aGlzLCBmaWxlUGF0aENhcHR1 cmVdIHsKICAgICAgICAgV2ViQ29yZTo6ZGVsZXRlRmlsZShmaWxlUGF0aENhcHR1cmUuc3RyaW5n KCkpOwotICAgICAgICBpZiAobV9hcHByb3hpbWF0ZUVudHJ5Q291bnQpCi0gICAgICAgICAgICAt LW1fYXBwcm94aW1hdGVFbnRyeUNvdW50OwogICAgIH0pOwogfQogCkBAIC00MjksNyArNDMzLDYg QEAgdm9pZCBOZXR3b3JrQ2FjaGVTdG9yYWdlOjpzdG9yZShjb25zdCBOZQogICAgIEFTU0VSVChS dW5Mb29wOjppc01haW4oKSk7CiAKICAgICBtX2NvbnRlbnRzRmlsdGVyLmFkZChrZXkuc2hvcnRI YXNoKCkpOwotICAgICsrbV9hcHByb3hpbWF0ZUVudHJ5Q291bnQ7CiAKICAgICBhdXRvIHN0b3Jl T3BlcmF0aW9uID0gc3RkOjptYWtlX3VuaXF1ZTxTdG9yZU9wZXJhdGlvbj4oU3RvcmVPcGVyYXRp b24geyBrZXksIGVudHJ5LCBXVEY6Om1vdmUoY29tcGxldGlvbkhhbmRsZXIpIH0pOwogICAgIGF1 dG8mIHN0b3JlID0gKnN0b3JlT3BlcmF0aW9uOwpAQCAtNDUxLDkgKzQ1NCw4IEBAIHZvaWQgTmV0 d29ya0NhY2hlU3RvcmFnZTo6c3RvcmUoY29uc3QgTmUKICAgICAgICAgICAgIGlmIChlcnJvcikg ewogICAgICAgICAgICAgICAgIGlmIChtX2NvbnRlbnRzRmlsdGVyLm1heUNvbnRhaW4oc3RvcmUu a2V5LnNob3J0SGFzaCgpKSkKICAgICAgICAgICAgICAgICAgICAgbV9jb250ZW50c0ZpbHRlci5y ZW1vdmUoc3RvcmUua2V5LnNob3J0SGFzaCgpKTsKLSAgICAgICAgICAgICAgICBpZiAobV9hcHBy b3hpbWF0ZUVudHJ5Q291bnQpCi0gICAgICAgICAgICAgICAgICAgIC0tbV9hcHByb3hpbWF0ZUVu dHJ5Q291bnQ7CiAgICAgICAgICAgICB9CisgICAgICAgICAgICBtX2FwcHJveGltYXRlU2l6ZSAr PSBib2R5T2Zmc2V0ICsgYm9keVNpemU7CiAKICAgICAgICAgICAgIGJvb2wgc2hvdWxkTWFwQm9k eSA9ICFlcnJvciAmJiBib2R5U2l6ZSA+PSB2bV9wYWdlX3NpemU7CiAgICAgICAgICAgICBhdXRv IGJvZHlNYXAgPSBzaG91bGRNYXBCb2R5ID8gbWFwRmlsZShmZCwgYm9keU9mZnNldCwgYm9keVNp emUpIDogbnVsbHB0cjsKQEAgLTUzMSw3ICs1MzMsNyBAQCB2b2lkIE5ldHdvcmtDYWNoZVN0b3Jh Z2U6OmNsZWFyKCkKICAgICBMT0coTmV0d29ya0NhY2hlU3RvcmFnZSwgIihOZXR3b3JrUHJvY2Vz cykgY2xlYXJpbmcgY2FjaGUiKTsKIAogICAgIG1fY29udGVudHNGaWx0ZXIuY2xlYXIoKTsKLSAg ICBtX2FwcHJveGltYXRlRW50cnlDb3VudCA9IDA7CisgICAgbV9hcHByb3hpbWF0ZVNpemUgPSAw OwogCiAgICAgU3RyaW5nQ2FwdHVyZSBkaXJlY3RvcnlQYXRoQ2FwdHVyZShtX2RpcmVjdG9yeVBh dGgpOwogCkBAIC01NDksMzIgKzU1MSwzMyBAQCB2b2lkIE5ldHdvcmtDYWNoZVN0b3JhZ2U6OmNs ZWFyKCkKIAogdm9pZCBOZXR3b3JrQ2FjaGVTdG9yYWdlOjpzaHJpbmtJZk5lZWRlZCgpCiB7Ci0g ICAgY29uc3Qgc2l6ZV90IGFzc3VtZWRBdmVyYWdlUmVzb3VyY2VTaXplIHsgNDggKiAxMDI0IH07 Ci0gICAgY29uc3Qgc2l6ZV90IGV2ZXJ5TnRoUmVzb3VyY2VUb0RlbGV0ZSB7IDQgfTsKKyAgICBz dGF0aWMgY29uc3QgZG91YmxlIGRlbGV0aW9uUHJvYmFiaWxpdHkgeyAwLjI1IH07CiAKLSAgICBz aXplX3QgZXN0aW1hdGVkQ2FjaGVTaXplID0gYXNzdW1lZEF2ZXJhZ2VSZXNvdXJjZVNpemUgKiBt X2FwcHJveGltYXRlRW50cnlDb3VudDsKLQotICAgIGlmIChlc3RpbWF0ZWRDYWNoZVNpemUgPD0g bV9tYXhpbXVtU2l6ZSkKKyAgICBpZiAobV9hcHByb3hpbWF0ZVNpemUgPD0gbV9tYXhpbXVtU2l6 ZSkKICAgICAgICAgcmV0dXJuOwogICAgIGlmIChtX3Nocmlua0luUHJvZ3Jlc3MpCiAgICAgICAg IHJldHVybjsKICAgICBtX3Nocmlua0luUHJvZ3Jlc3MgPSB0cnVlOwogCi0gICAgTE9HKE5ldHdv cmtDYWNoZVN0b3JhZ2UsICIoTmV0d29ya1Byb2Nlc3MpIHNocmlua2luZyBjYWNoZSBtX2FwcHJv eGltYXRlRW50cnlDb3VudD0lZCBlc3RpbWF0ZWRDYWNoZVNpemU9JWQsIG1fbWF4aW11bVNpemU9 JWQiLCBzdGF0aWNfY2FzdDxzaXplX3Q+KG1fYXBwcm94aW1hdGVFbnRyeUNvdW50KSwgZXN0aW1h dGVkQ2FjaGVTaXplLCBtX21heGltdW1TaXplKTsKKyAgICBMT0coTmV0d29ya0NhY2hlU3RvcmFn ZSwgIihOZXR3b3JrUHJvY2Vzcykgc2hyaW5raW5nIGNhY2hlIGFwcHJveGltYXRlU2l6ZT0lZCwg bV9tYXhpbXVtU2l6ZT0lZCIsIHN0YXRpY19jYXN0PHNpemVfdD4obV9hcHByb3hpbWF0ZVNpemUp LCBtX21heGltdW1TaXplKTsKKworICAgIG1fYXBwcm94aW1hdGVTaXplID0gMDsKIAogICAgIFN0 cmluZ0NhcHR1cmUgY2FjaGVQYXRoQ2FwdHVyZShtX2RpcmVjdG9yeVBhdGgpOwogICAgIGRpc3Bh dGNoX2FzeW5jKG1fYmFja2dyb3VuZElPUXVldWUuZ2V0KCksIFt0aGlzLCBjYWNoZVBhdGhDYXB0 dXJlXSB7CiAgICAgICAgIFN0cmluZyBjYWNoZVBhdGggPSBjYWNoZVBhdGhDYXB0dXJlLnN0cmlu ZygpOwotICAgICAgICBzaXplX3QgZm91bmRFbnRyeUNvdW50ID0gMDsKLSAgICAgICAgc2l6ZV90 IGRlbGV0ZWRDb3VudCA9IDA7Ci0gICAgICAgIHRyYXZlcnNlQ2FjaGVGaWxlcyhjYWNoZVBhdGgs IFt0aGlzLCAmZm91bmRFbnRyeUNvdW50LCAmZGVsZXRlZENvdW50XShjb25zdCBTdHJpbmcmIGZp bGVOYW1lLCBjb25zdCBTdHJpbmcmIHBhcnRpdGlvblBhdGgpIHsKLSAgICAgICAgICAgICsrZm91 bmRFbnRyeUNvdW50OwotICAgICAgICAgICAgaWYgKGZvdW5kRW50cnlDb3VudCAlIGV2ZXJ5TnRo UmVzb3VyY2VUb0RlbGV0ZSkKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAr K2RlbGV0ZWRDb3VudDsKKyAgICAgICAgdHJhdmVyc2VDYWNoZUZpbGVzKGNhY2hlUGF0aCwgW3Ro aXNdKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGNvbnN0IFN0cmluZyYgcGFydGl0aW9uUGF0aCkg eworICAgICAgICAgICAgYXV0byBmaWxlUGF0aCA9IFdlYkNvcmU6OnBhdGhCeUFwcGVuZGluZ0Nv bXBvbmVudChwYXJ0aXRpb25QYXRoLCBmaWxlTmFtZSk7CiAKLSAgICAgICAgICAgIFdlYkNvcmU6 OmRlbGV0ZUZpbGUoV2ViQ29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KHBhcnRpdGlvblBh dGgsIGZpbGVOYW1lKSk7CisgICAgICAgICAgICBib29sIHNob3VsZERlbGV0ZSA9IHJhbmRvbU51 bWJlcigpIDwgZGVsZXRpb25Qcm9iYWJpbGl0eTsKKyAgICAgICAgICAgIGlmICghc2hvdWxkRGVs ZXRlKSB7CisgICAgICAgICAgICAgICAgbG9uZyBsb25nIGZpbGVTaXplID0gMDsKKyAgICAgICAg ICAgICAgICBXZWJDb3JlOjpnZXRGaWxlU2l6ZShmaWxlUGF0aCwgZmlsZVNpemUpOworICAgICAg ICAgICAgICAgIG1fYXBwcm94aW1hdGVTaXplICs9IGZpbGVTaXplOworICAgICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgV2ViQ29yZTo6ZGVsZXRlRmls ZShmaWxlUGF0aCk7CiAgICAgICAgICAgICBOZXR3b3JrQ2FjaGVLZXk6Okhhc2hUeXBlIGhhc2g7 CiAgICAgICAgICAgICBpZiAoIU5ldHdvcmtDYWNoZUtleTo6c3RyaW5nVG9IYXNoKGZpbGVOYW1l LCBoYXNoKSkKICAgICAgICAgICAgICAgICByZXR1cm47CkBAIC01ODQsMTAgKzU4Nyw5IEBAIHZv aWQgTmV0d29ya0NhY2hlU3RvcmFnZTo6c2hyaW5rSWZOZWVkZWQKICAgICAgICAgICAgICAgICAg ICAgbV9jb250ZW50c0ZpbHRlci5yZW1vdmUoc2hvcnRIYXNoKTsKICAgICAgICAgICAgIH0pOwog ICAgICAgICB9KTsKLSAgICAgICAgbV9hcHByb3hpbWF0ZUVudHJ5Q291bnQgPSBmb3VuZEVudHJ5 Q291bnQgLSBkZWxldGVkQ291bnQ7CiAgICAgICAgIG1fc2hyaW5rSW5Qcm9ncmVzcyA9IGZhbHNl OwogCi0gICAgICAgIExPRyhOZXR3b3JrQ2FjaGVTdG9yYWdlLCAiKE5ldHdvcmtQcm9jZXNzKSBj YWNoZSBzaHJpbmsgY29tcGxldGVkIG1fYXBwcm94aW1hdGVFbnRyeUNvdW50PSVkIiwgc3RhdGlj X2Nhc3Q8c2l6ZV90PihtX2FwcHJveGltYXRlRW50cnlDb3VudCkpOworICAgICAgICBMT0coTmV0 d29ya0NhY2hlU3RvcmFnZSwgIihOZXR3b3JrUHJvY2VzcykgY2FjaGUgc2hyaW5rIGNvbXBsZXRl ZCBhcHByb3hpbWF0ZVNpemU9JWQiLCBzdGF0aWNfY2FzdDxzaXplX3Q+KG1fYXBwcm94aW1hdGVT aXplKSk7CiAgICAgfSk7CiB9CiAK