213389 2020-06-19 10:39:21 -0700 Have a memory monitor thread in jsc shell when running tests using --memory-limited 2020-06-19 15:14:17 -0700 1 1 1 Unclassified WebKit JavaScriptCore Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam benjamin fpizlo ggaren gskachkov guijemont jsc32 keith_miller mark.lam msaboff rmorisset ross.kirsling ryanhaddad ticaiolima tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1664413 0 saam 2020-06-19 10:39:21 -0700 ... 1664434 1 402299 saam 2020-06-19 11:39:03 -0700 Created attachment 402299 patch 1664444 2 402299 mark.lam 2020-06-19 11:56:29 -0700 Comment on attachment 402299 patch View in context: https://bugs.webkit.org/attachment.cgi?id=402299&action=review r=me with fixes. > Source/JavaScriptCore/ChangeLog:19 > + Currently, we use this feature when running JSC stress tests in extra space between "when running". > Source/JavaScriptCore/jsc.cpp:2515 > + memoryLimit = 0; This is not strictly needed because memoryLimit is in .bss and initialized to 0 by default. But it won't hurt. > Source/JavaScriptCore/jsc.cpp:2531 > + sleep(Seconds::fromMilliseconds(5)); Did you derive this 5 ms from some empirical test, or did you just pluck it out of the air? Why not 10 ms or something larger? Not saying you have to change this. Just wondering how you arrived at this number. > Source/JavaScriptCore/jsc.cpp:2535 > +#endif This belongs after the }. That should fix the Win builds. 1664475 3 402299 saam 2020-06-19 13:08:21 -0700 Comment on attachment 402299 patch View in context: https://bugs.webkit.org/attachment.cgi?id=402299&action=review >> Source/JavaScriptCore/jsc.cpp:2515 >> + memoryLimit = 0; > > This is not strictly needed because memoryLimit is in .bss and initialized to 0 by default. But it won't hurt. indeed. I always struggle with having the assignment vs not. I'll just remove it so it's understood there is no magic involved here. >> Source/JavaScriptCore/jsc.cpp:2531 >> + sleep(Seconds::fromMilliseconds(5)); > > Did you derive this 5 ms from some empirical test, or did you just pluck it out of the air? Why not 10 ms or something larger? Not saying you have to change this. Just wondering how you arrived at this number. no, just picked because it seemed reasonable based on how long tests run for 1664483 4 saam 2020-06-19 13:19:17 -0700 It's worth stating that I validated this by running on my MBP with "--memory-limited", and the only test failure was wasm multi table, and that's because it uses "$vm.isMemoryLimited()" at runtime, which returns true for iOS only. 1664485 5 402315 saam 2020-06-19 13:25:38 -0700 Created attachment 402315 patch for landing 1664553 6 ews-feeder 2020-06-19 15:13:51 -0700 Committed r263290: <https://trac.webkit.org/changeset/263290> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402315. 1664554 7 webkit-bug-importer 2020-06-19 15:14:17 -0700 <rdar://problem/64546573> 402299 2020-06-19 11:39:03 -0700 2020-06-19 13:25:38 -0700 patch b-backup.diff text/plain 7393 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjYzMjQzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDIwLTA2LTE5ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEhhdmUgYSBtZW1vcnkgbW9uaXRvciB0aHJlYWQgaW4ganNjIHNoZWxsIHdoZW4gcnVubmluZyB0 ZXN0cyB1c2luZyAtLW1lbW9yeS1saW1pdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMzODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIHRlc3Rpbmcgb24gaU9TLCB0aGVyZSBhcmUgdGltZXMg aGlnaCBtZW1vcnkgdXNhZ2UgZnJvbSBhIEpTQyB0ZXN0CisgICAgICAgIHdpbGwgamV0c2FtIG91 ciBlbnRpcmUgdGVzdCBydW5uZXIuIFRoaXMgbWFrZXMgaXQgc28gd2UgZG9uJ3QgZ2V0IGFueSB0 ZXN0CisgICAgICAgIHJlc3VsdHMgZnJvbSB0aGF0IHRlc3QgcnVuLCB3aGljaCBjYW4gbWFrZSBp dCBkaWZmaWN1bHQgdG8gdHJhY2sgdGVzdGluZworICAgICAgICByZXN1bHRzLgorICAgICAgICAK KyAgICAgICAgVGhpcyBwYXRjaCBpbnRyb2R1Y2VzIGFuIG9wdGlvbmFsIG1lbW9yeSBtb25pdG9y aW5nIHRocmVhZCB0byB0aGUgSlNDCisgICAgICAgIHNoZWxsLiBJdCdzIGEgYmVzdCBlZmZvcnQg YXBwcm9hY2guIElmIG1lbW9yeSB1c2FnZSBleGNlZWRzIHRoZSBwYXNzZWQKKyAgICAgICAgaW4g dGhyZXNob2xkLCB3ZSBjcmFzaCB0aGUgcHJvY2Vzcy4gU2ltaWxhciB0byBob3cgdGhlIHRpbWVv dXQgbWVjaGFuaXNtCisgICAgICAgIHdvcmtzLiBPbiBDb2NvYSBwbGF0Zm9ybXMsIHdlIGFsc28g cGVyZm9ybSB0aGlzIGNoZWNrIGluIHRoZSBsb3cgbWVtb3J5IAorICAgICAgICB3YXJuaW5nIGhh bmRsZXIuCisgICAgICAgIAorICAgICAgICBDdXJyZW50bHksIHdlIHVzZSB0aGlzIGZlYXR1cmUg d2hlbiAgcnVubmluZyBKU0Mgc3RyZXNzIHRlc3RzIGluCisgICAgICAgICItLW1lbW9yeS1saW1p dGVkIiBtb2RlLgorCisgICAgICAgICoganNjLmNwcDoKKyAgICAgICAgKGNyYXNoSWZFeGNlZWRp bmdNZW1vcnlMaW1pdCk6CisgICAgICAgIChzdGFydE1lbW9yeU1vbml0b3JpbmdUaHJlYWRJZk5l ZWRlZCk6CisgICAgICAgIChqc2NtYWluKToKKwogMjAyMC0wNi0xOCAgUm9zcyBLaXJzbGluZyAg PHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgYWRkcmVzcyBE YXJpbidzIGZlZWRiYWNrIG9uIHIyNjMyMjcuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv anNjLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAkocmV2 aXNpb24gMjYzMjQzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTI0OTYsNiArMjQ5Niw0NSBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxM IGZ1bmN0aW9uQXNECiAKIGludCBqc2NtYWluKGludCBhcmdjLCBjaGFyKiogYXJndik7CiAKKyNp ZiBPUyhEQVJXSU4pIHx8IE9TKExJTlVYKQorc3RhdGljIHNpemVfdCBtZW1vcnlMaW1pdDsKKwor c3RhdGljIHZvaWQgY3Jhc2hJZkV4Y2VlZGluZ01lbW9yeUxpbWl0KCkKK3sKKyAgICBpZiAoIW1l bW9yeUxpbWl0KQorICAgICAgICByZXR1cm47CisgICAgTWVtb3J5Rm9vdHByaW50IGZvb3Rwcmlu dCA9IE1lbW9yeUZvb3RwcmludDo6bm93KCk7CisgICAgaWYgKGZvb3RwcmludC5jdXJyZW50ID4g bWVtb3J5TGltaXQpIHsKKyAgICAgICAgZGF0YUxvZ0xuKCJDcmFzaGluZyBiZWNhdXNlIGN1cnJl bnQgZm9vdHByaW50OiAiLCBmb290cHJpbnQuY3VycmVudCwgIiBleGNlZWRzIGxpbWl0OiAiLCBt ZW1vcnlMaW1pdCk7CisgICAgICAgIENSQVNIKCk7CisgICAgfQorfQorCitzdGF0aWMgdm9pZCBz dGFydE1lbW9yeU1vbml0b3JpbmdUaHJlYWRJZk5lZWRlZCgpCit7CisgICAgbWVtb3J5TGltaXQg PSAwOworCisgICAgY2hhciogbWVtb3J5TGltaXRTdHJpbmcgPSBnZXRlbnYoIkpTQ1RFU1RfbWVt b3J5TGltaXQiKTsKKyAgICBpZiAoIW1lbW9yeUxpbWl0U3RyaW5nKQorICAgICAgICByZXR1cm47 CisKKyAgICBpZiAoc3NjYW5mKG1lbW9yeUxpbWl0U3RyaW5nLCAiJXp1IiwgJm1lbW9yeUxpbWl0 KSAhPSAxKSB7CisgICAgICAgIGRhdGFMb2dMbigiV0FSTklORzogbWFsZm9ybWVkIEpTQ1RFU1Rf bWVtb3J5TGltaXQgZW52aXJvbm1lbnQgdmFyaWFibGUiKTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KKworICAgIGlmICghbWVtb3J5TGltaXQpCisgICAgICAgIHJldHVybjsKKworICAgIFRocmVh ZDo6Y3JlYXRlKCJqc2MgTWVtb3J5IE1vbml0b3IiLCBbPV0geworICAgICAgICB3aGlsZSAodHJ1 ZSkgeworICAgICAgICAgICAgc2xlZXAoU2Vjb25kczo6ZnJvbU1pbGxpc2Vjb25kcyg1KSk7Cisg ICAgICAgICAgICBjcmFzaElmRXhjZWVkaW5nTWVtb3J5TGltaXQoKTsKKyAgICAgICAgfQorICAg IH0pOworI2VuZGlmCit9CisKIHN0YXRpYyBkb3VibGUgc19kZXNpcmVkVGltZW91dDsKIHN0YXRp YyBkb3VibGUgc190aW1lb3V0TXVsdGlwbGllciA9IDEuMDsKIHN0YXRpYyBTZWNvbmRzIHNfdGlt ZW91dER1cmF0aW9uOwpAQCAtMzI1Myw2ICszMjkyLDEwIEBAIGludCBqc2NtYWluKGludCBhcmdj LCBjaGFyKiogYXJndikKICAgICBKU0M6OmluaXRpYWxpemVUaHJlYWRpbmcoKTsKICAgICBpbml0 aWFsaXplVGltZW91dElmTmVlZGVkKCk7CiAKKyNpZiBPUyhEQVJXSU4pIHx8IE9TKExJTlVYKQor ICAgIHN0YXJ0TWVtb3J5TW9uaXRvcmluZ1RocmVhZElmTmVlZGVkKCk7CisjZW5kaWYKKwogICAg IGlmIChPcHRpb25zOjp1c2VTdXBlclNhbXBsZXIoKSkKICAgICAgICAgZW5hYmxlU3VwZXJTYW1w bGVyKCk7CiAKQEAgLTMyNzYsNiArMzMxOSw4IEBAIGludCBqc2NtYWluKGludCBhcmdjLCBjaGFy KiogYXJndikKICAgICBCb3g8Q3JpdGljYWw+IG1lbW9yeVByZXNzdXJlQ3JpdGljYWxTdGF0ZSA9 IEJveDxDcml0aWNhbD46OmNyZWF0ZShDcml0aWNhbDo6Tm8pOwogICAgIEJveDxTeW5jaHJvbm91 cz4gbWVtb3J5UHJlc3N1cmVTeW5jaHJvbm91c1N0YXRlID0gQm94PFN5bmNocm9ub3VzPjo6Y3Jl YXRlKFN5bmNocm9ub3VzOjpObyk7CiAgICAgbWVtb3J5UHJlc3N1cmVIYW5kbGVyLnNldExvd01l bW9yeUhhbmRsZXIoWz1dIChDcml0aWNhbCBjcml0aWNhbCwgU3luY2hyb25vdXMgc3luY2hyb25v dXMpIHsKKyAgICAgICAgY3Jhc2hJZkV4Y2VlZGluZ01lbW9yeUxpbWl0KCk7CisKICAgICAgICAg Ly8gV2Ugc2V0IHRoZXNlIHJhY2lseSB3aXRoIHJlc3BlY3QgdG8gcmVhZGluZyB0aGVtIGZyb20g dGhlIEpTIGV4ZWN1dGlvbiB0aHJlYWQuCiAgICAgICAgICptZW1vcnlQcmVzc3VyZUNyaXRpY2Fs U3RhdGUgPSBjcml0aWNhbDsKICAgICAgICAgKm1lbW9yeVByZXNzdXJlU3luY2hyb25vdXNTdGF0 ZSA9IHN5bmNocm9ub3VzOwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjYzMjc2KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDYtMTkgIFNhYW0gQmFyYXRpICA8c2Jh cmF0aUBhcHBsZS5jb20+CisKKyAgICAgICAgSGF2ZSBhIG1lbW9yeSBtb25pdG9yIHRocmVhZCBp biBqc2Mgc2hlbGwgd2hlbiBydW5uaW5nIHRlc3RzIHVzaW5nIC0tbWVtb3J5LWxpbWl0ZWQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzM4OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9y dW4tanNjLXN0cmVzcy10ZXN0czoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHJ1YnkvanNjLXN0 cmVzcy10ZXN0LXdyaXRlci1kZWZhdWx0LnJiOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cnVi eS9qc2Mtc3RyZXNzLXRlc3Qtd3JpdGVyLXJ1YnkucmI6CisKIDIwMjAtMDYtMTkgIENocmlzIEZs ZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogTWFrZSBpc29sYXRl ZCB0cmVlIGVuYWJsZW1lbnQgc3RhdHVzIGRlcGVuZGVudCBvbiBjbGllbnQgcHJlZmVyZW5jZQpJ bmRleDogVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCShyZXZpc2lvbiAyNjMyNDMpCisrKyBU b29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCSh3b3JraW5nIGNvcHkpCkBAIC0yMDkx LDYgKzIwOTEsNyBAQCBkZWYgcnVuVGVzdFJ1bm5lcihyZW1vdGVJbmRleD0wKQogICAgICAgICBy ZW1vdGVTY3JpcHQgKz0gImV4cG9ydCBEWUxEX0ZSQU1FV09SS19QQVRIPVxcXCJcXCQoY2QgI3sk dGVzdGluZ0ZyYW1ld29ya1BhdGguZGlybmFtZX07IHB3ZClcXFwiICYmICIKICAgICAgICAgcmVt b3RlU2NyaXB0ICs9ICJleHBvcnQgTERfTElCUkFSWV9QQVRIPSN7cmVtb3RlSG9zdC5yZW1vdGVE aXJlY3Rvcnl9LyN7JG91dHB1dERpci5iYXNlbmFtZX0vI3skanNjUGF0aC5kaXJuYW1lfSAmJiAi CiAgICAgICAgIHJlbW90ZVNjcmlwdCArPSAiZXhwb3J0IEpTQ1RFU1RfdGltZW91dD0je1NoZWxs d29yZHMuc2hlbGxlc2NhcGUoRU5WWydKU0NURVNUX3RpbWVvdXQnXSl9ICYmICIKKyAgICAgICAg cmVtb3RlU2NyaXB0ICs9ICJleHBvcnQgSlNDVEVTVF9tZW1vcnlMaW1pdD0je1NoZWxsd29yZHMu c2hlbGxlc2NhcGUoRU5WWydKU0NURVNUX21lbW9yeUxpbWl0J10pfSAmJiAiCiAgICAgICAgIHJl bW90ZVNjcmlwdCArPSAiZXhwb3J0IFRaPSN7U2hlbGx3b3Jkcy5zaGVsbGVzY2FwZShFTlZbJ1Ra J10pfSAmJiAiCiAgICAgICAgICRlbnZWYXJzLmVhY2ggeyB8dmFyfCByZW1vdGVTY3JpcHQgKz0g ImV4cG9ydCAiIDw8IHZhciA8PCAiXG4iIH0KICAgICAgICAgcmVtb3RlU2NyaXB0ICs9ICIje3Rl c3RSdW5uZXJDb21tYW5kKHJlbW90ZUluZGV4KX1cIiIKQEAgLTIyMjMsNiArMjIyNCwxMCBAQCBp ZiBFTlZbIkpTQ1RFU1RfdGltZW91dCJdCiAgICAgRU5WWyJKU0NURVNUX3RpbWVvdXQiXSA9IChF TlZbIkpTQ1RFU1RfdGltZW91dCJdLnRvX2kudG9fZiAqIE1hdGguc3FydCgkbnVtQ2hpbGRQcm9j ZXNzZXMpKS50b19pLnRvX3MKIGVuZAogCitpZiAhRU5WWyJKU0NURVNUX21lbW9yeUxpbWl0Il0g JiYgJG1lbW9yeUxpbWl0ZWQKKyAgICBFTlZbIkpTQ1RFU1RfbWVtb3J5TGltaXQiXSA9ICg2MDAg KiAxMDI0ICogMTAyNCkudG9fcworZW5kCisKICMgU29tZSB0ZXN0cyBmYWlsIGlmIHRoZSB0aW1l IHpvbmUgaXMgbm90IHNldCB0byBVUy9QYWNpZmljCiAjIGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEz NjM2MwogIyBTZXQgYXMgZG9uZSBpbiBydW4tamF2YXNjcmlwdC10ZXN0cwpJbmRleDogVG9vbHMv U2NyaXB0cy93ZWJraXRydWJ5L2pzYy1zdHJlc3MtdGVzdC13cml0ZXItZGVmYXVsdC5yYgo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHJ1YnkvanNjLXN0cmVzcy10ZXN0LXdyaXRl ci1kZWZhdWx0LnJiCShyZXZpc2lvbiAyNjMyNDMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHJ1 YnkvanNjLXN0cmVzcy10ZXN0LXdyaXRlci1kZWZhdWx0LnJiCSh3b3JraW5nIGNvcHkpCkBAIC0y NTYsNiArMjU2LDcgQEAgY2xhc3MgUGxhbgogCiAgICAgICAgIHNjcmlwdCArPSAiZXhwb3J0IERZ TERfRlJBTUVXT1JLX1BBVEg9JChjZCAjeyR0ZXN0aW5nRnJhbWV3b3JrUGF0aC5kaXJuYW1lfTsg cHdkKVxuIgogICAgICAgICBzY3JpcHQgKz0gImV4cG9ydCBKU0NURVNUX3RpbWVvdXQ9I3tTaGVs bHdvcmRzLnNoZWxsZXNjYXBlKEVOVlsnSlNDVEVTVF90aW1lb3V0J10pfVxuIgorICAgICAgICBz Y3JpcHQgKz0gImV4cG9ydCBKU0NURVNUX21lbW9yeUxpbWl0PSN7U2hlbGx3b3Jkcy5zaGVsbGVz Y2FwZShFTlZbJ0pTQ1RFU1RfbWVtb3J5TGltaXQnXSl9XG4iCiAgICAgICAgICRlbnZWYXJzLmVh Y2ggeyB8dmFyfCBzY3JpcHQgKz0gImV4cG9ydCAiIDw8IHZhciA8PCAiXG4iIH0KICAgICAgICAg c2NyaXB0ICs9ICIje3NoZWxsQ29tbWFuZH0gfHwgZXhpdCAxIgogICAgICAgICAiZWNobyAje1No ZWxsd29yZHMuc2hlbGxlc2NhcGUoc2NyaXB0KX0gPiAje1NoZWxsd29yZHMuc2hlbGxlc2NhcGUo KFBhdGhuYW1lLm5ldygiLi4iKSArIEBuYW1lKS50b19zKX0iCkluZGV4OiBUb29scy9TY3JpcHRz L3dlYmtpdHJ1YnkvanNjLXN0cmVzcy10ZXN0LXdyaXRlci1ydWJ5LnJiCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvd2Via2l0cnVieS9qc2Mtc3RyZXNzLXRlc3Qtd3JpdGVyLXJ1YnkucmIJ KHJldmlzaW9uIDI2MzI0MykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cnVieS9qc2Mtc3RyZXNz LXRlc3Qtd3JpdGVyLXJ1YnkucmIJKHdvcmtpbmcgY29weSkKQEAgLTMxMyw2ICszMTMsNyBAQCBj bGFzcyBQbGFuCiAgICAgICAgIHNjcmlwdCArPSAiLy5ydW5uZXJcIikgZG9cbiIKICAgICAgICAg c2NyaXB0ICs9ICIgICAgICAgICAgICBFTlZbXCJEWUxEX0ZSQU1FV09SS19QQVRIXCJdID0gXCIj eyR0ZXN0aW5nRnJhbWV3b3JrUGF0aC5kaXJuYW1lfVwiXG4iCiAgICAgICAgIHNjcmlwdCArPSAi ICAgICAgICAgICAgRU5WW1wiSlNDVEVTVF90aW1lb3V0XCJdID0gXCIje0VOVlsnSlNDVEVTVF90 aW1lb3V0J119XCJcbiIKKyAgICAgICAgc2NyaXB0ICs9ICIgICAgICAgICAgICBFTlZbXCJKU0NU RVNUX21lbW9yeUxpbWl0XCJdID0gXCIje0VOVlsnSlNDVEVTVF9tZW1vcnlMaW1pdCddfVwiXG4i CiAKICAgICAgICAgc2NyaXB0ICs9ICIgICAgICAgICAgICAje3NoZWxsQ29tbWFuZH0iCiAgICAg ICAgIHNjcmlwdCArPSAiICAgICAgICAgICAgcHJpbnQgb3V0XG4iCg== 402315 2020-06-19 13:25:38 -0700 2020-06-19 15:13:52 -0700 patch for landing b-backup.diff text/plain 7439 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjYzMjc4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDIwLTA2LTE5ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEhhdmUgYSBtZW1vcnkgbW9uaXRvciB0aHJlYWQgaW4ganNjIHNoZWxsIHdoZW4gcnVubmluZyB0 ZXN0cyB1c2luZyAtLW1lbW9yeS1saW1pdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMzODkKKworICAgICAgICBSZXZpZXdlZCBieSBNYXJrIExh bS4KKworICAgICAgICBXaGVuIHRlc3Rpbmcgb24gaU9TLCB0aGVyZSBhcmUgdGltZXMgaGlnaCBt ZW1vcnkgdXNhZ2UgZnJvbSBhIEpTQyB0ZXN0CisgICAgICAgIHdpbGwgamV0c2FtIG91ciBlbnRp cmUgdGVzdCBydW5uZXIuIFRoaXMgbWFrZXMgaXQgc28gd2UgZG9uJ3QgZ2V0IGFueSB0ZXN0Cisg ICAgICAgIHJlc3VsdHMgZnJvbSB0aGF0IHRlc3QgcnVuLCB3aGljaCBjYW4gbWFrZSBpdCBkaWZm aWN1bHQgdG8gdHJhY2sgdGVzdGluZworICAgICAgICByZXN1bHRzLgorICAgICAgICAKKyAgICAg ICAgVGhpcyBwYXRjaCBpbnRyb2R1Y2VzIGFuIG9wdGlvbmFsIG1lbW9yeSBtb25pdG9yaW5nIHRo cmVhZCB0byB0aGUgSlNDCisgICAgICAgIHNoZWxsLiBJdCdzIGEgYmVzdCBlZmZvcnQgYXBwcm9h Y2guIElmIG1lbW9yeSB1c2FnZSBleGNlZWRzIHRoZSBwYXNzZWQKKyAgICAgICAgaW4gdGhyZXNo b2xkLCB3ZSBjcmFzaCB0aGUgcHJvY2Vzcy4gU2ltaWxhciB0byBob3cgdGhlIHRpbWVvdXQgbWVj aGFuaXNtCisgICAgICAgIHdvcmtzLiBPbiBDb2NvYSBwbGF0Zm9ybXMsIHdlIGFsc28gcGVyZm9y bSB0aGlzIGNoZWNrIGluIHRoZSBsb3cgbWVtb3J5IAorICAgICAgICB3YXJuaW5nIGhhbmRsZXIu CisgICAgICAgIAorICAgICAgICBDdXJyZW50bHksIHdlIHVzZSB0aGlzIGZlYXR1cmUgd2hlbiBy dW5uaW5nIEpTQyBzdHJlc3MgdGVzdHMgaW4KKyAgICAgICAgIi0tbWVtb3J5LWxpbWl0ZWQiIG1v ZGUuCisKKyAgICAgICAgKiBqc2MuY3BwOgorICAgICAgICAoY3Jhc2hJZkV4Y2VlZGluZ01lbW9y eUxpbWl0KToKKyAgICAgICAgKHN0YXJ0TWVtb3J5TW9uaXRvcmluZ1RocmVhZElmTmVlZGVkKToK KyAgICAgICAgKGpzY21haW4pOgorCiAyMDIwLTA2LTE5ICBUdW9tYXMgS2Fya2thaW5lbiAgPHR1 b21hcy53ZWJraXRAYXBwbGUuY29tPgogCiAgICAgICAgIGZ1bmN0aW9uQ3B1Q2xmbHVzaCBjaGVj a3MgdGhhdCB0aGUgc2Vjb25kIGFyZ3VtZW50IGlzIEludDMyIGJ1dCBpdCBhY3R1YWxseSBleHBl Y3RzIGl0IHRvIGJlIFVJbnQzMgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAJKHJldmlzaW9uIDI2 MzI3OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yNDk2LDYgKzI0OTYsNDMgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBmdW5jdGlv bkFzRAogCiBpbnQganNjbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpOwogCisjaWYgT1MoREFS V0lOKSB8fCBPUyhMSU5VWCkKK3N0YXRpYyBzaXplX3QgbWVtb3J5TGltaXQ7CisKK3N0YXRpYyB2 b2lkIGNyYXNoSWZFeGNlZWRpbmdNZW1vcnlMaW1pdCgpCit7CisgICAgaWYgKCFtZW1vcnlMaW1p dCkKKyAgICAgICAgcmV0dXJuOworICAgIE1lbW9yeUZvb3RwcmludCBmb290cHJpbnQgPSBNZW1v cnlGb290cHJpbnQ6Om5vdygpOworICAgIGlmIChmb290cHJpbnQuY3VycmVudCA+IG1lbW9yeUxp bWl0KSB7CisgICAgICAgIGRhdGFMb2dMbigiQ3Jhc2hpbmcgYmVjYXVzZSBjdXJyZW50IGZvb3Rw cmludDogIiwgZm9vdHByaW50LmN1cnJlbnQsICIgZXhjZWVkcyBsaW1pdDogIiwgbWVtb3J5TGlt aXQpOworICAgICAgICBDUkFTSCgpOworICAgIH0KK30KKworc3RhdGljIHZvaWQgc3RhcnRNZW1v cnlNb25pdG9yaW5nVGhyZWFkSWZOZWVkZWQoKQoreworICAgIGNoYXIqIG1lbW9yeUxpbWl0U3Ry aW5nID0gZ2V0ZW52KCJKU0NURVNUX21lbW9yeUxpbWl0Iik7CisgICAgaWYgKCFtZW1vcnlMaW1p dFN0cmluZykKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKHNzY2FuZihtZW1vcnlMaW1pdFN0 cmluZywgIiV6dSIsICZtZW1vcnlMaW1pdCkgIT0gMSkgeworICAgICAgICBkYXRhTG9nTG4oIldB Uk5JTkc6IG1hbGZvcm1lZCBKU0NURVNUX21lbW9yeUxpbWl0IGVudmlyb25tZW50IHZhcmlhYmxl Iik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoIW1lbW9yeUxpbWl0KQorICAg ICAgICByZXR1cm47CisKKyAgICBUaHJlYWQ6OmNyZWF0ZSgianNjIE1lbW9yeSBNb25pdG9yIiwg Wz1dIHsKKyAgICAgICAgd2hpbGUgKHRydWUpIHsKKyAgICAgICAgICAgIHNsZWVwKFNlY29uZHM6 OmZyb21NaWxsaXNlY29uZHMoNSkpOworICAgICAgICAgICAgY3Jhc2hJZkV4Y2VlZGluZ01lbW9y eUxpbWl0KCk7CisgICAgICAgIH0KKyAgICB9KTsKK30KKyNlbmRpZiAvLyBPUyhEQVJXSU4pIHx8 IE9TKExJTlVYKQorCiBzdGF0aWMgZG91YmxlIHNfZGVzaXJlZFRpbWVvdXQ7CiBzdGF0aWMgZG91 YmxlIHNfdGltZW91dE11bHRpcGxpZXIgPSAxLjA7CiBzdGF0aWMgU2Vjb25kcyBzX3RpbWVvdXRE dXJhdGlvbjsKQEAgLTMyNTMsNiArMzI5MCwxMCBAQCBpbnQganNjbWFpbihpbnQgYXJnYywgY2hh cioqIGFyZ3YpCiAgICAgSlNDOjppbml0aWFsaXplVGhyZWFkaW5nKCk7CiAgICAgaW5pdGlhbGl6 ZVRpbWVvdXRJZk5lZWRlZCgpOwogCisjaWYgT1MoREFSV0lOKSB8fCBPUyhMSU5VWCkKKyAgICBz dGFydE1lbW9yeU1vbml0b3JpbmdUaHJlYWRJZk5lZWRlZCgpOworI2VuZGlmCisKICAgICBpZiAo T3B0aW9uczo6dXNlU3VwZXJTYW1wbGVyKCkpCiAgICAgICAgIGVuYWJsZVN1cGVyU2FtcGxlcigp OwogCkBAIC0zMjc2LDYgKzMzMTcsOCBAQCBpbnQganNjbWFpbihpbnQgYXJnYywgY2hhcioqIGFy Z3YpCiAgICAgQm94PENyaXRpY2FsPiBtZW1vcnlQcmVzc3VyZUNyaXRpY2FsU3RhdGUgPSBCb3g8 Q3JpdGljYWw+OjpjcmVhdGUoQ3JpdGljYWw6Ok5vKTsKICAgICBCb3g8U3luY2hyb25vdXM+IG1l bW9yeVByZXNzdXJlU3luY2hyb25vdXNTdGF0ZSA9IEJveDxTeW5jaHJvbm91cz46OmNyZWF0ZShT eW5jaHJvbm91czo6Tm8pOwogICAgIG1lbW9yeVByZXNzdXJlSGFuZGxlci5zZXRMb3dNZW1vcnlI YW5kbGVyKFs9XSAoQ3JpdGljYWwgY3JpdGljYWwsIFN5bmNocm9ub3VzIHN5bmNocm9ub3VzKSB7 CisgICAgICAgIGNyYXNoSWZFeGNlZWRpbmdNZW1vcnlMaW1pdCgpOworCiAgICAgICAgIC8vIFdl IHNldCB0aGVzZSByYWNpbHkgd2l0aCByZXNwZWN0IHRvIHJlYWRpbmcgdGhlbSBmcm9tIHRoZSBK UyBleGVjdXRpb24gdGhyZWFkLgogICAgICAgICAqbWVtb3J5UHJlc3N1cmVDcml0aWNhbFN0YXRl ID0gY3JpdGljYWw7CiAgICAgICAgICptZW1vcnlQcmVzc3VyZVN5bmNocm9ub3VzU3RhdGUgPSBz eW5jaHJvbm91czsKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDI2MzI3OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA2LTE5ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlA YXBwbGUuY29tPgorCisgICAgICAgIEhhdmUgYSBtZW1vcnkgbW9uaXRvciB0aHJlYWQgaW4ganNj IHNoZWxsIHdoZW4gcnVubmluZyB0ZXN0cyB1c2luZyAtLW1lbW9yeS1saW1pdGVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMzODkKKworICAgICAg ICBSZXZpZXdlZCBieSBNYXJrIExhbS4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWpzYy1zdHJl c3MtdGVzdHM6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRydWJ5L2pzYy1zdHJlc3MtdGVzdC13 cml0ZXItZGVmYXVsdC5yYjoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHJ1YnkvanNjLXN0cmVz cy10ZXN0LXdyaXRlci1ydWJ5LnJiOgorCiAyMDIwLTA2LTE5ICBDaHJpcyBGbGVpemFjaCAgPGNm bGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IE1ha2UgaXNvbGF0ZWQgdHJlZSBlbmFi bGVtZW50IHN0YXR1cyBkZXBlbmRlbnQgb24gY2xpZW50IHByZWZlcmVuY2UKSW5kZXg6IFRvb2xz L1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy9ydW4tanNjLXN0cmVzcy10ZXN0cwkocmV2aXNpb24gMjYzMjc4KQorKysgVG9vbHMvU2NyaXB0 cy9ydW4tanNjLXN0cmVzcy10ZXN0cwkod29ya2luZyBjb3B5KQpAQCAtMjA5MSw2ICsyMDkxLDcg QEAgZGVmIHJ1blRlc3RSdW5uZXIocmVtb3RlSW5kZXg9MCkKICAgICAgICAgcmVtb3RlU2NyaXB0 ICs9ICJleHBvcnQgRFlMRF9GUkFNRVdPUktfUEFUSD1cXFwiXFwkKGNkICN7JHRlc3RpbmdGcmFt ZXdvcmtQYXRoLmRpcm5hbWV9OyBwd2QpXFxcIiAmJiAiCiAgICAgICAgIHJlbW90ZVNjcmlwdCAr PSAiZXhwb3J0IExEX0xJQlJBUllfUEFUSD0je3JlbW90ZUhvc3QucmVtb3RlRGlyZWN0b3J5fS8j eyRvdXRwdXREaXIuYmFzZW5hbWV9LyN7JGpzY1BhdGguZGlybmFtZX0gJiYgIgogICAgICAgICBy ZW1vdGVTY3JpcHQgKz0gImV4cG9ydCBKU0NURVNUX3RpbWVvdXQ9I3tTaGVsbHdvcmRzLnNoZWxs ZXNjYXBlKEVOVlsnSlNDVEVTVF90aW1lb3V0J10pfSAmJiAiCisgICAgICAgIHJlbW90ZVNjcmlw dCArPSAiZXhwb3J0IEpTQ1RFU1RfbWVtb3J5TGltaXQ9I3tTaGVsbHdvcmRzLnNoZWxsZXNjYXBl KEVOVlsnSlNDVEVTVF9tZW1vcnlMaW1pdCddKX0gJiYgIgogICAgICAgICByZW1vdGVTY3JpcHQg Kz0gImV4cG9ydCBUWj0je1NoZWxsd29yZHMuc2hlbGxlc2NhcGUoRU5WWydUWiddKX0gJiYgIgog ICAgICAgICAkZW52VmFycy5lYWNoIHsgfHZhcnwgcmVtb3RlU2NyaXB0ICs9ICJleHBvcnQgIiA8 PCB2YXIgPDwgIlxuIiB9CiAgICAgICAgIHJlbW90ZVNjcmlwdCArPSAiI3t0ZXN0UnVubmVyQ29t bWFuZChyZW1vdGVJbmRleCl9XCIiCkBAIC0yMjIzLDYgKzIyMjQsMTAgQEAgaWYgRU5WWyJKU0NU RVNUX3RpbWVvdXQiXQogICAgIEVOVlsiSlNDVEVTVF90aW1lb3V0Il0gPSAoRU5WWyJKU0NURVNU X3RpbWVvdXQiXS50b19pLnRvX2YgKiBNYXRoLnNxcnQoJG51bUNoaWxkUHJvY2Vzc2VzKSkudG9f aS50b19zCiBlbmQKIAoraWYgIUVOVlsiSlNDVEVTVF9tZW1vcnlMaW1pdCJdICYmICRtZW1vcnlM aW1pdGVkCisgICAgRU5WWyJKU0NURVNUX21lbW9yeUxpbWl0Il0gPSAoNjAwICogMTAyNCAqIDEw MjQpLnRvX3MKK2VuZAorCiAjIFNvbWUgdGVzdHMgZmFpbCBpZiB0aGUgdGltZSB6b25lIGlzIG5v dCBzZXQgdG8gVVMvUGFjaWZpYwogIyBodHRwczovL3dlYmtpdC5vcmcvYi8xMzYzNjMKICMgU2V0 IGFzIGRvbmUgaW4gcnVuLWphdmFzY3JpcHQtdGVzdHMKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cnVieS9qc2Mtc3RyZXNzLXRlc3Qtd3JpdGVyLWRlZmF1bHQucmIKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy93ZWJraXRydWJ5L2pzYy1zdHJlc3MtdGVzdC13cml0ZXItZGVmYXVsdC5y YgkocmV2aXNpb24gMjYzMjc4KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRydWJ5L2pzYy1zdHJl c3MtdGVzdC13cml0ZXItZGVmYXVsdC5yYgkod29ya2luZyBjb3B5KQpAQCAtMjU2LDYgKzI1Niw3 IEBAIGNsYXNzIFBsYW4KIAogICAgICAgICBzY3JpcHQgKz0gImV4cG9ydCBEWUxEX0ZSQU1FV09S S19QQVRIPSQoY2QgI3skdGVzdGluZ0ZyYW1ld29ya1BhdGguZGlybmFtZX07IHB3ZClcbiIKICAg ICAgICAgc2NyaXB0ICs9ICJleHBvcnQgSlNDVEVTVF90aW1lb3V0PSN7U2hlbGx3b3Jkcy5zaGVs bGVzY2FwZShFTlZbJ0pTQ1RFU1RfdGltZW91dCddKX1cbiIKKyAgICAgICAgc2NyaXB0ICs9ICJl eHBvcnQgSlNDVEVTVF9tZW1vcnlMaW1pdD0je1NoZWxsd29yZHMuc2hlbGxlc2NhcGUoRU5WWydK U0NURVNUX21lbW9yeUxpbWl0J10pfVxuIgogICAgICAgICAkZW52VmFycy5lYWNoIHsgfHZhcnwg c2NyaXB0ICs9ICJleHBvcnQgIiA8PCB2YXIgPDwgIlxuIiB9CiAgICAgICAgIHNjcmlwdCArPSAi I3tzaGVsbENvbW1hbmR9IHx8IGV4aXQgMSIKICAgICAgICAgImVjaG8gI3tTaGVsbHdvcmRzLnNo ZWxsZXNjYXBlKHNjcmlwdCl9ID4gI3tTaGVsbHdvcmRzLnNoZWxsZXNjYXBlKChQYXRobmFtZS5u ZXcoIi4uIikgKyBAbmFtZSkudG9fcyl9IgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRydWJ5 L2pzYy1zdHJlc3MtdGVzdC13cml0ZXItcnVieS5yYgo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL3dlYmtpdHJ1YnkvanNjLXN0cmVzcy10ZXN0LXdyaXRlci1ydWJ5LnJiCShyZXZpc2lvbiAy NjMyNzgpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHJ1YnkvanNjLXN0cmVzcy10ZXN0LXdyaXRl ci1ydWJ5LnJiCSh3b3JraW5nIGNvcHkpCkBAIC0zMTMsNiArMzEzLDcgQEAgY2xhc3MgUGxhbgog ICAgICAgICBzY3JpcHQgKz0gIi8ucnVubmVyXCIpIGRvXG4iCiAgICAgICAgIHNjcmlwdCArPSAi ICAgICAgICAgICAgRU5WW1wiRFlMRF9GUkFNRVdPUktfUEFUSFwiXSA9IFwiI3skdGVzdGluZ0Zy YW1ld29ya1BhdGguZGlybmFtZX1cIlxuIgogICAgICAgICBzY3JpcHQgKz0gIiAgICAgICAgICAg IEVOVltcIkpTQ1RFU1RfdGltZW91dFwiXSA9IFwiI3tFTlZbJ0pTQ1RFU1RfdGltZW91dCddfVwi XG4iCisgICAgICAgIHNjcmlwdCArPSAiICAgICAgICAgICAgRU5WW1wiSlNDVEVTVF9tZW1vcnlM aW1pdFwiXSA9IFwiI3tFTlZbJ0pTQ1RFU1RfbWVtb3J5TGltaXQnXX1cIlxuIgogCiAgICAgICAg IHNjcmlwdCArPSAiICAgICAgICAgICAgI3tzaGVsbENvbW1hbmR9IgogICAgICAgICBzY3JpcHQg Kz0gIiAgICAgICAgICAgIHByaW50IG91dFxuIgo=