179514 2017-11-09 16:56:58 -0800 webkitpy: Remove find_system_pid from port classes 2017-11-17 10:25:22 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=117098 https://bugs.webkit.org/show_bug.cgi?id=179828 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain bfulgham buildbot commit-queue dbates ddkilzer glenn lforschler webkit-bug-importer oldest_to_newest 1370119 0 jbedard 2017-11-09 16:56:58 -0800 Even on Windows, find_system_pid is unused. Remove dead code. 1370120 1 webkit-bug-importer 2017-11-09 16:57:36 -0800 <rdar://problem/35456900> 1370123 2 326513 jbedard 2017-11-09 17:00:22 -0800 Created attachment 326513 Patch 1370125 3 326514 jbedard 2017-11-09 17:07:43 -0800 Created attachment 326514 Patch 1370126 4 326514 ddkilzer 2017-11-09 17:11:04 -0800 Comment on attachment 326514 Patch r=me 1370144 5 326520 jbedard 2017-11-09 17:54:07 -0800 Created attachment 326520 Patch 1370145 6 jbedard 2017-11-09 17:54:54 -0800 (In reply to Jonathan Bedard from comment #5) > Created attachment 326520 [details] > Patch Pushing back through EWS to test an unrelated fix <https://trac.webkit.org/changeset/224658>. 1370404 7 326520 commit-queue 2017-11-10 10:30:26 -0800 Comment on attachment 326520 Patch Clearing flags on attachment: 326520 Committed r224695: <https://trac.webkit.org/changeset/224695> 1370405 8 commit-queue 2017-11-10 10:30:28 -0800 All reviewed patches have been landed. Closing bug. 1371288 9 326520 dbates 2017-11-13 22:40:18 -0800 Comment on attachment 326520 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=326520&action=review > Tools/Scripts/webkitpy/port/server_process.py:-123 > - self._port.find_system_pid(self.process_name(), self._pid) I know that that return value of this function side is unused. Are we sure this is not simply a bug? I mean, this function was explicitly added in the patch for <https://bugs.webkit.org/show_bug.cgi?id=117098> and has a non-trivial implementation that makes use of platform knowledge. I have not read this patch in detail. It seems weird that this function would have been accidentally given that its implementation requires a non-trivial investment in time to code. 1371382 10 jbedard 2017-11-14 08:29:29 -0800 (In reply to Daniel Bates from comment #9) > Comment on attachment 326520 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=326520&action=review > > > Tools/Scripts/webkitpy/port/server_process.py:-123 > > - self._port.find_system_pid(self.process_name(), self._pid) > > I know that that return value of this function side is unused. Are we sure > this is not simply a bug? I mean, this function was explicitly added in the > patch for <https://bugs.webkit.org/show_bug.cgi?id=117098> and has a > non-trivial implementation that makes use of platform knowledge. I have not > read this patch in detail. It seems weird that this function would have been > accidentally given that its implementation requires a non-trivial investment > in time to code. The specified reason was to find matching crash-logs. We clearly were not using this functionality, and did not notice that we were missing it for 4 years. Even if we did want this functionality, it should be owned by _get_crash_log(...), not ServerProcess, since the ServerProcess pid is also used to kill a process. (and in that case, we do want to be killing the cygwin process) Lastly, this functionality is a bit redundant (even on Mac) since we pick up crash logs that occur during our test run anyways. The only win this would give us is being able to match a crash log with a specific test automatically. 1373136 11 jbedard 2017-11-17 10:25:19 -0800 I looked closer at our Windows results today. There is definitely a bug here, but it seems that the bug is actually in Executive.pid_to_system_pid or WinPort._get_crash_log. I filed a new bug to track that fix, because it will be unique to the WinPort and will not involve the ServerProcess <https://bugs.webkit.org/show_bug.cgi?id=179828>. 326513 2017-11-09 17:00:22 -0800 2017-11-09 17:07:42 -0800 Patch bug-179514-20171109170021.patch text/plain 4076 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyNDY1NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE3LTExLTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUmVtb3ZlIGZpbmRfc3lzdGVtX3BpZCBmcm9tIHBvcnQg Y2xhc3NlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTc5NTE0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNTQ1NjkwMD4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmluZyBkZWFkIGNvZGUuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQu ZmluZF9zeXN0ZW1fcGlkKTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Bv cnQvc2VydmVyX3Byb2Nlc3MucHk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl9zdGFydCk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weToKKyAgICAgICAgKFdpblBvcnQu ZmluZF9zeXN0ZW1fcGlkKTogRGVsZXRlZC4KKwogMjAxNy0xMS0wOSAgQmFzdWtlIFN1enVraSAg PEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CiAKICAgICAgICAgW1dpbkNhaXJvXSBDYW5ub3QgZmlu ZCBJbWFnZURpZmYgZXhlY3V0YWJsZQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L2Jhc2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2Uu cHkJKHJldmlzaW9uIDIyNDY0NykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNl LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMzgwLDEwICsxMzgwLDYgQEAgY2xhc3MgUG9ydChvYmpl Y3QpOgogICAgIGRlZiBzYW1wbGVfcHJvY2VzcyhzZWxmLCBuYW1lLCBwaWQsIHRhcmdldF9ob3N0 PU5vbmUpOgogICAgICAgICBwYXNzCiAKLSAgICBkZWYgZmluZF9zeXN0ZW1fcGlkKHNlbGYsIG5h bWUsIHBpZCk6Ci0gICAgICAgICMgVGhpcyBpcyBvbmx5IG92ZXJyaWRkZW4gb24gV2luZG93cwot ICAgICAgICByZXR1cm4gcGlkCi0KICAgICBkZWYgc2hvdWxkX3J1bl9hc19waXhlbF90ZXN0KHNl bGYsIHRlc3RfaW5wdXQpOgogICAgICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy5waXhlbF90ZXN0 czoKICAgICAgICAgICAgIHJldHVybiBGYWxzZQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQkocmV2aXNpb24gMjI0NjQ3KQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5CSh3b3JraW5nIGNvcHkpCkBA IC0xMjAsNyArMTIwLDYgQEAgY2xhc3MgU2VydmVyUHJvY2VzcyhvYmplY3QpOgogICAgICAgICAg ICAgZW52PXNlbGYuX2VudiwKICAgICAgICAgICAgIHVuaXZlcnNhbF9uZXdsaW5lcz1zZWxmLl91 bml2ZXJzYWxfbmV3bGluZXMpCiAgICAgICAgIHNlbGYuX3BpZCA9IHNlbGYuX3Byb2MucGlkCi0g ICAgICAgIHNlbGYuX3BvcnQuZmluZF9zeXN0ZW1fcGlkKHNlbGYucHJvY2Vzc19uYW1lKCksIHNl bGYuX3BpZCkKICAgICAgICAgaWYgbm90IHNlbGYuX3VzZV93aW4zMl9hcGlzOgogICAgICAgICAg ICAgc2VsZi5fc2V0X2ZpbGVfbm9uYmxvY2tpbmcoc2VsZi5fcHJvYy5zdGRvdXQpCiAgICAgICAg ICAgICBzZWxmLl9zZXRfZmlsZV9ub25ibG9ja2luZyhzZWxmLl9wcm9jLnN0ZGVycikKSW5kZXg6 IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQkocmV2aXNpb24gMjI0NjQ3KQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQkod29ya2luZyBjb3B5KQpAQCAtNDIxLDM4ICs0 MjEsNiBAQCBjbGFzcyBXaW5Qb3J0KEFwcGxlUG9ydCk6CiAgICAgICAgICAgICAgICAgY3Jhc2hf bG9nc1t0ZXN0X25hbWVdID0gY3Jhc2hfbG9nCiAgICAgICAgIHJldHVybiBjcmFzaF9sb2dzCiAK LSAgICBkZWYgZmluZF9zeXN0ZW1fcGlkKHNlbGYsIG5hbWUsIHBpZCk6Ci0gICAgICAgIHN5c3Rl bV9waWQgPSBpbnQocGlkKQotCi0gICAgICAgIGlmIHN5cy5wbGF0Zm9ybSA9PSAiY3lnd2luIjoK LSAgICAgICAgICAgICMgV2luZG93cyBhbmQgQ3lnd2luIFBJRHMgYXJlIG5vdCB0aGUgc2FtZS4g IFdlIG5lZWQgdG8gZmluZCB0aGUgV2luZG93cwotICAgICAgICAgICAgIyBQSUQgZm9yIG91ciBD eWd3aW4gcHJvY2VzcyBzbyB3ZSBjYW4gbWF0Y2ggaXQgbGF0ZXIgdG8gYW55IGNyYXNoCi0gICAg ICAgICAgICAjIGZpbGVzIHdlIGVuZCB1cCBjcmVhdGluZyAod2hpY2ggd2lsbCBiZSB0YWdnZWQg d2l0aCB0aGUgV2luZG93cyBQSUQpCi0gICAgICAgICAgICBwc19wcm9jZXNzID0gc2VsZi5fZXhl Y3V0aXZlLnJ1bl9jb21tYW5kKFsncHMnLCAnLWUnXSwgZXJyb3JfaGFuZGxlcj1FeGVjdXRpdmUu aWdub3JlX2Vycm9yKQotICAgICAgICAgICAgZm9yIGxpbmUgaW4gcHNfcHJvY2Vzcy5zcGxpdGxp bmVzKCk6Ci0gICAgICAgICAgICAgICAgdG9rZW5zID0gbGluZS5zdHJpcCgpLnNwbGl0KCkKLSAg ICAgICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgICAgIGNwaWQsIHBwaWQsIHBnaWQs IHdpbnBpZCwgdHR5LCB1aWQsIHN0aW1lLCBwcm9jZXNzX25hbWUgPSB0b2tlbnMKLSAgICAgICAg ICAgICAgICAgICAgaWYgcHJvY2Vzc19uYW1lLmVuZHN3aXRoKG5hbWUpOgotICAgICAgICAgICAg ICAgICAgICAgICAgc2VsZi5fZXhlY3V0aXZlLnBpZF90b19zeXN0ZW1fcGlkW2ludChjcGlkKV0g PSBpbnQod2lucGlkKQotICAgICAgICAgICAgICAgICAgICAgICAgaWYgaW50KHBpZCkgPT0gaW50 KGNwaWQpOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN5c3RlbV9waWQgPSBpbnQod2lu cGlkKQotICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWsKLSAgICAgICAgICAgICAgICBleGNl cHQgVmFsdWVFcnJvciwgZToKLSAgICAgICAgICAgICAgICAgICAgcGFzcwotICAgICAgICBlbHNl OgotICAgICAgICAgICAgd21pID0gd2luMzJjb20uY2xpZW50LkdldE9iamVjdCgnd2lubWdtdHM6 JykKLSAgICAgICAgICAgIF9sb2cuZGVidWcoJ1F1ZXJ5aW5nIFdNSSB3aXRoICIlezB9JSInLmZv cm1hdChuYW1lKSkKLSAgICAgICAgICAgIHByb2NzID0gd21pLkV4ZWNRdWVyeSgnU2VsZWN0ICog ZnJvbSB3aW4zMl9wcm9jZXNzIHdoZXJlIG5hbWUgbGlrZSAiJXswfSUiJy5mb3JtYXQobmFtZSkp Ci0gICAgICAgICAgICBmb3IgcHJvYyBpbiBwcm9jczoKLSAgICAgICAgICAgICAgICBzZWxmLl9l eGVjdXRpdmUucGlkX3RvX3N5c3RlbV9waWRbaW50KHByb2MuUHJvY2Vzc0lkKV0gPSBpbnQocHJv Yy5Qcm9jZXNzSWQpCi0gICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygiSSBzZWUgezB9OiB7MX0i LmZvcm1hdChwcm9jLk5hbWUsIHByb2MuUHJvY2Vzc0lkKSkKLSAgICAgICAgICAgICAgICBpZiBp bnQocGlkKSA9PSBpbnQocHJvYy5Qcm9jZXNzSWQpOgotICAgICAgICAgICAgICAgICAgICBzeXN0 ZW1fcGlkID0gaW50KHByb2MuUHJvY2Vzc0lkKQotICAgICAgICAgICAgICAgIGJyZWFrCi0KLSAg ICAgICAgcmV0dXJuIHN5c3RlbV9waWQKLQogCiBjbGFzcyBXaW5DYWlyb1BvcnQoV2luUG9ydCk6 CiAgICAgcG9ydF9uYW1lID0gIndpbmNhaXJvIgo= 326514 2017-11-09 17:07:43 -0800 2017-11-09 17:54:06 -0800 Patch bug-179514-20171109170742.patch text/plain 4058 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyNDY1NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE3LTExLTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUmVtb3ZlIGZpbmRfc3lzdGVtX3BpZCBmcm9tIHBvcnQg Y2xhc3NlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTc5NTE0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNTQ1NjkwMD4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmluZyBkZWFkIGNvZGUuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQu ZmluZF9zeXN0ZW1fcGlkKTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Bv cnQvc2VydmVyX3Byb2Nlc3MucHk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl9zdGFydCk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weToKKyAgICAgICAgKFdpblBvcnQu ZmluZF9zeXN0ZW1fcGlkKTogRGVsZXRlZC4KKwogMjAxNy0xMS0wOSAgSm9uYXRoYW4gQmVkYXJk ICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgd2Via2l0cHk6IFVuaWZ5IHZlcnNpb24g cGFyc2luZyBjb2RlCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQkocmV2aXNp b24gMjI0NjU3KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHdvcmtp bmcgY29weSkKQEAgLTEzODAsMTAgKzEzODAsNiBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAg ZGVmIHNhbXBsZV9wcm9jZXNzKHNlbGYsIG5hbWUsIHBpZCwgdGFyZ2V0X2hvc3Q9Tm9uZSk6CiAg ICAgICAgIHBhc3MKIAotICAgIGRlZiBmaW5kX3N5c3RlbV9waWQoc2VsZiwgbmFtZSwgcGlkKToK LSAgICAgICAgIyBUaGlzIGlzIG9ubHkgb3ZlcnJpZGRlbiBvbiBXaW5kb3dzCi0gICAgICAgIHJl dHVybiBwaWQKLQogICAgIGRlZiBzaG91bGRfcnVuX2FzX3BpeGVsX3Rlc3Qoc2VsZiwgdGVzdF9p bnB1dCk6CiAgICAgICAgIGlmIG5vdCBzZWxmLl9vcHRpb25zLnBpeGVsX3Rlc3RzOgogICAgICAg ICAgICAgcmV0dXJuIEZhbHNlCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvc2Vy dmVyX3Byb2Nlc3MucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L3NlcnZlcl9wcm9jZXNzLnB5CShyZXZpc2lvbiAyMjQ2NTcpCisrKyBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvc2VydmVyX3Byb2Nlc3MucHkJKHdvcmtpbmcgY29weSkKQEAgLTEyMCw3ICsx MjAsNiBAQCBjbGFzcyBTZXJ2ZXJQcm9jZXNzKG9iamVjdCk6CiAgICAgICAgICAgICBlbnY9c2Vs Zi5fZW52LAogICAgICAgICAgICAgdW5pdmVyc2FsX25ld2xpbmVzPXNlbGYuX3VuaXZlcnNhbF9u ZXdsaW5lcykKICAgICAgICAgc2VsZi5fcGlkID0gc2VsZi5fcHJvYy5waWQKLSAgICAgICAgc2Vs Zi5fcG9ydC5maW5kX3N5c3RlbV9waWQoc2VsZi5wcm9jZXNzX25hbWUoKSwgc2VsZi5fcGlkKQog ICAgICAgICBpZiBub3Qgc2VsZi5fdXNlX3dpbjMyX2FwaXM6CiAgICAgICAgICAgICBzZWxmLl9z ZXRfZmlsZV9ub25ibG9ja2luZyhzZWxmLl9wcm9jLnN0ZG91dCkKICAgICAgICAgICAgIHNlbGYu X3NldF9maWxlX25vbmJsb2NraW5nKHNlbGYuX3Byb2Muc3RkZXJyKQpJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvd2luLnB5CShyZXZpc2lvbiAyMjQ2NTcpCisrKyBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvd2luLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MzEsMzggKzQzMSw2IEBAIGNs YXNzIFdpblBvcnQoQXBwbGVQb3J0KToKICAgICAgICAgICAgICAgICBjcmFzaF9sb2dzW3Rlc3Rf bmFtZV0gPSBjcmFzaF9sb2cKICAgICAgICAgcmV0dXJuIGNyYXNoX2xvZ3MKIAotICAgIGRlZiBm aW5kX3N5c3RlbV9waWQoc2VsZiwgbmFtZSwgcGlkKToKLSAgICAgICAgc3lzdGVtX3BpZCA9IGlu dChwaWQpCi0KLSAgICAgICAgaWYgc2VsZi5pc19jeWd3aW4oKToKLSAgICAgICAgICAgICMgV2lu ZG93cyBhbmQgQ3lnd2luIFBJRHMgYXJlIG5vdCB0aGUgc2FtZS4gIFdlIG5lZWQgdG8gZmluZCB0 aGUgV2luZG93cwotICAgICAgICAgICAgIyBQSUQgZm9yIG91ciBDeWd3aW4gcHJvY2VzcyBzbyB3 ZSBjYW4gbWF0Y2ggaXQgbGF0ZXIgdG8gYW55IGNyYXNoCi0gICAgICAgICAgICAjIGZpbGVzIHdl IGVuZCB1cCBjcmVhdGluZyAod2hpY2ggd2lsbCBiZSB0YWdnZWQgd2l0aCB0aGUgV2luZG93cyBQ SUQpCi0gICAgICAgICAgICBwc19wcm9jZXNzID0gc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5k KFsncHMnLCAnLWUnXSwgZXJyb3JfaGFuZGxlcj1FeGVjdXRpdmUuaWdub3JlX2Vycm9yKQotICAg ICAgICAgICAgZm9yIGxpbmUgaW4gcHNfcHJvY2Vzcy5zcGxpdGxpbmVzKCk6Ci0gICAgICAgICAg ICAgICAgdG9rZW5zID0gbGluZS5zdHJpcCgpLnNwbGl0KCkKLSAgICAgICAgICAgICAgICB0cnk6 Ci0gICAgICAgICAgICAgICAgICAgIGNwaWQsIHBwaWQsIHBnaWQsIHdpbnBpZCwgdHR5LCB1aWQs IHN0aW1lLCBwcm9jZXNzX25hbWUgPSB0b2tlbnMKLSAgICAgICAgICAgICAgICAgICAgaWYgcHJv Y2Vzc19uYW1lLmVuZHN3aXRoKG5hbWUpOgotICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5f ZXhlY3V0aXZlLnBpZF90b19zeXN0ZW1fcGlkW2ludChjcGlkKV0gPSBpbnQod2lucGlkKQotICAg ICAgICAgICAgICAgICAgICAgICAgaWYgaW50KHBpZCkgPT0gaW50KGNwaWQpOgotICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHN5c3RlbV9waWQgPSBpbnQod2lucGlkKQotICAgICAgICAgICAg ICAgICAgICAgICAgYnJlYWsKLSAgICAgICAgICAgICAgICBleGNlcHQgVmFsdWVFcnJvciwgZToK LSAgICAgICAgICAgICAgICAgICAgcGFzcwotICAgICAgICBlbHNlOgotICAgICAgICAgICAgd21p ID0gd2luMzJjb20uY2xpZW50LkdldE9iamVjdCgnd2lubWdtdHM6JykKLSAgICAgICAgICAgIF9s b2cuZGVidWcoJ1F1ZXJ5aW5nIFdNSSB3aXRoICIlezB9JSInLmZvcm1hdChuYW1lKSkKLSAgICAg ICAgICAgIHByb2NzID0gd21pLkV4ZWNRdWVyeSgnU2VsZWN0ICogZnJvbSB3aW4zMl9wcm9jZXNz IHdoZXJlIG5hbWUgbGlrZSAiJXswfSUiJy5mb3JtYXQobmFtZSkpCi0gICAgICAgICAgICBmb3Ig cHJvYyBpbiBwcm9jczoKLSAgICAgICAgICAgICAgICBzZWxmLl9leGVjdXRpdmUucGlkX3RvX3N5 c3RlbV9waWRbaW50KHByb2MuUHJvY2Vzc0lkKV0gPSBpbnQocHJvYy5Qcm9jZXNzSWQpCi0gICAg ICAgICAgICAgICAgX2xvZy5kZWJ1ZygiSSBzZWUgezB9OiB7MX0iLmZvcm1hdChwcm9jLk5hbWUs IHByb2MuUHJvY2Vzc0lkKSkKLSAgICAgICAgICAgICAgICBpZiBpbnQocGlkKSA9PSBpbnQocHJv Yy5Qcm9jZXNzSWQpOgotICAgICAgICAgICAgICAgICAgICBzeXN0ZW1fcGlkID0gaW50KHByb2Mu UHJvY2Vzc0lkKQotICAgICAgICAgICAgICAgIGJyZWFrCi0KLSAgICAgICAgcmV0dXJuIHN5c3Rl bV9waWQKLQogCiBjbGFzcyBXaW5DYWlyb1BvcnQoV2luUG9ydCk6CiAgICAgcG9ydF9uYW1lID0g IndpbmNhaXJvIgo= 326520 2017-11-09 17:54:07 -0800 2017-11-10 10:30:26 -0800 Patch bug-179514-20171109175406.patch text/plain 4056 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyNDY1OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE3LTExLTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUmVtb3ZlIGZpbmRfc3lzdGVtX3BpZCBmcm9tIHBvcnQg Y2xhc3NlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTc5NTE0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNTQ1NjkwMD4KKworICAgICAgICBSZXZp ZXdlZCBieSBEYXZpZCBLaWx6ZXIuCisKKyAgICAgICAgUmVtb3ZpbmcgZGVhZCBjb2RlLgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHk6CisgICAgICAgIChQb3J0LmZp bmRfc3lzdGVtX3BpZCk6IERlbGV0ZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0 L3NlcnZlcl9wcm9jZXNzLnB5OgorICAgICAgICAoU2VydmVyUHJvY2Vzcy5fc3RhcnQpOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHk6CisgICAgICAgIChXaW5Qb3J0LmZp bmRfc3lzdGVtX3BpZCk6IERlbGV0ZWQuCisKIDIwMTctMTEtMDkgIEpvbmF0aGFuIEJlZGFyZCAg PGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIHdlYmtpdHB5OiBVbmlmeSB2ZXJzaW9uIHBh cnNpbmcgY29kZQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHJldmlzaW9u IDIyNDY1OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CSh3b3JraW5n IGNvcHkpCkBAIC0xMzgwLDEwICsxMzgwLDYgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgIGRl ZiBzYW1wbGVfcHJvY2VzcyhzZWxmLCBuYW1lLCBwaWQsIHRhcmdldF9ob3N0PU5vbmUpOgogICAg ICAgICBwYXNzCiAKLSAgICBkZWYgZmluZF9zeXN0ZW1fcGlkKHNlbGYsIG5hbWUsIHBpZCk6Ci0g ICAgICAgICMgVGhpcyBpcyBvbmx5IG92ZXJyaWRkZW4gb24gV2luZG93cwotICAgICAgICByZXR1 cm4gcGlkCi0KICAgICBkZWYgc2hvdWxkX3J1bl9hc19waXhlbF90ZXN0KHNlbGYsIHRlc3RfaW5w dXQpOgogICAgICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy5waXhlbF90ZXN0czoKICAgICAgICAg ICAgIHJldHVybiBGYWxzZQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZl cl9wcm9jZXNzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9z ZXJ2ZXJfcHJvY2Vzcy5weQkocmV2aXNpb24gMjI0NjU5KQorKysgVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMjAsNyArMTIw LDYgQEAgY2xhc3MgU2VydmVyUHJvY2VzcyhvYmplY3QpOgogICAgICAgICAgICAgZW52PXNlbGYu X2VudiwKICAgICAgICAgICAgIHVuaXZlcnNhbF9uZXdsaW5lcz1zZWxmLl91bml2ZXJzYWxfbmV3 bGluZXMpCiAgICAgICAgIHNlbGYuX3BpZCA9IHNlbGYuX3Byb2MucGlkCi0gICAgICAgIHNlbGYu X3BvcnQuZmluZF9zeXN0ZW1fcGlkKHNlbGYucHJvY2Vzc19uYW1lKCksIHNlbGYuX3BpZCkKICAg ICAgICAgaWYgbm90IHNlbGYuX3VzZV93aW4zMl9hcGlzOgogICAgICAgICAgICAgc2VsZi5fc2V0 X2ZpbGVfbm9uYmxvY2tpbmcoc2VsZi5fcHJvYy5zdGRvdXQpCiAgICAgICAgICAgICBzZWxmLl9z ZXRfZmlsZV9ub25ibG9ja2luZyhzZWxmLl9wcm9jLnN0ZGVycikKSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC93aW4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L3dpbi5weQkocmV2aXNpb24gMjI0NjU5KQorKysgVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L3dpbi5weQkod29ya2luZyBjb3B5KQpAQCAtNDMxLDM4ICs0MzEsNiBAQCBjbGFz cyBXaW5Qb3J0KEFwcGxlUG9ydCk6CiAgICAgICAgICAgICAgICAgY3Jhc2hfbG9nc1t0ZXN0X25h bWVdID0gY3Jhc2hfbG9nCiAgICAgICAgIHJldHVybiBjcmFzaF9sb2dzCiAKLSAgICBkZWYgZmlu ZF9zeXN0ZW1fcGlkKHNlbGYsIG5hbWUsIHBpZCk6Ci0gICAgICAgIHN5c3RlbV9waWQgPSBpbnQo cGlkKQotCi0gICAgICAgIGlmIHNlbGYuaXNfY3lnd2luKCk6Ci0gICAgICAgICAgICAjIFdpbmRv d3MgYW5kIEN5Z3dpbiBQSURzIGFyZSBub3QgdGhlIHNhbWUuICBXZSBuZWVkIHRvIGZpbmQgdGhl IFdpbmRvd3MKLSAgICAgICAgICAgICMgUElEIGZvciBvdXIgQ3lnd2luIHByb2Nlc3Mgc28gd2Ug Y2FuIG1hdGNoIGl0IGxhdGVyIHRvIGFueSBjcmFzaAotICAgICAgICAgICAgIyBmaWxlcyB3ZSBl bmQgdXAgY3JlYXRpbmcgKHdoaWNoIHdpbGwgYmUgdGFnZ2VkIHdpdGggdGhlIFdpbmRvd3MgUElE KQotICAgICAgICAgICAgcHNfcHJvY2VzcyA9IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChb J3BzJywgJy1lJ10sIGVycm9yX2hhbmRsZXI9RXhlY3V0aXZlLmlnbm9yZV9lcnJvcikKLSAgICAg ICAgICAgIGZvciBsaW5lIGluIHBzX3Byb2Nlc3Muc3BsaXRsaW5lcygpOgotICAgICAgICAgICAg ICAgIHRva2VucyA9IGxpbmUuc3RyaXAoKS5zcGxpdCgpCi0gICAgICAgICAgICAgICAgdHJ5Ogot ICAgICAgICAgICAgICAgICAgICBjcGlkLCBwcGlkLCBwZ2lkLCB3aW5waWQsIHR0eSwgdWlkLCBz dGltZSwgcHJvY2Vzc19uYW1lID0gdG9rZW5zCi0gICAgICAgICAgICAgICAgICAgIGlmIHByb2Nl c3NfbmFtZS5lbmRzd2l0aChuYW1lKToKLSAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX2V4 ZWN1dGl2ZS5waWRfdG9fc3lzdGVtX3BpZFtpbnQoY3BpZCldID0gaW50KHdpbnBpZCkKLSAgICAg ICAgICAgICAgICAgICAgICAgIGlmIGludChwaWQpID09IGludChjcGlkKToKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzeXN0ZW1fcGlkID0gaW50KHdpbnBpZCkKLSAgICAgICAgICAgICAg ICAgICAgICAgIGJyZWFrCi0gICAgICAgICAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3IsIGU6Ci0g ICAgICAgICAgICAgICAgICAgIHBhc3MKLSAgICAgICAgZWxzZToKLSAgICAgICAgICAgIHdtaSA9 IHdpbjMyY29tLmNsaWVudC5HZXRPYmplY3QoJ3dpbm1nbXRzOicpCi0gICAgICAgICAgICBfbG9n LmRlYnVnKCdRdWVyeWluZyBXTUkgd2l0aCAiJXswfSUiJy5mb3JtYXQobmFtZSkpCi0gICAgICAg ICAgICBwcm9jcyA9IHdtaS5FeGVjUXVlcnkoJ1NlbGVjdCAqIGZyb20gd2luMzJfcHJvY2VzcyB3 aGVyZSBuYW1lIGxpa2UgIiV7MH0lIicuZm9ybWF0KG5hbWUpKQotICAgICAgICAgICAgZm9yIHBy b2MgaW4gcHJvY3M6Ci0gICAgICAgICAgICAgICAgc2VsZi5fZXhlY3V0aXZlLnBpZF90b19zeXN0 ZW1fcGlkW2ludChwcm9jLlByb2Nlc3NJZCldID0gaW50KHByb2MuUHJvY2Vzc0lkKQotICAgICAg ICAgICAgICAgIF9sb2cuZGVidWcoIkkgc2VlIHswfTogezF9Ii5mb3JtYXQocHJvYy5OYW1lLCBw cm9jLlByb2Nlc3NJZCkpCi0gICAgICAgICAgICAgICAgaWYgaW50KHBpZCkgPT0gaW50KHByb2Mu UHJvY2Vzc0lkKToKLSAgICAgICAgICAgICAgICAgICAgc3lzdGVtX3BpZCA9IGludChwcm9jLlBy b2Nlc3NJZCkKLSAgICAgICAgICAgICAgICBicmVhawotCi0gICAgICAgIHJldHVybiBzeXN0ZW1f cGlkCi0KIAogY2xhc3MgV2luQ2Fpcm9Qb3J0KFdpblBvcnQpOgogICAgIHBvcnRfbmFtZSA9ICJ3 aW5jYWlybyIK