99222 2012-10-12 17:30:35 -0700 Make CopiedSpace and MarkedSpace regions independent 2012-10-15 10:47:50 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhahnenberg mhahnenberg webkit.review.bot oldest_to_newest 741343 0 mhahnenberg 2012-10-12 17:30:35 -0700 Right now CopiedSpace and MarkedSpace have the same block size and share the same regions, but there's no reason that they can't have different block sizes while still sharing the same underlying regions. We should factor the two "used" lists of regions apart so that MarkedBlocks and CopiedBlocks can be different sizes. Regions will still be a uniform size so that when they become empty they may be shared between the CopiedSpace and the MarkedSpace, since benchmarks indicate that sharing is a boon for performance. 741524 1 168566 mhahnenberg 2012-10-13 14:19:27 -0700 Created attachment 168566 Patch 742173 2 168566 webkit.review.bot 2012-10-15 10:47:48 -0700 Comment on attachment 168566 Patch Clearing flags on attachment: 168566 Committed r131321: <http://trac.webkit.org/changeset/131321> 742174 3 webkit.review.bot 2012-10-15 10:47:50 -0700 All reviewed patches have been landed. Closing bug. 168566 2012-10-13 14:19:27 -0700 2012-10-15 10:47:47 -0700 Patch bug-99222-20121013141821.patch text/plain 15519 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTMxMjYyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUzIEBA CisyMDEyLTEwLTEzICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgTWFrZSBDb3BpZWRTcGFjZSBhbmQgTWFya2VkU3BhY2UgcmVnaW9ucyBpbmRlcGVu ZGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTky MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSaWdo dCBub3cgQ29waWVkU3BhY2UgYW5kIE1hcmtlZFNwYWNlIGhhdmUgdGhlIHNhbWUgYmxvY2sgc2l6 ZSBhbmQgc2hhcmUgdGhlIHNhbWUgcmVnaW9ucywgCisgICAgICAgIGJ1dCB0aGVyZSdzIG5vIHJl YXNvbiB0aGF0IHRoZXkgY2FuJ3QgaGF2ZSBkaWZmZXJlbnQgYmxvY2sgc2l6ZXMgd2hpbGUgc3Rp bGwgc2hhcmluZyB0aGUgCisgICAgICAgIHNhbWUgdW5kZXJseWluZyByZWdpb25zLiBXZSBzaG91 bGQgZmFjdG9yIHRoZSB0d28gInVzZWQiIGxpc3RzIG9mIHJlZ2lvbnMgYXBhcnQgc28gdGhhdCAK KyAgICAgICAgTWFya2VkQmxvY2tzIGFuZCBDb3BpZWRCbG9ja3MgY2FuIGJlIGRpZmZlcmVudCBz aXplcy4gUmVnaW9ucyB3aWxsIHN0aWxsIGJlIGEgdW5pZm9ybSBzaXplIAorICAgICAgICBzbyB0 aGF0IHdoZW4gdGhleSBiZWNvbWUgZW1wdHkgdGhleSBtYXkgYmUgc2hhcmVkIGJldHdlZW4gdGhl IENvcGllZFNwYWNlIGFuZCB0aGUgTWFya2VkU3BhY2UsIAorICAgICAgICBzaW5jZSBiZW5jaG1h cmtzIGluZGljYXRlIHRoYXQgc2hhcmluZyBpcyBhIGJvb24gZm9yIHBlcmZvcm1hbmNlLgorCisg ICAgICAgICogaGVhcC9CbG9ja0FsbG9jYXRvci5jcHA6CisgICAgICAgIChKU0M6OkJsb2NrQWxs b2NhdG9yOjpCbG9ja0FsbG9jYXRvcik6CisgICAgICAgICogaGVhcC9CbG9ja0FsbG9jYXRvci5o OgorICAgICAgICAoSlNDKToKKyAgICAgICAgKFJlZ2lvbik6CisgICAgICAgIChKU0M6OlJlZ2lv bjo6Y3JlYXRlKTogV2Ugbm93IGhhdmUgYSBmaXhlZCBzaXplIGZvciBSZWdpb25zIHNvIHRoYXQg ZW1wdHkgcmVnaW9ucyBjYW4gY29udGludWUgdG8gCisgICAgICAgIGJlIHNoYXJlZCBiZXR3ZWVu IHRoZSBNYXJrZWRTcGFjZSBhbmQgQ29waWVkU3BhY2UuIE9uY2UgdGhleSBhcmUgdXNlZCBmb3Ig YSBzcGVjaWZpYyB0eXBlIG9mIGJsb2NrLAorICAgICAgICBob3dldmVyLCB0aGV5IGNhbiBvbmx5 IGJlIHVzZWQgZm9yIHRoYXQgdHlwZSBvZiBibG9jayB1bnRpbCB0aGV5IGJlY29tZSBlbXB0eSBh Z2Fpbi4KKyAgICAgICAgKEpTQzo6UmVnaW9uOjpjcmVhdGVDdXN0b21TaXplKToKKyAgICAgICAg KEpTQzo6UmVnaW9uOjpSZWdpb24pOgorICAgICAgICAoSlNDOjpSZWdpb246On5SZWdpb24pOgor ICAgICAgICAoSlNDOjpSZWdpb246OnJlc2V0KToKKyAgICAgICAgKEJsb2NrQWxsb2NhdG9yKToK KyAgICAgICAgKEpTQzo6QmxvY2tBbGxvY2F0b3I6OlJlZ2lvblNldDo6UmVnaW9uU2V0KToKKyAg ICAgICAgKFJlZ2lvblNldCk6CisgICAgICAgIChKU0M6OkJsb2NrQWxsb2NhdG9yOjp0cnlBbGxv Y2F0ZUZyb21SZWdpb24pOiBXZSBjaGFuZ2UgdGhpcyBmdW5jdGlvbiBzbyB0aGF0IGl0IGNvcnJl Y3RseSAKKyAgICAgICAgbW92ZXMgYmxvY2tzIGJldHdlZW4gZW1wdHksIHBhcnRpYWwsIGFuZCBm dWxsIGxpc3RzLgorICAgICAgICAoSlNDOjpCbG9ja0FsbG9jYXRvcjo6YWxsb2NhdGUpOgorICAg ICAgICAoSlNDOjpCbG9ja0FsbG9jYXRvcjo6YWxsb2NhdGVDdXN0b21TaXplKToKKyAgICAgICAg KEpTQzo6QmxvY2tBbGxvY2F0b3I6OmRlYWxsb2NhdGUpOiBEaXR0by4KKyAgICAgICAgKEpTQzo6 Q29waWVkQmxvY2spOgorICAgICAgICAoSlNDOjpNYXJrZWRCbG9jayk6CisgICAgICAgIChKU0M6 OkJsb2NrQWxsb2NhdG9yOjpyZWdpb25TZXRGb3IpOiBXZSB1c2UgdGhpcyBzbyB0aGF0IHdlIGNh biB1c2UgdGhlIHNhbWUgYWxsb2NhdGUvZGVhbGxvY2F0ZQorICAgICAgICBmdW5jdGlvbnMgd2l0 aCBkaWZmZXJlbnQgUmVnaW9uU2V0cy4gV2Ugc3BlY2lhbGl6ZSB0aGUgZnVuY3Rpb24gZm9yIGVh Y2ggdHlwZSBvZiBibG9jayB0aGF0IHdlIAorICAgICAgICB3YW50IHRvIGFsbG9jYXRlLgorICAg ICAgICAqIGhlYXAvQ29waWVkQmxvY2suaDoKKyAgICAgICAgKENvcGllZEJsb2NrKToKKyAgICAg ICAgKiBoZWFwL0NvcGllZFNwYWNlLmg6CisgICAgICAgIChDb3BpZWRTcGFjZSk6CisgICAgICAg ICogaGVhcC9IZWFwQmxvY2suaDoKKyAgICAgICAgKEhlYXBCbG9jayk6CisgICAgICAgICogaGVh cC9NYXJrZWRCbG9jay5jcHA6CisgICAgICAgIChKU0M6Ok1hcmtlZEJsb2NrOjpNYXJrZWRCbG9j ayk6IEZvciBvdmVyc2l6ZSBNYXJrZWRCbG9ja3MsIGlmIHRoZSBibG9jayBzaXplIGdldHMgdG9v IGJpZyB3ZSBjYW4gCisgICAgICAgIHVuZGVyZmxvdyB0aGUgZW5kQXRvbSwgd2hpY2ggd2lsbCBj YXVzZSB1cyB0byBzZWdmYXVsdCB3aGVuIHdlIHRyeSB0byBzd2VlcCBhIGJsb2NrLiBJZiB3ZSdy ZSBhIAorICAgICAgICBjdXN0b20gc2l6ZSBNYXJrZWRCbG9jayB3ZSBuZWVkIHRvIGNhbGN1bGF0 ZSBlbmRBdG9tIHNvIGl0IGRvZXNuJ3QgdW5kZXJmbG93LgorCiAyMDEyLTEwLTEyICBLYW5naWwg SGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KIAogICAgICAgICBGaXggYnVpbGQgZXJyb3Ig b24gREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9oZWFwL0Jsb2NrQWxsb2NhdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaGVhcC9CbG9ja0FsbG9jYXRvci5jcHAJKHJldmlzaW9uIDEzMTI0OCkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0Jsb2NrQWxsb2NhdG9yLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjYsMTMgKzI2LDE2IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiQmxvY2tB bGxvY2F0b3IuaCIKIAorI2luY2x1ZGUgIkNvcGllZEJsb2NrLmgiCisjaW5jbHVkZSAiTWFya2Vk QmxvY2suaCIKICNpbmNsdWRlIDx3dGYvQ3VycmVudFRpbWUuaD4KIAogbmFtZXNwYWNlIEpTQyB7 CiAKIEJsb2NrQWxsb2NhdG9yOjpCbG9ja0FsbG9jYXRvcigpCi0gICAgOiBtX251bWJlck9mRW1w dHlSZWdpb25zKDApCi0gICAgLCBtX251bWJlck9mUGFydGlhbFJlZ2lvbnMoMCkKKyAgICA6IG1f Y29waWVkUmVnaW9uU2V0KENvcGllZEJsb2NrOjpibG9ja1NpemUpCisgICAgLCBtX21hcmtlZFJl Z2lvblNldChNYXJrZWRCbG9jazo6YmxvY2tTaXplKQorICAgICwgbV9udW1iZXJPZkVtcHR5UmVn aW9ucygwKQogICAgICwgbV9pc0N1cnJlbnRseUFsbG9jYXRpbmcoZmFsc2UpCiAgICAgLCBtX2Js b2NrRnJlZWluZ1RocmVhZFNob3VsZFF1aXQoZmFsc2UpCiAgICAgLCBtX2Jsb2NrRnJlZWluZ1Ro cmVhZChjcmVhdGVUaHJlYWQoYmxvY2tGcmVlaW5nVGhyZWFkU3RhcnRGdW5jLCB0aGlzLCAiSmF2 YVNjcmlwdENvcmU6OkJsb2NrRnJlZSIpKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvQmxvY2tBbGxvY2F0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aGVhcC9CbG9ja0FsbG9jYXRvci5oCShyZXZpc2lvbiAxMzEyNDgpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaGVhcC9CbG9ja0FsbG9jYXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw2ICsz NSw3IEBACiAKIG5hbWVzcGFjZSBKU0MgewogCitjbGFzcyBCbG9ja0FsbG9jYXRvcjsKIGNsYXNz IENvcGllZEJsb2NrOwogY2xhc3MgTWFya2VkQmxvY2s7CiBjbGFzcyBSZWdpb247CkBAIC01NCw5 ICs1NSwxMiBAQCBpbmxpbmUgRGVhZEJsb2NrOjpEZWFkQmxvY2soUmVnaW9uKiByZWdpCiAKIGNs YXNzIFJlZ2lvbiA6IHB1YmxpYyBEb3VibHlMaW5rZWRMaXN0Tm9kZTxSZWdpb24+IHsKICAgICBm cmllbmQgQ0xBU1NfSUZfR0NDIERvdWJseUxpbmtlZExpc3ROb2RlPFJlZ2lvbj47CisgICAgZnJp ZW5kIGNsYXNzIEJsb2NrQWxsb2NhdG9yOwogcHVibGljOgogICAgIH5SZWdpb24oKTsKLSAgICBz dGF0aWMgUmVnaW9uKiBjcmVhdGUoc2l6ZV90IGJsb2NrU2l6ZSwgc2l6ZV90IGJsb2NrQWxpZ25t ZW50LCBzaXplX3QgbnVtYmVyT2ZCbG9ja3MpOworICAgIHN0YXRpYyBSZWdpb24qIGNyZWF0ZShz aXplX3QgYmxvY2tTaXplKTsKKyAgICBzdGF0aWMgUmVnaW9uKiBjcmVhdGVDdXN0b21TaXplKHNp emVfdCBibG9ja1NpemUsIHNpemVfdCBibG9ja0FsaWdubWVudCk7CisgICAgUmVnaW9uKiByZXNl dChzaXplX3QgYmxvY2tTaXplKTsKIAogICAgIHNpemVfdCBibG9ja1NpemUoKSBjb25zdCB7IHJl dHVybiBtX2Jsb2NrU2l6ZTsgfQogICAgIGJvb2wgaXNGdWxsKCkgY29uc3QgeyByZXR1cm4gbV9i bG9ja3NJblVzZSA9PSBtX3RvdGFsQmxvY2tzOyB9CkBAIC02NSw2ICs2OSw4IEBAIHB1YmxpYzoK ICAgICBEZWFkQmxvY2sqIGFsbG9jYXRlKCk7CiAgICAgdm9pZCBkZWFsbG9jYXRlKHZvaWQqKTsK IAorICAgIHN0YXRpYyBjb25zdCBzaXplX3Qgc19yZWdpb25TaXplID0gNjQgKiBLQjsKKwogcHJp dmF0ZToKICAgICBSZWdpb24oUGFnZUFsbG9jYXRpb25BbGlnbmVkJiwgc2l6ZV90IGJsb2NrU2l6 ZSwgc2l6ZV90IHRvdGFsQmxvY2tzKTsKIApAQCAtNzcsMTMgKzgzLDIyIEBAIHByaXZhdGU6CiAg ICAgRG91Ymx5TGlua2VkTGlzdDxEZWFkQmxvY2s+IG1fZGVhZEJsb2NrczsKIH07CiAKLWlubGlu ZSBSZWdpb24qIFJlZ2lvbjo6Y3JlYXRlKHNpemVfdCBibG9ja1NpemUsIHNpemVfdCBibG9ja0Fs aWdubWVudCwgc2l6ZV90IG51bWJlck9mQmxvY2tzKQoraW5saW5lIFJlZ2lvbiogUmVnaW9uOjpj cmVhdGUoc2l6ZV90IGJsb2NrU2l6ZSkKK3sKKyAgICBBU1NFUlQoYmxvY2tTaXplIDw9IHNfcmVn aW9uU2l6ZSk7CisgICAgQVNTRVJUKCEoc19yZWdpb25TaXplICUgYmxvY2tTaXplKSk7CisgICAg UGFnZUFsbG9jYXRpb25BbGlnbmVkIGFsbG9jYXRpb24gPSBQYWdlQWxsb2NhdGlvbkFsaWduZWQ6 OmFsbG9jYXRlKHNfcmVnaW9uU2l6ZSwgc19yZWdpb25TaXplLCBPU0FsbG9jYXRvcjo6SlNHQ0hl YXBQYWdlcyk7CisgICAgaWYgKCFzdGF0aWNfY2FzdDxib29sPihhbGxvY2F0aW9uKSkKKyAgICAg ICAgQ1JBU0goKTsKKyAgICByZXR1cm4gbmV3IFJlZ2lvbihhbGxvY2F0aW9uLCBibG9ja1NpemUs IHNfcmVnaW9uU2l6ZSAvIGJsb2NrU2l6ZSk7Cit9CisKK2lubGluZSBSZWdpb24qIFJlZ2lvbjo6 Y3JlYXRlQ3VzdG9tU2l6ZShzaXplX3QgYmxvY2tTaXplLCBzaXplX3QgYmxvY2tBbGlnbm1lbnQp CiB7Ci0gICAgc2l6ZV90IHJlZ2lvblNpemUgPSBibG9ja1NpemUgKiBudW1iZXJPZkJsb2NrczsK LSAgICBQYWdlQWxsb2NhdGlvbkFsaWduZWQgYWxsb2NhdGlvbiA9IFBhZ2VBbGxvY2F0aW9uQWxp Z25lZDo6YWxsb2NhdGUocmVnaW9uU2l6ZSwgYmxvY2tBbGlnbm1lbnQsIE9TQWxsb2NhdG9yOjpK U0dDSGVhcFBhZ2VzKTsKKyAgICBQYWdlQWxsb2NhdGlvbkFsaWduZWQgYWxsb2NhdGlvbiA9IFBh Z2VBbGxvY2F0aW9uQWxpZ25lZDo6YWxsb2NhdGUoYmxvY2tTaXplLCBibG9ja0FsaWdubWVudCwg T1NBbGxvY2F0b3I6OkpTR0NIZWFwUGFnZXMpOwogICAgIGlmICghc3RhdGljX2Nhc3Q8Ym9vbD4o YWxsb2NhdGlvbikpCiAgICAgICAgIENSQVNIKCk7Ci0gICAgcmV0dXJuIG5ldyBSZWdpb24oYWxs b2NhdGlvbiwgYmxvY2tTaXplLCBudW1iZXJPZkJsb2Nrcyk7CisgICAgcmV0dXJuIG5ldyBSZWdp b24oYWxsb2NhdGlvbiwgYmxvY2tTaXplLCAxKTsKIH0KIAogaW5saW5lIFJlZ2lvbjo6UmVnaW9u KFBhZ2VBbGxvY2F0aW9uQWxpZ25lZCYgYWxsb2NhdGlvbiwgc2l6ZV90IGJsb2NrU2l6ZSwgc2l6 ZV90IHRvdGFsQmxvY2tzKQpAQCAtOTYsMTggKzExMSwyNSBAQCBpbmxpbmUgUmVnaW9uOjpSZWdp b24oUGFnZUFsbG9jYXRpb25BbGlnCiAgICAgLCBtX25leHQoMCkKIHsKICAgICBBU1NFUlQoYWxs b2NhdGlvbik7Ci0gICAgY2hhciogc3RhcnQgPSBzdGF0aWNfY2FzdDxjaGFyKj4oYWxsb2NhdGlv bi5iYXNlKCkpOwotICAgIGNoYXIqIGVuZCA9IHN0YXJ0ICsgYWxsb2NhdGlvbi5zaXplKCk7Cisg ICAgY2hhciogc3RhcnQgPSBzdGF0aWNfY2FzdDxjaGFyKj4obV9hbGxvY2F0aW9uLmJhc2UoKSk7 CisgICAgY2hhciogZW5kID0gc3RhcnQgKyBtX2FsbG9jYXRpb24uc2l6ZSgpOwogICAgIGZvciAo Y2hhciogY3VycmVudCA9IHN0YXJ0OyBjdXJyZW50IDwgZW5kOyBjdXJyZW50ICs9IGJsb2NrU2l6 ZSkKICAgICAgICAgbV9kZWFkQmxvY2tzLmFwcGVuZChuZXcgKE5vdE51bGwsIGN1cnJlbnQpIERl YWRCbG9jayh0aGlzKSk7CiB9CiAKIGlubGluZSBSZWdpb246On5SZWdpb24oKQogewotICAgIEFT U0VSVCghbV9ibG9ja3NJblVzZSk7CisgICAgQVNTRVJUKGlzRW1wdHkoKSk7CiAgICAgbV9hbGxv Y2F0aW9uLmRlYWxsb2NhdGUoKTsKIH0KIAoraW5saW5lIFJlZ2lvbiogUmVnaW9uOjpyZXNldChz aXplX3QgYmxvY2tTaXplKQoreworICAgIEFTU0VSVChpc0VtcHR5KCkpOworICAgIFBhZ2VBbGxv Y2F0aW9uQWxpZ25lZCBhbGxvY2F0aW9uID0gbV9hbGxvY2F0aW9uOworICAgIHJldHVybiBuZXcg KE5vdE51bGwsIHRoaXMpIFJlZ2lvbihhbGxvY2F0aW9uLCBibG9ja1NpemUsIHNfcmVnaW9uU2l6 ZSAvIGJsb2NrU2l6ZSk7Cit9CisKIGlubGluZSBEZWFkQmxvY2sqIFJlZ2lvbjo6YWxsb2NhdGUo KQogewogICAgIEFTU0VSVCghaXNGdWxsKCkpOwpAQCAtMTM2LDIxICsxNTgsMzYgQEAgcHVibGlj OgogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiB2b2lkIGRlYWxsb2NhdGVDdXN0b21TaXplKFQq KTsKIAogcHJpdmF0ZToKLSAgICBEZWFkQmxvY2sqIHRyeUFsbG9jYXRlRnJvbVJlZ2lvbihEb3Vi bHlMaW5rZWRMaXN0PFJlZ2lvbj4mLCBzaXplX3QmKTsKLQogICAgIHZvaWQgd2FpdEZvclJlbGF0 aXZlVGltZVdoaWxlSG9sZGluZ0xvY2soZG91YmxlIHJlbGF0aXZlKTsKICAgICB2b2lkIHdhaXRG b3JSZWxhdGl2ZVRpbWUoZG91YmxlIHJlbGF0aXZlKTsKIAogICAgIHZvaWQgYmxvY2tGcmVlaW5n VGhyZWFkTWFpbigpOwogICAgIHN0YXRpYyB2b2lkIGJsb2NrRnJlZWluZ1RocmVhZFN0YXJ0RnVu Yyh2b2lkKiBoZWFwKTsKIAorICAgIHN0cnVjdCBSZWdpb25TZXQgeworICAgICAgICBSZWdpb25T ZXQoc2l6ZV90IGJsb2NrU2l6ZSkKKyAgICAgICAgICAgIDogbV9udW1iZXJPZlBhcnRpYWxSZWdp b25zKDApCisgICAgICAgICAgICAsIG1fYmxvY2tTaXplKGJsb2NrU2l6ZSkKKyAgICAgICAgewor ICAgICAgICB9CisgICAgICAgIERvdWJseUxpbmtlZExpc3Q8UmVnaW9uPiBtX2Z1bGxSZWdpb25z OworICAgICAgICBEb3VibHlMaW5rZWRMaXN0PFJlZ2lvbj4gbV9wYXJ0aWFsUmVnaW9uczsKKyAg ICAgICAgc2l6ZV90IG1fbnVtYmVyT2ZQYXJ0aWFsUmVnaW9uczsKKyAgICAgICAgc2l6ZV90IG1f YmxvY2tTaXplOworICAgIH07CisKKyAgICBEZWFkQmxvY2sqIHRyeUFsbG9jYXRlRnJvbVJlZ2lv bihSZWdpb25TZXQmLCBEb3VibHlMaW5rZWRMaXN0PFJlZ2lvbj4mLCBzaXplX3QmKTsKKwogICAg IHZvaWQgcmVsZWFzZUZyZWVSZWdpb25zKCk7CiAKLSAgICBEb3VibHlMaW5rZWRMaXN0PFJlZ2lv bj4gbV9mdWxsUmVnaW9uczsKLSAgICBEb3VibHlMaW5rZWRMaXN0PFJlZ2lvbj4gbV9wYXJ0aWFs UmVnaW9uczsKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gUmVnaW9uU2V0JiByZWdpb25TZXRG b3IoKTsKKworICAgIFJlZ2lvblNldCBtX2NvcGllZFJlZ2lvblNldDsKKyAgICBSZWdpb25TZXQg bV9tYXJrZWRSZWdpb25TZXQ7CisKICAgICBEb3VibHlMaW5rZWRMaXN0PFJlZ2lvbj4gbV9lbXB0 eVJlZ2lvbnM7CiAgICAgc2l6ZV90IG1fbnVtYmVyT2ZFbXB0eVJlZ2lvbnM7Ci0gICAgc2l6ZV90 IG1fbnVtYmVyT2ZQYXJ0aWFsUmVnaW9uczsKKwogICAgIGJvb2wgbV9pc0N1cnJlbnRseUFsbG9j YXRpbmc7CiAgICAgYm9vbCBtX2Jsb2NrRnJlZWluZ1RocmVhZFNob3VsZFF1aXQ7CiAgICAgU3Bp bkxvY2sgbV9yZWdpb25Mb2NrOwpAQCAtMTU5LDE3ICsxOTYsMjggQEAgcHJpdmF0ZToKICAgICBU aHJlYWRJZGVudGlmaWVyIG1fYmxvY2tGcmVlaW5nVGhyZWFkOwogfTsKIAotaW5saW5lIERlYWRC bG9jayogQmxvY2tBbGxvY2F0b3I6OnRyeUFsbG9jYXRlRnJvbVJlZ2lvbihEb3VibHlMaW5rZWRM aXN0PFJlZ2lvbj4mIHJlZ2lvbnMsIHNpemVfdCYgbnVtYmVyT2ZSZWdpb25zKQoraW5saW5lIERl YWRCbG9jayogQmxvY2tBbGxvY2F0b3I6OnRyeUFsbG9jYXRlRnJvbVJlZ2lvbihSZWdpb25TZXQm IHNldCwgRG91Ymx5TGlua2VkTGlzdDxSZWdpb24+JiByZWdpb25zLCBzaXplX3QmIG51bWJlck9m UmVnaW9ucykKIHsKICAgICBpZiAobnVtYmVyT2ZSZWdpb25zKSB7CiAgICAgICAgIEFTU0VSVCgh cmVnaW9ucy5pc0VtcHR5KCkpOwogICAgICAgICBSZWdpb24qIHJlZ2lvbiA9IHJlZ2lvbnMuaGVh ZCgpOwogICAgICAgICBBU1NFUlQoIXJlZ2lvbi0+aXNGdWxsKCkpOworCisgICAgICAgIGlmIChy ZWdpb24tPmlzRW1wdHkoKSkgeworICAgICAgICAgICAgQVNTRVJUKHJlZ2lvbiA9PSBtX2VtcHR5 UmVnaW9ucy5oZWFkKCkpOworICAgICAgICAgICAgbV9udW1iZXJPZkVtcHR5UmVnaW9ucy0tOwor ICAgICAgICAgICAgc2V0Lm1fbnVtYmVyT2ZQYXJ0aWFsUmVnaW9ucysrOworICAgICAgICAgICAg cmVnaW9uID0gbV9lbXB0eVJlZ2lvbnMucmVtb3ZlSGVhZCgpLT5yZXNldChzZXQubV9ibG9ja1Np emUpOworICAgICAgICAgICAgc2V0Lm1fcGFydGlhbFJlZ2lvbnMucHVzaChyZWdpb24pOworICAg ICAgICB9CisKICAgICAgICAgRGVhZEJsb2NrKiBibG9jayA9IHJlZ2lvbi0+YWxsb2NhdGUoKTsK KwogICAgICAgICBpZiAocmVnaW9uLT5pc0Z1bGwoKSkgewotICAgICAgICAgICAgbnVtYmVyT2ZS ZWdpb25zLS07Ci0gICAgICAgICAgICBtX2Z1bGxSZWdpb25zLnB1c2gocmVnaW9ucy5yZW1vdmVI ZWFkKCkpOworICAgICAgICAgICAgc2V0Lm1fbnVtYmVyT2ZQYXJ0aWFsUmVnaW9ucy0tOworICAg ICAgICAgICAgc2V0Lm1fZnVsbFJlZ2lvbnMucHVzaChzZXQubV9wYXJ0aWFsUmVnaW9ucy5yZW1v dmVIZWFkKCkpOwogICAgICAgICB9CisKICAgICAgICAgcmV0dXJuIGJsb2NrOwogICAgIH0KICAg ICByZXR1cm4gMDsKQEAgLTE3OCwyMiArMjI2LDIzIEBAIGlubGluZSBEZWFkQmxvY2sqIEJsb2Nr QWxsb2NhdG9yOjp0cnlBbGwKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CiBpbmxpbmUgRGVhZEJsb2Nr KiBCbG9ja0FsbG9jYXRvcjo6YWxsb2NhdGUoKQogeworICAgIFJlZ2lvblNldCYgc2V0ID0gcmVn aW9uU2V0Rm9yPFQ+KCk7CiAgICAgRGVhZEJsb2NrKiBibG9jazsKICAgICBtX2lzQ3VycmVudGx5 QWxsb2NhdGluZyA9IHRydWU7CiAgICAgewogICAgICAgICBTcGluTG9ja0hvbGRlciBsb2NrZXIo Jm1fcmVnaW9uTG9jayk7Ci0gICAgICAgIGlmICgoYmxvY2sgPSB0cnlBbGxvY2F0ZUZyb21SZWdp b24obV9wYXJ0aWFsUmVnaW9ucywgbV9udW1iZXJPZlBhcnRpYWxSZWdpb25zKSkpCisgICAgICAg IGlmICgoYmxvY2sgPSB0cnlBbGxvY2F0ZUZyb21SZWdpb24oc2V0LCBzZXQubV9wYXJ0aWFsUmVn aW9ucywgc2V0Lm1fbnVtYmVyT2ZQYXJ0aWFsUmVnaW9ucykpKQogICAgICAgICAgICAgcmV0dXJu IGJsb2NrOwotICAgICAgICBpZiAoKGJsb2NrID0gdHJ5QWxsb2NhdGVGcm9tUmVnaW9uKG1fZW1w dHlSZWdpb25zLCBtX251bWJlck9mRW1wdHlSZWdpb25zKSkpCisgICAgICAgIGlmICgoYmxvY2sg PSB0cnlBbGxvY2F0ZUZyb21SZWdpb24oc2V0LCBtX2VtcHR5UmVnaW9ucywgbV9udW1iZXJPZkVt cHR5UmVnaW9ucykpKQogICAgICAgICAgICAgcmV0dXJuIGJsb2NrOwogICAgIH0KIAotICAgIFJl Z2lvbiogbmV3UmVnaW9uID0gUmVnaW9uOjpjcmVhdGUoVDo6YmxvY2tTaXplLCBUOjpibG9ja1Np emUsIDEpOworICAgIFJlZ2lvbiogbmV3UmVnaW9uID0gUmVnaW9uOjpjcmVhdGUoVDo6YmxvY2tT aXplKTsKIAogICAgIFNwaW5Mb2NrSG9sZGVyIGxvY2tlcigmbV9yZWdpb25Mb2NrKTsKICAgICBt X2VtcHR5UmVnaW9ucy5wdXNoKG5ld1JlZ2lvbik7CiAgICAgbV9udW1iZXJPZkVtcHR5UmVnaW9u cysrOwotICAgIGJsb2NrID0gdHJ5QWxsb2NhdGVGcm9tUmVnaW9uKG1fZW1wdHlSZWdpb25zLCBt X251bWJlck9mRW1wdHlSZWdpb25zKTsKKyAgICBibG9jayA9IHRyeUFsbG9jYXRlRnJvbVJlZ2lv bihzZXQsIG1fZW1wdHlSZWdpb25zLCBtX251bWJlck9mRW1wdHlSZWdpb25zKTsKICAgICBBU1NF UlQoYmxvY2spOwogICAgIHJldHVybiBibG9jazsKIH0KQEAgLTIwMSw3ICsyNTAsNyBAQCBpbmxp bmUgRGVhZEJsb2NrKiBCbG9ja0FsbG9jYXRvcjo6YWxsb2NhCiBpbmxpbmUgRGVhZEJsb2NrKiBC bG9ja0FsbG9jYXRvcjo6YWxsb2NhdGVDdXN0b21TaXplKHNpemVfdCBibG9ja1NpemUsIHNpemVf dCBibG9ja0FsaWdubWVudCkKIHsKICAgICBzaXplX3QgcmVhbFNpemUgPSBXVEY6OnJvdW5kVXBU b011bHRpcGxlT2YoYmxvY2tBbGlnbm1lbnQsIGJsb2NrU2l6ZSk7Ci0gICAgUmVnaW9uKiBuZXdS ZWdpb24gPSBSZWdpb246OmNyZWF0ZShyZWFsU2l6ZSwgYmxvY2tBbGlnbm1lbnQsIDEpOworICAg IFJlZ2lvbiogbmV3UmVnaW9uID0gUmVnaW9uOjpjcmVhdGVDdXN0b21TaXplKHJlYWxTaXplLCBi bG9ja0FsaWdubWVudCk7CiAgICAgRGVhZEJsb2NrKiBibG9jayA9IG5ld1JlZ2lvbi0+YWxsb2Nh dGUoKTsKICAgICBBU1NFUlQoYmxvY2spOwogICAgIHJldHVybiBibG9jazsKQEAgLTIxMCwyMCAr MjU5LDI4IEBAIGlubGluZSBEZWFkQmxvY2sqIEJsb2NrQWxsb2NhdG9yOjphbGxvY2EKIHRlbXBs YXRlPHR5cGVuYW1lIFQ+CiBpbmxpbmUgdm9pZCBCbG9ja0FsbG9jYXRvcjo6ZGVhbGxvY2F0ZShU KiBibG9jaykKIHsKKyAgICBSZWdpb25TZXQmIHNldCA9IHJlZ2lvblNldEZvcjxUPigpOwogICAg IGJvb2wgc2hvdWxkV2FrZUJsb2NrRnJlZWluZ1RocmVhZCA9IGZhbHNlOwogICAgIHsKICAgICAg ICAgU3BpbkxvY2tIb2xkZXIgbG9ja2VyKCZtX3JlZ2lvbkxvY2spOwogICAgICAgICBSZWdpb24q IHJlZ2lvbiA9IGJsb2NrLT5yZWdpb24oKTsKKyAgICAgICAgQVNTRVJUKCFyZWdpb24tPmlzRW1w dHkoKSk7CiAgICAgICAgIGlmIChyZWdpb24tPmlzRnVsbCgpKQotICAgICAgICAgICAgbV9mdWxs UmVnaW9ucy5yZW1vdmUocmVnaW9uKTsKKyAgICAgICAgICAgIHNldC5tX2Z1bGxSZWdpb25zLnJl bW92ZShyZWdpb24pOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIHNldC5tX3BhcnRpYWxS ZWdpb25zLnJlbW92ZShyZWdpb24pOworICAgICAgICAgICAgc2V0Lm1fbnVtYmVyT2ZQYXJ0aWFs UmVnaW9ucy0tOworICAgICAgICB9CisKICAgICAgICAgcmVnaW9uLT5kZWFsbG9jYXRlKGJsb2Nr KTsKKwogICAgICAgICBpZiAocmVnaW9uLT5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIG1fZW1w dHlSZWdpb25zLnB1c2gocmVnaW9uKTsKICAgICAgICAgICAgIHNob3VsZFdha2VCbG9ja0ZyZWVp bmdUaHJlYWQgPSAhbV9udW1iZXJPZkVtcHR5UmVnaW9uczsKICAgICAgICAgICAgIG1fbnVtYmVy T2ZFbXB0eVJlZ2lvbnMrKzsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIG1fcGFydGlh bFJlZ2lvbnMucHVzaChyZWdpb24pOwotICAgICAgICAgICAgbV9udW1iZXJPZlBhcnRpYWxSZWdp b25zKys7CisgICAgICAgICAgICBzZXQubV9wYXJ0aWFsUmVnaW9ucy5wdXNoKHJlZ2lvbik7Cisg ICAgICAgICAgICBzZXQubV9udW1iZXJPZlBhcnRpYWxSZWdpb25zKys7CiAgICAgICAgIH0KICAg ICB9CiAKQEAgLTI0MSw2ICsyOTgsMzcgQEAgaW5saW5lIHZvaWQgQmxvY2tBbGxvY2F0b3I6OmRl YWxsb2NhdGVDdQogICAgIGRlbGV0ZSByZWdpb247CiB9CiAKK3RlbXBsYXRlIDw+CitpbmxpbmUg QmxvY2tBbGxvY2F0b3I6OlJlZ2lvblNldCYgQmxvY2tBbGxvY2F0b3I6OnJlZ2lvblNldEZvcjxD b3BpZWRCbG9jaz4oKQoreworICAgIHJldHVybiBtX2NvcGllZFJlZ2lvblNldDsKK30KKwordGVt cGxhdGUgPD4KK2lubGluZSBCbG9ja0FsbG9jYXRvcjo6UmVnaW9uU2V0JiBCbG9ja0FsbG9jYXRv cjo6cmVnaW9uU2V0Rm9yPE1hcmtlZEJsb2NrPigpCit7CisgICAgcmV0dXJuIG1fbWFya2VkUmVn aW9uU2V0OworfQorCit0ZW1wbGF0ZSA8PgoraW5saW5lIEJsb2NrQWxsb2NhdG9yOjpSZWdpb25T ZXQmIEJsb2NrQWxsb2NhdG9yOjpyZWdpb25TZXRGb3I8SGVhcEJsb2NrPENvcGllZEJsb2NrPiA+ KCkKK3sKKyAgICByZXR1cm4gbV9jb3BpZWRSZWdpb25TZXQ7Cit9CisKK3RlbXBsYXRlIDw+Citp bmxpbmUgQmxvY2tBbGxvY2F0b3I6OlJlZ2lvblNldCYgQmxvY2tBbGxvY2F0b3I6OnJlZ2lvblNl dEZvcjxIZWFwQmxvY2s8TWFya2VkQmxvY2s+ID4oKQoreworICAgIHJldHVybiBtX21hcmtlZFJl Z2lvblNldDsKK30KKwordGVtcGxhdGUgPHR5cGVuYW1lIFQ+CitpbmxpbmUgQmxvY2tBbGxvY2F0 b3I6OlJlZ2lvblNldCYgQmxvY2tBbGxvY2F0b3I6OnJlZ2lvblNldEZvcigpCit7CisgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuICooUmVnaW9uU2V0KikwOworfQorCiB9IC8v IG5hbWVzcGFjZSBKU0MKIAogI2VuZGlmIC8vIEJsb2NrQWxsb2NhdG9yX2gKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0NvcGllZEJsb2NrLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2hlYXAvQ29waWVkQmxvY2suaAkocmV2aXNpb24gMTMxMjQ4KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQ29waWVkQmxvY2suaAkod29ya2luZyBjb3B5KQpA QCAtNzIsNyArNzIsNyBAQCBwdWJsaWM6CiAgICAgc2l6ZV90IHNpemUoKTsKICAgICBzaXplX3Qg Y2FwYWNpdHkoKTsKIAotICAgIHN0YXRpYyBjb25zdCBzaXplX3QgYmxvY2tTaXplID0gNjQgKiBL QjsKKyAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IGJsb2NrU2l6ZSA9IDMyICogS0I7CiAKIHByaXZh dGU6CiAgICAgQ29waWVkQmxvY2soUmVnaW9uKik7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvaGVhcC9Db3BpZWRTcGFjZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9oZWFwL0NvcGllZFNwYWNlLmgJKHJldmlzaW9uIDEzMTI0OCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9oZWFwL0NvcGllZFNwYWNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTExNyw5ICsxMTcs OSBAQCBwcml2YXRlOgogICAgIFRocmVhZENvbmRpdGlvbiBtX2xvYW5lZEJsb2Nrc0NvbmRpdGlv bjsKICAgICBzaXplX3QgbV9udW1iZXJPZkxvYW5lZEJsb2NrczsKIAotICAgIHN0YXRpYyBjb25z dCBzaXplX3Qgc19tYXhBbGxvY2F0aW9uU2l6ZSA9IDMyICogS0I7CisgICAgc3RhdGljIGNvbnN0 IHNpemVfdCBzX21heEFsbG9jYXRpb25TaXplID0gQ29waWVkQmxvY2s6OmJsb2NrU2l6ZSAvIDI7 CiAgICAgc3RhdGljIGNvbnN0IHNpemVfdCBzX2luaXRpYWxCbG9ja051bSA9IDE2OwotICAgIHN0 YXRpYyBjb25zdCBzaXplX3Qgc19ibG9ja01hc2sgPSB+KENvcGllZEJsb2NrOjpzX2Jsb2NrU2l6 ZSAtIDEpOworICAgIHN0YXRpYyBjb25zdCBzaXplX3Qgc19ibG9ja01hc2sgPSB+KENvcGllZEJs b2NrOjpibG9ja1NpemUgLSAxKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIEpTQwpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcEJsb2NrLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcEJsb2NrLmgJKHJldmlzaW9uIDEzMTI0OCkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXBCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC00 NSw4ICs0NSw2IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CiBjbGFzcyBIZWFwQmxvY2sgOiBwdWJs aWMgRG91Ymx5TGlua2VkTGlzdE5vZGU8VD4gewogICAgIGZyaWVuZCBDTEFTU19JRl9HQ0MgRG91 Ymx5TGlua2VkTGlzdE5vZGU8VD47CiBwdWJsaWM6Ci0gICAgc3RhdGljIGNvbnN0IHNpemVfdCBz X2Jsb2NrU2l6ZSA9IDY0ICogS0I7Ci0KICAgICBzdGF0aWMgSGVhcEJsb2NrKiBkZXN0cm95KEhl YXBCbG9jayogYmxvY2spCiAgICAgewogICAgICAgICBzdGF0aWNfY2FzdDxUKj4oYmxvY2spLT5+ VCgpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkQmxvY2suY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEJsb2NrLmNwcAko cmV2aXNpb24gMTMxMjQ4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFya2VkQmxv Y2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Miw3ICs0Miw3IEBAIE1hcmtlZEJsb2NrKiBNYXJr ZWRCbG9jazo6Y3JlYXRlKERlYWRCbG8KIE1hcmtlZEJsb2NrOjpNYXJrZWRCbG9jayhSZWdpb24q IHJlZ2lvbiwgTWFya2VkQWxsb2NhdG9yKiBhbGxvY2F0b3IsIHNpemVfdCBjZWxsU2l6ZSwgRGVz dHJ1Y3RvclR5cGUgZGVzdHJ1Y3RvclR5cGUpCiAgICAgOiBIZWFwQmxvY2s8TWFya2VkQmxvY2s+ KHJlZ2lvbikKICAgICAsIG1fYXRvbXNQZXJDZWxsKChjZWxsU2l6ZSArIGF0b21TaXplIC0gMSkg LyBhdG9tU2l6ZSkKLSAgICAsIG1fZW5kQXRvbShhdG9tc1BlckJsb2NrIC0gbV9hdG9tc1BlckNl bGwgKyAxKQorICAgICwgbV9lbmRBdG9tKChhbGxvY2F0b3ItPmNlbGxTaXplKCkgPyBhdG9tc1Bl ckJsb2NrIDogcmVnaW9uLT5ibG9ja1NpemUoKSAvIGF0b21TaXplKSAtIG1fYXRvbXNQZXJDZWxs ICsgMSkKICAgICAsIG1fZGVzdHJ1Y3RvclR5cGUoZGVzdHJ1Y3RvclR5cGUpCiAgICAgLCBtX2Fs bG9jYXRvcihhbGxvY2F0b3IpCiAgICAgLCBtX3N0YXRlKE5ldykgLy8gQWxsIGNlbGxzIHN0YXJ0 IG91dCB1bm1hcmtlZC4K