167838 2017-02-04 11:52:03 -0800 Fix memory issues related to preload eviction. 2017-02-04 13:42:06 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 yoav webkit-unassigned cdumez commit-queue dbates japhet kling oldest_to_newest 1273268 0 yoav 2017-02-04 11:52:03 -0800 Fix memory issues related to preload eviction. 1273269 1 300633 yoav 2017-02-04 11:55:30 -0800 Created attachment 300633 Patch 1273270 2 300634 yoav 2017-02-04 12:00:15 -0800 Created attachment 300634 Patch 1273274 3 300634 kling 2017-02-04 12:47:38 -0800 Comment on attachment 300634 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300634&action=review r=me, thanks for the quick turnaround :) > Source/WebCore/loader/cache/CachedResourceLoader.cpp:1274 > + if (linkPreloads && linkPreloads->size()) > + m_preloads = WTFMove(linkPreloads); > + else > m_preloads = nullptr; I think linkPreloads->size() is guaranteed to be >= 1 here, since you only allocate it when actually adding something. I would suggest renaming it to remainingLinkPreloads, and then replacing this block with simply: m_preloads = WTFMove(remainingLinkPreloads); 1273276 4 300637 yoav 2017-02-04 12:56:25 -0800 Created attachment 300637 Patch 1273280 5 yoav 2017-02-04 13:04:24 -0800 (In reply to comment #3) > Comment on attachment 300634 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=300634&action=review > > r=me, thanks for the quick turnaround :) > > > Source/WebCore/loader/cache/CachedResourceLoader.cpp:1274 > > + if (linkPreloads && linkPreloads->size()) > > + m_preloads = WTFMove(linkPreloads); > > + else > > m_preloads = nullptr; > > I think linkPreloads->size() is guaranteed to be >= 1 here, since you only > allocate it when actually adding something. > I would suggest renaming it to remainingLinkPreloads, and then replacing > this block with simply: > m_preloads = WTFMove(remainingLinkPreloads); Good call. Changed as suggested 1273283 6 300637 commit-queue 2017-02-04 13:42:01 -0800 Comment on attachment 300637 Patch Clearing flags on attachment: 300637 Committed r211673: <http://trac.webkit.org/changeset/211673> 1273284 7 commit-queue 2017-02-04 13:42:06 -0800 All reviewed patches have been landed. Closing bug. 300633 2017-02-04 11:55:30 -0800 2017-02-04 12:00:04 -0800 Patch bug-167838-20170204115311.patch text/plain 2208 yoav U3VidmVyc2lvbiBSZXZpc2lvbjogMjExNjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDI3ZTAxOWI5OWJkNTVl YjA0MzdiMjYwZjc3ZDM1NTJmNDI5ZjI3OS4uMDliMDkzMDAxMjJjZTU3MTQ3YTQ4MjBlYzAwNjRl NTRhMjYxYTJjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTAyLTA0ICBZb2F2 IFdlaXNzICA8eW9hdkB5b2F2LndzPgorCisgICAgICAgIEZpeCBtZW1vcnkgaXNzdWVzIHJlbGF0 ZWQgdG8gcHJlbG9hZCBldmljdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2NzgzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBidXQgdGhpcyB3aWxsIGZpeCBjcmFzaGVzIG9u IHRoZSBsZWFrIGJvdHMuCisKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VM b2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmNsZWFy UHJlbG9hZHMpOgorCiAyMDE3LTAyLTAzICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNv bT4KIAogICAgICAgICBbTWFjXVtXSzJdIEFkZCBTUEkgdG8gb3ZlcnJpZGUgdGhlIENvbnRlbnQg U2VjdXJpdHkgUG9saWN5IG9mIGEgcGFnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggNzY3M2RjMjFjMTIxYmMxNTQ4 OTZlYzBjYTM0MTk4OTBmYWU2ZWExYS4uMTI3MzFkNDUzZjMyMDMwMTJhOGQ0MjFmZTY5N2M4Mzg0 Y2JhMzJjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJl c291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk UmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0xMjU0LDE2ICsxMjU0LDIzIEBAIHZvaWQgQ2FjaGVkUmVz b3VyY2VMb2FkZXI6OmNsZWFyUHJlbG9hZHMoQ2xlYXJQcmVsb2Fkc01vZGUgbW9kZSkKICAgICBp ZiAoIW1fcHJlbG9hZHMpCiAgICAgICAgIHJldHVybjsKIAorICAgIHN0ZDo6dW5pcXVlX3B0cjxM aXN0SGFzaFNldDxDYWNoZWRSZXNvdXJjZSo+PiBsaW5rUHJlbG9hZHM7CiAgICAgZm9yIChhdXRv KiByZXNvdXJjZSA6ICptX3ByZWxvYWRzKSB7Ci0gICAgICAgIGlmIChtb2RlID09IENsZWFyUHJl bG9hZHNNb2RlOjpDbGVhclNwZWN1bGF0aXZlUHJlbG9hZHMgJiYgcmVzb3VyY2UtPmlzTGlua1By ZWxvYWQoKSkKKyAgICAgICAgQVNTRVJUKHJlc291cmNlKTsKKyAgICAgICAgaWYgKG1vZGUgPT0g Q2xlYXJQcmVsb2Fkc01vZGU6OkNsZWFyU3BlY3VsYXRpdmVQcmVsb2FkcyAmJiByZXNvdXJjZS0+ aXNMaW5rUHJlbG9hZCgpKSB7CisgICAgICAgICAgICBpZiAoIWxpbmtQcmVsb2FkcykKKyAgICAg ICAgICAgICAgICBsaW5rUHJlbG9hZHMgPSBzdGQ6Om1ha2VfdW5pcXVlPExpc3RIYXNoU2V0PENh Y2hlZFJlc291cmNlKj4+KCk7CisgICAgICAgICAgICBsaW5rUHJlbG9hZHMtPmFkZChyZXNvdXJj ZSk7CiAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQogICAgICAgICByZXNvdXJjZS0+ ZGVjcmVhc2VQcmVsb2FkQ291bnQoKTsKICAgICAgICAgYm9vbCBkZWxldGVkID0gcmVzb3VyY2Ut PmRlbGV0ZUlmUG9zc2libGUoKTsKICAgICAgICAgaWYgKCFkZWxldGVkICYmIHJlc291cmNlLT5w cmVsb2FkUmVzdWx0KCkgPT0gQ2FjaGVkUmVzb3VyY2U6OlByZWxvYWROb3RSZWZlcmVuY2VkKQog ICAgICAgICAgICAgTWVtb3J5Q2FjaGU6OnNpbmdsZXRvbigpLnJlbW92ZSgqcmVzb3VyY2UpOwot ICAgICAgICBtX3ByZWxvYWRzLT5yZW1vdmUocmVzb3VyY2UpOwogICAgIH0KLSAgICBpZiAoIW1f cHJlbG9hZHMtPnNpemUoKSkKKyAgICBpZiAobGlua1ByZWxvYWRzICYmIGxpbmtQcmVsb2Fkcy0+ c2l6ZSgpKQorICAgICAgICBtX3ByZWxvYWRzID0gV1RGTW92ZShsaW5rUHJlbG9hZHMpOworICAg IGVsc2UKICAgICAgICAgbV9wcmVsb2FkcyA9IG51bGxwdHI7CiB9CiAK 300634 2017-02-04 12:00:15 -0800 2017-02-04 12:56:13 -0800 Patch bug-167838-20170204115756.patch text/plain 2369 yoav U3VidmVyc2lvbiBSZXZpc2lvbjogMjExNjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDI3ZTAxOWI5OWJkNTVl YjA0MzdiMjYwZjc3ZDM1NTJmNDI5ZjI3OS4uZmU0YWU5MzZhNDVkZDdkNThlMzIzMmE3Yjc4OGQ0 ZmViNjM1NTE4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTAyLTA0ICBZb2F2 IFdlaXNzICA8eW9hdkB5b2F2LndzPgorCisgICAgICAgIEZpeCBtZW1vcnkgaXNzdWVzIHJlbGF0 ZWQgdG8gcHJlbG9hZCBldmljdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2NzgzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgYXZvaWRzIHJlbW92aW5nIHJlc291cmNlcyBmcm9tIG1fcHJl bG9hZHMgZHVyaW5nIHRoZSBpdGVyYXRpb24KKyAgICAgICAgYnkgY3JlYXRpbmcgYSBzZWNvbmQg SGFzaFNldExpc3QgY29udGFpbmluZyB0aGUgcmVtYWluaW5nIGxpbmsgcHJlbG9hZHMuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIGJ1dCB0aGlzIHdpbGwgZml4IGNyYXNoZXMgb24gdGhlIGxlYWsg Ym90cy4KKworICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6Y2xlYXJQcmVsb2Fkcyk6 CisKIDIwMTctMDItMDMgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAg ICAgIFtNYWNdW1dLMl0gQWRkIFNQSSB0byBvdmVycmlkZSB0aGUgQ29udGVudCBTZWN1cml0eSBQ b2xpY3kgb2YgYSBwYWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlTG9hZGVyLmNwcAppbmRleCA3NjczZGMyMWMxMjFiYzE1NDg5NmVjMGNhMzQx OTg5MGZhZTZlYTFhLi4xMjczMWQ0NTNmMzIwMzAxMmE4ZDQyMWZlNjk3YzgzODRjYmEzMmNkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2Fk ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxv YWRlci5jcHAKQEAgLTEyNTQsMTYgKzEyNTQsMjMgQEAgdm9pZCBDYWNoZWRSZXNvdXJjZUxvYWRl cjo6Y2xlYXJQcmVsb2FkcyhDbGVhclByZWxvYWRzTW9kZSBtb2RlKQogICAgIGlmICghbV9wcmVs b2FkcykKICAgICAgICAgcmV0dXJuOwogCisgICAgc3RkOjp1bmlxdWVfcHRyPExpc3RIYXNoU2V0 PENhY2hlZFJlc291cmNlKj4+IGxpbmtQcmVsb2FkczsKICAgICBmb3IgKGF1dG8qIHJlc291cmNl IDogKm1fcHJlbG9hZHMpIHsKLSAgICAgICAgaWYgKG1vZGUgPT0gQ2xlYXJQcmVsb2Fkc01vZGU6 OkNsZWFyU3BlY3VsYXRpdmVQcmVsb2FkcyAmJiByZXNvdXJjZS0+aXNMaW5rUHJlbG9hZCgpKQor ICAgICAgICBBU1NFUlQocmVzb3VyY2UpOworICAgICAgICBpZiAobW9kZSA9PSBDbGVhclByZWxv YWRzTW9kZTo6Q2xlYXJTcGVjdWxhdGl2ZVByZWxvYWRzICYmIHJlc291cmNlLT5pc0xpbmtQcmVs b2FkKCkpIHsKKyAgICAgICAgICAgIGlmICghbGlua1ByZWxvYWRzKQorICAgICAgICAgICAgICAg IGxpbmtQcmVsb2FkcyA9IHN0ZDo6bWFrZV91bmlxdWU8TGlzdEhhc2hTZXQ8Q2FjaGVkUmVzb3Vy Y2UqPj4oKTsKKyAgICAgICAgICAgIGxpbmtQcmVsb2Fkcy0+YWRkKHJlc291cmNlKTsKICAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CiAgICAgICAgIHJlc291cmNlLT5kZWNyZWFzZVBy ZWxvYWRDb3VudCgpOwogICAgICAgICBib29sIGRlbGV0ZWQgPSByZXNvdXJjZS0+ZGVsZXRlSWZQ b3NzaWJsZSgpOwogICAgICAgICBpZiAoIWRlbGV0ZWQgJiYgcmVzb3VyY2UtPnByZWxvYWRSZXN1 bHQoKSA9PSBDYWNoZWRSZXNvdXJjZTo6UHJlbG9hZE5vdFJlZmVyZW5jZWQpCiAgICAgICAgICAg ICBNZW1vcnlDYWNoZTo6c2luZ2xldG9uKCkucmVtb3ZlKCpyZXNvdXJjZSk7Ci0gICAgICAgIG1f cHJlbG9hZHMtPnJlbW92ZShyZXNvdXJjZSk7CiAgICAgfQotICAgIGlmICghbV9wcmVsb2Fkcy0+ c2l6ZSgpKQorICAgIGlmIChsaW5rUHJlbG9hZHMgJiYgbGlua1ByZWxvYWRzLT5zaXplKCkpCisg ICAgICAgIG1fcHJlbG9hZHMgPSBXVEZNb3ZlKGxpbmtQcmVsb2Fkcyk7CisgICAgZWxzZQogICAg ICAgICBtX3ByZWxvYWRzID0gbnVsbHB0cjsKIH0KIAo= 300637 2017-02-04 12:56:25 -0800 2017-02-04 13:42:01 -0800 Patch bug-167838-20170204215406.patch text/plain 2371 yoav U3VidmVyc2lvbiBSZXZpc2lvbjogMjExNjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDI3ZTAxOWI5OWJkNTVl YjA0MzdiMjYwZjc3ZDM1NTJmNDI5ZjI3OS4uYTRiNzA0YzhhMjFjZDEwZWIxZWEzMDdjYWMxNDQw NjIyZjk3OTY5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTAyLTA0ICBZb2F2 IFdlaXNzICA8eW9hdkB5b2F2LndzPgorCisgICAgICAgIEZpeCBtZW1vcnkgaXNzdWVzIHJlbGF0 ZWQgdG8gcHJlbG9hZCBldmljdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2NzgzOAorCisgICAgICAgIFJldmlld2VkIGJ5IEFuZHJlYXMgS2xp bmcuCisKKyAgICAgICAgVGhpcyBhdm9pZHMgcmVtb3ZpbmcgcmVzb3VyY2VzIGZyb20gbV9wcmVs b2FkcyBkdXJpbmcgdGhlIGl0ZXJhdGlvbgorICAgICAgICBieSBjcmVhdGluZyBhIHNlY29uZCBI YXNoU2V0TGlzdCBjb250YWluaW5nIHRoZSByZW1haW5pbmcgbGluayBwcmVsb2Fkcy4KKworICAg ICAgICBObyBuZXcgdGVzdHMgYnV0IHRoaXMgd2lsbCBmaXggY3Jhc2hlcyBvbiB0aGUgbGVhayBi b3RzLgorCisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpjbGVhclByZWxvYWRzKToK KwogMjAxNy0wMi0wMyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAg ICAgW01hY11bV0syXSBBZGQgU1BJIHRvIG92ZXJyaWRlIHRoZSBDb250ZW50IFNlY3VyaXR5IFBv bGljeSBvZiBhIHBhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDc2NzNkYzIxYzEyMWJjMTU0ODk2ZWMwY2EzNDE5 ODkwZmFlNmVhMWEuLjM2YTM4NTZjNzBhZTQ2ZTc1ZWJhMmJjMGYzZjZlNTdhMzM2Y2U0YWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9h ZGVyLmNwcApAQCAtMTI1NCwxNyArMTI1NCwyMSBAQCB2b2lkIENhY2hlZFJlc291cmNlTG9hZGVy OjpjbGVhclByZWxvYWRzKENsZWFyUHJlbG9hZHNNb2RlIG1vZGUpCiAgICAgaWYgKCFtX3ByZWxv YWRzKQogICAgICAgICByZXR1cm47CiAKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8TGlzdEhhc2hTZXQ8 Q2FjaGVkUmVzb3VyY2UqPj4gcmVtYWluaW5nTGlua1ByZWxvYWRzOwogICAgIGZvciAoYXV0byog cmVzb3VyY2UgOiAqbV9wcmVsb2FkcykgewotICAgICAgICBpZiAobW9kZSA9PSBDbGVhclByZWxv YWRzTW9kZTo6Q2xlYXJTcGVjdWxhdGl2ZVByZWxvYWRzICYmIHJlc291cmNlLT5pc0xpbmtQcmVs b2FkKCkpCisgICAgICAgIEFTU0VSVChyZXNvdXJjZSk7CisgICAgICAgIGlmIChtb2RlID09IENs ZWFyUHJlbG9hZHNNb2RlOjpDbGVhclNwZWN1bGF0aXZlUHJlbG9hZHMgJiYgcmVzb3VyY2UtPmlz TGlua1ByZWxvYWQoKSkgeworICAgICAgICAgICAgaWYgKCFyZW1haW5pbmdMaW5rUHJlbG9hZHMp CisgICAgICAgICAgICAgICAgcmVtYWluaW5nTGlua1ByZWxvYWRzID0gc3RkOjptYWtlX3VuaXF1 ZTxMaXN0SGFzaFNldDxDYWNoZWRSZXNvdXJjZSo+PigpOworICAgICAgICAgICAgcmVtYWluaW5n TGlua1ByZWxvYWRzLT5hZGQocmVzb3VyY2UpOwogICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgIH0KICAgICAgICAgcmVzb3VyY2UtPmRlY3JlYXNlUHJlbG9hZENvdW50KCk7CiAgICAgICAg IGJvb2wgZGVsZXRlZCA9IHJlc291cmNlLT5kZWxldGVJZlBvc3NpYmxlKCk7CiAgICAgICAgIGlm ICghZGVsZXRlZCAmJiByZXNvdXJjZS0+cHJlbG9hZFJlc3VsdCgpID09IENhY2hlZFJlc291cmNl OjpQcmVsb2FkTm90UmVmZXJlbmNlZCkKICAgICAgICAgICAgIE1lbW9yeUNhY2hlOjpzaW5nbGV0 b24oKS5yZW1vdmUoKnJlc291cmNlKTsKLSAgICAgICAgbV9wcmVsb2Fkcy0+cmVtb3ZlKHJlc291 cmNlKTsKICAgICB9Ci0gICAgaWYgKCFtX3ByZWxvYWRzLT5zaXplKCkpCi0gICAgICAgIG1fcHJl bG9hZHMgPSBudWxscHRyOworICAgIG1fcHJlbG9hZHMgPSBXVEZNb3ZlKHJlbWFpbmluZ0xpbmtQ cmVsb2Fkcyk7CiB9CiAKICNpZiBQUkVMT0FEX0RFQlVHCg==