115631 2013-05-06 03:55:34 -0700 Removing m_maxDeadCapacity condition in fast path in MemoryCache::prune(). 2013-10-31 07:26:26 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 m.bychawski webkit-unassigned ap beidson commit-queue g.czajkowski japhet koivisto m.leszko mnaganov w.bielawski oldest_to_newest 884893 0 m.bychawski 2013-05-06 03:55:34 -0700 If the m_maxDeadCapacity == 0, MemoryCache::prune() always tries to prune Resources. But if m_deadSize is also 0, pruning is unnecessary. I removed one condition in the "fast path". Is it possible that in some case this condition is required for properly work? 884896 1 200652 m.bychawski 2013-05-06 04:07:40 -0700 Created attachment 200652 patch 885093 2 ap 2013-05-06 10:03:41 -0700 This patch is not currently marked for review. Did you intend to submit it for review? You can still do that via Details link to the right of the patch. 886618 3 200652 bfulgham 2013-05-08 23:23:03 -0700 Comment on attachment 200652 patch This looks fine to me. Is there any case we now fail, such as 'm_maxDeadCapacity == 0' and 'm_deadSize < 0' that might now get through and cause a problem? 887282 4 m.bychawski 2013-05-10 04:11:54 -0700 (In reply to comment #3) > (From update of attachment 200652 [details]) > This looks fine to me. Is there any case we now fail, such as 'm_maxDeadCapacity == 0' and 'm_deadSize < 0' that might now get through and cause a problem? I don't see any case we now can fail. m_deadSize is unsigned, so it can't be < 0. When m_maxDeadCapacity == 0, we need to prune resources only when m_deadSize > 0, so there condition 'm_deadSize <= m_maxDeadCapacity' is enough. 944989 5 200652 bfulgham 2013-10-30 10:35:16 -0700 Comment on attachment 200652 patch I forgot about this! Looks good. r=me 945000 6 200652 commit-queue 2013-10-30 10:47:21 -0700 Comment on attachment 200652 patch Rejecting attachment 200652 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 200652, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.appspot.com/results/17138231 945472 7 215636 w.bielawski 2013-10-31 02:29:01 -0700 Created attachment 215636 Patch 945503 8 215649 w.bielawski 2013-10-31 06:39:41 -0700 Created attachment 215649 Patch 945508 9 215649 commit-queue 2013-10-31 07:06:01 -0700 Comment on attachment 215649 Patch Clearing flags on attachment: 215649 Committed r158357: <http://trac.webkit.org/changeset/158357> 200652 2013-05-06 04:07:40 -0700 2013-10-30 10:47:21 -0700 patch MemoryCache002.path text/plain 1403 m.bychawski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5YTRkZjIyLi45OGU1NDU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTMtMDUtMDYgIE1hcmNpbiBCeWNoYXdza2kgIDxtLmJ5Y2hhd3NraUBzYW1zdW5nLmNv bT4KKworICAgICAgICBSZW1vdmluZyBtX21heERlYWRDYXBhY2l0eSBjb25kaXRpb24gaW4gZmFz dCBwYXRoIGluIE1lbW9yeUNhY2hlOjpwcnVuZSgpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1NjMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgdGhlIG1fbWF4RGVhZFNpemUgYW5kIG1fZGVhZFNp emUgYXJlIGJvdGggMCwgdGhlIG1ldGhvZCB1bm5lY2Vzc2FyeSB0cmllcyB0byBwcnVuZSByZXNv dXJjZXMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBsb2Fk ZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVtb3J5Q2FjaGU6 OnBydW5lKToKKwogMjAxMy0wNS0wNiAgWm9sdGFuIEFydmFpICA8emFydmFpQGluZi51LXN6ZWdl ZC5odT4KIAogICAgICAgICBbUXRdW1dpbl0gVW5yZXZpZXdlZCBidWlsZGZpeCBhZnRlciByMTQ5 NTc5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAKaW5kZXgg MzkyMTQ5Ny4uZWY3OTZkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L01lbW9yeUNhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5 Q2FjaGUuY3BwCkBAIC04MTQsNyArODE0LDcgQEAgdm9pZCBNZW1vcnlDYWNoZTo6ZXZpY3RSZXNv dXJjZXMoKQogCiB2b2lkIE1lbW9yeUNhY2hlOjpwcnVuZSgpCiB7Ci0gICAgaWYgKG1fbGl2ZVNp emUgKyBtX2RlYWRTaXplIDw9IG1fY2FwYWNpdHkgJiYgbV9tYXhEZWFkQ2FwYWNpdHkgJiYgbV9k ZWFkU2l6ZSA8PSBtX21heERlYWRDYXBhY2l0eSkgLy8gRmFzdCBwYXRoLgorICAgIGlmIChtX2xp dmVTaXplICsgbV9kZWFkU2l6ZSA8PSBtX2NhcGFjaXR5ICYmIG1fZGVhZFNpemUgPD0gbV9tYXhE ZWFkQ2FwYWNpdHkpIC8vIEZhc3QgcGF0aC4KICAgICAgICAgcmV0dXJuOwogICAgICAgICAKICAg ICBwcnVuZURlYWRSZXNvdXJjZXMoKTsgLy8gUHJ1bmUgZGVhZCBmaXJzdCwgaW4gY2FzZSBpdCB3 YXMgImJvcnJvd2luZyIgY2FwYWNpdHkgZnJvbSBsaXZlLgo= 215636 2013-10-31 02:29:01 -0700 2013-10-31 06:39:33 -0700 Patch bug-115631-20131031102855.patch text/plain 1558 w.bielawski U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4MzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmVhNzE4ODQ3NjEzZWM2 NzZlMTI0NzA3MjFjZDAwYzIwMTQxMThlNy4uZmMyMDczYzM3MzRhZDhiYmU2YzVkM2FiMGFmNDg5 Y2NkZjU5MDA1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTEwLTMxICBNYXJj aW4gQnljaGF3c2tpICA8bS5ieWNoYXdza2lAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgUmVtb3Zp bmcgbV9tYXhEZWFkQ2FwYWNpdHkgY29uZGl0aW9uIGluIGZhc3QgcGF0aCBpbiBNZW1vcnlDYWNo ZTo6cHJ1bmUoKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNTYzMQorCisgICAgICAgIFJldmlld2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAgICAg ICAgSWYgdGhlIG1fbWF4RGVhZFNpemUgYW5kIG1fZGVhZFNpemUgYXJlIGJvdGggMCwgdGhlIG1l dGhvZCB1bm5lY2Vzc2FyeSB0cmllcyB0byBwcnVuZSByZXNvdXJjZXMuCisKKyAgICAgICAgKiBs b2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVtb3J5Q2Fj aGU6OnBydW5lKToKKwogMjAxMy0xMC0zMSAgUm9iZXJ0IFBsb2NpZW5uaWsgIDxyLnBsb2NpZW5u aWtAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJv bGUtcmVwb3J0cy1zZWxlY3Rpb24uaHRtbCBpcyBmYWlsaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcAppbmRleCAxNGQyMzY2MDRiYThlNzc4OThhNmIwNzhm MDhkMTIxZTU0ZTFmMzI0Li40NjkwNDg1YzBmNWY3MmFmYTBlMThmOWJiNjdlMDQ2ZGRiZDU1NDBk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAKQEAgLTg2 Miw3ICs4NjIsNyBAQCB2b2lkIE1lbW9yeUNhY2hlOjpldmljdFJlc291cmNlcygpCiAKIHZvaWQg TWVtb3J5Q2FjaGU6OnBydW5lKCkKIHsKLSAgICBpZiAobV9saXZlU2l6ZSArIG1fZGVhZFNpemUg PD0gbV9jYXBhY2l0eSAmJiBtX21heERlYWRDYXBhY2l0eSAmJiBtX2RlYWRTaXplIDw9IG1fbWF4 RGVhZENhcGFjaXR5KSAvLyBGYXN0IHBhdGguCisgICAgaWYgKG1fbGl2ZVNpemUgKyBtX2RlYWRT aXplIDw9IG1fY2FwYWNpdHkgJiYgbV9kZWFkU2l6ZSA8PSBtX21heERlYWRDYXBhY2l0eSkgLy8g RmFzdCBwYXRoLgogICAgICAgICByZXR1cm47CiAgICAgICAgIAogICAgIHBydW5lRGVhZFJlc291 cmNlcygpOyAvLyBQcnVuZSBkZWFkIGZpcnN0LCBpbiBjYXNlIGl0IHdhcyAiYm9ycm93aW5nIiBj YXBhY2l0eSBmcm9tIGxpdmUuCg== 215649 2013-10-31 06:39:41 -0700 2013-10-31 07:06:01 -0700 Patch bug-115631-20131031143935.patch text/plain 1611 w.bielawski U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4MzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmVhNzE4ODQ3NjEzZWM2 NzZlMTI0NzA3MjFjZDAwYzIwMTQxMThlNy4uMTllM2ExZTUwYmQxNDdlZDE1YjRkZTUwY2M0ODUw MTljOWU2NDRiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTEwLTMxICBNYXJj aW4gQnljaGF3c2tpICA8bS5ieWNoYXdza2lAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgUmVtb3Zp bmcgbV9tYXhEZWFkQ2FwYWNpdHkgY29uZGl0aW9uIGluIGZhc3QgcGF0aCBpbiBNZW1vcnlDYWNo ZTo6cHJ1bmUoKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNTYzMQorCisgICAgICAgIFJldmlld2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAgICAg ICAgSWYgdGhlIG1fbWF4RGVhZFNpemUgYW5kIG1fZGVhZFNpemUgYXJlIGJvdGggMCwgdGhlIG1l dGhvZCB1bm5lY2Vzc2Fpcmx5IHRyaWVzIHRvIHBydW5lIHJlc291cmNlcy4KKworICAgICAgICBO byBuZXcgdGVzdHMsIGNvdmVyZWQgYnkgZXhpc3Rpbmcgb25lcy4KKworICAgICAgICAqIGxvYWRl ci9jYWNoZS9NZW1vcnlDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlDYWNoZTo6 cHJ1bmUpOgorCiAyMDEzLTEwLTMxICBSb2JlcnQgUGxvY2llbm5payAgPHIucGxvY2llbm5pa0Bz YW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXSBhY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9sZS1y ZXBvcnRzLXNlbGVjdGlvbi5odG1sIGlzIGZhaWxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv Y2FjaGUvTWVtb3J5Q2FjaGUuY3BwCmluZGV4IDE0ZDIzNjYwNGJhOGU3Nzg5OGE2YjA3OGYwOGQx MjFlNTRlMWYzMjQuLjQ2OTA0ODVjMGY1ZjcyYWZhMGUxOGY5YmI2N2UwNDZkZGJkNTU0MGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcApAQCAtODYyLDcg Kzg2Miw3IEBAIHZvaWQgTWVtb3J5Q2FjaGU6OmV2aWN0UmVzb3VyY2VzKCkKIAogdm9pZCBNZW1v cnlDYWNoZTo6cHJ1bmUoKQogewotICAgIGlmIChtX2xpdmVTaXplICsgbV9kZWFkU2l6ZSA8PSBt X2NhcGFjaXR5ICYmIG1fbWF4RGVhZENhcGFjaXR5ICYmIG1fZGVhZFNpemUgPD0gbV9tYXhEZWFk Q2FwYWNpdHkpIC8vIEZhc3QgcGF0aC4KKyAgICBpZiAobV9saXZlU2l6ZSArIG1fZGVhZFNpemUg PD0gbV9jYXBhY2l0eSAmJiBtX2RlYWRTaXplIDw9IG1fbWF4RGVhZENhcGFjaXR5KSAvLyBGYXN0 IHBhdGguCiAgICAgICAgIHJldHVybjsKICAgICAgICAgCiAgICAgcHJ1bmVEZWFkUmVzb3VyY2Vz KCk7IC8vIFBydW5lIGRlYWQgZmlyc3QsIGluIGNhc2UgaXQgd2FzICJib3Jyb3dpbmciIGNhcGFj aXR5IGZyb20gbGl2ZS4K