196694 2019-04-08 09:25:17 -0700 iOS 12 Simulator Release WK2 frequently timing out while running layout tests 2019-04-09 09:27:09 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ap ews-watchlist glenn lforschler sroberts webkit-bug-importer oldest_to_newest 1525200 0 jbedard 2019-04-08 09:25:17 -0700 This is related to communication between ImageDiff and webkitpy, as killing ImageDiff causes tests to continue running. 1525201 1 jbedard 2019-04-08 09:25:40 -0700 <rdar://problem/48388734> 1525205 2 366941 jbedard 2019-04-08 09:33:36 -0700 Created attachment 366941 Patch 1525206 3 366941 jbedard 2019-04-08 09:34:07 -0700 Comment on attachment 366941 Patch This is a speculative change, I'm testing it now. 1525209 4 366941 ap 2019-04-08 09:39:08 -0700 Comment on attachment 366941 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=366941&action=review > Tools/ChangeLog:10 > + (main): Only flush stdout after writing to it. This doesn't sound like it should make a difference. 1525320 5 366974 jbedard 2019-04-08 13:23:05 -0700 Created attachment 366974 Patch 1525323 6 jbedard 2019-04-08 13:26:12 -0700 The problem here looks to be a deadlock filling up buffers when reading/writing from and to ImageDiff. I have a few ideas, not sure if the fix should be in ImageDiff or webkitpy. 1525428 7 366990 jbedard 2019-04-08 15:34:23 -0700 Created attachment 366990 Patch 1525429 8 366990 jbedard 2019-04-08 15:36:32 -0700 Comment on attachment 366990 Patch This patch seems to stop the problem, but also defeats the point of using ImageDiff as a server process. I think the right way to fix this will basically be 'check if there is stdout available, if there is, stop ImageDiff, otherwise, use the existing process' 1525475 9 367002 jbedard 2019-04-08 17:07:46 -0700 Created attachment 367002 Patch 1525496 10 367002 jbedard 2019-04-08 18:02:44 -0700 Comment on attachment 367002 Patch Verified that this approach solves the problem. It's probably worth investigating how ImageDiff can get into this state, but once it is in this state, we should throw away the process. 1525624 11 367002 aakash_jain 2019-04-09 08:49:30 -0700 Comment on attachment 367002 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367002&action=review rs=me > Tools/Scripts/webkitpy/port/image_diff.py:50 > + if tolerance != self._tolerance or self._process and self._process.has_available_stdout(): Can we use parenthesis here to make the code more readable? 1525638 12 jbedard 2019-04-09 09:14:45 -0700 Committed r244080: <https://trac.webkit.org/changeset/244080> 1525639 13 jbedard 2019-04-09 09:16:42 -0700 (In reply to Jonathan Bedard from comment #12) > Committed r244080: <https://trac.webkit.org/changeset/244080> Not done with this bug yet, but at least change patch will stop the bleeding. 1525640 14 jbedard 2019-04-09 09:27:09 -0700 It seems like it's possible for ImageDiff to dump twice? That's probably where the root cause of this bug is. 366941 2019-04-08 09:33:36 -0700 2019-04-08 13:23:04 -0700 Patch bug-196694-20190408093336.patch text/plain 1933 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NDAyMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTA0LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBpT1MgMTIgU2ltdWxhdG9yIFJlbGVhc2UgV0syIGZyZXF1ZW50bHkgdGlt aW5nIG91dCB3aGlsZSBydW5uaW5nIGxheW91dCB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2Njk0CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS80ODM4ODczND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIEltYWdlRGlmZi9JbWFnZURpZmYuY3BwOgorICAgICAgICAobWFpbik6IE9ubHkgZmx1 c2ggc3Rkb3V0IGFmdGVyIHdyaXRpbmcgdG8gaXQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5OgorICAgICAgICAoU2VydmVyUHJvY2Vzcy53cml0ZSk6 IEZsdXNoIHN0ZGluIGFmdGVyIHdyaXRpbmcgdG8gaXQuCisKIDIwMTktMDQtMDggIEd1aWxsYXVt ZSBFbW9udCAgPGd1aWplbW9udEBpZ2FsaWEuY29tPgogCiAgICAgICAgIEVuYWJsZSBERkcgb24g TUlQUwpJbmRleDogVG9vbHMvSW1hZ2VEaWZmL0ltYWdlRGlmZi5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvSW1hZ2VEaWZmL0ltYWdlRGlmZi5jcHAJKHJldmlzaW9uIDI0NDAxOSkKKysrIFRvb2xz L0ltYWdlRGlmZi9JbWFnZURpZmYuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjcsMTIgKzEyNywx MSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltdKQogICAgICAgICAgICAg ICAgIGZwcmludGYoc3Rkb3V0LCAiZGlmZjogJTAxLjJmJSUgZmFpbGVkXG4iLCBkaWZmZXJlbmNl KTsKICAgICAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgICAgIGZwcmludGYoc3Rkb3V0LCAi ZGlmZjogJTAxLjJmJSUgcGFzc2VkXG4iLCBkaWZmZXJlbmNlKTsKKyAgICAgICAgICAgIGZmbHVz aChzdGRvdXQpOwogCiAgICAgICAgICAgICBhY3R1YWxJbWFnZSA9IG51bGxwdHI7CiAgICAgICAg ICAgICBiYXNlbGluZUltYWdlID0gbnVsbHB0cjsKICAgICAgICAgfQotCi0gICAgICAgIGZmbHVz aChzdGRvdXQpOwogICAgIH0KIAogICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CkluZGV4OiBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvc2VydmVyX3Byb2Nlc3MucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5CShyZXZpc2lvbiAy NDQwMTkpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvc2VydmVyX3Byb2Nlc3MucHkJ KHdvcmtpbmcgY29weSkKQEAgLTE3NCw2ICsxNzQsNyBAQCBjbGFzcyBTZXJ2ZXJQcm9jZXNzKG9i amVjdCk6CiAgICAgICAgICAgICBzZWxmLl9zdGFydCgpCiAgICAgICAgIHRyeToKICAgICAgICAg ICAgIHNlbGYuX3Byb2Muc3RkaW4ud3JpdGUoYnl0ZXMpCisgICAgICAgICAgICBzZWxmLl9wcm9j LnN0ZGluLmZsdXNoKCkKICAgICAgICAgZXhjZXB0IElPRXJyb3IgYXMgZToKICAgICAgICAgICAg IHNlbGYuc3RvcCgwLjApCiAgICAgICAgICAgICAjIHN0b3AoKSBjYWxscyBfcmVzZXQoKSwgc28g d2UgaGF2ZSB0byBzZXQgY3Jhc2hlZCB0byBUcnVlIGFmdGVyIGNhbGxpbmcgc3RvcCgpCg== 366974 2019-04-08 13:23:05 -0700 2019-04-08 15:34:21 -0700 Patch bug-196694-20190408132304.patch text/plain 2379 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NDAzMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTA0LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBpT1MgMTIgU2ltdWxhdG9yIFJlbGVhc2UgV0syIGZyZXF1ZW50bHkgdGlt aW5nIG91dCB3aGlsZSBydW5uaW5nIGxheW91dCB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2Njk0CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS80ODM4ODczND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pbWFnZV9kaWZmLnB5OgorICAgICAgICAoSW1h Z2VEaWZmZXIuZGlmZl9pbWFnZSk6IFVzZSAyIHNlcGFyYXRlIGNhbGxzIHRvIHdyaXRlLgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weToKKyAgICAgICAg KFNlcnZlclByb2Nlc3Mud3JpdGUpOiBGbHVzaCBzdGRpbiBhZnRlciB3cml0aW5nIHRvIGl0Lgor CiAyMDE5LTA0LTA4ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAg ICAgICBbZXdzLWJ1aWxkXSBEbyBub3QgdXBsb2FkIGFyY2hpdmUgd2hlbiBDb21waWxlIEZhaWxz CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW1hZ2VfZGlmZi5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW1hZ2VfZGlmZi5weQkocmV2aXNp b24gMjQ0MDE5KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYucHkJ KHdvcmtpbmcgY29weSkKQEAgLTU3LDkgKzU3LDggQEAgY2xhc3MgSW1hZ2VEaWZmZXIob2JqZWN0 KToKICAgICAgICAgICAgIGlmIG5vdCBzZWxmLl9wcm9jZXNzOgogICAgICAgICAgICAgICAgIHNl bGYuX3N0YXJ0KHRvbGVyYW5jZSkKICAgICAgICAgICAgICMgTm90ZSB0aGF0IGFsdGhvdWdoIHdl IGFyZSBoYW5kZWQgJ29sZCcsICduZXcnLCBJbWFnZURpZmYgd2FudHMgJ25ldycsICdvbGQnLgot ICAgICAgICAgICAgc2VsZi5fcHJvY2Vzcy53cml0ZSgnQ29udGVudC1MZW5ndGg6ICVkXG4lc0Nv bnRlbnQtTGVuZ3RoOiAlZFxuJXMnICUgKAotICAgICAgICAgICAgICAgIGxlbihhY3R1YWxfY29u dGVudHMpLCBhY3R1YWxfY29udGVudHMsCi0gICAgICAgICAgICAgICAgbGVuKGV4cGVjdGVkX2Nv bnRlbnRzKSwgZXhwZWN0ZWRfY29udGVudHMpKQorICAgICAgICAgICAgZm9yIGNvbnRlbnRzIGlu IFthY3R1YWxfY29udGVudHMsIGV4cGVjdGVkX2NvbnRlbnRzXToKKyAgICAgICAgICAgICAgICBz ZWxmLl9wcm9jZXNzLndyaXRlKCdDb250ZW50LUxlbmd0aDoge2xlbmd0aH1cbntjb250ZW50c30n LmZvcm1hdChsZW5ndGg9bGVuKGNvbnRlbnRzKSwgY29udGVudHM9Y29udGVudHMpKQogICAgICAg ICAgICAgcmV0dXJuIHNlbGYuX3JlYWQoKQogICAgICAgICBleGNlcHQgSU9FcnJvciBhcyBleGNl cHRpb246CiAgICAgICAgICAgICByZXR1cm4gKE5vbmUsIDAsICJGYWlsZWQgdG8gY29tcHV0ZSBh biBpbWFnZSBkaWZmOiAlcyIgJSBzdHIoZXhjZXB0aW9uKSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvc2VydmVyX3Byb2Nlc3MucHkJKHJldmlzaW9uIDI0NDAxOSkKKysr IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQkod29ya2luZyBj b3B5KQpAQCAtMTc0LDYgKzE3NCw3IEBAIGNsYXNzIFNlcnZlclByb2Nlc3Mob2JqZWN0KToKICAg ICAgICAgICAgIHNlbGYuX3N0YXJ0KCkKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgc2VsZi5f cHJvYy5zdGRpbi53cml0ZShieXRlcykKKyAgICAgICAgICAgIHNlbGYuX3Byb2Muc3RkaW4uZmx1 c2goKQogICAgICAgICBleGNlcHQgSU9FcnJvciBhcyBlOgogICAgICAgICAgICAgc2VsZi5zdG9w KDAuMCkKICAgICAgICAgICAgICMgc3RvcCgpIGNhbGxzIF9yZXNldCgpLCBzbyB3ZSBoYXZlIHRv IHNldCBjcmFzaGVkIHRvIFRydWUgYWZ0ZXIgY2FsbGluZyBzdG9wKCkK 366990 2019-04-08 15:34:23 -0700 2019-04-08 17:07:44 -0700 Patch bug-196694-20190408153422.patch text/plain 1257 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NDA1MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE5LTA0LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBpT1MgMTIgU2ltdWxhdG9yIFJlbGVhc2UgV0syIGZyZXF1ZW50bHkgdGlt aW5nIG91dCB3aGlsZSBydW5uaW5nIGxheW91dCB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2Njk0CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS80ODM4ODczND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pbWFnZV9kaWZmLnB5OgorICAgICAgICAoSW1h Z2VEaWZmZXIuZGlmZl9pbWFnZSk6IEtpbGwgSW1hZ2VEaWZmIGJlZm9yZSBkaWZmaW5nIGFuIGlt YWdlLgorCiAyMDE5LTA0LTA4ICBKdXN0aW4gRmFuICA8anVzdGluX2ZhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW1dlYiBHUFVdIEZpeCBXZWIgR1BVIGV4cGVyaW1lbnRhbCBmZWF0dXJlIG9uIGlP UwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYucHkJKHJldmlz aW9uIDI0NDAxOSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pbWFnZV9kaWZmLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC00Nyw4ICs0Nyw3IEBAIGNsYXNzIEltYWdlRGlmZmVyKG9iamVj dCk6CiAgICAgICAgIHNlbGYuX3Byb2Nlc3MgPSBOb25lCiAKICAgICBkZWYgZGlmZl9pbWFnZShz ZWxmLCBleHBlY3RlZF9jb250ZW50cywgYWN0dWFsX2NvbnRlbnRzLCB0b2xlcmFuY2UpOgotICAg ICAgICBpZiB0b2xlcmFuY2UgIT0gc2VsZi5fdG9sZXJhbmNlOgotICAgICAgICAgICAgc2VsZi5z dG9wKCkKKyAgICAgICAgc2VsZi5zdG9wKCkKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgYXNz ZXJ0KGV4cGVjdGVkX2NvbnRlbnRzKQogICAgICAgICAgICAgYXNzZXJ0KGFjdHVhbF9jb250ZW50 cykK 367002 2019-04-08 17:07:46 -0700 2019-04-09 09:16:12 -0700 Patch bug-196694-20190408170745.patch text/plain 6356 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NDA1OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDE5LTA0LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBpT1MgMTIgU2ltdWxhdG9yIFJlbGVhc2UgV0syIGZyZXF1ZW50bHkgdGlt aW5nIG91dCB3aGlsZSBydW5uaW5nIGxheW91dCB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2Njk0CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS80ODM4ODczND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pbWFnZV9kaWZmLnB5OgorICAgICAgICAoSW1h Z2VEaWZmZXIuZGlmZl9pbWFnZSk6IElmIHRoZSBJbWFnZURpZmYgcHJvY2VzcyBoYXMgZGF0YSwg a2lsbCBpdCBiZWZvcmUgcnVubmluZyBhZ2Fpbi4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3BvcnQvc2VydmVyX3Byb2Nlc3MucHk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLmhhc19hdmFp bGFibGVfc3Rkb3V0KTogQ2hlY2sgaWYgc3Rkb3V0IGhhcyBkYXRhIGluIGl0LgorICAgICAgICAo U2VydmVyUHJvY2Vzcy5fd2FpdF9mb3JfZGF0YV9hbmRfdXBkYXRlX2J1ZmZlcnNfdXNpbmdfc2Vs ZWN0KToKKyAgICAgICAgKFNlcnZlclByb2Nlc3MuX3dhaXRfZm9yX2RhdGFfYW5kX3VwZGF0ZV9i dWZmZXJzX3VzaW5nX3dpbjMyX2FwaXMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9y dC9zZXJ2ZXJfcHJvY2Vzc19tb2NrLnB5OgorICAgICAgICAoTW9ja1NlcnZlclByb2Nlc3MuaGFz X2F2YWlsYWJsZV9zdGRvdXQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9zZXJ2 ZXJfcHJvY2Vzc191bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RTZXJ2ZXJQcm9jZXNzLnNlcmlh bF90ZXN0X2Jhc2ljKToKKwogMjAxOS0wNC0wOCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVo QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBEbyBub3QgYWxsb3cgc3RhcnRpbmcgc2VsZWN0 aW9uIGRyYWdzIHdoZW4gc2VsZWN0aW9uIHZpZXdzIGFyZSBub3QgdmlzaWJsZQpJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYucHkJKHJldmlzaW9uIDI0NDAxOSkK KysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pbWFnZV9kaWZmLnB5CSh3b3JraW5nIGNv cHkpCkBAIC00Nyw3ICs0Nyw3IEBAIGNsYXNzIEltYWdlRGlmZmVyKG9iamVjdCk6CiAgICAgICAg IHNlbGYuX3Byb2Nlc3MgPSBOb25lCiAKICAgICBkZWYgZGlmZl9pbWFnZShzZWxmLCBleHBlY3Rl ZF9jb250ZW50cywgYWN0dWFsX2NvbnRlbnRzLCB0b2xlcmFuY2UpOgotICAgICAgICBpZiB0b2xl cmFuY2UgIT0gc2VsZi5fdG9sZXJhbmNlOgorICAgICAgICBpZiB0b2xlcmFuY2UgIT0gc2VsZi5f dG9sZXJhbmNlIG9yIHNlbGYuX3Byb2Nlc3MgYW5kIHNlbGYuX3Byb2Nlc3MuaGFzX2F2YWlsYWJs ZV9zdGRvdXQoKToKICAgICAgICAgICAgIHNlbGYuc3RvcCgpCiAgICAgICAgIHRyeToKICAgICAg ICAgICAgIGFzc2VydChleHBlY3RlZF9jb250ZW50cykKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3BvcnQvc2VydmVyX3Byb2Nlc3MucHkJKHJldmlzaW9uIDI0NDAxOSkKKysrIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQkod29ya2luZyBjb3B5 KQpAQCAtMjAzLDYgKzIwMywxNCBAQCBjbGFzcyBTZXJ2ZXJQcm9jZXNzKG9iamVjdCk6CiAgICAg ZGVmIHJlYWRfc3Rkb3V0X2xpbmUoc2VsZiwgZGVhZGxpbmUpOgogICAgICAgICByZXR1cm4gc2Vs Zi5fcmVhZChkZWFkbGluZSwgc2VsZi5fcG9wX3N0ZG91dF9saW5lX2lmX3JlYWR5KQogCisgICAg ZGVmIGhhc19hdmFpbGFibGVfc3Rkb3V0KHNlbGYpOgorICAgICAgICBpZiBub3Qgc2VsZi5oYXNf Y3Jhc2hlZCgpIGFuZCBzZWxmLl91c2Vfd2luMzJfYXBpczoKKyAgICAgICAgICAgIHNlbGYuX3dh aXRfZm9yX2RhdGFfYW5kX3VwZGF0ZV9idWZmZXJzX3VzaW5nX3dpbjMyX2FwaXMoMCkKKyAgICAg ICAgZWxpZiBub3Qgc2VsZi5oYXNfY3Jhc2hlZCgpOgorICAgICAgICAgICAgc2VsZi5fd2FpdF9m b3JfZGF0YV9hbmRfdXBkYXRlX2J1ZmZlcnNfdXNpbmdfc2VsZWN0KDApCisKKyAgICAgICAgcmV0 dXJuIGJvb2woc2VsZi5fb3V0cHV0KQorCiAgICAgZGVmIHJlYWRfc3RkZXJyX2xpbmUoc2VsZiwg ZGVhZGxpbmUpOgogICAgICAgICByZXR1cm4gc2VsZi5fcmVhZChkZWFkbGluZSwgc2VsZi5fcG9w X3N0ZGVycl9saW5lX2lmX3JlYWR5KQogCkBAIC0yNTYsNyArMjY0LDcgQEAgY2xhc3MgU2VydmVy UHJvY2VzcyhvYmplY3QpOgogICAgICAgICByZXR1cm4gb3V0cHV0CiAKICAgICBkZWYgX3dhaXRf Zm9yX2RhdGFfYW5kX3VwZGF0ZV9idWZmZXJzX3VzaW5nX3NlbGVjdChzZWxmLCBkZWFkbGluZSwg c3RvcHBpbmc9RmFsc2UpOgotICAgICAgICBpZiBzZWxmLl9wcm9jLnN0ZG91dC5jbG9zZWQgb3Ig c2VsZi5fcHJvYy5zdGRlcnIuY2xvc2VkOgorICAgICAgICBpZiBub3Qgc2VsZi5fcHJvYyBvciBz ZWxmLl9wcm9jLnN0ZG91dC5jbG9zZWQgb3Igc2VsZi5fcHJvYy5zdGRlcnIuY2xvc2VkOgogICAg ICAgICAgICAgIyBJZiB0aGUgcHJvY2VzcyBjcmFzaGVkIGFuZCBpcyB1c2luZyBGSUZPcywgbGlr ZSBDaHJvbWl1bSBBbmRyb2lkLCB0aGUKICAgICAgICAgICAgICMgc3Rkb3V0IGFuZCBzdGRlcnIg cGlwZXMgd2lsbCBiZSBjbG9zZWQuCiAgICAgICAgICAgICByZXR1cm4KQEAgLTMwMCwxMiArMzA4 LDE2IEBAIGNsYXNzIFNlcnZlclByb2Nlc3Mob2JqZWN0KToKICAgICAgICAgICAgIHBhc3MKIAog ICAgIGRlZiBfd2FpdF9mb3JfZGF0YV9hbmRfdXBkYXRlX2J1ZmZlcnNfdXNpbmdfd2luMzJfYXBp cyhzZWxmLCBkZWFkbGluZSk6CisgICAgICAgIGlmIG5vdCBzZWxmLl9wcm9jOgorICAgICAgICAg ICAgcmV0dXJuCisKICAgICAgICAgIyBTZWUgaHR0cDovL2NvZGUuYWN0aXZlc3RhdGUuY29tL3Jl Y2lwZXMvNDQwNTU0LW1vZHVsZS10by1hbGxvdy1hc3luY2hyb25vdXMtc3VicHJvY2Vzcy11c2Ut b24td2luLwogICAgICAgICAjIGFuZCBodHRwOi8vZG9jcy5hY3RpdmVzdGF0ZS5jb20vYWN0aXZl cHl0aG9uLzIuNi9weXdpbjMyL21vZHVsZXMuaHRtbAogICAgICAgICAjIGZvciBkb2N1bWVudGF0 aW9uIG9uIGFsbCBvZiB0aGVzZSB3aW4zMi1zcGVjaWZpYyBtb2R1bGVzLgogICAgICAgICBvdXRf ZmggPSBtc3ZjcnQuZ2V0X29zZmhhbmRsZShzZWxmLl9wcm9jLnN0ZG91dC5maWxlbm8oKSkKICAg ICAgICAgZXJyX2ZoID0gbXN2Y3J0LmdldF9vc2ZoYW5kbGUoc2VsZi5fcHJvYy5zdGRlcnIuZmls ZW5vKCkpCi0gICAgICAgIHdoaWxlIHRpbWUudGltZSgpIDwgZGVhZGxpbmU6CisgICAgICAgIGNo ZWNraW5nID0gVHJ1ZQorICAgICAgICB3aGlsZSBjaGVja2luZzoKICAgICAgICAgICAgIG91dHB1 dCA9IHNlbGYuX25vbl9ibG9ja2luZ19yZWFkX3dpbjMyKG91dF9maCkKICAgICAgICAgICAgIGVy cm9yID0gc2VsZi5fbm9uX2Jsb2NraW5nX3JlYWRfd2luMzIoZXJyX2ZoKQogICAgICAgICAgICAg aWYgb3V0cHV0IG9yIGVycm9yOgpAQCAtMzE3LDYgKzMyOSw3IEBAIGNsYXNzIFNlcnZlclByb2Nl c3Mob2JqZWN0KToKICAgICAgICAgICAgIGlmIHNlbGYuX3Byb2MucG9sbCgpIGlzIG5vdCBOb25l OgogICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICAgdGltZS5zbGVlcCgwLjAxKQor ICAgICAgICAgICAgY2hlY2tpbmcgPSB0aW1lLnRpbWUoKSA8IGRlYWRsaW5lCiAKICAgICBkZWYg X25vbl9ibG9ja2luZ19yZWFkX3dpbjMyKHNlbGYsIGhhbmRsZSk6CiAgICAgICAgIHRyeToKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzc19tb2NrLnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzc19t b2NrLnB5CShyZXZpc2lvbiAyNDQwMTkpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv c2VydmVyX3Byb2Nlc3NfbW9jay5weQkod29ya2luZyBjb3B5KQpAQCAtNTQsNiArNTQsMTEgQEAg Y2xhc3MgTW9ja1NlcnZlclByb2Nlc3Mob2JqZWN0KToKICAgICAgICAgICAgIHJldHVybiBOb25l CiAgICAgICAgIHJldHVybiBzZWxmLmxpbmVzLnBvcCgwKSArICJcbiIKIAorICAgIGRlZiBoYXNf YXZhaWxhYmxlX3N0ZG91dChzZWxmKToKKyAgICAgICAgaWYgc2VsZi5oYXNfY3Jhc2hlZCgpOgor ICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisgICAgICAgIHJldHVybiBib29sKHNlbGYubGluZXMp CisKICAgICBkZWYgcmVhZF9zdGRvdXQoc2VsZiwgZGVhZGxpbmUsIHNpemUpOgogICAgICAgICBp ZiBzZWxmLmhhc19jcmFzaGVkKCk6CiAgICAgICAgICAgICByZXR1cm4gTm9uZQpJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNzX3VuaXR0ZXN0LnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzc191bml0 dGVzdC5weQkocmV2aXNpb24gMjQ0MDE5KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L3NlcnZlcl9wcm9jZXNzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMDEsNyArMTAx LDcgQEAgY2xhc3MgRmFrZVNlcnZlclByb2Nlc3Moc2VydmVyX3Byb2Nlc3MuUwogY2xhc3MgVGVz dFNlcnZlclByb2Nlc3ModW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBzZXJpYWxfdGVzdF9i YXNpYyhzZWxmKToKICAgICAgICAgIyBHaXZlIC11IHN3aXRjaCB0byBmb3JjZSBzdGRvdXQgYW5k IHN0ZGVyciB0byBiZSB1bmJ1ZmZlcmVkIGZvciBXaW5kb3dzCi0gICAgICAgIGNtZCA9IFtzeXMu ZXhlY3V0YWJsZSwgJy11YycsICdpbXBvcnQgc3lzOyBwcmludCAic3Rkb3V0IjsgcHJpbnQgPj5z eXMuc3RkZXJyLCAic3RkZXJyIjsgc3lzLnN0ZGluLnJlYWRsaW5lKCk7J10KKyAgICAgICAgY21k ID0gW3N5cy5leGVjdXRhYmxlLCAnLXVjJywgJ2ltcG9ydCBzeXM7IHByaW50ICJzdGRvdXQiOyBw cmludCAiYWdhaW4iOyBwcmludCA+PnN5cy5zdGRlcnIsICJzdGRlcnIiOyBzeXMuc3RkaW4ucmVh ZGxpbmUoKTsnXQogICAgICAgICBob3N0ID0gU3lzdGVtSG9zdCgpCiAgICAgICAgIGZhY3Rvcnkg PSBQb3J0RmFjdG9yeShob3N0KQogICAgICAgICBwb3J0ID0gZmFjdG9yeS5nZXQoKQpAQCAtMTIw LDkgKzEyMCwxNSBAQCBjbGFzcyBUZXN0U2VydmVyUHJvY2Vzcyh1bml0dGVzdC5UZXN0Q2FzCiAg ICAgICAgIGxpbmUgPSBwcm9jLnJlYWRfc3Rkb3V0X2xpbmUobm93ICsgMS4wKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGxpbmUuc3RyaXAoKSwgInN0ZG91dCIpCiAKKyAgICAgICAgc2VsZi5h c3NlcnRUcnVlKHByb2MuaGFzX2F2YWlsYWJsZV9zdGRvdXQoKSkKKwogICAgICAgICBsaW5lID0g cHJvYy5yZWFkX3N0ZGVycl9saW5lKG5vdyArIDEuMCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChsaW5lLnN0cmlwKCksICJzdGRlcnIiKQogCisgICAgICAgIGxpbmUgPSBwcm9jLnJlYWRfc3Rk b3V0X2xpbmUobm93ICsgMS4wKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxpbmUuc3RyaXAo KSwgImFnYWluIikKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShwcm9jLmhhc19hdmFpbGFibGVf c3Rkb3V0KCkpCisKICAgICAgICAgcHJvYy53cml0ZSgnRW5kXG4nKQogICAgICAgICB0aW1lLnNs ZWVwKDAuMSkgICMgR2l2ZSBwcm9jZXNzIGEgbW9tZW50IHRvIGNsb3NlLgogICAgICAgICBzZWxm LmFzc2VydEVxdWFsKHByb2MucG9sbCgpLCAwKQo=