170515 2017-04-05 12:22:18 -0700 Kill any WebContent process using over 16 GB of memory. 2017-04-06 13:18:57 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar, Performance P2 Normal --- 1 kling kling benjamin buildbot cdumez cmarcelo commit-queue dbates kling koivisto oldest_to_newest 1294589 0 kling 2017-04-05 12:22:18 -0700 If you go over 16 GB, I don't care if you're "active", what are you even doing. Time to die. <rdar://problem/29930931> 1294597 1 306302 kling 2017-04-05 12:52:30 -0700 Created attachment 306302 Patch 1294774 2 ap 2017-04-05 19:36:51 -0700 16 GB should be enough for everyone. 1294847 3 306302 koivisto 2017-04-06 03:32:11 -0700 Comment on attachment 306302 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=306302&action=review > Source/WTF/wtf/MemoryPressureHandler.cpp:112 > -void MemoryPressureHandler::measurementTimerFired() > +void MemoryPressureHandler::shrinkOrDie() Nice, this is now much more readable. 1294848 4 koivisto 2017-04-06 03:59:07 -0700 I think we should have tests for the memory policy. You could add internals APIs to simulate the condition and log the kill/pressure events (but not actually kill anything). 1294972 5 kling 2017-04-06 11:35:51 -0700 (In reply to Antti Koivisto from comment #4) > I think we should have tests for the memory policy. You could add internals > APIs to simulate the condition and log the kill/pressure events (but not > actually kill anything). Absolutely. Filed bug 170558 for that. 1294991 6 306410 kling 2017-04-06 12:38:13 -0700 Created attachment 306410 Patch for landing 1295011 7 306410 commit-queue 2017-04-06 13:18:56 -0700 Comment on attachment 306410 Patch for landing Clearing flags on attachment: 306410 Committed r215055: <http://trac.webkit.org/changeset/215055> 1295012 8 commit-queue 2017-04-06 13:18:57 -0700 All reviewed patches have been landed. Closing bug. 306302 2017-04-05 12:52:30 -0700 2017-04-06 12:38:13 -0700 Patch bug-170515.diff text/plain 8693 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggNjQ5ZGRkY2ZkNzIuLmExNWZlNmQ3YmFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE3 LTA0LTA1ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAgICAgICBLaWxs IGFueSBXZWJDb250ZW50IHByb2Nlc3MgdXNpbmcgb3ZlciAxNiBHQiBvZiBtZW1vcnkuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA1MTUKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzI5OTMwOTMxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlc3RydWN0dXJlIHRoZSBjb2RlIHNpbmNlIGl0IHdhcyBn ZXR0aW5nIG91dCBvZiBzeW5jIHdpdGggdGhlIGludGVuZGVkIGJlaGF2aW9yLgorICAgICAgICBO b3cgdGhlcmUncyBhIHRocmVzaG9sZEZvck1lbW9yeUtpbGwoKSB3aGljaCByZXR1cm5zIHRoZSBj dXJyZW50IG1lbW9yeSBsaW1pdCBiYXNlZAorICAgICAgICBvbiB0aGUgcHJvY2VzcyBzdGF0dXMu CisKKyAgICAgICAgVGhlIG1lbW9yeSB1c2FnZSBwb2xpY3kgaXMgc2VwYXJhdGVkIGZyb20gdGhl IGtpbGxpbmcsIGFuZCBub3cgb25seSBkcml2ZXMgdGhlCisgICAgICAgIGFzeW5jaHJvbm91cyBp bnZvY2F0aW9ucyBvZiBwcmVzc3VyZSByZWxpZWYgdGhhdCBvY2N1ciB3aGVuIHdlIHBhc3Mgb3Zl ciBvbmUgb2YKKyAgICAgICAgdGhlIHBvbGljeSBlZGdlcyAobm93IDFHQiBmb3IgQ29uc2VydmF0 aXZlLCAyR0IgZm9yIFN0cmljdC4pCisKKyAgICAgICAgUmVtb3ZlZCB0aGUgIlBhbmljIiBwb2xp Y3kgYW5kIG1vdmVkIHRoZSBtZW1vcnkga2lsbCBsb2dpYyB0byBzaHJpbmtPckRpZSgpLgorCisg ICAgICAgIEJlaGF2aW9yIGFzIG9mIHRoaXMgcGF0Y2g6CisKKyAgICAgICAgICAgIC0gRXZlcnlv bmUgZ2V0cyBraWxsZWQgb3ZlciAxNiBHQi4KKyAgICAgICAgICAgIC0gSW5hY3RpdmUgcHJvY2Vz c2VzIGdldCBraWxsZWQgb3ZlciA0IEdCLgorICAgICAgICAgICAgLSBTdHJpY3QgbWVtb3J5IHVz YWdlIHBvbGljeSBraWNrcyBpbiBhdCAyIEdCLgorICAgICAgICAgICAgLSBDb25zZXJ2YXRpdmUg bWVtb3J5IHVzYWdlIHBvbGljeSBhdCAxIEdCLgorCisgICAgICAgIExpa2UgYmVmb3JlLCB3ZSBt YWtlIGEgYmVzdC1lZmZvcnQgYXR0ZW1wdCB0byBmcmVlIHVwIG1lbW9yeSBiZWZvcmUga2lsbGlu ZyB0aGUgcHJvY2Vzcy4KKworICAgICAgICAqIHd0Zi9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuY3Bw OgorICAgICAgICAoV1RGOjp0b1N0cmluZyk6CisgICAgICAgIChXVEY6Ok1lbW9yeVByZXNzdXJl SGFuZGxlcjo6dGhyZXNob2xkRm9yTWVtb3J5S2lsbCk6CisgICAgICAgIChXVEY6OnRocmVzaG9s ZEZvclBvbGljeSk6CisgICAgICAgIChXVEY6OnBvbGljeUZvckZvb3RwcmludCk6CisgICAgICAg IChXVEY6Ok1lbW9yeVByZXNzdXJlSGFuZGxlcjo6c2hyaW5rT3JEaWUpOgorICAgICAgICAoV1RG OjpNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnNldE1lbW9yeVVzYWdlUG9saWN5QmFzZWRPbkZvb3Rw cmludCk6CisgICAgICAgIChXVEY6Ok1lbW9yeVByZXNzdXJlSGFuZGxlcjo6bWVhc3VyZW1lbnRU aW1lckZpcmVkKToKKyAgICAgICAgKiB3dGYvTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmg6CisKIDIw MTctMDQtMDEgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAg ICBNYWMgY21ha2UgYnVpbGRmaXggYWZ0ZXIgMjE0NTg2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dU Ri93dGYvTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmNwcCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeVBy ZXNzdXJlSGFuZGxlci5jcHAKaW5kZXggNDY2MzMwMjIwMDYuLjZhNmU1N2I2NzA5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuY3BwCisrKyBiL1NvdXJj ZS9XVEYvd3RmL01lbW9yeVByZXNzdXJlSGFuZGxlci5jcHAKQEAgLTcxLDExICs3MSwyMSBAQCBz dGF0aWMgY29uc3QgY2hhciogdG9TdHJpbmcoTWVtb3J5VXNhZ2VQb2xpY3kgcG9saWN5KQogICAg IGNhc2UgTWVtb3J5VXNhZ2VQb2xpY3k6OlVucmVzdHJpY3RlZDogcmV0dXJuICJVbnJlc3RyaWN0 ZWQiOwogICAgIGNhc2UgTWVtb3J5VXNhZ2VQb2xpY3k6OkNvbnNlcnZhdGl2ZTogcmV0dXJuICJD b25zZXJ2YXRpdmUiOwogICAgIGNhc2UgTWVtb3J5VXNhZ2VQb2xpY3k6OlN0cmljdDogcmV0dXJu ICJTdHJpY3QiOwotICAgIGNhc2UgTWVtb3J5VXNhZ2VQb2xpY3k6OlBhbmljOiByZXR1cm4gIlBh bmljIjsKICAgICB9CiB9CiAjZW5kaWYKIAorc2l6ZV90IE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6 dGhyZXNob2xkRm9yTWVtb3J5S2lsbCgpCit7CisjaWYgQ1BVKFg4Nl82NCkgfHwgQ1BVKEFSTTY0 KQorICAgIGlmIChtX3Byb2Nlc3NTdGF0ZSA9PSBXZWJzYW1Qcm9jZXNzU3RhdGU6OkFjdGl2ZSkK KyAgICAgICAgcmV0dXJuIDE2ICogR0I7CisgICAgcmV0dXJuIDQgKiBHQjsKKyNlbHNlCisgICAg cmV0dXJuIDMgKiBHQjsKKyNlbmRpZgorfQorCiBzdGF0aWMgc2l6ZV90IHRocmVzaG9sZEZvclBv bGljeShNZW1vcnlVc2FnZVBvbGljeSBwb2xpY3kpCiB7CiAgICAgc3dpdGNoIChwb2xpY3kpIHsK QEAgLTgzLDEyICs5Myw2IEBAIHN0YXRpYyBzaXplX3QgdGhyZXNob2xkRm9yUG9saWN5KE1lbW9y eVVzYWdlUG9saWN5IHBvbGljeSkKICAgICAgICAgcmV0dXJuIDEgKiBHQjsKICAgICBjYXNlIE1l bW9yeVVzYWdlUG9saWN5OjpTdHJpY3Q6CiAgICAgICAgIHJldHVybiAyICogR0I7Ci0gICAgY2Fz ZSBNZW1vcnlVc2FnZVBvbGljeTo6UGFuaWM6Ci0jaWYgQ1BVKFg4Nl82NCkgfHwgQ1BVKEFSTTY0 KQotICAgICAgICByZXR1cm4gNCAqIEdCOwotI2Vsc2UKLSAgICAgICAgcmV0dXJuIDMgKiBHQjsK LSNlbmRpZgogICAgIGNhc2UgTWVtb3J5VXNhZ2VQb2xpY3k6OlVucmVzdHJpY3RlZDoKICAgICBk ZWZhdWx0OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKQEAgLTk4LDggKzEwMiw2IEBA IHN0YXRpYyBzaXplX3QgdGhyZXNob2xkRm9yUG9saWN5KE1lbW9yeVVzYWdlUG9saWN5IHBvbGlj eSkKIAogc3RhdGljIE1lbW9yeVVzYWdlUG9saWN5IHBvbGljeUZvckZvb3RwcmludChzaXplX3Qg Zm9vdHByaW50KQogewotICAgIGlmIChmb290cHJpbnQgPj0gdGhyZXNob2xkRm9yUG9saWN5KE1l bW9yeVVzYWdlUG9saWN5OjpQYW5pYykpCi0gICAgICAgIHJldHVybiBNZW1vcnlVc2FnZVBvbGlj eTo6UGFuaWM7CiAgICAgaWYgKGZvb3RwcmludCA+PSB0aHJlc2hvbGRGb3JQb2xpY3koTWVtb3J5 VXNhZ2VQb2xpY3k6OlN0cmljdCkpCiAgICAgICAgIHJldHVybiBNZW1vcnlVc2FnZVBvbGljeTo6 U3RyaWN0OwogICAgIGlmIChmb290cHJpbnQgPj0gdGhyZXNob2xkRm9yUG9saWN5KE1lbW9yeVVz YWdlUG9saWN5OjpDb25zZXJ2YXRpdmUpKQpAQCAtMTA3LDYzICsxMDksNTggQEAgc3RhdGljIE1l bW9yeVVzYWdlUG9saWN5IHBvbGljeUZvckZvb3RwcmludChzaXplX3QgZm9vdHByaW50KQogICAg IHJldHVybiBNZW1vcnlVc2FnZVBvbGljeTo6VW5yZXN0cmljdGVkOwogfQogCi12b2lkIE1lbW9y eVByZXNzdXJlSGFuZGxlcjo6bWVhc3VyZW1lbnRUaW1lckZpcmVkKCkKK3ZvaWQgTWVtb3J5UHJl c3N1cmVIYW5kbGVyOjpzaHJpbmtPckRpZSgpCiB7CisgICAgUkVMRUFTRV9MT0coTWVtb3J5UHJl c3N1cmUsICJQcm9jZXNzIGlzIGFib3ZlIHRoZSBtZW1vcnkga2lsbCB0aHJlc2hvbGQuIFRyeWlu ZyB0byBzaHJpbmsgZG93bi4iKTsKKyAgICByZWxlYXNlTWVtb3J5KENyaXRpY2FsOjpZZXMsIFN5 bmNocm9ub3VzOjpZZXMpOworCiAgICAgYXV0byBmb290cHJpbnQgPSBtZW1vcnlGb290cHJpbnQo KTsKLSAgICBpZiAoIWZvb3RwcmludCkKKyAgICBSRUxFQVNFX0FTU0VSVChmb290cHJpbnQpOwor ICAgIFJFTEVBU0VfTE9HKE1lbW9yeVByZXNzdXJlLCAiTmV3IG1lbW9yeSBmb290cHJpbnQ6ICVs dSBNQiIsIGZvb3RwcmludC52YWx1ZSgpIC8gTUIpOworCisgICAgaWYgKGZvb3RwcmludC52YWx1 ZSgpIDwgdGhyZXNob2xkRm9yTWVtb3J5S2lsbCgpKSB7CisgICAgICAgIFJFTEVBU0VfTE9HKE1l bW9yeVByZXNzdXJlLCAiU2hyYW5rIGJlbG93IG1lbW9yeSBraWxsIHRocmVzaG9sZC4gUHJvY2Vz cyBnZXRzIHRvIGxpdmUuIik7CisgICAgICAgIHNldE1lbW9yeVVzYWdlUG9saWN5QmFzZWRPbkZv b3RwcmludChmb290cHJpbnQudmFsdWUoKSk7CiAgICAgICAgIHJldHVybjsKKyAgICB9CiAKLSAg ICBSRUxFQVNFX0xPRyhNZW1vcnlQcmVzc3VyZSwgIkN1cnJlbnQgbWVtb3J5IGZvb3RwcmludDog JWx1IE1CIiwgZm9vdHByaW50LnZhbHVlKCkgLyBNQik7CisgICAgUkVMRUFTRV9BU1NFUlQobV9t ZW1vcnlLaWxsQ2FsbGJhY2spOworICAgIG1fbWVtb3J5S2lsbENhbGxiYWNrKCk7Cit9CiAKLSAg ICBhdXRvIG5ld1BvbGljeSA9IHBvbGljeUZvckZvb3RwcmludChmb290cHJpbnQudmFsdWUoKSk7 Ci0gICAgaWYgKG5ld1BvbGljeSA9PSBtX21lbW9yeVVzYWdlUG9saWN5KSB7Ci0gICAgICAgIGlm IChtX21lbW9yeVVzYWdlUG9saWN5ICE9IE1lbW9yeVVzYWdlUG9saWN5OjpQYW5pYykKLSAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgUkVMRUFTRV9MT0coTWVtb3J5UHJlc3N1cmUsICJNZW1v cnkgdXNhZ2Ugc3RpbGwgYWJvdmUgcGFuaWMgdGhyZXNob2xkIik7Ci0gICAgfSBlbHNlCi0gICAg ICAgIFJFTEVBU0VfTE9HKE1lbW9yeVByZXNzdXJlLCAiTWVtb3J5IHVzYWdlIHBvbGljeSBjaGFu Z2VkOiAlcyAtPiAlcyIsIHRvU3RyaW5nKG1fbWVtb3J5VXNhZ2VQb2xpY3kpLCB0b1N0cmluZyhu ZXdQb2xpY3kpKTsKK3ZvaWQgTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpzZXRNZW1vcnlVc2FnZVBv bGljeUJhc2VkT25Gb290cHJpbnQoc2l6ZV90IGZvb3RwcmludCkKK3sKKyAgICBhdXRvIG5ld1Bv bGljeSA9IHBvbGljeUZvckZvb3RwcmludChmb290cHJpbnQpOworICAgIGlmIChuZXdQb2xpY3kg PT0gbV9tZW1vcnlVc2FnZVBvbGljeSkKKyAgICAgICAgcmV0dXJuOwogCisgICAgUkVMRUFTRV9M T0coTWVtb3J5UHJlc3N1cmUsICJNZW1vcnkgdXNhZ2UgcG9saWN5IGNoYW5nZWQ6ICVzIC0+ICVz IiwgdG9TdHJpbmcobV9tZW1vcnlVc2FnZVBvbGljeSksIHRvU3RyaW5nKG5ld1BvbGljeSkpOwog ICAgIG1fbWVtb3J5VXNhZ2VQb2xpY3kgPSBuZXdQb2xpY3k7CiAgICAgbWVtb3J5UHJlc3N1cmVT dGF0dXNDaGFuZ2VkKCk7Cit9CiAKLSAgICBpZiAobmV3UG9saWN5ID09IE1lbW9yeVVzYWdlUG9s aWN5OjpVbnJlc3RyaWN0ZWQpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlmIChuZXdQb2xpY3kg PT0gTWVtb3J5VXNhZ2VQb2xpY3k6OkNvbnNlcnZhdGl2ZSkgewotICAgICAgICAvLyBGSVhNRTog SW1wbGVtZW50IHRoaXMgcG9saWN5IGJ5IGNob29zaW5nIHdoaWNoIGNhY2hlcyBzaG91bGQgcmVz cGVjdCBpdCwgYW5kIGhvb2tpbmcgdGhlbSB1cC4KK3ZvaWQgTWVtb3J5UHJlc3N1cmVIYW5kbGVy OjptZWFzdXJlbWVudFRpbWVyRmlyZWQoKQoreworICAgIGF1dG8gZm9vdHByaW50ID0gbWVtb3J5 Rm9vdHByaW50KCk7CisgICAgaWYgKCFmb290cHJpbnQpCiAgICAgICAgIHJldHVybjsKLSAgICB9 CiAKLSAgICBpZiAobmV3UG9saWN5ID09IE1lbW9yeVVzYWdlUG9saWN5OjpTdHJpY3QpIHsKLSAg ICAgICAgUkVMRUFTRV9MT0coTWVtb3J5UHJlc3N1cmUsICJBdHRlbXB0aW5nIHRvIHJlZHVjZSBt ZW1vcnkgZm9vdHByaW50IGJ5IGZyZWVpbmcgbGVzcyBpbXBvcnRhbnQgb2JqZWN0cy4iKTsKLSAg ICAgICAgcmVsZWFzZU1lbW9yeShDcml0aWNhbDo6Tm8sIFN5bmNocm9ub3VzOjpObyk7Ci0gICAg ICAgIHJldHVybjsKLSAgICB9CisgICAgUkVMRUFTRV9MT0coTWVtb3J5UHJlc3N1cmUsICJDdXJy ZW50IG1lbW9yeSBmb290cHJpbnQ6ICVsdSBNQiIsIGZvb3RwcmludC52YWx1ZSgpIC8gTUIpOwor ICAgIGlmIChmb290cHJpbnQudmFsdWUoKSA+PSB0aHJlc2hvbGRGb3JNZW1vcnlLaWxsKCkpCisg ICAgICAgIHNocmlua09yRGllKCk7CiAKLSAgICBSRUxFQVNFX0FTU0VSVChuZXdQb2xpY3kgPT0g TWVtb3J5VXNhZ2VQb2xpY3k6OlBhbmljKTsKKyAgICBzZXRNZW1vcnlVc2FnZVBvbGljeUJhc2Vk T25Gb290cHJpbnQoZm9vdHByaW50LnZhbHVlKCkpOwogCi0gICAgUkVMRUFTRV9MT0coTWVtb3J5 UHJlc3N1cmUsICJBdHRlbXB0aW5nIHRvIHJlZHVjZSBtZW1vcnkgZm9vdHByaW50IGJ5IGZyZWVp bmcgbW9yZSBpbXBvcnRhbnQgb2JqZWN0cy4iKTsKLSAgICBpZiAobV9wcm9jZXNzU3RhdGUgPT0g V2Vic2FtUHJvY2Vzc1N0YXRlOjpBY3RpdmUpIHsKKyAgICBzd2l0Y2ggKG1fbWVtb3J5VXNhZ2VQ b2xpY3kpIHsKKyAgICBjYXNlIE1lbW9yeVVzYWdlUG9saWN5OjpVbnJlc3RyaWN0ZWQ6CisgICAg ICAgIGJyZWFrOworICAgIGNhc2UgTWVtb3J5VXNhZ2VQb2xpY3k6OkNvbnNlcnZhdGl2ZToKKyAg ICAgICAgcmVsZWFzZU1lbW9yeShDcml0aWNhbDo6Tm8sIFN5bmNocm9ub3VzOjpObyk7CisgICAg ICAgIGJyZWFrOworICAgIGNhc2UgTWVtb3J5VXNhZ2VQb2xpY3k6OlN0cmljdDoKICAgICAgICAg cmVsZWFzZU1lbW9yeShDcml0aWNhbDo6WWVzLCBTeW5jaHJvbm91czo6Tm8pOwotICAgICAgICBy ZXR1cm47Ci0gICAgfQotCi0gICAgcmVsZWFzZU1lbW9yeShDcml0aWNhbDo6WWVzLCBTeW5jaHJv bm91czo6WWVzKTsKLQotICAgIC8vIFJlbWVhc3VyZSBmb290cHJpbnQgdG8gc2VlIGhvdyB3ZWxs IHRoZSBwcmVzc3VyZSBoYW5kbGVyIGRpZC4KLSAgICBmb290cHJpbnQgPSBtZW1vcnlGb290cHJp bnQoKTsKLSAgICBSRUxFQVNFX0FTU0VSVChmb290cHJpbnQpOwotCi0gICAgUkVMRUFTRV9MT0co TWVtb3J5UHJlc3N1cmUsICJOZXcgbWVtb3J5IGZvb3RwcmludDogJWx1IE1CIiwgZm9vdHByaW50 LnZhbHVlKCkgLyBNQik7Ci0gICAgaWYgKGZvb3RwcmludC52YWx1ZSgpIDwgdGhyZXNob2xkRm9y UG9saWN5KE1lbW9yeVVzYWdlUG9saWN5OjpQYW5pYykpIHsKLSAgICAgICAgbV9tZW1vcnlVc2Fn ZVBvbGljeSA9IHBvbGljeUZvckZvb3RwcmludChmb290cHJpbnQudmFsdWUoKSk7Ci0gICAgICAg IFJFTEVBU0VfTE9HKE1lbW9yeVByZXNzdXJlLCAiUHJlc3N1cmUgcmVkdWNlZCBiZWxvdyBwYW5p YyB0aHJlc2hvbGQuIE5ldyBtZW1vcnkgdXNhZ2UgcG9saWN5OiAlcyIsIHRvU3RyaW5nKG1fbWVt b3J5VXNhZ2VQb2xpY3kpKTsKLSAgICAgICAgbWVtb3J5UHJlc3N1cmVTdGF0dXNDaGFuZ2VkKCk7 Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgYnJlYWs7CiAgICAgfQotCi0gICAgaWYgKG1fbWVt b3J5S2lsbENhbGxiYWNrKQotICAgICAgICBtX21lbW9yeUtpbGxDYWxsYmFjaygpOwogfQogCiB2 b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6c2V0UHJvY2Vzc1N0YXRlKFdlYnNhbVByb2Nlc3NT dGF0ZSBzdGF0ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeVByZXNzdXJlSGFu ZGxlci5oIGIvU291cmNlL1dURi93dGYvTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmgKaW5kZXggNDRk YmM1NmU4MGMuLjAyMzRmM2UxZWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlQ cmVzc3VyZUhhbmRsZXIuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlQcmVzc3VyZUhhbmRs ZXIuaApAQCAtNDksNyArNDksNiBAQCBlbnVtIGNsYXNzIE1lbW9yeVVzYWdlUG9saWN5IHsKICAg ICBVbnJlc3RyaWN0ZWQsIC8vIEFsbG9jYXRlIGFzIG11Y2ggYXMgeW91IHdhbnQKICAgICBDb25z ZXJ2YXRpdmUsIC8vIE1heWJlIHlvdSBkb24ndCBjYWNoZSBldmVyeSBzaW5nbGUgdGhpbmcKICAg ICBTdHJpY3QsIC8vIFRpbWUgdG8gc3RhcnQgcGluY2hpbmcgcGVubmllcyBmb3IgcmVhbAotICAg IFBhbmljLCAvLyBPSCBHT0QgV0UnUkUgU0lOS0lORywgVEhST1cgRVZFUllUSElORyBPVkVSQk9B UkQKIH07CiAKIGVudW0gY2xhc3MgV2Vic2FtUHJvY2Vzc1N0YXRlIHsKQEAgLTE0OCw2ICsxNDcs NyBAQCBwdWJsaWM6CiAgICAgV2Vic2FtUHJvY2Vzc1N0YXRlIHByb2Nlc3NTdGF0ZSgpIGNvbnN0 IHsgcmV0dXJuIG1fcHJvY2Vzc1N0YXRlOyB9CiAKIHByaXZhdGU6CisgICAgc2l6ZV90IHRocmVz aG9sZEZvck1lbW9yeUtpbGwoKTsKICAgICB2b2lkIG1lbW9yeVByZXNzdXJlU3RhdHVzQ2hhbmdl ZCgpOwogCiAgICAgdm9pZCB1bmluc3RhbGwoKTsKQEAgLTE2MSw4ICsxNjEsOSBAQCBwcml2YXRl OgogICAgIHZvaWQgcGxhdGZvcm1SZWxlYXNlTWVtb3J5KENyaXRpY2FsKTsKICAgICB2b2lkIHBs YXRmb3JtSW5pdGlhbGl6ZSgpOwogCi0gICAgTk9fUkVUVVJOX0RVRV9UT19DUkFTSCB2b2lkIGRp ZEV4Y2VlZE1lbW9yeUxpbWl0QW5kRmFpbGVkVG9SZWNvdmVyKCk7CiAgICAgdm9pZCBtZWFzdXJl bWVudFRpbWVyRmlyZWQoKTsKKyAgICB2b2lkIHNocmlua09yRGllKCk7CisgICAgdm9pZCBzZXRN ZW1vcnlVc2FnZVBvbGljeUJhc2VkT25Gb290cHJpbnQoc2l6ZV90KTsKIAogI2lmIE9TKExJTlVY KQogICAgIGNsYXNzIEV2ZW50RkRQb2xsZXIgewo= 306410 2017-04-06 12:38:13 -0700 2017-04-06 13:18:56 -0700 Patch for landing land-170515.diff text/plain 8726 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggN2Y1MTNjY2ZmOWMuLjk0NjdkMTY0MzAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE3 LTA0LTA2ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAgICAgICBLaWxs IGFueSBXZWJDb250ZW50IHByb2Nlc3MgdXNpbmcgb3ZlciAxNiBHQiBvZiBtZW1vcnkuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA1MTUKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzI5OTMwOTMxPgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRp IEtvaXZpc3RvLgorCisgICAgICAgIFJlc3RydWN0dXJlIHRoZSBjb2RlIHNpbmNlIGl0IHdhcyBn ZXR0aW5nIG91dCBvZiBzeW5jIHdpdGggdGhlIGludGVuZGVkIGJlaGF2aW9yLgorICAgICAgICBO b3cgdGhlcmUncyBhIHRocmVzaG9sZEZvck1lbW9yeUtpbGwoKSB3aGljaCByZXR1cm5zIHRoZSBj dXJyZW50IG1lbW9yeSBsaW1pdCBiYXNlZAorICAgICAgICBvbiB0aGUgcHJvY2VzcyBzdGF0dXMu CisKKyAgICAgICAgVGhlIG1lbW9yeSB1c2FnZSBwb2xpY3kgaXMgc2VwYXJhdGVkIGZyb20gdGhl IGtpbGxpbmcsIGFuZCBub3cgb25seSBkcml2ZXMgdGhlCisgICAgICAgIGFzeW5jaHJvbm91cyBp bnZvY2F0aW9ucyBvZiBwcmVzc3VyZSByZWxpZWYgdGhhdCBvY2N1ciB3aGVuIHdlIHBhc3Mgb3Zl ciBvbmUgb2YKKyAgICAgICAgdGhlIHBvbGljeSBlZGdlcyAobm93IDFHQiBmb3IgQ29uc2VydmF0 aXZlLCAyR0IgZm9yIFN0cmljdC4pCisKKyAgICAgICAgUmVtb3ZlZCB0aGUgIlBhbmljIiBwb2xp Y3kgYW5kIG1vdmVkIHRoZSBtZW1vcnkga2lsbCBsb2dpYyB0byBzaHJpbmtPckRpZSgpLgorCisg ICAgICAgIEJlaGF2aW9yIGFzIG9mIHRoaXMgcGF0Y2g6CisKKyAgICAgICAgICAgIC0gRXZlcnlv bmUgZ2V0cyBraWxsZWQgb3ZlciAxNiBHQi4KKyAgICAgICAgICAgIC0gSW5hY3RpdmUgcHJvY2Vz c2VzIGdldCBraWxsZWQgb3ZlciA0IEdCLgorICAgICAgICAgICAgLSBTdHJpY3QgbWVtb3J5IHVz YWdlIHBvbGljeSBraWNrcyBpbiBhdCAyIEdCLgorICAgICAgICAgICAgLSBDb25zZXJ2YXRpdmUg bWVtb3J5IHVzYWdlIHBvbGljeSBhdCAxIEdCLgorCisgICAgICAgIExpa2UgYmVmb3JlLCB3ZSBt YWtlIGEgYmVzdC1lZmZvcnQgYXR0ZW1wdCB0byBmcmVlIHVwIG1lbW9yeSBiZWZvcmUga2lsbGlu ZyB0aGUgcHJvY2Vzcy4KKworICAgICAgICAqIHd0Zi9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuY3Bw OgorICAgICAgICAoV1RGOjp0b1N0cmluZyk6CisgICAgICAgIChXVEY6Ok1lbW9yeVByZXNzdXJl SGFuZGxlcjo6dGhyZXNob2xkRm9yTWVtb3J5S2lsbCk6CisgICAgICAgIChXVEY6OnRocmVzaG9s ZEZvclBvbGljeSk6CisgICAgICAgIChXVEY6OnBvbGljeUZvckZvb3RwcmludCk6CisgICAgICAg IChXVEY6Ok1lbW9yeVByZXNzdXJlSGFuZGxlcjo6c2hyaW5rT3JEaWUpOgorICAgICAgICAoV1RG OjpNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnNldE1lbW9yeVVzYWdlUG9saWN5QmFzZWRPbkZvb3Rw cmludCk6CisgICAgICAgIChXVEY6Ok1lbW9yeVByZXNzdXJlSGFuZGxlcjo6bWVhc3VyZW1lbnRU aW1lckZpcmVkKToKKyAgICAgICAgKiB3dGYvTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmg6CisKIDIw MTctMDQtMDUgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIE1h a2UgaW5hY3RpdmUgd2ViIHByb2Nlc3NlcyBiZWhhdmUgYXMgdGhvdWdoIHVuZGVyIG1lbW9yeSBw cmVzc3VyZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeVByZXNzdXJlSGFuZGxl ci5jcHAgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuY3BwCmluZGV4IGJm OWEwNzU5YTRhLi5hZjE0YjFkZmQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvTWVtb3J5 UHJlc3N1cmVIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlQcmVzc3VyZUhh bmRsZXIuY3BwCkBAIC03MSwxMSArNzEsMjEgQEAgc3RhdGljIGNvbnN0IGNoYXIqIHRvU3RyaW5n KE1lbW9yeVVzYWdlUG9saWN5IHBvbGljeSkKICAgICBjYXNlIE1lbW9yeVVzYWdlUG9saWN5OjpV bnJlc3RyaWN0ZWQ6IHJldHVybiAiVW5yZXN0cmljdGVkIjsKICAgICBjYXNlIE1lbW9yeVVzYWdl UG9saWN5OjpDb25zZXJ2YXRpdmU6IHJldHVybiAiQ29uc2VydmF0aXZlIjsKICAgICBjYXNlIE1l bW9yeVVzYWdlUG9saWN5OjpTdHJpY3Q6IHJldHVybiAiU3RyaWN0IjsKLSAgICBjYXNlIE1lbW9y eVVzYWdlUG9saWN5OjpQYW5pYzogcmV0dXJuICJQYW5pYyI7CiAgICAgfQogfQogI2VuZGlmCiAK K3NpemVfdCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnRocmVzaG9sZEZvck1lbW9yeUtpbGwoKQor eworI2lmIENQVShYODZfNjQpIHx8IENQVShBUk02NCkKKyAgICBpZiAobV9wcm9jZXNzU3RhdGUg PT0gV2Vic2FtUHJvY2Vzc1N0YXRlOjpBY3RpdmUpCisgICAgICAgIHJldHVybiAxNiAqIEdCOwor ICAgIHJldHVybiA0ICogR0I7CisjZWxzZQorICAgIHJldHVybiAzICogR0I7CisjZW5kaWYKK30K Kwogc3RhdGljIHNpemVfdCB0aHJlc2hvbGRGb3JQb2xpY3koTWVtb3J5VXNhZ2VQb2xpY3kgcG9s aWN5KQogewogICAgIHN3aXRjaCAocG9saWN5KSB7CkBAIC04MywxMiArOTMsNiBAQCBzdGF0aWMg c2l6ZV90IHRocmVzaG9sZEZvclBvbGljeShNZW1vcnlVc2FnZVBvbGljeSBwb2xpY3kpCiAgICAg ICAgIHJldHVybiAxICogR0I7CiAgICAgY2FzZSBNZW1vcnlVc2FnZVBvbGljeTo6U3RyaWN0Ogog ICAgICAgICByZXR1cm4gMiAqIEdCOwotICAgIGNhc2UgTWVtb3J5VXNhZ2VQb2xpY3k6OlBhbmlj OgotI2lmIENQVShYODZfNjQpIHx8IENQVShBUk02NCkKLSAgICAgICAgcmV0dXJuIDQgKiBHQjsK LSNlbHNlCi0gICAgICAgIHJldHVybiAzICogR0I7Ci0jZW5kaWYKICAgICBjYXNlIE1lbW9yeVVz YWdlUG9saWN5OjpVbnJlc3RyaWN0ZWQ6CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CkBAIC05OCw4ICsxMDIsNiBAQCBzdGF0aWMgc2l6ZV90IHRocmVzaG9sZEZv clBvbGljeShNZW1vcnlVc2FnZVBvbGljeSBwb2xpY3kpCiAKIHN0YXRpYyBNZW1vcnlVc2FnZVBv bGljeSBwb2xpY3lGb3JGb290cHJpbnQoc2l6ZV90IGZvb3RwcmludCkKIHsKLSAgICBpZiAoZm9v dHByaW50ID49IHRocmVzaG9sZEZvclBvbGljeShNZW1vcnlVc2FnZVBvbGljeTo6UGFuaWMpKQot ICAgICAgICByZXR1cm4gTWVtb3J5VXNhZ2VQb2xpY3k6OlBhbmljOwogICAgIGlmIChmb290cHJp bnQgPj0gdGhyZXNob2xkRm9yUG9saWN5KE1lbW9yeVVzYWdlUG9saWN5OjpTdHJpY3QpKQogICAg ICAgICByZXR1cm4gTWVtb3J5VXNhZ2VQb2xpY3k6OlN0cmljdDsKICAgICBpZiAoZm9vdHByaW50 ID49IHRocmVzaG9sZEZvclBvbGljeShNZW1vcnlVc2FnZVBvbGljeTo6Q29uc2VydmF0aXZlKSkK QEAgLTEwNyw2MyArMTA5LDYwIEBAIHN0YXRpYyBNZW1vcnlVc2FnZVBvbGljeSBwb2xpY3lGb3JG b290cHJpbnQoc2l6ZV90IGZvb3RwcmludCkKICAgICByZXR1cm4gTWVtb3J5VXNhZ2VQb2xpY3k6 OlVucmVzdHJpY3RlZDsKIH0KIAotdm9pZCBNZW1vcnlQcmVzc3VyZUhhbmRsZXI6Om1lYXN1cmVt ZW50VGltZXJGaXJlZCgpCit2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6c2hyaW5rT3JEaWUo KQogeworICAgIFJFTEVBU0VfTE9HKE1lbW9yeVByZXNzdXJlLCAiUHJvY2VzcyBpcyBhYm92ZSB0 aGUgbWVtb3J5IGtpbGwgdGhyZXNob2xkLiBUcnlpbmcgdG8gc2hyaW5rIGRvd24uIik7CisgICAg cmVsZWFzZU1lbW9yeShDcml0aWNhbDo6WWVzLCBTeW5jaHJvbm91czo6WWVzKTsKKwogICAgIGF1 dG8gZm9vdHByaW50ID0gbWVtb3J5Rm9vdHByaW50KCk7Ci0gICAgaWYgKCFmb290cHJpbnQpCisg ICAgUkVMRUFTRV9BU1NFUlQoZm9vdHByaW50KTsKKyAgICBSRUxFQVNFX0xPRyhNZW1vcnlQcmVz c3VyZSwgIk5ldyBtZW1vcnkgZm9vdHByaW50OiAlbHUgTUIiLCBmb290cHJpbnQudmFsdWUoKSAv IE1CKTsKKworICAgIGlmIChmb290cHJpbnQudmFsdWUoKSA8IHRocmVzaG9sZEZvck1lbW9yeUtp bGwoKSkgeworICAgICAgICBSRUxFQVNFX0xPRyhNZW1vcnlQcmVzc3VyZSwgIlNocmFuayBiZWxv dyBtZW1vcnkga2lsbCB0aHJlc2hvbGQuIFByb2Nlc3MgZ2V0cyB0byBsaXZlLiIpOworICAgICAg ICBzZXRNZW1vcnlVc2FnZVBvbGljeUJhc2VkT25Gb290cHJpbnQoZm9vdHByaW50LnZhbHVlKCkp OwogICAgICAgICByZXR1cm47CisgICAgfQogCi0gICAgUkVMRUFTRV9MT0coTWVtb3J5UHJlc3N1 cmUsICJDdXJyZW50IG1lbW9yeSBmb290cHJpbnQ6ICVsdSBNQiIsIGZvb3RwcmludC52YWx1ZSgp IC8gTUIpOworICAgIFJFTEVBU0VfQVNTRVJUKG1fbWVtb3J5S2lsbENhbGxiYWNrKTsKKyAgICBt X21lbW9yeUtpbGxDYWxsYmFjaygpOworfQogCi0gICAgYXV0byBuZXdQb2xpY3kgPSBwb2xpY3lG b3JGb290cHJpbnQoZm9vdHByaW50LnZhbHVlKCkpOwotICAgIGlmIChuZXdQb2xpY3kgPT0gbV9t ZW1vcnlVc2FnZVBvbGljeSkgewotICAgICAgICBpZiAobV9tZW1vcnlVc2FnZVBvbGljeSAhPSBN ZW1vcnlVc2FnZVBvbGljeTo6UGFuaWMpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIFJF TEVBU0VfTE9HKE1lbW9yeVByZXNzdXJlLCAiTWVtb3J5IHVzYWdlIHN0aWxsIGFib3ZlIHBhbmlj IHRocmVzaG9sZCIpOwotICAgIH0gZWxzZQotICAgICAgICBSRUxFQVNFX0xPRyhNZW1vcnlQcmVz c3VyZSwgIk1lbW9yeSB1c2FnZSBwb2xpY3kgY2hhbmdlZDogJXMgLT4gJXMiLCB0b1N0cmluZyht X21lbW9yeVVzYWdlUG9saWN5KSwgdG9TdHJpbmcobmV3UG9saWN5KSk7Cit2b2lkIE1lbW9yeVBy ZXNzdXJlSGFuZGxlcjo6c2V0TWVtb3J5VXNhZ2VQb2xpY3lCYXNlZE9uRm9vdHByaW50KHNpemVf dCBmb290cHJpbnQpCit7CisgICAgYXV0byBuZXdQb2xpY3kgPSBwb2xpY3lGb3JGb290cHJpbnQo Zm9vdHByaW50KTsKKyAgICBpZiAobmV3UG9saWN5ID09IG1fbWVtb3J5VXNhZ2VQb2xpY3kpCisg ICAgICAgIHJldHVybjsKIAorICAgIFJFTEVBU0VfTE9HKE1lbW9yeVByZXNzdXJlLCAiTWVtb3J5 IHVzYWdlIHBvbGljeSBjaGFuZ2VkOiAlcyAtPiAlcyIsIHRvU3RyaW5nKG1fbWVtb3J5VXNhZ2VQ b2xpY3kpLCB0b1N0cmluZyhuZXdQb2xpY3kpKTsKICAgICBtX21lbW9yeVVzYWdlUG9saWN5ID0g bmV3UG9saWN5OwogICAgIG1lbW9yeVByZXNzdXJlU3RhdHVzQ2hhbmdlZCgpOworfQogCi0gICAg aWYgKG5ld1BvbGljeSA9PSBNZW1vcnlVc2FnZVBvbGljeTo6VW5yZXN0cmljdGVkKQotICAgICAg ICByZXR1cm47Ci0KLSAgICBpZiAobmV3UG9saWN5ID09IE1lbW9yeVVzYWdlUG9saWN5OjpDb25z ZXJ2YXRpdmUpIHsKLSAgICAgICAgLy8gRklYTUU6IEltcGxlbWVudCB0aGlzIHBvbGljeSBieSBj aG9vc2luZyB3aGljaCBjYWNoZXMgc2hvdWxkIHJlc3BlY3QgaXQsIGFuZCBob29raW5nIHRoZW0g dXAuCit2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxlcjo6bWVhc3VyZW1lbnRUaW1lckZpcmVkKCkK K3sKKyAgICBhdXRvIGZvb3RwcmludCA9IG1lbW9yeUZvb3RwcmludCgpOworICAgIGlmICghZm9v dHByaW50KQogICAgICAgICByZXR1cm47Ci0gICAgfQogCi0gICAgaWYgKG5ld1BvbGljeSA9PSBN ZW1vcnlVc2FnZVBvbGljeTo6U3RyaWN0KSB7Ci0gICAgICAgIFJFTEVBU0VfTE9HKE1lbW9yeVBy ZXNzdXJlLCAiQXR0ZW1wdGluZyB0byByZWR1Y2UgbWVtb3J5IGZvb3RwcmludCBieSBmcmVlaW5n IGxlc3MgaW1wb3J0YW50IG9iamVjdHMuIik7Ci0gICAgICAgIHJlbGVhc2VNZW1vcnkoQ3JpdGlj YWw6Ok5vLCBTeW5jaHJvbm91czo6Tm8pOworICAgIFJFTEVBU0VfTE9HKE1lbW9yeVByZXNzdXJl LCAiQ3VycmVudCBtZW1vcnkgZm9vdHByaW50OiAlbHUgTUIiLCBmb290cHJpbnQudmFsdWUoKSAv IE1CKTsKKyAgICBpZiAoZm9vdHByaW50LnZhbHVlKCkgPj0gdGhyZXNob2xkRm9yTWVtb3J5S2ls bCgpKSB7CisgICAgICAgIHNocmlua09yRGllKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK LSAgICBSRUxFQVNFX0FTU0VSVChuZXdQb2xpY3kgPT0gTWVtb3J5VXNhZ2VQb2xpY3k6OlBhbmlj KTsKKyAgICBzZXRNZW1vcnlVc2FnZVBvbGljeUJhc2VkT25Gb290cHJpbnQoZm9vdHByaW50LnZh bHVlKCkpOwogCi0gICAgUkVMRUFTRV9MT0coTWVtb3J5UHJlc3N1cmUsICJBdHRlbXB0aW5nIHRv IHJlZHVjZSBtZW1vcnkgZm9vdHByaW50IGJ5IGZyZWVpbmcgbW9yZSBpbXBvcnRhbnQgb2JqZWN0 cy4iKTsKLSAgICBpZiAobV9wcm9jZXNzU3RhdGUgPT0gV2Vic2FtUHJvY2Vzc1N0YXRlOjpBY3Rp dmUpIHsKKyAgICBzd2l0Y2ggKG1fbWVtb3J5VXNhZ2VQb2xpY3kpIHsKKyAgICBjYXNlIE1lbW9y eVVzYWdlUG9saWN5OjpVbnJlc3RyaWN0ZWQ6CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTWVt b3J5VXNhZ2VQb2xpY3k6OkNvbnNlcnZhdGl2ZToKKyAgICAgICAgcmVsZWFzZU1lbW9yeShDcml0 aWNhbDo6Tm8sIFN5bmNocm9ub3VzOjpObyk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTWVt b3J5VXNhZ2VQb2xpY3k6OlN0cmljdDoKICAgICAgICAgcmVsZWFzZU1lbW9yeShDcml0aWNhbDo6 WWVzLCBTeW5jaHJvbm91czo6Tm8pOwotICAgICAgICByZXR1cm47CisgICAgICAgIGJyZWFrOwog ICAgIH0KLQotICAgIHJlbGVhc2VNZW1vcnkoQ3JpdGljYWw6OlllcywgU3luY2hyb25vdXM6Olll cyk7Ci0KLSAgICAvLyBSZW1lYXN1cmUgZm9vdHByaW50IHRvIHNlZSBob3cgd2VsbCB0aGUgcHJl c3N1cmUgaGFuZGxlciBkaWQuCi0gICAgZm9vdHByaW50ID0gbWVtb3J5Rm9vdHByaW50KCk7Ci0g ICAgUkVMRUFTRV9BU1NFUlQoZm9vdHByaW50KTsKLQotICAgIFJFTEVBU0VfTE9HKE1lbW9yeVBy ZXNzdXJlLCAiTmV3IG1lbW9yeSBmb290cHJpbnQ6ICVsdSBNQiIsIGZvb3RwcmludC52YWx1ZSgp IC8gTUIpOwotICAgIGlmIChmb290cHJpbnQudmFsdWUoKSA8IHRocmVzaG9sZEZvclBvbGljeShN ZW1vcnlVc2FnZVBvbGljeTo6UGFuaWMpKSB7Ci0gICAgICAgIG1fbWVtb3J5VXNhZ2VQb2xpY3kg PSBwb2xpY3lGb3JGb290cHJpbnQoZm9vdHByaW50LnZhbHVlKCkpOwotICAgICAgICBSRUxFQVNF X0xPRyhNZW1vcnlQcmVzc3VyZSwgIlByZXNzdXJlIHJlZHVjZWQgYmVsb3cgcGFuaWMgdGhyZXNo b2xkLiBOZXcgbWVtb3J5IHVzYWdlIHBvbGljeTogJXMiLCB0b1N0cmluZyhtX21lbW9yeVVzYWdl UG9saWN5KSk7Ci0gICAgICAgIG1lbW9yeVByZXNzdXJlU3RhdHVzQ2hhbmdlZCgpOwotICAgICAg ICByZXR1cm47Ci0gICAgfQotCi0gICAgaWYgKG1fbWVtb3J5S2lsbENhbGxiYWNrKQotICAgICAg ICBtX21lbW9yeUtpbGxDYWxsYmFjaygpOwogfQogCiB2b2lkIE1lbW9yeVByZXNzdXJlSGFuZGxl cjo6c2V0UHJvY2Vzc1N0YXRlKFdlYnNhbVByb2Nlc3NTdGF0ZSBzdGF0ZSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XVEYvd3RmL01lbW9yeVByZXNzdXJlSGFuZGxlci5oIGIvU291cmNlL1dURi93dGYv TWVtb3J5UHJlc3N1cmVIYW5kbGVyLmgKaW5kZXggNjE3NTFiMTAwM2QuLmRmZGRmMGE5NTU1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuaAorKysgYi9T b3VyY2UvV1RGL3d0Zi9NZW1vcnlQcmVzc3VyZUhhbmRsZXIuaApAQCAtNDksNyArNDksNiBAQCBl bnVtIGNsYXNzIE1lbW9yeVVzYWdlUG9saWN5IHsKICAgICBVbnJlc3RyaWN0ZWQsIC8vIEFsbG9j YXRlIGFzIG11Y2ggYXMgeW91IHdhbnQKICAgICBDb25zZXJ2YXRpdmUsIC8vIE1heWJlIHlvdSBk b24ndCBjYWNoZSBldmVyeSBzaW5nbGUgdGhpbmcKICAgICBTdHJpY3QsIC8vIFRpbWUgdG8gc3Rh cnQgcGluY2hpbmcgcGVubmllcyBmb3IgcmVhbAotICAgIFBhbmljLCAvLyBPSCBHT0QgV0UnUkUg U0lOS0lORywgVEhST1cgRVZFUllUSElORyBPVkVSQk9BUkQKIH07CiAKIGVudW0gY2xhc3MgV2Vi c2FtUHJvY2Vzc1N0YXRlIHsKQEAgLTE0MSw2ICsxNDAsNyBAQCBwdWJsaWM6CiAgICAgV2Vic2Ft UHJvY2Vzc1N0YXRlIHByb2Nlc3NTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvY2Vzc1N0YXRl OyB9CiAKIHByaXZhdGU6CisgICAgc2l6ZV90IHRocmVzaG9sZEZvck1lbW9yeUtpbGwoKTsKICAg ICB2b2lkIG1lbW9yeVByZXNzdXJlU3RhdHVzQ2hhbmdlZCgpOwogCiAgICAgdm9pZCB1bmluc3Rh bGwoKTsKQEAgLTE1NCw4ICsxNTQsOSBAQCBwcml2YXRlOgogICAgIHZvaWQgcGxhdGZvcm1SZWxl YXNlTWVtb3J5KENyaXRpY2FsKTsKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZSgpOwogCi0g ICAgTk9fUkVUVVJOX0RVRV9UT19DUkFTSCB2b2lkIGRpZEV4Y2VlZE1lbW9yeUxpbWl0QW5kRmFp bGVkVG9SZWNvdmVyKCk7CiAgICAgdm9pZCBtZWFzdXJlbWVudFRpbWVyRmlyZWQoKTsKKyAgICB2 b2lkIHNocmlua09yRGllKCk7CisgICAgdm9pZCBzZXRNZW1vcnlVc2FnZVBvbGljeUJhc2VkT25G b290cHJpbnQoc2l6ZV90KTsKIAogI2lmIE9TKExJTlVYKQogICAgIGNsYXNzIEV2ZW50RkRQb2xs ZXIgewo=