131661 2014-04-14 19:57:21 -0700 MallocBench should scavenge explicitly instead of waiting 2014-04-14 20:53:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren barraclough commit-queue kling rniwa sam oldest_to_newest 1000717 0 ggaren 2014-04-14 19:57:21 -0700 MallocBench should scavenge explicitly instead of waiting 1000718 1 229340 ggaren 2014-04-14 20:06:26 -0700 Created attachment 229340 patch 1000721 2 229340 kling 2014-04-14 20:11:50 -0700 Comment on attachment 229340 patch r=me 1000727 3 ggaren 2014-04-14 20:53:19 -0700 Committed revision 167292. 229340 2014-04-14 20:06:26 -0700 2014-04-14 20:11:50 -0700 patch patch.txt text/plain 14793 ggaren SW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1h bmNlVGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjcyOTApCisrKyBQZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA0LTE0ICBH ZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgTWFsbG9jQmVuY2gg c2hvdWxkIHNjYXZlbmdlIGV4cGxpY2l0bHkgaW5zdGVhZCBvZiB3YWl0aW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE2NjEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1hbGxvY0JlbmNoL01hbGxv Y0JlbmNoLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6IERvbid0IGJ1aWxkIG1ibWFsbG9jCisg ICAgICAgIGJ5IGRlZmF1bHQgYmVjYXVzZSBpdCB3aWxsIG92ZXJ3cml0ZSBhbnkgb3RoZXIgbWJt YWxsb2MgeW91J3JlIHdvcmtpbmcKKyAgICAgICAgd2l0aCBpbiB0aGUgV2ViS2l0QnVpbGQgZGly ZWN0b3J5LgorCisgICAgICAgICogTWFsbG9jQmVuY2gvTWFsbG9jQmVuY2gvQmVuY2htYXJrLmNw cDoKKyAgICAgICAgKEJlbmNobWFyazo6cnVuKTogU2NhdmVuZ2UgZXhwbGljaXRseSBpbnN0ZWFk IG9mIHdhaXRpbmcuIFRoaXMgaXMgZmFzdGVyLAorICAgICAgICBhbmQgaXQncyB0aGUgb25seSB3 YXkgdG8gZ2V0IEZhc3RNYWxsb2MgdG8gc2NhdmVuZ2UuIChUaGF0J3MgYSBidWcgaW4KKyAgICAg ICAgRmFzdE1hbGxvYywgYnV0IHdlIGRvbid0IHdhbnQgaXQgdG8gaW50ZXJmZXJlIHdpdGggYnJv YWRlciB0ZXN0aW5nLikKKworICAgICAgICAqIE1hbGxvY0JlbmNoL01hbGxvY0JlbmNoL21ibWFs bG9jLmNwcDoKKyAgICAgICAgKiBNYWxsb2NCZW5jaC9NYWxsb2NCZW5jaC9tYm1hbGxvYy5oOiBB ZGRlZCBhIHNjYXZlbmdlIGltcGxlbWVudGF0aW9uCisgICAgICAgIGZvciBzeXN0ZW0gbWFsbG9j LgorCiAyMDE0LTA0LTE0ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAg ICAgICAgQSBmZXcgTWFsbG9jQmVuY2ggcmVjb3JkL3JlcGxheSBmaXhlcwpJbmRleDogUGVyZm9y bWFuY2VUZXN0cy9NYWxsb2NCZW5jaC9NYWxsb2NCZW5jaC54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1hbmNlVGVzdHMvTWFsbG9jQmVuY2gvTWFsbG9jQmVu Y2gueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gMTY3Mjg5KQorKysgUGVyZm9y bWFuY2VUZXN0cy9NYWxsb2NCZW5jaC9NYWxsb2NCZW5jaC54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCSh3b3JraW5nIGNvcHkpCkBAIC0zNywxNiArMzcsNiBAQAogCQkxNEUxMTkzMjE3N0VDQzhC MDAzQThEMTUgLyogQ1BVQ291bnQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gMTRFMTE5MzAxNzdFQ0M4QjAwM0E4RDE1IC8qIENQVUNvdW50LmNwcCAq LzsgfTsKIC8qIEVuZCBQQlhCdWlsZEZpbGUgc2VjdGlvbiAqLwogCi0vKiBCZWdpbiBQQlhDb250 YWluZXJJdGVtUHJveHkgc2VjdGlvbiAqLwotCQkxNENDMzkzRDE4RUE4MTNGMDA0QUZFMzQgLyog UEJYQ29udGFpbmVySXRlbVByb3h5ICovID0gewotCQkJaXNhID0gUEJYQ29udGFpbmVySXRlbVBy b3h5OwotCQkJY29udGFpbmVyUG9ydGFsID0gMTQ0NTJDQTExNzdEMjQ0NjAwOTdFMDU3IC8qIFBy b2plY3Qgb2JqZWN0ICovOwotCQkJcHJveHlUeXBlID0gMTsKLQkJCXJlbW90ZUdsb2JhbElEU3Ry aW5nID0gMTRDQzM5MzcxOEVBODExRjAwNEFGRTM0OwotCQkJcmVtb3RlSW5mbyA9IG1ibWFsbG9j OwotCQl9OwotLyogRW5kIFBCWENvbnRhaW5lckl0ZW1Qcm94eSBzZWN0aW9uICovCi0KIC8qIEJl Z2luIFBCWENvcHlGaWxlc0J1aWxkUGhhc2Ugc2VjdGlvbiAqLwogCQkxNDQ1MkNBNzE3N0QyNDQ2 MDA5N0UwNTcgLyogQ29weSBGaWxlcyAqLyA9IHsKIAkJCWlzYSA9IFBCWENvcHlGaWxlc0J1aWxk UGhhc2U7CkBAIC0yNTQsNyArMjQ0LDYgQEAKIAkJCWJ1aWxkUnVsZXMgPSAoCiAJCQkpOwogCQkJ ZGVwZW5kZW5jaWVzID0gKAotCQkJCTE0Q0MzOTNFMThFQTgxM0YwMDRBRkUzNCAvKiBQQlhUYXJn ZXREZXBlbmRlbmN5ICovLAogCQkJKTsKIAkJCW5hbWUgPSBNYWxsb2NCZW5jaDsKIAkJCXByb2R1 Y3ROYW1lID0gTWFsbG9jQmVuY2g7CkBAIC0zNDEsMTQgKzMzMCw2IEBACiAJCX07CiAvKiBFbmQg UEJYU291cmNlc0J1aWxkUGhhc2Ugc2VjdGlvbiAqLwogCi0vKiBCZWdpbiBQQlhUYXJnZXREZXBl bmRlbmN5IHNlY3Rpb24gKi8KLQkJMTRDQzM5M0UxOEVBODEzRjAwNEFGRTM0IC8qIFBCWFRhcmdl dERlcGVuZGVuY3kgKi8gPSB7Ci0JCQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OwotCQkJdGFy Z2V0ID0gMTRDQzM5MzcxOEVBODExRjAwNEFGRTM0IC8qIG1ibWFsbG9jICovOwotCQkJdGFyZ2V0 UHJveHkgPSAxNENDMzkzRDE4RUE4MTNGMDA0QUZFMzQgLyogUEJYQ29udGFpbmVySXRlbVByb3h5 ICovOwotCQl9OwotLyogRW5kIFBCWFRhcmdldERlcGVuZGVuY3kgc2VjdGlvbiAqLwotCiAvKiBC ZWdpbiBYQ0J1aWxkQ29uZmlndXJhdGlvbiBzZWN0aW9uICovCiAJCTE0NDUyQ0I1MTc3RDI0NDYw MDk3RTA1NyAvKiBEZWJ1ZyAqLyA9IHsKIAkJCWlzYSA9IFhDQnVpbGRDb25maWd1cmF0aW9uOwpJ bmRleDogUGVyZm9ybWFuY2VUZXN0cy9NYWxsb2NCZW5jaC9NYWxsb2NCZW5jaC9CZW5jaG1hcmsu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1hbmNlVGVzdHMvTWFsbG9jQmVuY2gvTWFsbG9jQmVu Y2gvQmVuY2htYXJrLmNwcAkocmV2aXNpb24gMTY3Mjg5KQorKysgUGVyZm9ybWFuY2VUZXN0cy9N YWxsb2NCZW5jaC9NYWxsb2NCZW5jaC9CZW5jaG1hcmsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x ODQsMTQgKzE4NCw4IEBAIHZvaWQgQmVuY2htYXJrOjpydW4oKQogICAgIAogICAgIGlmICghbV9t ZWFzdXJlSGVhcCkKICAgICAgICAgcmV0dXJuOwotCi0gICAgLy8gV2FpdCBhIGJpdCBmb3IgYW55 IGFzeW5jIGZyZWVpbmcgdG8gZmluaXNoLgotICAgIHNpemVfdCBsYXN0OwotICAgIGRvIHsKLSAg ICAgICAgbGFzdCA9IGN1cnJlbnRNZW1vcnlCeXRlcygpLnJlc2lkZW50OwotICAgICAgICBzdGQ6 OnRoaXNfdGhyZWFkOjpzbGVlcF9mb3Ioc3RkOjpjaHJvbm86OnNlY29uZHMoMikpOwotICAgIH0g d2hpbGUgKGN1cnJlbnRNZW1vcnlCeXRlcygpLnJlc2lkZW50IDwgbGFzdCk7Ci0KKyAgICAKKyAg ICBtYnNjYXZlbmdlKCk7CiAgICAgbV9tZW1vcnkgPSBjdXJyZW50TWVtb3J5Qnl0ZXMoKTsKIH0K IApJbmRleDogUGVyZm9ybWFuY2VUZXN0cy9NYWxsb2NCZW5jaC9NYWxsb2NCZW5jaC9tYm1hbGxv Yy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gUGVyZm9ybWFuY2VUZXN0cy9NYWxsb2NCZW5jaC9NYWxsb2NC ZW5jaC9tYm1hbGxvYy5jcHAJKHJldmlzaW9uIDE2NzI4OSkKKysrIFBlcmZvcm1hbmNlVGVzdHMv TWFsbG9jQmVuY2gvTWFsbG9jQmVuY2gvbWJtYWxsb2MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y Niw2ICsyNiw3IEBACiAjaW5jbHVkZSA8bGltaXRzPgogI2luY2x1ZGUgPHN0ZGlvLmg+CiAjaW5j bHVkZSA8c3RkbGliLmg+CisjaW1wb3J0IDxtYWxsb2MvbWFsbG9jLmg+CiAKIGV4dGVybiAiQyIg ewogCkBAIC00NCw0ICs0NSw5IEBAIHZvaWQqIG1icmVhbGxvYyh2b2lkKiBwLCBzaXplX3QsIHNp emVfdCAKICAgICByZXR1cm4gcmVhbGxvYyhwLCBuZXdTaXplKTsKIH0KIAordm9pZCBtYnNjYXZl bmdlKCkKK3sKKyAgICBtYWxsb2Nfem9uZV9wcmVzc3VyZV9yZWxpZWYobnVsbHB0ciwgMCk7Cit9 CisKIH0gLy8gZXh0ZXJuICJDIgpJbmRleDogUGVyZm9ybWFuY2VUZXN0cy9NYWxsb2NCZW5jaC9N YWxsb2NCZW5jaC9tYm1hbGxvYy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1hbmNlVGVzdHMvTWFs bG9jQmVuY2gvTWFsbG9jQmVuY2gvbWJtYWxsb2MuaAkocmV2aXNpb24gMTY3Mjg5KQorKysgUGVy Zm9ybWFuY2VUZXN0cy9NYWxsb2NCZW5jaC9NYWxsb2NCZW5jaC9tYm1hbGxvYy5oCSh3b3JraW5n IGNvcHkpCkBAIC0zNyw3ICszNyw4IEBAIGV4dGVybiAiQyIgewogdm9pZCogbWJtYWxsb2Moc2l6 ZV90KTsKIHZvaWQgbWJmcmVlKHZvaWQqLCBzaXplX3QpOwogdm9pZCogbWJyZWFsbG9jKHZvaWQq LCBzaXplX3QsIHNpemVfdCk7Ci0KK3ZvaWQgbWJzY2F2ZW5nZSgpOworICAgIAogfQogCiAvLyBD YXRjaCBhY2NpZGVudGFsIGJlbmNobWFyayBhbGxvY2F0aW9uIHRocm91Z2ggbWFsbG9jIGFuZCBm cmVlLiBBbGwgYmVuY2htYXJrCkluZGV4OiBTb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjcyOTApCisrKyBT b3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSw0NSBAQAor MjAxNC0wNC0xNCAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgorCisgICAgICAg IE1hbGxvY0JlbmNoIHNob3VsZCBzY2F2ZW5nZSBleHBsaWNpdGx5IGluc3RlYWQgb2Ygd2FpdGlu ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNjYx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQg ZXhwbGljaXQgc2NhdmVuZ2Ugc3VwcG9ydCB0byBibWFsbG9jLiBUaGlzIGlzbid0IGEgbWVtb3J5 IHdpbiwKKyAgICAgICAgc2luY2UgYm1hbGxvYydzIHBlci10aHJlYWQgY2FjaGUgaXMgc28gc21h bGwuIEJ1dCBpdCBtYWtlcyB0ZXN0aW5nCisgICAgICAgIHNpbXBsZXIuCisKKyAgICAgICAgKiBi bWFsbG9jL0FsbG9jYXRvci5jcHA6CisgICAgICAgIChibWFsbG9jOjpBbGxvY2F0b3I6On5BbGxv Y2F0b3IpOgorICAgICAgICAoYm1hbGxvYzo6QWxsb2NhdG9yOjpzY2F2ZW5nZSk6CisgICAgICAg ICogYm1hbGxvYy9BbGxvY2F0b3IuaDoKKyAgICAgICAgKiBibWFsbG9jL0NhY2hlLmNwcDoKKyAg ICAgICAgKGJtYWxsb2M6OkNhY2hlOjpvcGVyYXRvciBuZXcpOgorICAgICAgICAoYm1hbGxvYzo6 Q2FjaGU6Om9wZXJhdG9yIGRlbGV0ZSk6CisgICAgICAgIChibWFsbG9jOjpDYWNoZTo6Q2FjaGUp OgorICAgICAgICAoYm1hbGxvYzo6Q2FjaGU6OnNjYXZlbmdlKToKKyAgICAgICAgKiBibWFsbG9j L0NhY2hlLmg6CisgICAgICAgICogYm1hbGxvYy9EZWFsbG9jYXRvci5jcHA6CisgICAgICAgIChi bWFsbG9jOjpEZWFsbG9jYXRvcjo6fkRlYWxsb2NhdG9yKToKKyAgICAgICAgKGJtYWxsb2M6OkRl YWxsb2NhdG9yOjpzY2F2ZW5nZSk6CisgICAgICAgICogYm1hbGxvYy9EZWFsbG9jYXRvci5oOiBG YWN0b3JlZCBleGlzdGluZyBzY2F2ZW5naW5nIGNvZGUgaW50byBoZWxwZXIKKyAgICAgICAgZnVu Y3Rpb25zLCBmb3IgcmV1c2UuCisKKyAgICAgICAgKiBibWFsbG9jL0hlYXAuY3BwOgorICAgICAg ICAoYm1hbGxvYzo6c2xlZXApOgorICAgICAgICAoYm1hbGxvYzo6SGVhcDo6Y29uY3VycmVudFNj YXZlbmdlKToKKyAgICAgICAgKGJtYWxsb2M6OkhlYXA6OnNjYXZlbmdlKToKKyAgICAgICAgKGJt YWxsb2M6OkhlYXA6OnNjYXZlbmdlU21hbGxQYWdlcyk6CisgICAgICAgIChibWFsbG9jOjpIZWFw OjpzY2F2ZW5nZU1lZGl1bVBhZ2VzKToKKyAgICAgICAgKGJtYWxsb2M6OkhlYXA6OnNjYXZlbmdl TGFyZ2VSYW5nZXMpOgorICAgICAgICAqIGJtYWxsb2MvSGVhcC5oOiBNYWRlIHNjYXZlbmdlIHNs ZWVwIGR1cmF0aW9uIGEgcGFyYW1ldGVyLiBGb3JjZWQKKyAgICAgICAgc2NhdmVuZ2luZyAtLSBp biByZXNwb25zZSB0byBhIGJlbmNobWFyayBvciBhIGxvdyBtZW1vcnkgd2FybmluZyAtLQorICAg ICAgICB3YW50cyB0byBjb21wbGV0ZSBhcyBzb29uIGFzIHBvc3NpYmxlLCBzbyBpdHMgc2xlZXAg ZHVyYXRpb24gaXMgMC4KKworICAgICAgICAqIGJtYWxsb2MvYm1hbGxvYy5oOgorICAgICAgICAo Ym1hbGxvYzo6YXBpOjpzY2F2ZW5nZSk6CisgICAgICAgICogYm1hbGxvYy9tYm1hbGxvYy5jcHA6 IEV4cG9ydGVkIHRoZSBzY2F2ZW5nZSBBUEkgZm9yIE1hbGxvY0JlbmNoJ3MgdXNlLgorCiAyMDE0 LTA0LTE0ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgVXNl IDRrQiBwYWdlcyBvbiBNYWMKSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQWxsb2NhdG9y LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0FsbG9jYXRvci5jcHAJ KHJldmlzaW9uIDE2NzI4OSkKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQWxsb2NhdG9yLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNTEsNiArNTEsMTEgQEAgQWxsb2NhdG9yOjpBbGxvY2F0b3Io RGVhbGxvY2F0b3ImIGRlYWxsbwogCiBBbGxvY2F0b3I6On5BbGxvY2F0b3IoKQogeworICAgIHNj YXZlbmdlKCk7Cit9CisgICAgCit2b2lkIEFsbG9jYXRvcjo6c2NhdmVuZ2UoKQorewogICAgIGZv ciAoYXV0byYgYWxsb2NhdG9yIDogbV9zbWFsbEFsbG9jYXRvcnMpCiAgICAgICAgIGxvZyhhbGxv Y2F0b3IpOwogICAgIHByb2Nlc3NTbWFsbEFsbG9jYXRvckxvZygpOwpJbmRleDogU291cmNlL2Jt YWxsb2MvYm1hbGxvYy9BbGxvY2F0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9i bWFsbG9jL0FsbG9jYXRvci5oCShyZXZpc2lvbiAxNjcyODkpCisrKyBTb3VyY2UvYm1hbGxvYy9i bWFsbG9jL0FsbG9jYXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC00Niw2ICs0Niw4IEBAIHB1Ymxp YzoKICAgICB2b2lkKiBhbGxvY2F0ZShzaXplX3QpOwogICAgIGJvb2wgYWxsb2NhdGVGYXN0Q2Fz ZShzaXplX3QsIHZvaWQqJik7CiAgICAgdm9pZCogYWxsb2NhdGVTbG93Q2FzZShzaXplX3QpOwor ICAgIAorICAgIHZvaWQgc2NhdmVuZ2UoKTsKIAogcHJpdmF0ZToKICAgICBTbWFsbEFsbG9jYXRv ciYgc21hbGxBbGxvY2F0b3JGb3Ioc2l6ZV90KTsKSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxs b2MvQ2FjaGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQ2FjaGUu Y3BwCShyZXZpc2lvbiAxNjcyODkpCisrKyBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0NhY2hlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzAsMjMgKzMwLDI5IEBACiAKIG5hbWVzcGFjZSBibWFsbG9j IHsKIAotaW5saW5lIHZvaWQqIENhY2hlOjpvcGVyYXRvciBuZXcoc2l6ZV90IHNpemUpCit2b2lk KiBDYWNoZTo6b3BlcmF0b3IgbmV3KHNpemVfdCBzaXplKQogewogICAgIHJldHVybiB2bUFsbG9j YXRlKHZtU2l6ZShzaXplKSk7CiB9CiAKLWlubGluZSB2b2lkIENhY2hlOjpvcGVyYXRvciBkZWxl dGUodm9pZCogcCwgc2l6ZV90IHNpemUpCit2b2lkIENhY2hlOjpvcGVyYXRvciBkZWxldGUodm9p ZCogcCwgc2l6ZV90IHNpemUpCiB7CiAgICAgdm1EZWFsbG9jYXRlKHAsIHZtU2l6ZShzaXplKSk7 CiB9CiAKLWlubGluZSBDYWNoZTo6Q2FjaGUoKQorQ2FjaGU6OkNhY2hlKCkKICAgICA6IG1fZGVh bGxvY2F0b3IoKQogICAgICwgbV9hbGxvY2F0b3IobV9kZWFsbG9jYXRvcikKIHsKICAgICAvLyBF bnN1cmUgdGhhdCB0aGUgaGVhcCBleGlzdHMsIHNvIEFsbG9jYXRvciBhbmQgRGVhbGxvY2F0b3Ig Y2FuIGFzc3VtZSBpdCBkb2VzLgogICAgIFBlclByb2Nlc3M8SGVhcD46OmdldCgpOwogfQorICAg IAordm9pZCBDYWNoZTo6c2NhdmVuZ2UoKQoreworICAgIG1fZGVhbGxvY2F0b3Iuc2NhdmVuZ2Uo KTsKKyAgICBtX2FsbG9jYXRvci5zY2F2ZW5nZSgpOworfQogCiBOT19JTkxJTkUgdm9pZCogQ2Fj aGU6OmFsbG9jYXRlU2xvd0Nhc2Uoc2l6ZV90IHNpemUpCiB7CkluZGV4OiBTb3VyY2UvYm1hbGxv Yy9ibWFsbG9jL0NhY2hlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL2JtYWxsb2MvYm1hbGxvYy9D YWNoZS5oCShyZXZpc2lvbiAxNjcyODkpCisrKyBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0NhY2hl LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDYgKzQ2LDggQEAgcHVibGljOgogCiAgICAgQWxsb2Nh dG9yJiBhbGxvY2F0b3IoKSB7IHJldHVybiBtX2FsbG9jYXRvcjsgfQogICAgIERlYWxsb2NhdG9y JiBkZWFsbG9jYXRvcigpIHsgcmV0dXJuIG1fZGVhbGxvY2F0b3I7IH0KKyAgICAKKyAgICB2b2lk IHNjYXZlbmdlKCk7CiAKIHByaXZhdGU6CiAgICAgc3RhdGljIGJvb2wgYWxsb2NhdGVGYXN0Q2Fz ZShzaXplX3QsIHZvaWQqJik7CkluZGV4OiBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0RlYWxsb2Nh dG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0RlYWxsb2NhdG9y LmNwcAkocmV2aXNpb24gMTY3Mjg5KQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9EZWFsbG9j YXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDExIEBAIERlYWxsb2NhdG9yOjpE ZWFsbG9jYXRvcigpCiAKIERlYWxsb2NhdG9yOjp+RGVhbGxvY2F0b3IoKQogeworICAgIHNjYXZl bmdlKCk7Cit9CisgICAgCit2b2lkIERlYWxsb2NhdG9yOjpzY2F2ZW5nZSgpCit7CiAgICAgcHJv Y2Vzc09iamVjdExvZygpOwogICAgIAogICAgIHN0ZDo6bG9ja19ndWFyZDxNdXRleD4gbG9jayhQ ZXJQcm9jZXNzPEhlYXA+OjptdXRleCgpKTsKSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2Mv RGVhbGxvY2F0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0RlYWxs b2NhdG9yLmgJKHJldmlzaW9uIDE2NzI4OSkKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvRGVh bGxvY2F0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtNDksNyArNDksOSBAQCBwdWJsaWM6CiAKICAg ICB2b2lkIGRlYWxsb2NhdGVNZWRpdW1MaW5lKHN0ZDo6bG9ja19ndWFyZDxNdXRleD4mLCBNZWRp dW1MaW5lKik7CiAgICAgTWVkaXVtTGluZSogYWxsb2NhdGVNZWRpdW1MaW5lKCk7Ci0KKyAgICAK KyAgICB2b2lkIHNjYXZlbmdlKCk7CisgICAgCiBwcml2YXRlOgogICAgIHZvaWQgZGVhbGxvY2F0 ZUxhcmdlKHZvaWQqKTsKICAgICB2b2lkIGRlYWxsb2NhdGVYTGFyZ2Uodm9pZCopOwpJbmRleDog U291cmNlL2JtYWxsb2MvYm1hbGxvYy9IZWFwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1h bGxvYy9ibWFsbG9jL0hlYXAuY3BwCShyZXZpc2lvbiAxNjcyODkpCisrKyBTb3VyY2UvYm1hbGxv Yy9ibWFsbG9jL0hlYXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw2ICszOCw5IEBAIG5hbWVz cGFjZSBibWFsbG9jIHsKIAogc3RhdGljIGlubGluZSB2b2lkIHNsZWVwKHN0ZDo6dW5pcXVlX2xv Y2s8TXV0ZXg+JiBsb2NrLCBzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzIGR1cmF0aW9uKQogewor ICAgIGlmIChkdXJhdGlvbiA9PSBzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzKDApKQorICAgICAg ICByZXR1cm47CisgICAgCiAgICAgbG9jay51bmxvY2soKTsKICAgICBzdGQ6OnRoaXNfdGhyZWFk OjpzbGVlcF9mb3IoZHVyYXRpb24pOwogICAgIGxvY2subG9jaygpOwpAQCAtNTIsMjAgKzU1LDI1 IEBAIEhlYXA6OkhlYXAoc3RkOjpsb2NrX2d1YXJkPE11dGV4PiYpCiB2b2lkIEhlYXA6OmNvbmN1 cnJlbnRTY2F2ZW5nZSgpCiB7CiAgICAgc3RkOjp1bmlxdWVfbG9jazxNdXRleD4gbG9jayhQZXJQ cm9jZXNzPEhlYXA+OjptdXRleCgpKTsKLSAgICBzY2F2ZW5nZVNtYWxsUGFnZXMobG9jayk7Ci0g ICAgc2NhdmVuZ2VNZWRpdW1QYWdlcyhsb2NrKTsKLSAgICBzY2F2ZW5nZUxhcmdlUmFuZ2VzKGxv Y2spOworICAgIHNjYXZlbmdlKGxvY2ssIHNjYXZlbmdlU2xlZXBEdXJhdGlvbik7Cit9CisgICAg Cit2b2lkIEhlYXA6OnNjYXZlbmdlKHN0ZDo6dW5pcXVlX2xvY2s8TXV0ZXg+JiBsb2NrLCBzdGQ6 OmNocm9ubzo6bWlsbGlzZWNvbmRzIHNsZWVwRHVyYXRpb24pCit7CisgICAgc2NhdmVuZ2VTbWFs bFBhZ2VzKGxvY2ssIHNsZWVwRHVyYXRpb24pOworICAgIHNjYXZlbmdlTWVkaXVtUGFnZXMobG9j aywgc2xlZXBEdXJhdGlvbik7CisgICAgc2NhdmVuZ2VMYXJnZVJhbmdlcyhsb2NrLCBzbGVlcER1 cmF0aW9uKTsKIAotICAgIHNsZWVwKGxvY2ssIHNjYXZlbmdlU2xlZXBEdXJhdGlvbik7CisgICAg c2xlZXAobG9jaywgc2xlZXBEdXJhdGlvbik7CiB9CiAKLXZvaWQgSGVhcDo6c2NhdmVuZ2VTbWFs bFBhZ2VzKHN0ZDo6dW5pcXVlX2xvY2s8TXV0ZXg+JiBsb2NrKQordm9pZCBIZWFwOjpzY2F2ZW5n ZVNtYWxsUGFnZXMoc3RkOjp1bmlxdWVfbG9jazxNdXRleD4mIGxvY2ssIHN0ZDo6Y2hyb25vOjpt aWxsaXNlY29uZHMgc2xlZXBEdXJhdGlvbikKIHsKICAgICB3aGlsZSAoMSkgewogICAgICAgICBp ZiAobV9pc0FsbG9jYXRpbmdQYWdlcykgewogICAgICAgICAgICAgbV9pc0FsbG9jYXRpbmdQYWdl cyA9IGZhbHNlOwogCi0gICAgICAgICAgICBzbGVlcChsb2NrLCBzY2F2ZW5nZVNsZWVwRHVyYXRp b24pOworICAgICAgICAgICAgc2xlZXAobG9jaywgc2xlZXBEdXJhdGlvbik7CiAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgfQogCkBAIC03NSwxMyArODMsMTMgQEAgdm9pZCBIZWFwOjpz Y2F2ZW5nZVNtYWxsUGFnZXMoc3RkOjp1bmlxdQogICAgIH0KIH0KIAotdm9pZCBIZWFwOjpzY2F2 ZW5nZU1lZGl1bVBhZ2VzKHN0ZDo6dW5pcXVlX2xvY2s8TXV0ZXg+JiBsb2NrKQordm9pZCBIZWFw OjpzY2F2ZW5nZU1lZGl1bVBhZ2VzKHN0ZDo6dW5pcXVlX2xvY2s8TXV0ZXg+JiBsb2NrLCBzdGQ6 OmNocm9ubzo6bWlsbGlzZWNvbmRzIHNsZWVwRHVyYXRpb24pCiB7CiAgICAgd2hpbGUgKDEpIHsK ICAgICAgICAgaWYgKG1faXNBbGxvY2F0aW5nUGFnZXMpIHsKICAgICAgICAgICAgIG1faXNBbGxv Y2F0aW5nUGFnZXMgPSBmYWxzZTsKIAotICAgICAgICAgICAgc2xlZXAobG9jaywgc2NhdmVuZ2VT bGVlcER1cmF0aW9uKTsKKyAgICAgICAgICAgIHNsZWVwKGxvY2ssIHNsZWVwRHVyYXRpb24pOwog ICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIApAQCAtOTEsMTMgKzk5LDEzIEBAIHZv aWQgSGVhcDo6c2NhdmVuZ2VNZWRpdW1QYWdlcyhzdGQ6OnVuaXEKICAgICB9CiB9CiAKLXZvaWQg SGVhcDo6c2NhdmVuZ2VMYXJnZVJhbmdlcyhzdGQ6OnVuaXF1ZV9sb2NrPE11dGV4PiYgbG9jaykK K3ZvaWQgSGVhcDo6c2NhdmVuZ2VMYXJnZVJhbmdlcyhzdGQ6OnVuaXF1ZV9sb2NrPE11dGV4PiYg bG9jaywgc3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kcyBzbGVlcER1cmF0aW9uKQogewogICAgIHdo aWxlICgxKSB7CiAgICAgICAgIGlmIChtX2lzQWxsb2NhdGluZ1BhZ2VzKSB7CiAgICAgICAgICAg ICBtX2lzQWxsb2NhdGluZ1BhZ2VzID0gZmFsc2U7CiAKLSAgICAgICAgICAgIHNsZWVwKGxvY2ss IHNjYXZlbmdlU2xlZXBEdXJhdGlvbik7CisgICAgICAgICAgICBzbGVlcChsb2NrLCBzbGVlcER1 cmF0aW9uKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKSW5kZXg6IFNvdXJj ZS9ibWFsbG9jL2JtYWxsb2MvSGVhcC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9ibWFsbG9jL2Jt YWxsb2MvSGVhcC5oCShyZXZpc2lvbiAxNjcyODkpCisrKyBTb3VyY2UvYm1hbGxvYy9ibWFsbG9j L0hlYXAuaAkod29ya2luZyBjb3B5KQpAQCAtNjEsNiArNjEsOCBAQCBwdWJsaWM6CiAgICAgdm9p ZCogYWxsb2NhdGVYTGFyZ2Uoc3RkOjpsb2NrX2d1YXJkPE11dGV4PiYsIHNpemVfdCk7CiAgICAg dm9pZCBkZWFsbG9jYXRlWExhcmdlKHN0ZDo6bG9ja19ndWFyZDxNdXRleD4mLCB2b2lkKik7CiAK KyAgICB2b2lkIHNjYXZlbmdlKHN0ZDo6dW5pcXVlX2xvY2s8TXV0ZXg+Jiwgc3RkOjpjaHJvbm86 Om1pbGxpc2Vjb25kcyBzbGVlcER1cmF0aW9uKTsKKyAgICAKIHByaXZhdGU6CiAgICAgfkhlYXAo KSA9IGRlbGV0ZTsKIApAQCAtNzYsOSArNzgsOSBAQCBwcml2YXRlOgogICAgIHZvaWQgbWVyZ2VM YXJnZVJpZ2h0KEVuZFRhZyomLCBCZWdpblRhZyomLCBSYW5nZSYsIGJvb2wmIGhhc1BoeXNpY2Fs UGFnZXMpOwogICAgIAogICAgIHZvaWQgY29uY3VycmVudFNjYXZlbmdlKCk7Ci0gICAgdm9pZCBz Y2F2ZW5nZVNtYWxsUGFnZXMoc3RkOjp1bmlxdWVfbG9jazxNdXRleD4mKTsKLSAgICB2b2lkIHNj YXZlbmdlTWVkaXVtUGFnZXMoc3RkOjp1bmlxdWVfbG9jazxNdXRleD4mKTsKLSAgICB2b2lkIHNj YXZlbmdlTGFyZ2VSYW5nZXMoc3RkOjp1bmlxdWVfbG9jazxNdXRleD4mKTsKKyAgICB2b2lkIHNj YXZlbmdlU21hbGxQYWdlcyhzdGQ6OnVuaXF1ZV9sb2NrPE11dGV4PiYsIHN0ZDo6Y2hyb25vOjpt aWxsaXNlY29uZHMpOworICAgIHZvaWQgc2NhdmVuZ2VNZWRpdW1QYWdlcyhzdGQ6OnVuaXF1ZV9s b2NrPE11dGV4PiYsIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHMpOworICAgIHZvaWQgc2NhdmVu Z2VMYXJnZVJhbmdlcyhzdGQ6OnVuaXF1ZV9sb2NrPE11dGV4PiYsIHN0ZDo6Y2hyb25vOjptaWxs aXNlY29uZHMpOwogCiAgICAgVmVjdG9yPFNtYWxsTGluZSo+IG1fc21hbGxMaW5lczsKICAgICBW ZWN0b3I8TWVkaXVtTGluZSo+IG1fbWVkaXVtTGluZXM7CkluZGV4OiBTb3VyY2UvYm1hbGxvYy9i bWFsbG9jL2JtYWxsb2MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL2Jt YWxsb2MuaAkocmV2aXNpb24gMTY3Mjg5KQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9ibWFs bG9jLmgJKHdvcmtpbmcgY29weSkKQEAgLTI0LDcgKzI0LDkgQEAKICAqLwogCiAjaW5jbHVkZSAi Q2FjaGUuaCIKKyNpbmNsdWRlICJIZWFwLmgiCiAjaW5jbHVkZSAiTGFyZ2VDaHVuay5oIgorI2lu Y2x1ZGUgIlBlclByb2Nlc3MuaCIKICNpbmNsdWRlICJYTGFyZ2VDaHVuay5oIgogI2luY2x1ZGUg IlNpemVzLmgiCiAKQEAgLTc4LDYgKzgwLDE0IEBAIGlubGluZSB2b2lkKiByZWFsbG9jKHZvaWQq IG9iamVjdCwgc2l6ZV8KICAgICBDYWNoZTo6ZGVhbGxvY2F0ZShvYmplY3QpOwogICAgIHJldHVy biByZXN1bHQ7CiB9CisgICAgCitpbmxpbmUgdm9pZCBzY2F2ZW5nZSgpCit7CisgICAgUGVyVGhy ZWFkPENhY2hlPjo6Z2V0KCktPnNjYXZlbmdlKCk7CisgICAgCisgICAgc3RkOjp1bmlxdWVfbG9j azxNdXRleD4gbG9jayhQZXJQcm9jZXNzPEhlYXA+OjptdXRleCgpKTsKKyAgICBQZXJQcm9jZXNz PEhlYXA+OjpnZXQoKS0+c2NhdmVuZ2UobG9jaywgc3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kcygw KSk7Cit9CiAKIH0gLy8gbmFtZXNwYWNlIGFwaQogfSAvLyBuYW1lc3BhY2UgYm1hbGxvYwpJbmRl eDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9tYm1hbGxvYy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL2JtYWxsb2MvYm1hbGxvYy9tYm1hbGxvYy5jcHAJKHJldmlzaW9uIDE2NzI4OSkKKysrIFNv dXJjZS9ibWFsbG9jL2JtYWxsb2MvbWJtYWxsb2MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw3 ICszMiw4IEBAIGV4dGVybiAiQyIgewogRVhQT1JUIHZvaWQqIG1ibWFsbG9jKHNpemVfdCk7CiBF WFBPUlQgdm9pZCBtYmZyZWUodm9pZCosIHNpemVfdCk7CiBFWFBPUlQgdm9pZCogbWJyZWFsbG9j KHZvaWQqLCBzaXplX3QsIHNpemVfdCk7Ci0KK0VYUE9SVCB2b2lkIG1ic2NhdmVuZ2UoKTsKKyAg ICAKIHZvaWQqIG1ibWFsbG9jKHNpemVfdCBzaXplKQogewogICAgIHJldHVybiBibWFsbG9jOjph cGk6Om1hbGxvYyhzaXplKTsKQEAgLTQ4LDQgKzQ5LDkgQEAgdm9pZCogbWJyZWFsbG9jKHZvaWQq IHAsIHNpemVfdCwgc2l6ZV90IAogICAgIHJldHVybiBibWFsbG9jOjphcGk6OnJlYWxsb2MocCwg c2l6ZSk7CiB9CiAKK3ZvaWQgbWJzY2F2ZW5nZSgpCit7CisgICAgYm1hbGxvYzo6YXBpOjpzY2F2 ZW5nZSgpOworfQorCiB9IC8vIGV4dGVybiAiQyIK