152344 2015-12-16 10:37:24 -0800 Modern IDB: Combine handling open requests, delete requests, and transactions into one timer 2015-12-16 10:44:50 -0800 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1149679 0 beidson 2015-12-16 10:37:24 -0800 Modern IDB: Combine handling open requests, delete requests, and transactions into one timer This is the first step towards a more unified handling of all three of these concepts that is required to get remaining tests passing. 1149681 1 267469 beidson 2015-12-16 10:39:08 -0800 Created attachment 267469 Patch v1 1149682 2 beidson 2015-12-16 10:44:50 -0800 http://trac.webkit.org/changeset/194160 267469 2015-12-16 10:39:08 -0800 2015-12-16 10:42:24 -0800 Patch v1 patch text/plain 6460 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxNDk5MTNkLi4yNDBhMmE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTUtMTItMTYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIE1vZGVybiBJREI6IENvbWJpbmUgaGFuZGxpbmcgb3BlbiByZXF1ZXN0cywgZGVsZXRlIHJl cXVlc3RzLCBhbmQgdHJhbnNhY3Rpb25zIGludG8gb25lIHRpbWVyLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyMzQ0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChSZWZhY3Rvciwg ZXhpc3RpbmcgdGVzdHMgcGFzcykuCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2 ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpV bmlxdWVJREJEYXRhYmFzZTo6VW5pcXVlSURCRGF0YWJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6 SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6Y29tbWl0VHJhbnNhY3Rpb24pOgorICAgICAg ICAoV2ViQ29yZTo6SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6Y29ubmVjdGlvbkNsb3Nl ZEZyb21DbGllbnQpOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpVbmlxdWVJREJEYXRh YmFzZTo6ZW5xdWV1ZVRyYW5zYWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6 VW5pcXVlSURCRGF0YWJhc2U6Omludm9rZU9wZXJhdGlvbkFuZFRyYW5zYWN0aW9uVGltZXIpOgor ICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6b3BlcmF0aW9u QW5kVHJhbnNhY3Rpb25UaW1lckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6 VW5pcXVlSURCRGF0YWJhc2U6OmRpZFBlcmZvcm1BY3RpdmF0ZVRyYW5zYWN0aW9uSW5CYWNraW5n U3RvcmUpOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6 aW5Qcm9ncmVzc1RyYW5zYWN0aW9uQ29tcGxldGVkKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNl cnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6Omludm9rZURlbGV0ZU9yUnVuVHJhbnNhY3Rpb25UaW1l cik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFi YXNlOjpkZWxldGVPclJ1blRyYW5zYWN0aW9uc1RpbWVyRmlyZWQpOiBEZWxldGVkLgorICAgICAg ICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5oOgorCiAyMDE1 LTEyLTE2ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgSW1wbGVtZW50IFdlYiBUaW1pbmcgd2hlbiB1c2luZyBORVRXT1JLX1NFU1NJT04KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJ REJEYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIv VW5pcXVlSURCRGF0YWJhc2UuY3BwCmluZGV4IDRhYzhkZDMuLmRkZDcxNWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFz ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1 ZUlEQkRhdGFiYXNlLmNwcApAQCAtNDcsOCArNDcsNyBAQCBuYW1lc3BhY2UgSURCU2VydmVyIHsK IFVuaXF1ZUlEQkRhdGFiYXNlOjpVbmlxdWVJREJEYXRhYmFzZShJREJTZXJ2ZXImIHNlcnZlciwg Y29uc3QgSURCRGF0YWJhc2VJZGVudGlmaWVyJiBpZGVudGlmaWVyKQogICAgIDogbV9zZXJ2ZXIo c2VydmVyKQogICAgICwgbV9pZGVudGlmaWVyKGlkZW50aWZpZXIpCi0gICAgLCBtX2RlbGV0ZU9y UnVuVHJhbnNhY3Rpb25zVGltZXIoKnRoaXMsICZVbmlxdWVJREJEYXRhYmFzZTo6ZGVsZXRlT3JS dW5UcmFuc2FjdGlvbnNUaW1lckZpcmVkKQotICAgICwgbV9oYW5kbGVPcGVuRGF0YWJhc2VPcGVy YXRpb25zVGltZXIoKnRoaXMsICZVbmlxdWVJREJEYXRhYmFzZTo6aGFuZGxlT3BlbkRhdGFiYXNl T3BlcmF0aW9ucykKKyAgICAsIG1fb3BlcmF0aW9uQW5kVHJhbnNhY3Rpb25UaW1lcigqdGhpcywg JlVuaXF1ZUlEQkRhdGFiYXNlOjpvcGVyYXRpb25BbmRUcmFuc2FjdGlvblRpbWVyRmlyZWQpCiB7 CiB9CiAKQEAgLTc5Myw4ICs3OTIsNyBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpjb21taXRU cmFuc2FjdGlvbihVbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uJiB0cmFuc2FjdAogICAgICAg ICBtX3ZlcnNpb25DaGFuZ2VUcmFuc2FjdGlvbiA9IG51bGxwdHI7CiAgICAgICAgIG1fdmVyc2lv bkNoYW5nZURhdGFiYXNlQ29ubmVjdGlvbiA9IG51bGxwdHI7CiAKLSAgICAgICAgaWYgKCFtX2hh bmRsZU9wZW5EYXRhYmFzZU9wZXJhdGlvbnNUaW1lci5pc0FjdGl2ZSgpKQotICAgICAgICAgICAg bV9oYW5kbGVPcGVuRGF0YWJhc2VPcGVyYXRpb25zVGltZXIuc3RhcnRPbmVTaG90KDApOworICAg ICAgICBpbnZva2VPcGVyYXRpb25BbmRUcmFuc2FjdGlvblRpbWVyKCk7CiAgICAgfQogCiAgICAg dWludDY0X3QgY2FsbGJhY2tJRCA9IHN0b3JlQ2FsbGJhY2soY2FsbGJhY2spOwpAQCAtODkyLDcg Kzg5MCw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmNvbm5lY3Rpb25DbG9zZWRGcm9tQ2xp ZW50KFVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbiYKICAgICB9CiAKICAgICAvLyBOb3cgdGhh dCBhIGRhdGFiYXNlIGNvbm5lY3Rpb24gaGFzIGNsb3NlZCwgcHJldmlvdXNseSBibG9ja2VkIG9w ZXJhdGlvbnMgbWlnaHQgYmUgcnVubmFibGUuCi0gICAgaW52b2tlRGVsZXRlT3JSdW5UcmFuc2Fj dGlvblRpbWVyKCk7CisgICAgaW52b2tlT3BlcmF0aW9uQW5kVHJhbnNhY3Rpb25UaW1lcigpOwog fQogCiB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjplbnF1ZXVlVHJhbnNhY3Rpb24oUmVmPFVuaXF1 ZUlEQkRhdGFiYXNlVHJhbnNhY3Rpb24+JiYgdHJhbnNhY3Rpb24pCkBAIC05MDMsMTggKzkwMSwy MCBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjplbnF1ZXVlVHJhbnNhY3Rpb24oUmVmPFVuaXF1 ZUlEQkRhdGFiYXNlVHJhbnNhY3Rpb24+JiYgdAogCiAgICAgbV9wZW5kaW5nVHJhbnNhY3Rpb25z LmFwcGVuZChXVEY6Om1vdmUodHJhbnNhY3Rpb24pKTsKIAotICAgIGludm9rZURlbGV0ZU9yUnVu VHJhbnNhY3Rpb25UaW1lcigpOworICAgIGludm9rZU9wZXJhdGlvbkFuZFRyYW5zYWN0aW9uVGlt ZXIoKTsKIH0KIAotdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6aW52b2tlRGVsZXRlT3JSdW5UcmFu c2FjdGlvblRpbWVyKCkKK3ZvaWQgVW5pcXVlSURCRGF0YWJhc2U6Omludm9rZU9wZXJhdGlvbkFu ZFRyYW5zYWN0aW9uVGltZXIoKQogewotICAgIGlmICghbV9kZWxldGVPclJ1blRyYW5zYWN0aW9u c1RpbWVyLmlzQWN0aXZlKCkpCi0gICAgICAgIG1fZGVsZXRlT3JSdW5UcmFuc2FjdGlvbnNUaW1l ci5zdGFydE9uZVNob3QoMCk7CisgICAgaWYgKCFtX29wZXJhdGlvbkFuZFRyYW5zYWN0aW9uVGlt ZXIuaXNBY3RpdmUoKSkKKyAgICAgICAgbV9vcGVyYXRpb25BbmRUcmFuc2FjdGlvblRpbWVyLnN0 YXJ0T25lU2hvdCgwKTsKIH0KIAotdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6ZGVsZXRlT3JSdW5U cmFuc2FjdGlvbnNUaW1lckZpcmVkKCkKK3ZvaWQgVW5pcXVlSURCRGF0YWJhc2U6Om9wZXJhdGlv bkFuZFRyYW5zYWN0aW9uVGltZXJGaXJlZCgpCiB7Ci0gICAgTE9HKEluZGV4ZWREQiwgIihtYWlu KSBVbmlxdWVJREJEYXRhYmFzZTo6ZGVsZXRlT3JSdW5UcmFuc2FjdGlvbnNUaW1lckZpcmVkIik7 CisgICAgTE9HKEluZGV4ZWREQiwgIihtYWluKSBVbmlxdWVJREJEYXRhYmFzZTo6b3BlcmF0aW9u QW5kVHJhbnNhY3Rpb25UaW1lckZpcmVkIik7CisKKyAgICBoYW5kbGVPcGVuRGF0YWJhc2VPcGVy YXRpb25zKCk7CiAKICAgICBpZiAobV9kZWxldGVQZW5kaW5nICYmIG1heWJlRGVsZXRlRGF0YWJh c2UobnVsbHB0cikpCiAgICAgICAgIHJldHVybjsKQEAgLTkzOSw3ICs5MzksNyBAQCB2b2lkIFVu aXF1ZUlEQkRhdGFiYXNlOjpkZWxldGVPclJ1blRyYW5zYWN0aW9uc1RpbWVyRmlyZWQoKQogCiAg ICAgICAgIC8vIElmIG5vIHRyYW5zYWN0aW9ucyB3ZXJlIGRlZmVycmVkLCBpdCdzIHBvc3NpYmxl IHdlIGNhbiBzdGFydCBhbm90aGVyIHRyYW5zYWN0aW9uIHJpZ2h0IG5vdy4KICAgICAgICAgaWYg KCFoYWREZWZlcnJlZFRyYW5zYWN0aW9ucykKLSAgICAgICAgICAgIGludm9rZURlbGV0ZU9yUnVu VHJhbnNhY3Rpb25UaW1lcigpOworICAgICAgICAgICAgaW52b2tlT3BlcmF0aW9uQW5kVHJhbnNh Y3Rpb25UaW1lcigpOwogICAgIH0KIH0KIApAQCAtOTcwLDcgKzk3MCw3IEBAIHZvaWQgVW5pcXVl SURCRGF0YWJhc2U6OmRpZFBlcmZvcm1BY3RpdmF0ZVRyYW5zYWN0aW9uSW5CYWNraW5nU3RvcmUo dWludDY0X3QgY2FsCiB7CiAgICAgTE9HKEluZGV4ZWREQiwgIihtYWluKSBVbmlxdWVJREJEYXRh YmFzZTo6ZGlkUGVyZm9ybUFjdGl2YXRlVHJhbnNhY3Rpb25JbkJhY2tpbmdTdG9yZSIpOwogCi0g ICAgaW52b2tlRGVsZXRlT3JSdW5UcmFuc2FjdGlvblRpbWVyKCk7CisgICAgaW52b2tlT3BlcmF0 aW9uQW5kVHJhbnNhY3Rpb25UaW1lcigpOwogCiAgICAgcGVyZm9ybUVycm9yQ2FsbGJhY2soY2Fs bGJhY2tJZGVudGlmaWVyLCBlcnJvcik7CiB9CkBAIC0xMDQ2LDcgKzEwNDYsNyBAQCB2b2lkIFVu aXF1ZUlEQkRhdGFiYXNlOjppblByb2dyZXNzVHJhbnNhY3Rpb25Db21wbGV0ZWQoY29uc3QgSURC UmVzb3VyY2VJZGVudGlmaQogICAgICAgICBtX2Nsb3NlUGVuZGluZ0RhdGFiYXNlQ29ubmVjdGlv bnMucmVtb3ZlKCZ0cmFuc2FjdGlvbi0+ZGF0YWJhc2VDb25uZWN0aW9uKCkpOwogCiAgICAgLy8g UHJldmlvdXNseSBibG9ja2VkIG9wZXJhdGlvbnMgbWlnaHQgYmUgcnVubmFibGUuCi0gICAgaW52 b2tlRGVsZXRlT3JSdW5UcmFuc2FjdGlvblRpbWVyKCk7CisgICAgaW52b2tlT3BlcmF0aW9uQW5k VHJhbnNhY3Rpb25UaW1lcigpOwogfQogCiB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpwZXJmb3Jt RXJyb3JDYWxsYmFjayh1aW50NjRfdCBjYWxsYmFja0lkZW50aWZpZXIsIGNvbnN0IElEQkVycm9y JiBlcnJvcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3Nl cnZlci9VbmlxdWVJREJEYXRhYmFzZS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmgKaW5kZXggMjdlYzhmNS4uNWZmYWJlNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlE QkRhdGFiYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVy L1VuaXF1ZUlEQkRhdGFiYXNlLmgKQEAgLTE2NCw4ICsxNjQsOCBAQCBwcml2YXRlOgogCiAgICAg Ym9vbCBoYXNBbnlQZW5kaW5nQ2FsbGJhY2tzKCkgY29uc3Q7CiAKLSAgICB2b2lkIGludm9rZURl bGV0ZU9yUnVuVHJhbnNhY3Rpb25UaW1lcigpOwotICAgIHZvaWQgZGVsZXRlT3JSdW5UcmFuc2Fj dGlvbnNUaW1lckZpcmVkKCk7CisgICAgdm9pZCBpbnZva2VPcGVyYXRpb25BbmRUcmFuc2FjdGlv blRpbWVyKCk7CisgICAgdm9pZCBvcGVyYXRpb25BbmRUcmFuc2FjdGlvblRpbWVyRmlyZWQoKTsK ICAgICBSZWZQdHI8VW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlvbj4gdGFrZU5leHRSdW5uYWJs ZVRyYW5zYWN0aW9uKGJvb2wmIGhhZERlZmVycmVkVHJhbnNhY3Rpb25zKTsKIAogICAgIElEQlNl cnZlciYgbV9zZXJ2ZXI7CkBAIC0xOTAsOCArMTkwLDcgQEAgcHJpdmF0ZToKICAgICBIYXNoTWFw PHVpbnQ2NF90LCBHZXRSZXN1bHRDYWxsYmFjaz4gbV9nZXRSZXN1bHRDYWxsYmFja3M7CiAgICAg SGFzaE1hcDx1aW50NjRfdCwgQ291bnRDYWxsYmFjaz4gbV9jb3VudENhbGxiYWNrczsKIAotICAg IFRpbWVyIG1fZGVsZXRlT3JSdW5UcmFuc2FjdGlvbnNUaW1lcjsKLSAgICBUaW1lciBtX2hhbmRs ZU9wZW5EYXRhYmFzZU9wZXJhdGlvbnNUaW1lcjsKKyAgICBUaW1lciBtX29wZXJhdGlvbkFuZFRy YW5zYWN0aW9uVGltZXI7CiAKICAgICBEZXF1ZTxSZWZQdHI8VW5pcXVlSURCRGF0YWJhc2VUcmFu c2FjdGlvbj4+IG1fcGVuZGluZ1RyYW5zYWN0aW9uczsKICAgICBIYXNoTWFwPElEQlJlc291cmNl SWRlbnRpZmllciwgUmVmUHRyPFVuaXF1ZUlEQkRhdGFiYXNlVHJhbnNhY3Rpb24+PiBtX2luUHJv Z3Jlc3NUcmFuc2FjdGlvbnM7Cg==