164823 2016-11-16 09:41:37 -0800 Slight Octane regression from concurrent GC's eager object zero-fill 2016-12-13 10:13:52 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED WONTFIX P2 Normal --- 164885 149432 1 fpizlo fpizlo cdumez commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1251892 0 fpizlo 2016-11-16 09:41:37 -0800 Patch forthcoming. 1251893 1 294946 fpizlo 2016-11-16 09:49:58 -0800 Created attachment 294946 one possible approach This fixes the eager zero-fill performance problems by doing the zero-fill conditionally. But I'm also going to attempt a fix where the GC manages the zero-filling. 1251986 2 fpizlo 2016-11-16 13:02:10 -0800 (In reply to comment #1) > Created attachment 294946 [details] > one possible approach > > This fixes the eager zero-fill performance problems by doing the zero-fill > conditionally. > > But I'm also going to attempt a fix where the GC manages the zero-filling. Thinking about it more, doing the zero-filling in GC doesn't work. It fails to protect us from the case where the collector races with a transition on an object that was allocated without eager zero-fill. Also, the GC zero-fill patch was not really faster. 1251988 3 294967 fpizlo 2016-11-16 13:02:53 -0800 Created attachment 294967 the patch 1251989 4 294967 ggaren 2016-11-16 13:05:59 -0800 Comment on attachment 294967 the patch r=me 1252017 5 fpizlo 2016-11-16 14:25:13 -0800 Landed in https://trac.webkit.org/changeset/208811 1252072 6 fpizlo 2016-11-16 15:50:38 -0800 I'm beginning to think that no version of this optimization is sound: it's possible that an object allocated before GC started, and so without zero-fill, could be part of a memory ordering race while the GC is running. I think that a better approach would be to remove object initializations and then put fences on PutStructure. To make that efficient on ARM, we would have to do redundant PutStructure elimination in DFG IR. 1252079 7 fpizlo 2016-11-16 16:02:20 -0800 (In reply to comment #6) > I'm beginning to think that no version of this optimization is sound: it's > possible that an object allocated before GC started, and so without > zero-fill, could be part of a memory ordering race while the GC is running. > > I think that a better approach would be to remove object initializations and > then put fences on PutStructure. To make that efficient on ARM, we would > have to do redundant PutStructure elimination in DFG IR. Rolled out in r208822. 1252198 8 cdumez 2016-11-16 21:02:10 -0800 (In reply to comment #5) > Landed in https://trac.webkit.org/changeset/208811 FYI, one of our Mac bots has caught up with r208811 and there was no progression on Octane. 1252698 9 cdumez 2016-11-18 09:30:20 -0800 (In reply to comment #8) > (In reply to comment #5) > > Landed in https://trac.webkit.org/changeset/208811 > > FYI, one of our Mac bots has caught up with r208811 and there was no > progression on Octane. FYI, A/B testing shows there was no Speedometer progression from r208811 on ARM either. 1259426 10 fpizlo 2016-12-13 10:13:52 -0800 I don't think that we know that there was actually any regression due to this specifically, based on subsequent testing. 294946 2016-11-16 09:49:58 -0800 2016-11-16 13:02:53 -0800 one possible approach blah.patch text/plain 5161 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4Nzk0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBA CisyMDE2LTExLTE2ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg U2xpZ2h0IE9jdGFuZSByZWdyZXNzaW9uIGZyb20gY29uY3VycmVudCBHQydzIGVhZ2VyIG9iamVj dCB6ZXJvLWZpbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2NDgyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAg ICAKKyAgICAgICAgRHVyaW5nIGNvbmN1cnJlbnQgR0MsIHdlIG5lZWQgdG8gZWFnZXJseSB6ZXJv LWZpbGwgb2JqZWN0cyB3ZSBhbGxvY2F0ZSBwcmlvciB0bworICAgICAgICBleGVjdXRpbmcgdGhl IGVuZC1vZi1hbGxvY2F0aW9uIGZlbmNlLiBUaGlzIGNhdXNlcyBzb21lIHJlZ3Jlc3Npb25zLiBU aGlzIGlzIGFuIGF0dGVtcHQKKyAgICAgICAgdG8gZml4IHRob3NlIHJlZ3Jlc3Npb25zIGJ5IG1h a2luZyB0aGVtIGNvbmRpdGlvbmFsIG9uIHdoZXRoZXIgdGhlIG11dGF0b3IgaXMgZmVuY2VkLgor ICAgICAgICAKKyAgICAgICAgVGhpcyBpcyBhIHNsaWdodCBzcGVlZC11cCBvbiByYXl0cmFjZSBh bmQgYm95ZXIuCisKKyAgICAgICAgKiBmdGwvRlRMTG93ZXJERkdUb0IzLmNwcDoKKyAgICAgICAg KEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9CMzo6Y29tcGlsZU1hdGVyaWFsaXplTmV3T2JqZWN0 KToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9CMzo6c3BsYXRXb3Jkc0lmTXV0 YXRvcklzRmVuY2VkKToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9CMzo6YWxs b2NhdGVQcm9wZXJ0eVN0b3JhZ2UpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdU b0IzOjpyZWFsbG9jYXRlUHJvcGVydHlTdG9yYWdlKToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6 Okxvd2VyREZHVG9CMzo6YWxsb2NhdGVPYmplY3QpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6 TG93ZXJERkdUb0IzOjptdXRhdG9yRmVuY2UpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93 ZXJERkdUb0IzOjpzZXRCdXR0ZXJmbHkpOgorCiAyMDE2LTExLTE2ICBLZWl0aCBNaWxsZXIgIDxr ZWl0aF9taWxsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIEFSTSBidWlsZCBm aXguCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMu Y3BwCShyZXZpc2lvbiAyMDg3NzkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExv d2VyREZHVG9CMy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgxMzQsNyArODEzNCw3IEBAIHByaXZh dGU6CiAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgVmFsdWVGcm9tQmxvY2sgaGF2 ZUJ1dHRlcmZseSA9IG1fb3V0LmFuY2hvcihmYXN0QnV0dGVyZmx5VmFsdWUpOwogICAgICAgICAg ICAgICAgIAotICAgICAgICAgICAgICAgIHNwbGF0V29yZHMoCisgICAgICAgICAgICAgICAgc3Bs YXRXb3Jkc0lmTXV0YXRvcklzRmVuY2VkKAogICAgICAgICAgICAgICAgICAgICBmYXN0QnV0dGVy Zmx5VmFsdWUsCiAgICAgICAgICAgICAgICAgICAgIG1fb3V0LmNvbnN0SW50MzIoLXN0cnVjdHVy ZS0+b3V0T2ZMaW5lQ2FwYWNpdHkoKSAtIDEpLAogICAgICAgICAgICAgICAgICAgICBtX291dC5j b25zdEludDMyKC0xKSwKQEAgLTg5NjAsNiArODk2MCwyNSBAQCBwcml2YXRlOgogICAgICAgICBz cGxhdFdvcmRzKGJ1dHRlcmZseSwgYmVnaW4sIGVuZCwgaG9sZSwgaGVhcC0+YXRBbnlJbmRleCgp KTsKICAgICB9CiAgICAgCisgICAgdm9pZCBzcGxhdFdvcmRzSWZNdXRhdG9ySXNGZW5jZWQoTFZh bHVlIGJhc2UsIExWYWx1ZSBiZWdpbiwgTFZhbHVlIGVuZCwgTFZhbHVlIHZhbHVlLCBjb25zdCBB YnN0cmFjdEhlYXAmIGhlYXApCisgICAgeworICAgICAgICBMQmFzaWNCbG9jayBzbG93UGF0aCA9 IG1fb3V0Lm5ld0Jsb2NrKCk7CisgICAgICAgIExCYXNpY0Jsb2NrIGNvbnRpbnVhdGlvbiA9IG1f b3V0Lm5ld0Jsb2NrKCk7CisgICAgICAgIAorICAgICAgICBMQmFzaWNCbG9jayBsYXN0TmV4dCA9 IG1fb3V0Lmluc2VydE5ld0Jsb2Nrc0JlZm9yZShzbG93UGF0aCk7CisgICAgICAgIAorICAgICAg ICBtX291dC5icmFuY2goCisgICAgICAgICAgICBtX291dC5sb2FkOFplcm9FeHQzMihtX291dC5h YnNvbHV0ZSh2bSgpLmhlYXAuYWRkcmVzc09mTXV0YXRvclNob3VsZEJlRmVuY2VkKCkpKSwKKyAg ICAgICAgICAgIHJhcmVseShzbG93UGF0aCksIHVzdWFsbHkoY29udGludWF0aW9uKSk7CisgICAg ICAgIAorICAgICAgICBtX291dC5hcHBlbmRUbyhzbG93UGF0aCwgY29udGludWF0aW9uKTsKKyAg ICAgICAgCisgICAgICAgIHNwbGF0V29yZHMoYmFzZSwgYmVnaW4sIGVuZCwgdmFsdWUsIGhlYXAp OworICAgICAgICBtX291dC5qdW1wKGNvbnRpbnVhdGlvbik7CisgICAgICAgIAorICAgICAgICBt X291dC5hcHBlbmRUbyhjb250aW51YXRpb24sIGxhc3ROZXh0KTsKKyAgICB9CisgICAgCiAgICAg dm9pZCBzcGxhdFdvcmRzKExWYWx1ZSBiYXNlLCBMVmFsdWUgYmVnaW4sIExWYWx1ZSBlbmQsIExW YWx1ZSB2YWx1ZSwgY29uc3QgQWJzdHJhY3RIZWFwJiBoZWFwKQogICAgIHsKICAgICAgICAgY29u c3QgdWludDY0X3QgdW5yb2xsaW5nTGltaXQgPSAxMDsKQEAgLTkwMTMsNyArOTAzMiw3IEBAIHBy aXZhdGU6CiAgICAgICAgIAogICAgICAgICBMVmFsdWUgcmVzdWx0ID0gYWxsb2NhdGVQcm9wZXJ0 eVN0b3JhZ2VXaXRoU2l6ZUltcGwoaW5pdGlhbE91dE9mTGluZUNhcGFjaXR5KTsKIAotICAgICAg ICBzcGxhdFdvcmRzKAorICAgICAgICBzcGxhdFdvcmRzSWZNdXRhdG9ySXNGZW5jZWQoCiAgICAg ICAgICAgICByZXN1bHQsCiAgICAgICAgICAgICBtX291dC5jb25zdEludDMyKC1pbml0aWFsT3V0 T2ZMaW5lQ2FwYWNpdHkgLSAxKSwgbV9vdXQuY29uc3RJbnQzMigtMSksCiAgICAgICAgICAgICBt X291dC5pbnQ2NFplcm8sIG1faGVhcHMucHJvcGVydGllcy5hdEFueU51bWJlcigpKTsKQEAgLTkw NDYsNyArOTA2NSw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBtX291dC5zdG9yZVB0cihsb2Fk ZWQsIG1fb3V0LmFkZHJlc3MobV9oZWFwcy5wcm9wZXJ0aWVzLmF0QW55TnVtYmVyKCksIHJlc3Vs dCwgb2Zmc2V0KSk7CiAgICAgICAgIH0KICAgICAgICAgCi0gICAgICAgIHNwbGF0V29yZHMoCisg ICAgICAgIHNwbGF0V29yZHNJZk11dGF0b3JJc0ZlbmNlZCgKICAgICAgICAgICAgIHJlc3VsdCwK ICAgICAgICAgICAgIG1fb3V0LmNvbnN0SW50MzIoLW5ld1NpemUgLSAxKSwgbV9vdXQuY29uc3RJ bnQzMigtb2xkU2l6ZSAtIDEpLAogICAgICAgICAgICAgbV9vdXQuaW50NjRaZXJvLCBtX2hlYXBz LnByb3BlcnRpZXMuYXRBbnlOdW1iZXIoKSk7CkBAIC05OTI2LDcgKzk5NDUsNyBAQCBwcml2YXRl OgogICAgICAgICBMVmFsdWUgYWxsb2NhdG9yLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgTFZhbHVl IGJ1dHRlcmZseSwgTEJhc2ljQmxvY2sgc2xvd1BhdGgpCiAgICAgewogICAgICAgICBMVmFsdWUg cmVzdWx0ID0gYWxsb2NhdGVDZWxsKGFsbG9jYXRvciwgc3RydWN0dXJlLCBzbG93UGF0aCk7Ci0g ICAgICAgIHNwbGF0V29yZHMoCisgICAgICAgIHNwbGF0V29yZHNJZk11dGF0b3JJc0ZlbmNlZCgK ICAgICAgICAgICAgIHJlc3VsdCwKICAgICAgICAgICAgIG1fb3V0LmNvbnN0SW50MzIoSlNGaW5h bE9iamVjdDo6b2Zmc2V0T2ZJbmxpbmVTdG9yYWdlKCkgLyA4KSwKICAgICAgICAgICAgIG1fb3V0 LmNvbnN0SW50MzIoSlNGaW5hbE9iamVjdDo6b2Zmc2V0T2ZJbmxpbmVTdG9yYWdlKCkgLyA4ICsg c3RydWN0dXJlLT5pbmxpbmVDYXBhY2l0eSgpKSwKQEAgLTEyNTg1LDcgKzEyNjA0LDcgQEAgcHJp dmF0ZToKICAgICAgICAgICAgIG1fb3V0LmxvYWQ4WmVyb0V4dDMyKG1fb3V0LmFic29sdXRlKHZt KCkuaGVhcC5hZGRyZXNzT2ZNdXRhdG9yU2hvdWxkQmVGZW5jZWQoKSkpLAogICAgICAgICAgICAg cmFyZWx5KHNsb3dQYXRoKSwgdXN1YWxseShjb250aW51YXRpb24pKTsKICAgICAgICAgCi0gICAg ICAgIG1fb3V0LmFwcGVuZFRvKHNsb3dQYXRoKTsKKyAgICAgICAgbV9vdXQuYXBwZW5kVG8oc2xv d1BhdGgsIGNvbnRpbnVhdGlvbik7CiAgICAgICAgIAogICAgICAgICBtX291dC5mZW5jZSgmbV9o ZWFwcy5yb290LCBudWxscHRyKTsKICAgICAgICAgbV9vdXQuanVtcChjb250aW51YXRpb24pOwpA QCAtMTI2MTIsMTIgKzEyNjMxLDEyIEBAIHByaXZhdGU6CiAgICAgICAgICAgICBtX291dC5sb2Fk OFplcm9FeHQzMihtX291dC5hYnNvbHV0ZSh2bSgpLmhlYXAuYWRkcmVzc09mTXV0YXRvclNob3Vs ZEJlRmVuY2VkKCkpKSwKICAgICAgICAgICAgIHJhcmVseShzbG93UGF0aCksIHVzdWFsbHkoZmFz dFBhdGgpKTsKIAotICAgICAgICBtX291dC5hcHBlbmRUbyhmYXN0UGF0aCk7CisgICAgICAgIG1f b3V0LmFwcGVuZFRvKGZhc3RQYXRoLCBzbG93UGF0aCk7CiAgICAgICAgIAogICAgICAgICBtX291 dC5zdG9yZVB0cihidXR0ZXJmbHksIG9iamVjdCwgbV9oZWFwcy5KU09iamVjdF9idXR0ZXJmbHkp OwogICAgICAgICBtX291dC5qdW1wKGNvbnRpbnVhdGlvbik7CiAgICAgICAgIAotICAgICAgICBt X291dC5hcHBlbmRUbyhzbG93UGF0aCk7CisgICAgICAgIG1fb3V0LmFwcGVuZFRvKHNsb3dQYXRo LCBjb250aW51YXRpb24pOwogICAgICAgICAKICAgICAgICAgbV9vdXQuZmVuY2UoJm1faGVhcHMu cm9vdCwgbnVsbHB0cik7CiAgICAgICAgIG1fb3V0LnN0b3JlUHRyKGJ1dHRlcmZseSwgb2JqZWN0 LCBtX2hlYXBzLkpTT2JqZWN0X2J1dHRlcmZseSk7Cg== 294967 2016-11-16 13:02:53 -0800 2016-11-16 13:05:59 -0800 the patch blah.patch text/plain 5212 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4Nzk0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBA CisyMDE2LTExLTE2ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg U2xpZ2h0IE9jdGFuZSByZWdyZXNzaW9uIGZyb20gY29uY3VycmVudCBHQydzIGVhZ2VyIG9iamVj dCB6ZXJvLWZpbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2NDgyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAg ICAKKyAgICAgICAgRHVyaW5nIGNvbmN1cnJlbnQgR0MsIHdlIG5lZWQgdG8gZWFnZXJseSB6ZXJv LWZpbGwgb2JqZWN0cyB3ZSBhbGxvY2F0ZSBwcmlvciB0bworICAgICAgICBleGVjdXRpbmcgdGhl IGVuZC1vZi1hbGxvY2F0aW9uIGZlbmNlLiBUaGlzIGNhdXNlcyBzb21lIHJlZ3Jlc3Npb25zLiBU aGlzIGlzIGFuIGF0dGVtcHQKKyAgICAgICAgdG8gZml4IHRob3NlIHJlZ3Jlc3Npb25zIGJ5IG1h a2luZyB0aGVtIGNvbmRpdGlvbmFsIG9uIHdoZXRoZXIgdGhlIG11dGF0b3IgaXMgZmVuY2VkLgor ICAgICAgICAKKyAgICAgICAgVGhpcyBpcyBhIHNsaWdodCBzcGVlZC11cCBvbiByYXl0cmFjZSBh bmQgYm95ZXIsIGFuZCBob3BlZnVsbHkgaXQgd2lsbCBmaXggdGhlCisgICAgICAgIHJlZ3Jlc3Np b24uCisKKyAgICAgICAgKiBmdGwvRlRMTG93ZXJERkdUb0IzLmNwcDoKKyAgICAgICAgKEpTQzo6 RlRMOjpERkc6Okxvd2VyREZHVG9CMzo6Y29tcGlsZU1hdGVyaWFsaXplTmV3T2JqZWN0KToKKyAg ICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9CMzo6c3BsYXRXb3Jkc0lmTXV0YXRvcklz RmVuY2VkKToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2VyREZHVG9CMzo6YWxsb2NhdGVQ cm9wZXJ0eVN0b3JhZ2UpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdUb0IzOjpy ZWFsbG9jYXRlUHJvcGVydHlTdG9yYWdlKToKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6Okxvd2Vy REZHVG9CMzo6YWxsb2NhdGVPYmplY3QpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJE RkdUb0IzOjptdXRhdG9yRmVuY2UpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdU b0IzOjpzZXRCdXR0ZXJmbHkpOgorCiAyMDE2LTExLTE2ICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9t aWxsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIEFSTSBidWlsZCBmaXguCklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCShy ZXZpc2lvbiAyMDg3NzkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZH VG9CMy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgxMzQsNyArODEzNCw3IEBAIHByaXZhdGU6CiAg ICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgVmFsdWVGcm9tQmxvY2sgaGF2ZUJ1dHRl cmZseSA9IG1fb3V0LmFuY2hvcihmYXN0QnV0dGVyZmx5VmFsdWUpOwogICAgICAgICAgICAgICAg IAotICAgICAgICAgICAgICAgIHNwbGF0V29yZHMoCisgICAgICAgICAgICAgICAgc3BsYXRXb3Jk c0lmTXV0YXRvcklzRmVuY2VkKAogICAgICAgICAgICAgICAgICAgICBmYXN0QnV0dGVyZmx5VmFs dWUsCiAgICAgICAgICAgICAgICAgICAgIG1fb3V0LmNvbnN0SW50MzIoLXN0cnVjdHVyZS0+b3V0 T2ZMaW5lQ2FwYWNpdHkoKSAtIDEpLAogICAgICAgICAgICAgICAgICAgICBtX291dC5jb25zdElu dDMyKC0xKSwKQEAgLTg5NjAsNiArODk2MCwyNSBAQCBwcml2YXRlOgogICAgICAgICBzcGxhdFdv cmRzKGJ1dHRlcmZseSwgYmVnaW4sIGVuZCwgaG9sZSwgaGVhcC0+YXRBbnlJbmRleCgpKTsKICAg ICB9CiAgICAgCisgICAgdm9pZCBzcGxhdFdvcmRzSWZNdXRhdG9ySXNGZW5jZWQoTFZhbHVlIGJh c2UsIExWYWx1ZSBiZWdpbiwgTFZhbHVlIGVuZCwgTFZhbHVlIHZhbHVlLCBjb25zdCBBYnN0cmFj dEhlYXAmIGhlYXApCisgICAgeworICAgICAgICBMQmFzaWNCbG9jayBzbG93UGF0aCA9IG1fb3V0 Lm5ld0Jsb2NrKCk7CisgICAgICAgIExCYXNpY0Jsb2NrIGNvbnRpbnVhdGlvbiA9IG1fb3V0Lm5l d0Jsb2NrKCk7CisgICAgICAgIAorICAgICAgICBMQmFzaWNCbG9jayBsYXN0TmV4dCA9IG1fb3V0 Lmluc2VydE5ld0Jsb2Nrc0JlZm9yZShzbG93UGF0aCk7CisgICAgICAgIAorICAgICAgICBtX291 dC5icmFuY2goCisgICAgICAgICAgICBtX291dC5sb2FkOFplcm9FeHQzMihtX291dC5hYnNvbHV0 ZSh2bSgpLmhlYXAuYWRkcmVzc09mTXV0YXRvclNob3VsZEJlRmVuY2VkKCkpKSwKKyAgICAgICAg ICAgIHJhcmVseShzbG93UGF0aCksIHVzdWFsbHkoY29udGludWF0aW9uKSk7CisgICAgICAgIAor ICAgICAgICBtX291dC5hcHBlbmRUbyhzbG93UGF0aCwgY29udGludWF0aW9uKTsKKyAgICAgICAg CisgICAgICAgIHNwbGF0V29yZHMoYmFzZSwgYmVnaW4sIGVuZCwgdmFsdWUsIGhlYXApOworICAg ICAgICBtX291dC5qdW1wKGNvbnRpbnVhdGlvbik7CisgICAgICAgIAorICAgICAgICBtX291dC5h cHBlbmRUbyhjb250aW51YXRpb24sIGxhc3ROZXh0KTsKKyAgICB9CisgICAgCiAgICAgdm9pZCBz cGxhdFdvcmRzKExWYWx1ZSBiYXNlLCBMVmFsdWUgYmVnaW4sIExWYWx1ZSBlbmQsIExWYWx1ZSB2 YWx1ZSwgY29uc3QgQWJzdHJhY3RIZWFwJiBoZWFwKQogICAgIHsKICAgICAgICAgY29uc3QgdWlu dDY0X3QgdW5yb2xsaW5nTGltaXQgPSAxMDsKQEAgLTkwMTMsNyArOTAzMiw3IEBAIHByaXZhdGU6 CiAgICAgICAgIAogICAgICAgICBMVmFsdWUgcmVzdWx0ID0gYWxsb2NhdGVQcm9wZXJ0eVN0b3Jh Z2VXaXRoU2l6ZUltcGwoaW5pdGlhbE91dE9mTGluZUNhcGFjaXR5KTsKIAotICAgICAgICBzcGxh dFdvcmRzKAorICAgICAgICBzcGxhdFdvcmRzSWZNdXRhdG9ySXNGZW5jZWQoCiAgICAgICAgICAg ICByZXN1bHQsCiAgICAgICAgICAgICBtX291dC5jb25zdEludDMyKC1pbml0aWFsT3V0T2ZMaW5l Q2FwYWNpdHkgLSAxKSwgbV9vdXQuY29uc3RJbnQzMigtMSksCiAgICAgICAgICAgICBtX291dC5p bnQ2NFplcm8sIG1faGVhcHMucHJvcGVydGllcy5hdEFueU51bWJlcigpKTsKQEAgLTkwNDYsNyAr OTA2NSw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBtX291dC5zdG9yZVB0cihsb2FkZWQsIG1f b3V0LmFkZHJlc3MobV9oZWFwcy5wcm9wZXJ0aWVzLmF0QW55TnVtYmVyKCksIHJlc3VsdCwgb2Zm c2V0KSk7CiAgICAgICAgIH0KICAgICAgICAgCi0gICAgICAgIHNwbGF0V29yZHMoCisgICAgICAg IHNwbGF0V29yZHNJZk11dGF0b3JJc0ZlbmNlZCgKICAgICAgICAgICAgIHJlc3VsdCwKICAgICAg ICAgICAgIG1fb3V0LmNvbnN0SW50MzIoLW5ld1NpemUgLSAxKSwgbV9vdXQuY29uc3RJbnQzMigt b2xkU2l6ZSAtIDEpLAogICAgICAgICAgICAgbV9vdXQuaW50NjRaZXJvLCBtX2hlYXBzLnByb3Bl cnRpZXMuYXRBbnlOdW1iZXIoKSk7CkBAIC05OTI2LDcgKzk5NDUsNyBAQCBwcml2YXRlOgogICAg ICAgICBMVmFsdWUgYWxsb2NhdG9yLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgTFZhbHVlIGJ1dHRl cmZseSwgTEJhc2ljQmxvY2sgc2xvd1BhdGgpCiAgICAgewogICAgICAgICBMVmFsdWUgcmVzdWx0 ID0gYWxsb2NhdGVDZWxsKGFsbG9jYXRvciwgc3RydWN0dXJlLCBzbG93UGF0aCk7Ci0gICAgICAg IHNwbGF0V29yZHMoCisgICAgICAgIHNwbGF0V29yZHNJZk11dGF0b3JJc0ZlbmNlZCgKICAgICAg ICAgICAgIHJlc3VsdCwKICAgICAgICAgICAgIG1fb3V0LmNvbnN0SW50MzIoSlNGaW5hbE9iamVj dDo6b2Zmc2V0T2ZJbmxpbmVTdG9yYWdlKCkgLyA4KSwKICAgICAgICAgICAgIG1fb3V0LmNvbnN0 SW50MzIoSlNGaW5hbE9iamVjdDo6b2Zmc2V0T2ZJbmxpbmVTdG9yYWdlKCkgLyA4ICsgc3RydWN0 dXJlLT5pbmxpbmVDYXBhY2l0eSgpKSwKQEAgLTEyNTg1LDcgKzEyNjA0LDcgQEAgcHJpdmF0ZToK ICAgICAgICAgICAgIG1fb3V0LmxvYWQ4WmVyb0V4dDMyKG1fb3V0LmFic29sdXRlKHZtKCkuaGVh cC5hZGRyZXNzT2ZNdXRhdG9yU2hvdWxkQmVGZW5jZWQoKSkpLAogICAgICAgICAgICAgcmFyZWx5 KHNsb3dQYXRoKSwgdXN1YWxseShjb250aW51YXRpb24pKTsKICAgICAgICAgCi0gICAgICAgIG1f b3V0LmFwcGVuZFRvKHNsb3dQYXRoKTsKKyAgICAgICAgbV9vdXQuYXBwZW5kVG8oc2xvd1BhdGgs IGNvbnRpbnVhdGlvbik7CiAgICAgICAgIAogICAgICAgICBtX291dC5mZW5jZSgmbV9oZWFwcy5y b290LCBudWxscHRyKTsKICAgICAgICAgbV9vdXQuanVtcChjb250aW51YXRpb24pOwpAQCAtMTI2 MTIsMTIgKzEyNjMxLDEyIEBAIHByaXZhdGU6CiAgICAgICAgICAgICBtX291dC5sb2FkOFplcm9F eHQzMihtX291dC5hYnNvbHV0ZSh2bSgpLmhlYXAuYWRkcmVzc09mTXV0YXRvclNob3VsZEJlRmVu Y2VkKCkpKSwKICAgICAgICAgICAgIHJhcmVseShzbG93UGF0aCksIHVzdWFsbHkoZmFzdFBhdGgp KTsKIAotICAgICAgICBtX291dC5hcHBlbmRUbyhmYXN0UGF0aCk7CisgICAgICAgIG1fb3V0LmFw cGVuZFRvKGZhc3RQYXRoLCBzbG93UGF0aCk7CiAgICAgICAgIAogICAgICAgICBtX291dC5zdG9y ZVB0cihidXR0ZXJmbHksIG9iamVjdCwgbV9oZWFwcy5KU09iamVjdF9idXR0ZXJmbHkpOwogICAg ICAgICBtX291dC5qdW1wKGNvbnRpbnVhdGlvbik7CiAgICAgICAgIAotICAgICAgICBtX291dC5h cHBlbmRUbyhzbG93UGF0aCk7CisgICAgICAgIG1fb3V0LmFwcGVuZFRvKHNsb3dQYXRoLCBjb250 aW51YXRpb24pOwogICAgICAgICAKICAgICAgICAgbV9vdXQuZmVuY2UoJm1faGVhcHMucm9vdCwg bnVsbHB0cik7CiAgICAgICAgIG1fb3V0LnN0b3JlUHRyKGJ1dHRlcmZseSwgb2JqZWN0LCBtX2hl YXBzLkpTT2JqZWN0X2J1dHRlcmZseSk7Cg==