126313 2013-12-30 16:40:13 -0800 Stop using ThreadCondition in BlockAllocator 2014-01-20 11:27:19 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 963409 0 andersca 2013-12-30 16:40:13 -0800 Stop using ThreadCondition in BlockAllocator 963410 1 220136 andersca 2013-12-30 16:41:36 -0800 Created attachment 220136 Patch 963414 2 220138 andersca 2013-12-30 17:14:57 -0800 Created attachment 220138 Patch 963416 3 andersca 2013-12-30 17:18:38 -0800 Committed r161161: <http://trac.webkit.org/changeset/161161> 963478 4 ap 2013-12-30 22:53:40 -0800 Rolled out with the rest of today's threading fixes, which broke WebKit2 on Mountain Lion. I don't know if this particular change caused any trouble - there was so much churn today that I could't tell which patch caused which badness. Perhaps we should simply re-land if we can get EWS green. I think that r161163 was a follow-up fix to this. 963608 5 220138 fpizlo 2014-01-01 09:52:07 -0800 Comment on attachment 220138 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=220138&action=review > Source/JavaScriptCore/heap/BlockAllocator.cpp:106 > + std::unique_lock<std::mutex> lock(m_emptyRegionConditionMutex); Why is this a unique_lock instead of lock_guard? 964679 6 andersca 2014-01-06 11:12:55 -0800 (In reply to comment #5) > (From update of attachment 220138 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=220138&action=review > > > Source/JavaScriptCore/heap/BlockAllocator.cpp:106 > > + std::unique_lock<std::mutex> lock(m_emptyRegionConditionMutex); > > Why is this a unique_lock instead of lock_guard? Unique locks are used together with std::condition_variable. 969933 7 andersca 2014-01-20 11:27:19 -0800 Committed r162362: <http://trac.webkit.org/changeset/162362> 220136 2013-12-30 16:41:36 -0800 2013-12-30 17:14:55 -0800 Patch bug-126313-20131230164135.patch text/plain 5498 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxMTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 ZmFlYmQ2OTkwNjA3YTk0NjI5Y2Y1NWIzMmQ5OWEwMTAxYzNjNDYwLi5hNmU1ODg1YmQ5NWM2NDYw OTRmZGEwNmNiOGY4NzBhZDNlZTQ1Yjk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxOSBAQAogMjAxMy0xMi0zMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCisgICAgICAgIFN0b3AgdXNpbmcgVGhyZWFkQ29uZGl0aW9uIGluIEJsb2NrQWxsb2Nh dG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjYz MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGhl YXAvQmxvY2tBbGxvY2F0b3IuY3BwOgorICAgICAgICAoSlNDOjpCbG9ja0FsbG9jYXRvcjo6fkJs b2NrQWxsb2NhdG9yKToKKyAgICAgICAgKEpTQzo6QmxvY2tBbGxvY2F0b3I6OndhaXRGb3JEdXJh dGlvbik6CisgICAgICAgIChKU0M6OkJsb2NrQWxsb2NhdG9yOjpibG9ja0ZyZWVpbmdUaHJlYWRN YWluKToKKyAgICAgICAgKiBoZWFwL0Jsb2NrQWxsb2NhdG9yLmg6CisgICAgICAgIChKU0M6OkJs b2NrQWxsb2NhdG9yOjpkZWFsbG9jYXRlKToKKworMjAxMy0xMi0zMCAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFN0b3AgdXNpbmcgVGhyZWFkQ29uZGl0 aW9uIGluIGpzYy5jcHAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyNjMxMQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9C bG9ja0FsbG9jYXRvci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9CbG9ja0FsbG9j YXRvci5jcHAKaW5kZXggZDhlNDVjN2JlNWY2N2ExOTI4YTY0ZTcxNzVlYWU0ZTc4NWZiYWQ4MS4u N2E3NDc0OTEzMGIxZDY2ZmY0MTU3NjkyODk4ODE1ZTYxMDY2NTNmOSAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQmxvY2tBbGxvY2F0b3IuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9oZWFwL0Jsb2NrQWxsb2NhdG9yLmNwcApAQCAtNjEsOSArNjEsOSBAQCBC bG9ja0FsbG9jYXRvcjo6fkJsb2NrQWxsb2NhdG9yKCkKIHsKICAgICByZWxlYXNlRnJlZVJlZ2lv bnMoKTsKICAgICB7Ci0gICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX2VtcHR5UmVnaW9uQ29u ZGl0aW9uTG9jayk7CisgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrKG1f ZW1wdHlSZWdpb25Db25kaXRpb25NdXRleCk7CiAgICAgICAgIG1fYmxvY2tGcmVlaW5nVGhyZWFk U2hvdWxkUXVpdCA9IHRydWU7Ci0gICAgICAgIG1fZW1wdHlSZWdpb25Db25kaXRpb24uYnJvYWRj YXN0KCk7CisgICAgICAgIG1fZW1wdHlSZWdpb25Db25kaXRpb24ubm90aWZ5X2FsbCgpOwogICAg IH0KICAgICBpZiAobV9ibG9ja0ZyZWVpbmdUaHJlYWQpCiAgICAgICAgIHdhaXRGb3JUaHJlYWRD b21wbGV0aW9uKG1fYmxvY2tGcmVlaW5nVGhyZWFkKTsKQEAgLTEwMSwyMiArMTAxLDE3IEBAIHZv aWQgQmxvY2tBbGxvY2F0b3I6OnJlbGVhc2VGcmVlUmVnaW9ucygpCiAgICAgfQogfQogCi12b2lk IEJsb2NrQWxsb2NhdG9yOjp3YWl0Rm9yUmVsYXRpdmVUaW1lV2hpbGVIb2xkaW5nTG9jayhkb3Vi bGUgcmVsYXRpdmUpCit2b2lkIEJsb2NrQWxsb2NhdG9yOjp3YWl0Rm9yRHVyYXRpb24oc3RkOjpj aHJvbm86Om1pbGxpc2Vjb25kcyBkdXJhdGlvbikKIHsKLSAgICBpZiAobV9ibG9ja0ZyZWVpbmdU aHJlYWRTaG91bGRRdWl0KQotICAgICAgICByZXR1cm47Ci0KLSAgICBtX2VtcHR5UmVnaW9uQ29u ZGl0aW9uLnRpbWVkV2FpdChtX2VtcHR5UmVnaW9uQ29uZGl0aW9uTG9jaywgY3VycmVudFRpbWUo KSArIHJlbGF0aXZlKTsKLX0KKyAgICBzdGQ6OnVuaXF1ZV9sb2NrPHN0ZDo6bXV0ZXg+IGxvY2so bV9lbXB0eVJlZ2lvbkNvbmRpdGlvbk11dGV4KTsKIAotdm9pZCBCbG9ja0FsbG9jYXRvcjo6d2Fp dEZvclJlbGF0aXZlVGltZShkb3VibGUgcmVsYXRpdmUpCi17CiAgICAgLy8gSWYgdGhpcyByZXR1 cm5zIGVhcmx5LCB0aGF0J3MgZmluZSwgc28gbG9uZyBhcyBpdCBkb2Vzbid0IGRvIGl0IHRvbwog ICAgIC8vIGZyZXF1ZW50bHkuIEl0IHdvdWxkIG9ubHkgYmUgYSBidWcgaWYgdGhpcyBmdW5jdGlv biBmYWlsZWQgdG8gcmV0dXJuCiAgICAgLy8gd2hlbiBpdCB3YXMgYXNrZWQgdG8gZG8gc28uCi0g ICAgCi0gICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fZW1wdHlSZWdpb25Db25kaXRpb25Mb2NrKTsK LSAgICB3YWl0Rm9yUmVsYXRpdmVUaW1lV2hpbGVIb2xkaW5nTG9jayhyZWxhdGl2ZSk7CisgICAg aWYgKG1fYmxvY2tGcmVlaW5nVGhyZWFkU2hvdWxkUXVpdCkKKyAgICAgICAgcmV0dXJuOworCisg ICAgbV9lbXB0eVJlZ2lvbkNvbmRpdGlvbi53YWl0X2Zvcihsb2NrLCBkdXJhdGlvbik7CiB9CiAK IHZvaWQgQmxvY2tBbGxvY2F0b3I6OmJsb2NrRnJlZWluZ1RocmVhZFN0YXJ0RnVuYyh2b2lkKiBi bG9ja0FsbG9jYXRvcikKQEAgLTEzMCw3ICsxMjUsNyBAQCB2b2lkIEJsb2NrQWxsb2NhdG9yOjpi bG9ja0ZyZWVpbmdUaHJlYWRNYWluKCkKICAgICB3aGlsZSAoIW1fYmxvY2tGcmVlaW5nVGhyZWFk U2hvdWxkUXVpdCkgewogICAgICAgICAvLyBHZW5lcmFsbHkgd2FpdCBmb3Igb25lIHNlY29uZCBi ZWZvcmUgc2NhdmVuZ2luZyBmcmVlIGJsb2Nrcy4gVGhpcwogICAgICAgICAvLyBtYXkgcmV0dXJu IGVhcmx5LCBwYXJ0aWN1bGFybHkgd2hlbiB3ZSdyZSBiZWluZyBhc2tlZCB0byBxdWl0LgotICAg ICAgICB3YWl0Rm9yUmVsYXRpdmVUaW1lKDEuMCk7CisgICAgICAgIHdhaXRGb3JEdXJhdGlvbihz dGQ6OmNocm9ubzo6c2Vjb25kcygxKSk7CiAgICAgICAgIGlmIChtX2Jsb2NrRnJlZWluZ1RocmVh ZFNob3VsZFF1aXQpCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgCkBAIC0xNDEsMTEgKzEz NiwxMSBAQCB2b2lkIEJsb2NrQWxsb2NhdG9yOjpibG9ja0ZyZWVpbmdUaHJlYWRNYWluKCkKIAog ICAgICAgICAvLyBTbGVlcCB1bnRpbCB0aGVyZSBpcyBhY3R1YWxseSB3b3JrIHRvIGRvIHJhdGhl ciB0aGFuIHdha2luZyB1cCBldmVyeSBzZWNvbmQgdG8gY2hlY2suCiAgICAgICAgIHsKLSAgICAg ICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX2VtcHR5UmVnaW9uQ29uZGl0aW9uTG9jayk7Cisg ICAgICAgICAgICBzdGQ6OnVuaXF1ZV9sb2NrPHN0ZDo6bXV0ZXg+IGxvY2sobV9lbXB0eVJlZ2lv bkNvbmRpdGlvbk11dGV4KTsKICAgICAgICAgICAgIFNwaW5Mb2NrSG9sZGVyIHJlZ2lvbkxvY2tl cigmbV9yZWdpb25Mb2NrKTsKICAgICAgICAgICAgIHdoaWxlICghbV9udW1iZXJPZkVtcHR5UmVn aW9ucyAmJiAhbV9ibG9ja0ZyZWVpbmdUaHJlYWRTaG91bGRRdWl0KSB7CiAgICAgICAgICAgICAg ICAgbV9yZWdpb25Mb2NrLlVubG9jaygpOwotICAgICAgICAgICAgICAgIG1fZW1wdHlSZWdpb25D b25kaXRpb24ud2FpdChtX2VtcHR5UmVnaW9uQ29uZGl0aW9uTG9jayk7CisgICAgICAgICAgICAg ICAgbV9lbXB0eVJlZ2lvbkNvbmRpdGlvbi53YWl0KGxvY2spOwogICAgICAgICAgICAgICAgIG1f cmVnaW9uTG9jay5Mb2NrKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBjdXJyZW50TnVt YmVyT2ZFbXB0eVJlZ2lvbnMgPSBtX251bWJlck9mRW1wdHlSZWdpb25zOwpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQmxvY2tBbGxvY2F0b3IuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9oZWFwL0Jsb2NrQWxsb2NhdG9yLmgKaW5kZXggZWZhZWM2NjUyYTIxZmQzMmYz YTgxYzE0MmIzY2UzZDBiZDBmNTQ0YS4uYzZlOTE0MzUyN2U1OTI3Y2U5YmZjMGU4Y2ViYjk3YjBh ZmYwZjVmOCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQmxvY2tBbGxv Y2F0b3IuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9CbG9ja0FsbG9jYXRvci5o CkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSAiR0NBY3Rpdml0eUNhbGxiYWNrLmgiCiAjaW5j bHVkZSAiSGVhcEJsb2NrLmgiCiAjaW5jbHVkZSAiUmVnaW9uLmgiCisjaW5jbHVkZSA8dGhyZWFk PgogI2luY2x1ZGUgPHd0Zi9Eb3VibHlMaW5rZWRMaXN0Lmg+CiAjaW5jbHVkZSA8d3RmL0Zvcndh cmQuaD4KICNpbmNsdWRlIDx3dGYvUGFnZUFsbG9jYXRpb25BbGlnbmVkLmg+CkBAIC02MCw4ICs2 MSw3IEBAIHB1YmxpYzoKICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gdm9pZCBkZWFsbG9jYXRl Q3VzdG9tU2l6ZShUKik7CiAKIHByaXZhdGU6Ci0gICAgdm9pZCB3YWl0Rm9yUmVsYXRpdmVUaW1l V2hpbGVIb2xkaW5nTG9jayhkb3VibGUgcmVsYXRpdmUpOwotICAgIHZvaWQgd2FpdEZvclJlbGF0 aXZlVGltZShkb3VibGUgcmVsYXRpdmUpOworICAgIHZvaWQgd2FpdEZvckR1cmF0aW9uKHN0ZDo6 Y2hyb25vOjptaWxsaXNlY29uZHMpOwogCiAgICAgZnJpZW5kIFRocmVhZElkZW50aWZpZXIgY3Jl YXRlQmxvY2tGcmVlaW5nVGhyZWFkKEJsb2NrQWxsb2NhdG9yKik7CiAgICAgdm9pZCBibG9ja0Zy ZWVpbmdUaHJlYWRNYWluKCk7CkBAIC0xMDUsOCArMTA1LDggQEAgcHJpdmF0ZToKICAgICBib29s IG1faXNDdXJyZW50bHlBbGxvY2F0aW5nOwogICAgIGJvb2wgbV9ibG9ja0ZyZWVpbmdUaHJlYWRT aG91bGRRdWl0OwogICAgIFNwaW5Mb2NrIG1fcmVnaW9uTG9jazsKLSAgICBNdXRleCBtX2VtcHR5 UmVnaW9uQ29uZGl0aW9uTG9jazsKLSAgICBUaHJlYWRDb25kaXRpb24gbV9lbXB0eVJlZ2lvbkNv bmRpdGlvbjsKKyAgICBzdGQ6Om11dGV4IG1fZW1wdHlSZWdpb25Db25kaXRpb25NdXRleDsKKyAg ICBzdGQ6OmNvbmRpdGlvbl92YXJpYWJsZSBtX2VtcHR5UmVnaW9uQ29uZGl0aW9uOwogICAgIFRo cmVhZElkZW50aWZpZXIgbV9ibG9ja0ZyZWVpbmdUaHJlYWQ7CiB9OwogCkBAIC0xOTksOCArMTk5 LDggQEAgaW5saW5lIHZvaWQgQmxvY2tBbGxvY2F0b3I6OmRlYWxsb2NhdGUoVCogYmxvY2spCiAg ICAgfQogCiAgICAgaWYgKHNob3VsZFdha2VCbG9ja0ZyZWVpbmdUaHJlYWQpIHsKLSAgICAgICAg TXV0ZXhMb2NrZXIgbXV0ZXhMb2NrZXIobV9lbXB0eVJlZ2lvbkNvbmRpdGlvbkxvY2spOwotICAg ICAgICBtX2VtcHR5UmVnaW9uQ29uZGl0aW9uLnNpZ25hbCgpOworICAgICAgICBzdGQ6OmxvY2tf Z3VhcmQ8c3RkOjptdXRleD4gbG9jayhtX2VtcHR5UmVnaW9uQ29uZGl0aW9uTXV0ZXgpOworICAg ICAgICBtX2VtcHR5UmVnaW9uQ29uZGl0aW9uLm5vdGlmeV9vbmUoKTsKICAgICB9CiAKICAgICBp ZiAoIW1fYmxvY2tGcmVlaW5nVGhyZWFkKQo= 220138 2013-12-30 17:14:57 -0800 2014-01-01 09:52:07 -0800 Patch bug-126313-20131230171456.patch text/plain 5497 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxMTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 ZmFlYmQ2OTkwNjA3YTk0NjI5Y2Y1NWIzMmQ5OWEwMTAxYzNjNDYwLi5hNmU1ODg1YmQ5NWM2NDYw OTRmZGEwNmNiOGY4NzBhZDNlZTQ1Yjk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxOSBAQAogMjAxMy0xMi0zMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCisgICAgICAgIFN0b3AgdXNpbmcgVGhyZWFkQ29uZGl0aW9uIGluIEJsb2NrQWxsb2Nh dG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjYz MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGhl YXAvQmxvY2tBbGxvY2F0b3IuY3BwOgorICAgICAgICAoSlNDOjpCbG9ja0FsbG9jYXRvcjo6fkJs b2NrQWxsb2NhdG9yKToKKyAgICAgICAgKEpTQzo6QmxvY2tBbGxvY2F0b3I6OndhaXRGb3JEdXJh dGlvbik6CisgICAgICAgIChKU0M6OkJsb2NrQWxsb2NhdG9yOjpibG9ja0ZyZWVpbmdUaHJlYWRN YWluKToKKyAgICAgICAgKiBoZWFwL0Jsb2NrQWxsb2NhdG9yLmg6CisgICAgICAgIChKU0M6OkJs b2NrQWxsb2NhdG9yOjpkZWFsbG9jYXRlKToKKworMjAxMy0xMi0zMCAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFN0b3AgdXNpbmcgVGhyZWFkQ29uZGl0 aW9uIGluIGpzYy5jcHAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyNjMxMQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9C bG9ja0FsbG9jYXRvci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9CbG9ja0FsbG9j YXRvci5jcHAKaW5kZXggZDhlNDVjN2JlNWY2N2ExOTI4YTY0ZTcxNzVlYWU0ZTc4NWZiYWQ4MS4u N2E3NDc0OTEzMGIxZDY2ZmY0MTU3NjkyODk4ODE1ZTYxMDY2NTNmOSAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQmxvY2tBbGxvY2F0b3IuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9oZWFwL0Jsb2NrQWxsb2NhdG9yLmNwcApAQCAtNjEsOSArNjEsOSBAQCBC bG9ja0FsbG9jYXRvcjo6fkJsb2NrQWxsb2NhdG9yKCkKIHsKICAgICByZWxlYXNlRnJlZVJlZ2lv bnMoKTsKICAgICB7Ci0gICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX2VtcHR5UmVnaW9uQ29u ZGl0aW9uTG9jayk7CisgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrKG1f ZW1wdHlSZWdpb25Db25kaXRpb25NdXRleCk7CiAgICAgICAgIG1fYmxvY2tGcmVlaW5nVGhyZWFk U2hvdWxkUXVpdCA9IHRydWU7Ci0gICAgICAgIG1fZW1wdHlSZWdpb25Db25kaXRpb24uYnJvYWRj YXN0KCk7CisgICAgICAgIG1fZW1wdHlSZWdpb25Db25kaXRpb24ubm90aWZ5X2FsbCgpOwogICAg IH0KICAgICBpZiAobV9ibG9ja0ZyZWVpbmdUaHJlYWQpCiAgICAgICAgIHdhaXRGb3JUaHJlYWRD b21wbGV0aW9uKG1fYmxvY2tGcmVlaW5nVGhyZWFkKTsKQEAgLTEwMSwyMiArMTAxLDE3IEBAIHZv aWQgQmxvY2tBbGxvY2F0b3I6OnJlbGVhc2VGcmVlUmVnaW9ucygpCiAgICAgfQogfQogCi12b2lk IEJsb2NrQWxsb2NhdG9yOjp3YWl0Rm9yUmVsYXRpdmVUaW1lV2hpbGVIb2xkaW5nTG9jayhkb3Vi bGUgcmVsYXRpdmUpCit2b2lkIEJsb2NrQWxsb2NhdG9yOjp3YWl0Rm9yRHVyYXRpb24oc3RkOjpj aHJvbm86Om1pbGxpc2Vjb25kcyBkdXJhdGlvbikKIHsKLSAgICBpZiAobV9ibG9ja0ZyZWVpbmdU aHJlYWRTaG91bGRRdWl0KQotICAgICAgICByZXR1cm47Ci0KLSAgICBtX2VtcHR5UmVnaW9uQ29u ZGl0aW9uLnRpbWVkV2FpdChtX2VtcHR5UmVnaW9uQ29uZGl0aW9uTG9jaywgY3VycmVudFRpbWUo KSArIHJlbGF0aXZlKTsKLX0KKyAgICBzdGQ6OnVuaXF1ZV9sb2NrPHN0ZDo6bXV0ZXg+IGxvY2so bV9lbXB0eVJlZ2lvbkNvbmRpdGlvbk11dGV4KTsKIAotdm9pZCBCbG9ja0FsbG9jYXRvcjo6d2Fp dEZvclJlbGF0aXZlVGltZShkb3VibGUgcmVsYXRpdmUpCi17CiAgICAgLy8gSWYgdGhpcyByZXR1 cm5zIGVhcmx5LCB0aGF0J3MgZmluZSwgc28gbG9uZyBhcyBpdCBkb2Vzbid0IGRvIGl0IHRvbwog ICAgIC8vIGZyZXF1ZW50bHkuIEl0IHdvdWxkIG9ubHkgYmUgYSBidWcgaWYgdGhpcyBmdW5jdGlv biBmYWlsZWQgdG8gcmV0dXJuCiAgICAgLy8gd2hlbiBpdCB3YXMgYXNrZWQgdG8gZG8gc28uCi0g ICAgCi0gICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fZW1wdHlSZWdpb25Db25kaXRpb25Mb2NrKTsK LSAgICB3YWl0Rm9yUmVsYXRpdmVUaW1lV2hpbGVIb2xkaW5nTG9jayhyZWxhdGl2ZSk7CisgICAg aWYgKG1fYmxvY2tGcmVlaW5nVGhyZWFkU2hvdWxkUXVpdCkKKyAgICAgICAgcmV0dXJuOworCisg ICAgbV9lbXB0eVJlZ2lvbkNvbmRpdGlvbi53YWl0X2Zvcihsb2NrLCBkdXJhdGlvbik7CiB9CiAK IHZvaWQgQmxvY2tBbGxvY2F0b3I6OmJsb2NrRnJlZWluZ1RocmVhZFN0YXJ0RnVuYyh2b2lkKiBi bG9ja0FsbG9jYXRvcikKQEAgLTEzMCw3ICsxMjUsNyBAQCB2b2lkIEJsb2NrQWxsb2NhdG9yOjpi bG9ja0ZyZWVpbmdUaHJlYWRNYWluKCkKICAgICB3aGlsZSAoIW1fYmxvY2tGcmVlaW5nVGhyZWFk U2hvdWxkUXVpdCkgewogICAgICAgICAvLyBHZW5lcmFsbHkgd2FpdCBmb3Igb25lIHNlY29uZCBi ZWZvcmUgc2NhdmVuZ2luZyBmcmVlIGJsb2Nrcy4gVGhpcwogICAgICAgICAvLyBtYXkgcmV0dXJu IGVhcmx5LCBwYXJ0aWN1bGFybHkgd2hlbiB3ZSdyZSBiZWluZyBhc2tlZCB0byBxdWl0LgotICAg ICAgICB3YWl0Rm9yUmVsYXRpdmVUaW1lKDEuMCk7CisgICAgICAgIHdhaXRGb3JEdXJhdGlvbihz dGQ6OmNocm9ubzo6c2Vjb25kcygxKSk7CiAgICAgICAgIGlmIChtX2Jsb2NrRnJlZWluZ1RocmVh ZFNob3VsZFF1aXQpCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgCkBAIC0xNDEsMTEgKzEz NiwxMSBAQCB2b2lkIEJsb2NrQWxsb2NhdG9yOjpibG9ja0ZyZWVpbmdUaHJlYWRNYWluKCkKIAog ICAgICAgICAvLyBTbGVlcCB1bnRpbCB0aGVyZSBpcyBhY3R1YWxseSB3b3JrIHRvIGRvIHJhdGhl ciB0aGFuIHdha2luZyB1cCBldmVyeSBzZWNvbmQgdG8gY2hlY2suCiAgICAgICAgIHsKLSAgICAg ICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX2VtcHR5UmVnaW9uQ29uZGl0aW9uTG9jayk7Cisg ICAgICAgICAgICBzdGQ6OnVuaXF1ZV9sb2NrPHN0ZDo6bXV0ZXg+IGxvY2sobV9lbXB0eVJlZ2lv bkNvbmRpdGlvbk11dGV4KTsKICAgICAgICAgICAgIFNwaW5Mb2NrSG9sZGVyIHJlZ2lvbkxvY2tl cigmbV9yZWdpb25Mb2NrKTsKICAgICAgICAgICAgIHdoaWxlICghbV9udW1iZXJPZkVtcHR5UmVn aW9ucyAmJiAhbV9ibG9ja0ZyZWVpbmdUaHJlYWRTaG91bGRRdWl0KSB7CiAgICAgICAgICAgICAg ICAgbV9yZWdpb25Mb2NrLlVubG9jaygpOwotICAgICAgICAgICAgICAgIG1fZW1wdHlSZWdpb25D b25kaXRpb24ud2FpdChtX2VtcHR5UmVnaW9uQ29uZGl0aW9uTG9jayk7CisgICAgICAgICAgICAg ICAgbV9lbXB0eVJlZ2lvbkNvbmRpdGlvbi53YWl0KGxvY2spOwogICAgICAgICAgICAgICAgIG1f cmVnaW9uTG9jay5Mb2NrKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBjdXJyZW50TnVt YmVyT2ZFbXB0eVJlZ2lvbnMgPSBtX251bWJlck9mRW1wdHlSZWdpb25zOwpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQmxvY2tBbGxvY2F0b3IuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9oZWFwL0Jsb2NrQWxsb2NhdG9yLmgKaW5kZXggZWZhZWM2NjUyYTIxZmQzMmYz YTgxYzE0MmIzY2UzZDBiZDBmNTQ0YS4uOWY3ZTIxYTE4OWQ5MmI5ZDVmNzAxMGI2YTJjNmMyN2I0 NWUxMWJkMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQmxvY2tBbGxv Y2F0b3IuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9CbG9ja0FsbG9jYXRvci5o CkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSAiR0NBY3Rpdml0eUNhbGxiYWNrLmgiCiAjaW5j bHVkZSAiSGVhcEJsb2NrLmgiCiAjaW5jbHVkZSAiUmVnaW9uLmgiCisjaW5jbHVkZSA8bXV0ZXg+ CiAjaW5jbHVkZSA8d3RmL0RvdWJseUxpbmtlZExpc3QuaD4KICNpbmNsdWRlIDx3dGYvRm9yd2Fy ZC5oPgogI2luY2x1ZGUgPHd0Zi9QYWdlQWxsb2NhdGlvbkFsaWduZWQuaD4KQEAgLTYwLDggKzYx LDcgQEAgcHVibGljOgogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiB2b2lkIGRlYWxsb2NhdGVD dXN0b21TaXplKFQqKTsKIAogcHJpdmF0ZToKLSAgICB2b2lkIHdhaXRGb3JSZWxhdGl2ZVRpbWVX aGlsZUhvbGRpbmdMb2NrKGRvdWJsZSByZWxhdGl2ZSk7Ci0gICAgdm9pZCB3YWl0Rm9yUmVsYXRp dmVUaW1lKGRvdWJsZSByZWxhdGl2ZSk7CisgICAgdm9pZCB3YWl0Rm9yRHVyYXRpb24oc3RkOjpj aHJvbm86Om1pbGxpc2Vjb25kcyk7CiAKICAgICBmcmllbmQgVGhyZWFkSWRlbnRpZmllciBjcmVh dGVCbG9ja0ZyZWVpbmdUaHJlYWQoQmxvY2tBbGxvY2F0b3IqKTsKICAgICB2b2lkIGJsb2NrRnJl ZWluZ1RocmVhZE1haW4oKTsKQEAgLTEwNSw4ICsxMDUsOCBAQCBwcml2YXRlOgogICAgIGJvb2wg bV9pc0N1cnJlbnRseUFsbG9jYXRpbmc7CiAgICAgYm9vbCBtX2Jsb2NrRnJlZWluZ1RocmVhZFNo b3VsZFF1aXQ7CiAgICAgU3BpbkxvY2sgbV9yZWdpb25Mb2NrOwotICAgIE11dGV4IG1fZW1wdHlS ZWdpb25Db25kaXRpb25Mb2NrOwotICAgIFRocmVhZENvbmRpdGlvbiBtX2VtcHR5UmVnaW9uQ29u ZGl0aW9uOworICAgIHN0ZDo6bXV0ZXggbV9lbXB0eVJlZ2lvbkNvbmRpdGlvbk11dGV4OworICAg IHN0ZDo6Y29uZGl0aW9uX3ZhcmlhYmxlIG1fZW1wdHlSZWdpb25Db25kaXRpb247CiAgICAgVGhy ZWFkSWRlbnRpZmllciBtX2Jsb2NrRnJlZWluZ1RocmVhZDsKIH07CiAKQEAgLTE5OSw4ICsxOTks OCBAQCBpbmxpbmUgdm9pZCBCbG9ja0FsbG9jYXRvcjo6ZGVhbGxvY2F0ZShUKiBibG9jaykKICAg ICB9CiAKICAgICBpZiAoc2hvdWxkV2FrZUJsb2NrRnJlZWluZ1RocmVhZCkgewotICAgICAgICBN dXRleExvY2tlciBtdXRleExvY2tlcihtX2VtcHR5UmVnaW9uQ29uZGl0aW9uTG9jayk7Ci0gICAg ICAgIG1fZW1wdHlSZWdpb25Db25kaXRpb24uc2lnbmFsKCk7CisgICAgICAgIHN0ZDo6bG9ja19n dWFyZDxzdGQ6Om11dGV4PiBsb2NrKG1fZW1wdHlSZWdpb25Db25kaXRpb25NdXRleCk7CisgICAg ICAgIG1fZW1wdHlSZWdpb25Db25kaXRpb24ubm90aWZ5X29uZSgpOwogICAgIH0KIAogICAgIGlm ICghbV9ibG9ja0ZyZWVpbmdUaHJlYWQpCg==