86790 2012-05-17 17:34:03 -0700 Refactored the Heap to move more MarkedSpace logic into MarkedSpace 2012-05-17 17:39:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oldest_to_newest 627148 0 ggaren 2012-05-17 17:34:03 -0700 Refactored the Heap to move more MarkedSpace logic into MarkedSpace 627152 1 142594 ggaren 2012-05-17 17:38:36 -0700 Created attachment 142594 Patch 627154 2 142594 ggaren 2012-05-17 17:39:18 -0700 Comment on attachment 142594 Patch Gavin reviewed this. 627155 3 ggaren 2012-05-17 17:39:36 -0700 Committed r117517: <http://trac.webkit.org/changeset/117517> 142594 2012-05-17 17:38:36 -0700 2012-05-17 17:39:18 -0700 Patch bug-86790-20120517173834.patch text/plain 10778 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTE3NTE2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBA CisyMDEyLTA1LTE3ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgUmVmYWN0b3JlZCB0aGUgSGVhcCB0byBtb3ZlIG1vcmUgTWFya2VkU3BhY2UgbG9naWMgaW50 byBNYXJrZWRTcGFjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODY3OTAKKworICAgICAgICBSZXZpZXdlZCBieSBHYXZpbiBCYXJyYWNsb3VnaC4KKwor ICAgICAgICAqIGhlYXAvSGVhcC5jcHA6CisgICAgICAgIChKU0M6OkhlYXA6Omxhc3RDaGFuY2VU b0ZpbmFsaXplKToKKyAgICAgICAgKEpTQzo6SGVhcDo6bWFya1Jvb3RzKToKKyAgICAgICAgKEpT Qyk6CisgICAgICAgIChKU0M6OkhlYXA6Om9iamVjdENvdW50KToKKyAgICAgICAgKEpTQzo6SGVh cDo6c2l6ZSk6CisgICAgICAgIChKU0M6OkhlYXA6OmNhcGFjaXR5KToKKyAgICAgICAgKEpTQzo6 SGVhcDo6Y29sbGVjdCk6CisgICAgICAgICogaGVhcC9IZWFwLmg6CisgICAgICAgIChIZWFwKTog VG9vayBhbGwgdGhlIGZ1bmN0b3JzIGZyb20gaGVyZS4uLgorCisgICAgICAgICogaGVhcC9NYXJr ZWRCbG9jay5oOgorICAgICAgICAoQ291bnRGdW5jdG9yKToKKyAgICAgICAgKEpTQzo6TWFya2Vk QmxvY2s6OkNvdW50RnVuY3Rvcjo6Q291bnRGdW5jdG9yKToKKyAgICAgICAgKEpTQzo6TWFya2Vk QmxvY2s6OkNvdW50RnVuY3Rvcjo6Y291bnQpOgorICAgICAgICAoSlNDOjpNYXJrZWRCbG9jazo6 Q291bnRGdW5jdG9yOjpyZXR1cm5WYWx1ZSk6CisgICAgICAgIChNYXJrZWRCbG9jayk6CisgICAg ICAgICogaGVhcC9NYXJrZWRTcGFjZS5oOgorICAgICAgICAoSlNDOjpDbGVhck1hcmtzOjpvcGVy YXRvcigpKToKKyAgICAgICAgKEpTQyk6CisgICAgICAgIChKU0M6OlN3ZWVwOjpvcGVyYXRvcigp KToKKyAgICAgICAgKEpTQzo6TWFya0NvdW50OjpvcGVyYXRvcigpKToKKyAgICAgICAgKEpTQzo6 U2l6ZTo6b3BlcmF0b3IoKSk6CisgICAgICAgIChKU0M6OkNhcGFjaXR5OjpvcGVyYXRvcigpKToK KyAgICAgICAgKE1hcmtlZFNwYWNlKToKKyAgICAgICAgKEpTQzo6TWFya2VkU3BhY2U6OmNsZWFy TWFya3MpOgorICAgICAgICAoSlNDOjpNYXJrZWRTcGFjZTo6c3dlZXApOgorICAgICAgICAoSlND OjpNYXJrZWRTcGFjZTo6b2JqZWN0Q291bnQpOgorICAgICAgICAoSlNDOjpNYXJrZWRTcGFjZTo6 c2l6ZSk6CisgICAgICAgIChKU0M6Ok1hcmtlZFNwYWNlOjpjYXBhY2l0eSk6IGFuZCBwdXQgdGhl bSBoZXJlLgorCiAyMDEyLTA1LTE3ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+ CiAKICAgICAgICAgSW5jcmVhc2UgdGhlIEdDIGFsbG9jYXRpb24gdHJpZ2dlcgpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAJKHJldmlzaW9uIDExNzQ5NikKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzgsMTAwICsx NzgsMjAgQEAgc3RhdGljIGlubGluZSBib29sIGlzVmFsaWRUaHJlYWRTdGF0ZShKUwogICAgIHJl dHVybiB0cnVlOwogfQogCi1jbGFzcyBDb3VudEZ1bmN0b3IgewotcHVibGljOgotICAgIHR5cGVk ZWYgc2l6ZV90IFJldHVyblR5cGU7Ci0KLSAgICBDb3VudEZ1bmN0b3IoKTsKLSAgICB2b2lkIGNv dW50KHNpemVfdCk7Ci0gICAgUmV0dXJuVHlwZSByZXR1cm5WYWx1ZSgpOwotCi1wcml2YXRlOgot ICAgIFJldHVyblR5cGUgbV9jb3VudDsKLX07Ci0KLWlubGluZSBDb3VudEZ1bmN0b3I6OkNvdW50 RnVuY3RvcigpCi0gICAgOiBtX2NvdW50KDApCi17Ci19Ci0KLWlubGluZSB2b2lkIENvdW50RnVu Y3Rvcjo6Y291bnQoc2l6ZV90IGNvdW50KQotewotICAgIG1fY291bnQgKz0gY291bnQ7Ci19Ci0K LWlubGluZSBDb3VudEZ1bmN0b3I6OlJldHVyblR5cGUgQ291bnRGdW5jdG9yOjpyZXR1cm5WYWx1 ZSgpCi17Ci0gICAgcmV0dXJuIG1fY291bnQ7Ci19Ci0KLXN0cnVjdCBDbGVhck1hcmtzIDogTWFy a2VkQmxvY2s6OlZvaWRGdW5jdG9yIHsKLSAgICB2b2lkIG9wZXJhdG9yKCkoTWFya2VkQmxvY2sq KTsKLX07Ci0KLWlubGluZSB2b2lkIENsZWFyTWFya3M6Om9wZXJhdG9yKCkoTWFya2VkQmxvY2sq IGJsb2NrKQotewotICAgIGJsb2NrLT5jbGVhck1hcmtzKCk7Ci19Ci0KLXN0cnVjdCBTd2VlcCA6 IE1hcmtlZEJsb2NrOjpWb2lkRnVuY3RvciB7Ci0gICAgdm9pZCBvcGVyYXRvcigpKE1hcmtlZEJs b2NrKik7Ci19OwotCi1pbmxpbmUgdm9pZCBTd2VlcDo6b3BlcmF0b3IoKShNYXJrZWRCbG9jayog YmxvY2spCi17Ci0gICAgYmxvY2stPnN3ZWVwKCk7Ci19Ci0KLXN0cnVjdCBNYXJrQ291bnQgOiBD b3VudEZ1bmN0b3IgewotICAgIHZvaWQgb3BlcmF0b3IoKShNYXJrZWRCbG9jayopOwotfTsKLQot aW5saW5lIHZvaWQgTWFya0NvdW50OjpvcGVyYXRvcigpKE1hcmtlZEJsb2NrKiBibG9jaykKLXsK LSAgICBjb3VudChibG9jay0+bWFya0NvdW50KCkpOwotfQotCi1zdHJ1Y3QgU2l6ZSA6IENvdW50 RnVuY3RvciB7Ci0gICAgdm9pZCBvcGVyYXRvcigpKE1hcmtlZEJsb2NrKik7Ci19OwotCi1pbmxp bmUgdm9pZCBTaXplOjpvcGVyYXRvcigpKE1hcmtlZEJsb2NrKiBibG9jaykKLXsKLSAgICBjb3Vu dChibG9jay0+bWFya0NvdW50KCkgKiBibG9jay0+Y2VsbFNpemUoKSk7Ci19Ci0KLXN0cnVjdCBD YXBhY2l0eSA6IENvdW50RnVuY3RvciB7Ci0gICAgdm9pZCBvcGVyYXRvcigpKE1hcmtlZEJsb2Nr Kik7Ci19OwotCi1pbmxpbmUgdm9pZCBDYXBhY2l0eTo6b3BlcmF0b3IoKShNYXJrZWRCbG9jayog YmxvY2spCi17Ci0gICAgY291bnQoYmxvY2stPmNhcGFjaXR5KCkpOwotfQotCi1zdHJ1Y3QgQ291 bnQgOiBwdWJsaWMgQ291bnRGdW5jdG9yIHsKLSAgICB2b2lkIG9wZXJhdG9yKCkoSlNDZWxsKik7 CitzdHJ1Y3QgQ291bnQgOiBwdWJsaWMgTWFya2VkQmxvY2s6OkNvdW50RnVuY3RvciB7CisgICAg dm9pZCBvcGVyYXRvcigpKEpTQ2VsbCopIHsgY291bnQoMSk7IH0KIH07CiAKLWlubGluZSB2b2lk IENvdW50OjpvcGVyYXRvcigpKEpTQ2VsbCopCi17Ci0gICAgY291bnQoMSk7Ci19Ci0KLXN0cnVj dCBDb3VudElmR2xvYmFsT2JqZWN0IDogQ291bnRGdW5jdG9yIHsKLSAgICB2b2lkIG9wZXJhdG9y KCkoSlNDZWxsKik7CitzdHJ1Y3QgQ291bnRJZkdsb2JhbE9iamVjdCA6IE1hcmtlZEJsb2NrOjpD b3VudEZ1bmN0b3IgeworICAgIHZvaWQgb3BlcmF0b3IoKShKU0NlbGwqIGNlbGwpIHsKKyAgICAg ICAgaWYgKCFjZWxsLT5pc09iamVjdCgpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBp ZiAoIWFzT2JqZWN0KGNlbGwpLT5pc0dsb2JhbE9iamVjdCgpKQorICAgICAgICAgICAgcmV0dXJu OworICAgICAgICBjb3VudCgxKTsKKyAgICB9CiB9OwogCi1pbmxpbmUgdm9pZCBDb3VudElmR2xv YmFsT2JqZWN0OjpvcGVyYXRvcigpKEpTQ2VsbCogY2VsbCkKLXsKLSAgICBpZiAoIWNlbGwtPmlz T2JqZWN0KCkpCi0gICAgICAgIHJldHVybjsKLSAgICBpZiAoIWFzT2JqZWN0KGNlbGwpLT5pc0ds b2JhbE9iamVjdCgpKQotICAgICAgICByZXR1cm47Ci0gICAgY291bnQoMSk7Ci19Ci0KIGNsYXNz IFJlY29yZFR5cGUgewogcHVibGljOgogICAgIHR5cGVkZWYgUGFzc093blB0cjxUeXBlQ291bnRT ZXQ+IFJldHVyblR5cGU7CkBAIC0zNjMsOSArMjgzLDkgQEAgdm9pZCBIZWFwOjpsYXN0Q2hhbmNl VG9GaW5hbGl6ZSgpCiAgICAgICAgIFdURkxvZ0Fsd2F5cygiRVJST1I6IEphdmFTY3JpcHRDb3Jl IGhlYXAgZGVhbGxvY2F0ZWQgd2hpbGUgJWxkIHZhbHVlcyB3ZXJlIHN0aWxsIHByb3RlY3RlZCIs IHN0YXRpY19jYXN0PHVuc2lnbmVkIGxvbmc+KHNpemUpKTsKIAogICAgIG1fd2Vha1NldC5maW5h bGl6ZUFsbCgpOwotICAgIGNhbm9uaWNhbGl6ZUNlbGxMaXZlbmVzc0RhdGEoKTsKLSAgICBjbGVh ck1hcmtzKCk7Ci0gICAgc3dlZXAoKTsKKyAgICBtX29iamVjdFNwYWNlLmNhbm9uaWNhbGl6ZUNl bGxMaXZlbmVzc0RhdGEoKTsKKyAgICBtX29iamVjdFNwYWNlLmNsZWFyTWFya3MoKTsKKyAgICBt X29iamVjdFNwYWNlLnN3ZWVwKCk7CiAgICAgbV9nbG9iYWxEYXRhLT5zbWFsbFN0cmluZ3MuZmlu YWxpemVTbWFsbFN0cmluZ3MoKTsKIAogI2lmIEVOQUJMRShTSU1QTEVfSEVBUF9QUk9GSUxJTkcp CkBAIC01NDAsNyArNDYwLDcgQEAgdm9pZCBIZWFwOjptYXJrUm9vdHMoYm9vbCBmdWxsR0MpCiAj ZW5kaWYKICAgICB7CiAgICAgICAgIEdDUEhBU0UoY2xlYXJNYXJrcyk7Ci0gICAgICAgIGNsZWFy TWFya3MoKTsKKyAgICAgICAgbV9vYmplY3RTcGFjZS5jbGVhck1hcmtzKCk7CiAgICAgfQogCiAg ICAgbV9zdG9yYWdlU3BhY2Uuc3RhcnRlZENvcHlpbmcoKTsKQEAgLTY2MSwyOSArNTgxLDE5IEBA IHZvaWQgSGVhcDo6bWFya1Jvb3RzKGJvb2wgZnVsbEdDKQogICAgIG1fb3BlcmF0aW9uSW5Qcm9n cmVzcyA9IE5vT3BlcmF0aW9uOwogfQogCi12b2lkIEhlYXA6OmNsZWFyTWFya3MoKQotewotICAg IG1fb2JqZWN0U3BhY2UuZm9yRWFjaEJsb2NrPENsZWFyTWFya3M+KCk7Ci19Ci0KLXZvaWQgSGVh cDo6c3dlZXAoKQotewotICAgIG1fb2JqZWN0U3BhY2UuZm9yRWFjaEJsb2NrPFN3ZWVwPigpOwot fQotCiBzaXplX3QgSGVhcDo6b2JqZWN0Q291bnQoKQogewotICAgIHJldHVybiBtX29iamVjdFNw YWNlLmZvckVhY2hCbG9jazxNYXJrQ291bnQ+KCk7CisgICAgcmV0dXJuIG1fb2JqZWN0U3BhY2Uu b2JqZWN0Q291bnQoKTsKIH0KIAogc2l6ZV90IEhlYXA6OnNpemUoKQogewotICAgIHJldHVybiBt X29iamVjdFNwYWNlLmZvckVhY2hCbG9jazxTaXplPigpICsgbV9zdG9yYWdlU3BhY2Uuc2l6ZSgp OworICAgIHJldHVybiBtX29iamVjdFNwYWNlLnNpemUoKSArIG1fc3RvcmFnZVNwYWNlLnNpemUo KTsKIH0KIAogc2l6ZV90IEhlYXA6OmNhcGFjaXR5KCkKIHsKLSAgICByZXR1cm4gbV9vYmplY3RT cGFjZS5mb3JFYWNoQmxvY2s8Q2FwYWNpdHk+KCkgKyBtX3N0b3JhZ2VTcGFjZS5jYXBhY2l0eSgp OworICAgIHJldHVybiBtX29iamVjdFNwYWNlLmNhcGFjaXR5KCkgKyBtX3N0b3JhZ2VTcGFjZS5j YXBhY2l0eSgpOwogfQogCiBzaXplX3QgSGVhcDo6cHJvdGVjdGVkR2xvYmFsT2JqZWN0Q291bnQo KQpAQCAtNzU4LDcgKzY2OCw3IEBAIHZvaWQgSGVhcDo6Y29sbGVjdChTd2VlcFRvZ2dsZSBzd2Vl cFRvZ2cKICNlbmRpZgogICAgIHsKICAgICAgICAgR0NQSEFTRShDYW5vbmljYWxpemUpOwotICAg ICAgICBjYW5vbmljYWxpemVDZWxsTGl2ZW5lc3NEYXRhKCk7CisgICAgICAgIG1fb2JqZWN0U3Bh Y2UuY2Fub25pY2FsaXplQ2VsbExpdmVuZXNzRGF0YSgpOwogICAgIH0KIAogICAgIG1hcmtSb290 cyhmdWxsR0MpOwpAQCAtNzc3LDggKzY4Nyw5IEBAIHZvaWQgSGVhcDo6Y29sbGVjdChTd2VlcFRv Z2dsZSBzd2VlcFRvZ2cKICAgICBKQVZBU0NSSVBUQ09SRV9HQ19NQVJLRUQoKTsKIAogICAgIHsK LSAgICAgICAgR0NQSEFTRShSZXNldEFsbG9jYXRvcik7Ci0gICAgICAgIHJlc2V0QWxsb2NhdG9y cygpOworICAgICAgICBHQ1BIQVNFKFJlc2V0QWxsb2NhdG9ycyk7CisgICAgICAgIG1fb2JqZWN0 U3BhY2UucmVzZXRBbGxvY2F0b3JzKCk7CisgICAgICAgIG1fd2Vha1NldC5yZXNldEFsbG9jYXRv cigpOwogICAgIH0KICAgICAKICAgICB7CkBAIC03ODksNyArNzAwLDcgQEAgdm9pZCBIZWFwOjpj b2xsZWN0KFN3ZWVwVG9nZ2xlIHN3ZWVwVG9nZwogICAgIGlmIChzd2VlcFRvZ2dsZSA9PSBEb1N3 ZWVwKSB7CiAgICAgICAgIFNhbXBsaW5nUmVnaW9uIHNhbXBsaW5nUmVnaW9uKCJHYXJiYWdlIENv bGxlY3Rpb246IFN3ZWVwaW5nIik7CiAgICAgICAgIEdDUEhBU0UoU3dlZXBpbmcpOwotICAgICAg ICBzd2VlcCgpOworICAgICAgICBtX29iamVjdFNwYWNlLnN3ZWVwKCk7CiAgICAgICAgIG1fb2Jq ZWN0U3BhY2Uuc2hyaW5rKCk7CiAgICAgICAgIG1fd2Vha1NldC5zaHJpbmsoKTsKICAgICAgICAg bV9ieXRlc0FiYW5kb25lZCA9IDA7CkBAIC04MTAsMTcgKzcyMSw2IEBAIHZvaWQgSGVhcDo6Y29s bGVjdChTd2VlcFRvZ2dsZSBzd2VlcFRvZ2cKICAgICBKQVZBU0NSSVBUQ09SRV9HQ19FTkQoKTsK IH0KIAotdm9pZCBIZWFwOjpjYW5vbmljYWxpemVDZWxsTGl2ZW5lc3NEYXRhKCkKLXsKLSAgICBt X29iamVjdFNwYWNlLmNhbm9uaWNhbGl6ZUNlbGxMaXZlbmVzc0RhdGEoKTsKLX0KLQotdm9pZCBI ZWFwOjpyZXNldEFsbG9jYXRvcnMoKQotewotICAgIG1fb2JqZWN0U3BhY2UucmVzZXRBbGxvY2F0 b3JzKCk7Ci0gICAgbV93ZWFrU2V0LnJlc2V0QWxsb2NhdG9yKCk7Ci19Ci0KIHZvaWQgSGVhcDo6 c2V0QWN0aXZpdHlDYWxsYmFjayhQYXNzT3duUHRyPEdDQWN0aXZpdHlDYWxsYmFjaz4gYWN0aXZp dHlDYWxsYmFjaykKIHsKICAgICBtX2FjdGl2aXR5Q2FsbGJhY2sgPSBhY3Rpdml0eUNhbGxiYWNr OwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaAkocmV2aXNpb24gMTE3NDk1KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODgs MjIgKzE4OCwxMiBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUg Ym9vbCBpc1ZhbGlkQWxsb2NhdGlvbihzaXplX3QpOwogICAgICAgICBKU19FWFBPUlRfUFJJVkFU RSB2b2lkIHJlcG9ydEV4dHJhTWVtb3J5Q29zdFNsb3dDYXNlKHNpemVfdCk7CiAKLSAgICAgICAg Ly8gQ2FsbCB0aGlzIGZ1bmN0aW9uIGJlZm9yZSBhbnkgb3BlcmF0aW9uIHRoYXQgbmVlZHMgdG8g a25vdyB3aGljaCBjZWxscwotICAgICAgICAvLyBpbiB0aGUgaGVhcCBhcmUgbGl2ZS4gKEZvciBl eGFtcGxlLCBjYWxsIHRoaXMgZnVuY3Rpb24gYmVmb3JlCi0gICAgICAgIC8vIGNvbnNlcnZhdGl2 ZSBtYXJraW5nLCBlYWdlciBzd2VlcGluZywgb3IgaXRlcmF0aW5nIHRoZSBjZWxscyBpbiBhIE1h cmtlZEJsb2NrLikKLSAgICAgICAgdm9pZCBjYW5vbmljYWxpemVDZWxsTGl2ZW5lc3NEYXRhKCk7 Ci0KLSAgICAgICAgdm9pZCByZXNldEFsbG9jYXRvcnMoKTsKLQotICAgICAgICB2b2lkIGNsZWFy TWFya3MoKTsKICAgICAgICAgdm9pZCBtYXJrUm9vdHMoYm9vbCBmdWxsR0MpOwogICAgICAgICB2 b2lkIG1hcmtQcm90ZWN0ZWRPYmplY3RzKEhlYXBSb290VmlzaXRvciYpOwogICAgICAgICB2b2lk IG1hcmtUZW1wU29ydFZlY3RvcnMoSGVhcFJvb3RWaXNpdG9yJik7CiAgICAgICAgIHZvaWQgaGFy dmVzdFdlYWtSZWZlcmVuY2VzKCk7CiAgICAgICAgIHZvaWQgZmluYWxpemVVbmNvbmRpdGlvbmFs RmluYWxpemVycygpOwogICAgICAgICAKLSAgICAgICAgdm9pZCBzd2VlcCgpOwotCiAgICAgICAg IFJlZ2lzdGVyRmlsZSYgcmVnaXN0ZXJGaWxlKCk7CiAgICAgICAgIEJsb2NrQWxsb2NhdG9yJiBi bG9ja0FsbG9jYXRvcigpOwogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJr ZWRCbG9jay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtl ZEJsb2NrLmgJKHJldmlzaW9uIDExNzQ5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L01hcmtlZEJsb2NrLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMCw2ICsxMDAsMTggQEAgbmFtZXNw YWNlIEpTQyB7CiAgICAgICAgICAgICB2b2lkIHJldHVyblZhbHVlKCkgeyB9CiAgICAgICAgIH07 CiAKKyAgICAgICAgY2xhc3MgQ291bnRGdW5jdG9yIHsKKyAgICAgICAgcHVibGljOgorICAgICAg ICAgICAgdHlwZWRlZiBzaXplX3QgUmV0dXJuVHlwZTsKKworICAgICAgICAgICAgQ291bnRGdW5j dG9yKCkgOiBtX2NvdW50KDApIHsgfQorICAgICAgICAgICAgdm9pZCBjb3VudChzaXplX3QgY291 bnQpIHsgbV9jb3VudCArPSBjb3VudDsgfQorICAgICAgICAgICAgUmV0dXJuVHlwZSByZXR1cm5W YWx1ZSgpIHsgcmV0dXJuIG1fY291bnQ7IH0KKworICAgICAgICBwcml2YXRlOgorICAgICAgICAg ICAgUmV0dXJuVHlwZSBtX2NvdW50OworICAgICAgICB9OworCiAgICAgICAgIHN0YXRpYyBNYXJr ZWRCbG9jayogY3JlYXRlKEhlYXAqLCBzaXplX3QgY2VsbFNpemUsIGJvb2wgY2VsbHNOZWVkRGVz dHJ1Y3Rpb24pOwogICAgICAgICBzdGF0aWMgTWFya2VkQmxvY2sqIHJlY3ljbGUoTWFya2VkQmxv Y2sqLCBIZWFwKiwgc2l6ZV90IGNlbGxTaXplLCBib29sIGNlbGxzTmVlZERlc3RydWN0aW9uKTsK ICAgICAgICAgc3RhdGljIHZvaWQgZGVzdHJveShNYXJrZWRCbG9jayopOwpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkU3BhY2UuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRTcGFjZS5oCShyZXZpc2lvbiAxMTc0OTUpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRTcGFjZS5oCSh3b3JraW5nIGNvcHkpCkBA IC00NSw2ICs0NSwyNiBAQCBjbGFzcyBMTEludE9mZnNldHNFeHRyYWN0b3I7CiBjbGFzcyBXZWFr R0NIYW5kbGU7CiBjbGFzcyBTbG90VmlzaXRvcjsKIAorc3RydWN0IENsZWFyTWFya3MgOiBNYXJr ZWRCbG9jazo6Vm9pZEZ1bmN0b3IgeworICAgIHZvaWQgb3BlcmF0b3IoKShNYXJrZWRCbG9jayog YmxvY2spIHsgYmxvY2stPmNsZWFyTWFya3MoKTsgfQorfTsKKworc3RydWN0IFN3ZWVwIDogTWFy a2VkQmxvY2s6OlZvaWRGdW5jdG9yIHsKKyAgICB2b2lkIG9wZXJhdG9yKCkoTWFya2VkQmxvY2sq IGJsb2NrKSB7IGJsb2NrLT5zd2VlcCgpOyB9Cit9OworCitzdHJ1Y3QgTWFya0NvdW50IDogTWFy a2VkQmxvY2s6OkNvdW50RnVuY3RvciB7CisgICAgdm9pZCBvcGVyYXRvcigpKE1hcmtlZEJsb2Nr KiBibG9jaykgeyBjb3VudChibG9jay0+bWFya0NvdW50KCkpOyB9Cit9OworCitzdHJ1Y3QgU2l6 ZSA6IE1hcmtlZEJsb2NrOjpDb3VudEZ1bmN0b3IgeworICAgIHZvaWQgb3BlcmF0b3IoKShNYXJr ZWRCbG9jayogYmxvY2spIHsgY291bnQoYmxvY2stPm1hcmtDb3VudCgpICogYmxvY2stPmNlbGxT aXplKCkpOyB9Cit9OworCitzdHJ1Y3QgQ2FwYWNpdHkgOiBNYXJrZWRCbG9jazo6Q291bnRGdW5j dG9yIHsKKyAgICB2b2lkIG9wZXJhdG9yKCkoTWFya2VkQmxvY2sqIGJsb2NrKSB7IGNvdW50KGJs b2NrLT5jYXBhY2l0eSgpKTsgfQorfTsKKwogY2xhc3MgTWFya2VkU3BhY2UgewogICAgIFdURl9N QUtFX05PTkNPUFlBQkxFKE1hcmtlZFNwYWNlKTsKIHB1YmxpYzoKQEAgLTczLDExICs5MywxOCBA QCBwdWJsaWM6CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgRnVuY3Rvcj4gdHlwZW5hbWUgRnVuY3Rv cjo6UmV0dXJuVHlwZSBmb3JFYWNoQmxvY2soKTsKICAgICAKICAgICB2b2lkIHNocmluaygpOwor ICAgIHZvaWQgZnJlZUFsbEJsb2NrcygpOwogICAgIHZvaWQgZnJlZUJsb2NrcyhNYXJrZWRCbG9j ayogaGVhZCk7CiAKICAgICB2b2lkIGRpZEFkZEJsb2NrKE1hcmtlZEJsb2NrKik7CiAgICAgdm9p ZCBkaWRDb25zdW1lRnJlZUxpc3QoTWFya2VkQmxvY2sqKTsKIAorICAgIHZvaWQgY2xlYXJNYXJr cygpOworICAgIHZvaWQgc3dlZXAoKTsKKyAgICBzaXplX3Qgb2JqZWN0Q291bnQoKTsKKyAgICBz aXplX3Qgc2l6ZSgpOworICAgIHNpemVfdCBjYXBhY2l0eSgpOworCiAgICAgYm9vbCBpc1BhZ2Vk T3V0KGRvdWJsZSBkZWFkbGluZSk7CiAKIHByaXZhdGU6CkBAIC0xODUsNiArMjEyLDMxIEBAIGlu bGluZSB2b2lkIE1hcmtlZFNwYWNlOjpkaWRBZGRCbG9jayhNYXIKICAgICBtX2Jsb2Nrcy5hZGQo YmxvY2spOwogfQogCitpbmxpbmUgdm9pZCBNYXJrZWRTcGFjZTo6Y2xlYXJNYXJrcygpCit7Cisg ICAgZm9yRWFjaEJsb2NrPENsZWFyTWFya3M+KCk7Cit9CisKK2lubGluZSB2b2lkIE1hcmtlZFNw YWNlOjpzd2VlcCgpCit7CisgICAgZm9yRWFjaEJsb2NrPFN3ZWVwPigpOworfQorCitpbmxpbmUg c2l6ZV90IE1hcmtlZFNwYWNlOjpvYmplY3RDb3VudCgpCit7CisgICAgcmV0dXJuIGZvckVhY2hC bG9jazxNYXJrQ291bnQ+KCk7Cit9CisKK2lubGluZSBzaXplX3QgTWFya2VkU3BhY2U6OnNpemUo KQoreworICAgIHJldHVybiBmb3JFYWNoQmxvY2s8U2l6ZT4oKTsKK30KKworaW5saW5lIHNpemVf dCBNYXJrZWRTcGFjZTo6Y2FwYWNpdHkoKQoreworICAgIHJldHVybiBmb3JFYWNoQmxvY2s8Q2Fw YWNpdHk+KCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIEpTQwogCiAjZW5kaWYgLy8gTWFya2VkU3Bh Y2VfaAo=