231190 2021-10-04 13:04:46 -0700 [ews-build.webkit.org] check-patch-relevance can get stuck 2021-10-05 08:23:08 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain cdumez dewei_zhu slewis webkit-bug-importer oldest_to_newest 1800189 0 jbedard 2021-10-04 13:04:46 -0700 With large patches, check-patch-relevance can get stuck. Part of this is because of the constant re-computation of regexes, but it's always possible for extremely large patches to jam up EWS. Along with making check-patch-relevance more efficient, we should provide a timeout. 1800190 1 jbedard 2021-10-04 13:05:00 -0700 <rdar://problem/77327168> 1800193 2 440094 jbedard 2021-10-04 13:07:45 -0700 Created attachment 440094 Patch 1800211 3 440094 aakash_jain 2021-10-04 13:52:24 -0700 Comment on attachment 440094 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440094&action=review > Tools/CISupport/ews-build/steps.py:467 > for change in patch.splitlines(): You can consider adding a check here if the line is a filename or not. We actually need to match only the filenames of file being modified in the patch, not the complete patch content. e.g.: if not (change.startswith(b'---') or change.startswith(b'+++')): continue 1800212 4 aakash_jain 2021-10-04 13:52:42 -0700 Also, can you please profile the relevant code portion before and after your change (maybe on your local computer), especially on attachment 440066 and attachment 427346. 1800228 5 440105 jbedard 2021-10-04 14:45:03 -0700 Created attachment 440105 Patch 1800230 6 jbedard 2021-10-04 14:47:33 -0700 (In reply to Aakash Jain from comment #4) > Also, can you please profile the relevant code portion before and after your > change (maybe on your local computer), especially on attachment 440066 > [details] and attachment 427346 [details]. Did some profiling. The kicker is really line size. If we limit line size to 250, the code in the attached patch takes less than a half-second. 1800285 7 440105 ap 2021-10-04 16:27:37 -0700 Comment on attachment 440105 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440105&action=review > Tools/CISupport/ews-build/steps.py:399 > + bindings_regexes = [ I think that the new name doesn't describe the variable well. Either bindings_paths or bindings_path_regexes would be better in my opinion. Same comment for all the others below. > Tools/CISupport/ews-build/steps.py:471 > + if regex.search(change[:250]): [:250] doesn't appear to be explained, and I don't think that it's even accurate to only look at the first 250 characters (.*jsc.* could be anywhere). 1800289 8 jbedard 2021-10-04 16:35:51 -0700 (In reply to Alexey Proskuryakov from comment #7) > Comment on attachment 440105 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=440105&action=review > > > Tools/CISupport/ews-build/steps.py:399 > > + bindings_regexes = [ > > I think that the new name doesn't describe the variable well. Either > bindings_paths or bindings_path_regexes would be better in my opinion. > > Same comment for all the others below. Will change the variable names. > > > Tools/CISupport/ews-build/steps.py:471 > > + if regex.search(change[:250]): > > [:250] doesn't appear to be explained, and I don't think that it's even > accurate to only look at the first 250 characters (.*jsc.* could be > anywhere). I'll add this to the changelog, but it's the really bit lines that end up being what kills our performance. It's true that we're potentially sacrificing some correctness. But it's also unlikely that a patch will have a line that exceeds 250 characters and contains a legitimate match in truncated portion of the line, a match which does not appear in another line in the patch. 1800297 9 440124 jbedard 2021-10-04 16:44:43 -0700 Created attachment 440124 Patch 1800316 10 ews-feeder 2021-10-04 17:52:30 -0700 Committed r283528 (242495@main): <https://commits.webkit.org/242495@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440124. 1800317 11 webkit-bug-importer 2021-10-04 17:53:21 -0700 <rdar://problem/83864363> 1800566 12 aakash_jain 2021-10-05 08:23:08 -0700 Confirmed that EWS can now process similar patch efficiently. e.g.: https://ews-build.webkit.org/#/builders/1/builds/50144 took only 1 second in check-patch-relevance. Earlier it was taking 30+ minutes in similar patch in https://ews-build.webkit.org/#/builders/1/builds/50001 440094 2021-10-04 13:07:45 -0700 2021-10-04 14:45:01 -0700 Patch bug-231190-20211004130744.patch text/plain 6524 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDk3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2M1NDg1MzlhMWMwZDhmZjAyYTMwMGFjMDg5ZGJhMzU0 OTVmZTk0Ni4uNjk4YTY2ZDE4N2JkMjc5ZTNjOGVhZjZmYmI2YWE2ZjNiZjJkNzRlNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTEwLTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZXdzLWJ1aWxkLndlYmtpdC5vcmddIGNoZWNrLXBhdGNoLXJlbGV2YW5jZSBjYW4g Z2V0IHN0dWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzExOTAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc3MzI3MTY4PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQ0lTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weToKKyAgICAgICAgKENoZWNrUGF0Y2hSZWxldmFuY2UpOiBDb21wdXRlIGFsbCBy ZWdleGVzIGluIGFkdmFuY2UuCisgICAgICAgIChDaGVja1BhdGNoUmVsZXZhbmNlLl9wYXRjaF9p c19yZWxldmFudCk6IFJlbHkgb24gcHJlLWNvbXB1dGVkIHJlZ2V4ZXMsCisgICAgICAgIGluY2x1 ZGUgYSBoYXJkLXRpbWVvdXQgc28gdGhhdCBhIHBhdGNoIGNhbiBuZXZlciBnZXQgRVdTIHN0dWNr LgorCiAyMDIxLTEwLTA0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAog ICAgICAgICBTZW5kIEVXUyBleGNlcHRpb24gZW1haWxzIHRvIGJvdCB3YXRjaGVycyBpbnN0ZWFk IG9mIEFha2FzaApkaWZmIC0tZ2l0IGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5w eSBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKaW5kZXggMjczZDAyMTQxOWQ4 Njk0NTI1MGMwYTE4NDA1N2IxZmFmNGJhNDBkZC4uOGQ2MzYwOTM2ZjYzZjQ1ZDg3MzkxZmYyNjBm ZjYzMjIzODU5ZTAzZSAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVw cy5weQorKysgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CkBAIC0zOCw2ICsz OCw3IEBAIGltcG9ydCByZQogaW1wb3J0IHJlcXVlc3RzCiBpbXBvcnQgc29ja2V0CiBpbXBvcnQg c3lzCitpbXBvcnQgdGltZQogCiBpZiBzeXMudmVyc2lvbl9pbmZvIDwgKDMsIDUpOgogICAgIHBy aW50KCdFUlJPUjogUGxlYXNlIHVzZSBQeXRob24gMy4gVGhpcyBjb2RlIGlzIG5vdCBjb21wYXRp YmxlIHdpdGggUHl0aG9uIDIuJykKQEAgLTM5NSw4MSArMzk2LDgyIEBAIGNsYXNzIENoZWNrUGF0 Y2hSZWxldmFuY2UoQW5hbHl6ZVBhdGNoKToKICAgICBkZXNjcmlwdGlvbiA9IFsnY2hlY2stcGF0 Y2gtcmVsZXZhbmNlIHJ1bm5pbmcnXQogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnUGF0Y2ggY29u dGFpbnMgcmVsZXZhbnQgY2hhbmdlcyddCiAKLSAgICBiaW5kaW5nc19wYXRocyA9IFsKLSAgICAg ICAgJ1NvdXJjZS9XZWJDb3JlJywKLSAgICAgICAgJ1Rvb2xzJywKKyAgICBiaW5kaW5nc19yZWdl eGVzID0gWworICAgICAgICByZS5jb21waWxlKHJiJ1NvdXJjZS9XZWJDb3JlJywgcmUuSUdOT1JF Q0FTRSksCisgICAgICAgIHJlLmNvbXBpbGUocmInVG9vbHMnLCByZS5JR05PUkVDQVNFKSwKICAg ICBdCiAKLSAgICBzZXJ2aWNlc19wYXRocyA9IFsKLSAgICAgICAgJ1Rvb2xzL0NJU3VwcG9ydC9i dWlsZC13ZWJraXQtb3JnJywKLSAgICAgICAgJ1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQnLAot ICAgICAgICAnVG9vbHMvQ0lTdXBwb3J0L1NoYXJlZCcsCi0gICAgICAgICdUb29scy9TY3JpcHRz L2xpYnJhcmllcy9yZXN1bHRzZGJweScsCi0gICAgICAgICdUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRjb3JlcHknLAotICAgICAgICAnVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHknLAorICAgIHNlcnZpY2VzX3JlZ2V4ZXMgPSBbCisgICAgICAgIHJlLmNvbXBpbGUocmIn VG9vbHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcnLCByZS5JR05PUkVDQVNFKSwKKyAgICAg ICAgcmUuY29tcGlsZShyYidUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkJywgcmUuSUdOT1JFQ0FT RSksCisgICAgICAgIHJlLmNvbXBpbGUocmInVG9vbHMvQ0lTdXBwb3J0L1NoYXJlZCcsIHJlLklH Tk9SRUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3Jlc3VsdHNkYnB5JywgcmUuSUdOT1JFQ0FTRSksCisgICAgICAgIHJlLmNvbXBpbGUocmInVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5JywgcmUuSUdOT1JFQ0FTRSksCisgICAg ICAgIHJlLmNvbXBpbGUocmInVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHknLCBy ZS5JR05PUkVDQVNFKSwKICAgICBdCiAKLSAgICBqc2NfcGF0aHMgPSBbCi0gICAgICAgICcuKmpz Yy4qJywKLSAgICAgICAgJy4qamF2YXNjcmlwdGNvcmUuKicsCi0gICAgICAgICdKU1Rlc3RzLycs Ci0gICAgICAgICdTb3VyY2UvV1RGLycsCi0gICAgICAgICdTb3VyY2UvYm1hbGxvYy8nLAotICAg ICAgICAnLipNYWtlZmlsZS4qJywKLSAgICAgICAgJ1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0 JywKLSAgICAgICAgJ1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbScsCisgICAganNjX3JlZ2V4 ZXMgPSBbCisgICAgICAgIHJlLmNvbXBpbGUocmInLipqc2MuKicsIHJlLklHTk9SRUNBU0UpLAor ICAgICAgICByZS5jb21waWxlKHJiJy4qamF2YXNjcmlwdGNvcmUuKicsIHJlLklHTk9SRUNBU0Up LAorICAgICAgICByZS5jb21waWxlKHJiJ0pTVGVzdHMvJywgcmUuSUdOT1JFQ0FTRSksCisgICAg ICAgIHJlLmNvbXBpbGUocmInU291cmNlL1dURi8nLCByZS5JR05PUkVDQVNFKSwKKyAgICAgICAg cmUuY29tcGlsZShyYidTb3VyY2UvYm1hbGxvYy8nLCByZS5JR05PUkVDQVNFKSwKKyAgICAgICAg cmUuY29tcGlsZShyYicuKk1ha2VmaWxlLionLCByZS5JR05PUkVDQVNFKSwKKyAgICAgICAgcmUu Y29tcGlsZShyYidUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCcsIHJlLklHTk9SRUNBU0UpLAor ICAgICAgICByZS5jb21waWxlKHJiJ1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbScsIHJlLklH Tk9SRUNBU0UpLAogICAgIF0KIAotICAgIHdrMV9wYXRocyA9IFsKLSAgICAgICAgJ1NvdXJjZS9X ZWJLaXRMZWdhY3knLAotICAgICAgICAnU291cmNlL1dlYkNvcmUnLAotICAgICAgICAnU291cmNl L1dlYkluc3BlY3RvclVJJywKLSAgICAgICAgJ1NvdXJjZS9XZWJEcml2ZXInLAotICAgICAgICAn U291cmNlL1dURicsCi0gICAgICAgICdTb3VyY2UvYm1hbGxvYycsCi0gICAgICAgICdTb3VyY2Uv SmF2YVNjcmlwdENvcmUnLAotICAgICAgICAnU291cmNlL1RoaXJkUGFydHknLAotICAgICAgICAn TGF5b3V0VGVzdHMnLAotICAgICAgICAnVG9vbHMnLAorICAgIHdrMV9yZWdleGVzID0gWworICAg ICAgICByZS5jb21waWxlKHJiJ1NvdXJjZS9XZWJLaXRMZWdhY3knLCByZS5JR05PUkVDQVNFKSwK KyAgICAgICAgcmUuY29tcGlsZShyYidTb3VyY2UvV2ViQ29yZScsIHJlLklHTk9SRUNBU0UpLAor ICAgICAgICByZS5jb21waWxlKHJiJ1NvdXJjZS9XZWJJbnNwZWN0b3JVSScsIHJlLklHTk9SRUNB U0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ1NvdXJjZS9XZWJEcml2ZXInLCByZS5JR05PUkVD QVNFKSwKKyAgICAgICAgcmUuY29tcGlsZShyYidTb3VyY2UvV1RGJywgcmUuSUdOT1JFQ0FTRSks CisgICAgICAgIHJlLmNvbXBpbGUocmInU291cmNlL2JtYWxsb2MnLCByZS5JR05PUkVDQVNFKSwK KyAgICAgICAgcmUuY29tcGlsZShyYidTb3VyY2UvSmF2YVNjcmlwdENvcmUnLCByZS5JR05PUkVD QVNFKSwKKyAgICAgICAgcmUuY29tcGlsZShyYidTb3VyY2UvVGhpcmRQYXJ0eScsIHJlLklHTk9S RUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ0xheW91dFRlc3RzJywgcmUuSUdOT1JFQ0FT RSksCisgICAgICAgIHJlLmNvbXBpbGUocmInVG9vbHMnLCByZS5JR05PUkVDQVNFKSwKICAgICBd CiAKLSAgICBiaWdfc3VyX2J1aWxkZXJfcGF0aHMgPSBbCi0gICAgICAgICdTb3VyY2UvJywKLSAg ICAgICAgJ1Rvb2xzLycsCisgICAgYmlnX3N1cl9idWlsZGVyX3JlZ2V4ZXMgPSBbCisgICAgICAg IHJlLmNvbXBpbGUocmInU291cmNlLycsIHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21w aWxlKHJiJ1Rvb2xzLycsIHJlLklHTk9SRUNBU0UpLAogICAgIF0KLSAgICB3ZWJraXRweV9wYXRo cyA9IFsKLSAgICAgICAgJ1Rvb2xzL1NjcmlwdHMvd2Via2l0cHknLAotICAgICAgICAnVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMnLAotICAgICAgICAnVG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVk aXRvcicsCi0gICAgICAgICdTb3VyY2UvV2ViS2l0L1NjcmlwdHMnLAorICAgIHdlYmtpdHB5X3Jl Z2V4ZXMgPSBbCisgICAgICAgIHJlLmNvbXBpbGUocmInVG9vbHMvU2NyaXB0cy93ZWJraXRweScs IHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ1Rvb2xzL1NjcmlwdHMvbGli cmFyaWVzJywgcmUuSUdOT1JFQ0FTRSksCisgICAgICAgIHJlLmNvbXBpbGUocmInVG9vbHMvU2Ny aXB0cy9jb21taXQtbG9nLWVkaXRvcicsIHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21w aWxlKHJiJ1NvdXJjZS9XZWJLaXQvU2NyaXB0cycsIHJlLklHTk9SRUNBU0UpLAogICAgIF0KIAog ICAgIGdyb3VwX3RvX3BhdGhzX21hcHBpbmcgPSB7Ci0gICAgICAgICdiaW5kaW5ncyc6IGJpbmRp bmdzX3BhdGhzLAotICAgICAgICAnYmlnc3VyLXJlbGVhc2UtYnVpbGQnOiBiaWdfc3VyX2J1aWxk ZXJfcGF0aHMsCi0gICAgICAgICdzZXJ2aWNlcy1ld3MnOiBzZXJ2aWNlc19wYXRocywKLSAgICAg ICAgJ2pzYyc6IGpzY19wYXRocywKLSAgICAgICAgJ3dlYmtpdHB5Jzogd2Via2l0cHlfcGF0aHMs Ci0gICAgICAgICd3azEtdGVzdHMnOiB3azFfcGF0aHMsCi0gICAgICAgICd3aW5kb3dzJzogd2sx X3BhdGhzLAorICAgICAgICAnYmluZGluZ3MnOiBiaW5kaW5nc19yZWdleGVzLAorICAgICAgICAn Ymlnc3VyLXJlbGVhc2UtYnVpbGQnOiBiaWdfc3VyX2J1aWxkZXJfcmVnZXhlcywKKyAgICAgICAg J3NlcnZpY2VzLWV3cyc6IHNlcnZpY2VzX3JlZ2V4ZXMsCisgICAgICAgICdqc2MnOiBqc2NfcmVn ZXhlcywKKyAgICAgICAgJ3dlYmtpdHB5Jzogd2Via2l0cHlfcmVnZXhlcywKKyAgICAgICAgJ3dr MS10ZXN0cyc6IHdrMV9yZWdleGVzLAorICAgICAgICAnd2luZG93cyc6IHdrMV9yZWdleGVzLAog ICAgIH0KIAotICAgIGRlZiBfcGF0Y2hfaXNfcmVsZXZhbnQoc2VsZiwgcGF0Y2gsIGJ1aWxkZXJO YW1lKToKKyAgICBkZWYgX3BhdGNoX2lzX3JlbGV2YW50KHNlbGYsIHBhdGNoLCBidWlsZGVyTmFt ZSwgdGltZW91dD0zMCk6CiAgICAgICAgIGdyb3VwID0gW2dyb3VwIGZvciBncm91cCBpbiBzZWxm Lmdyb3VwX3RvX3BhdGhzX21hcHBpbmcua2V5cygpIGlmIGdyb3VwLmxvd2VyKCkgaW4gYnVpbGRl ck5hbWUubG93ZXIoKV0KICAgICAgICAgaWYgbm90IGdyb3VwOgogICAgICAgICAgICAgIyBUaGlz IGJ1aWxkZXIgZG9lc24ndCBoYXZlIHBhdGhzIGRlZmluZWQsIGFsbCBwYXRjaGVzIGFyZSByZWxl dmFudC4KICAgICAgICAgICAgIHJldHVybiBUcnVlCiAKLSAgICAgICAgcmVsZXZhbnRfcGF0aHMg PSBzZWxmLmdyb3VwX3RvX3BhdGhzX21hcHBpbmdbZ3JvdXBbMF1dCisgICAgICAgIHJlbGV2YW50 X3JlZ2V4ZXMgPSBzZWxmLmdyb3VwX3RvX3BhdGhzX21hcHBpbmcuZ2V0KGdyb3VwWzBdLCBbXSkK KyAgICAgICAgc3RhcnQgPSB0aW1lLnRpbWUoKQogCiAgICAgICAgIGZvciBjaGFuZ2UgaW4gcGF0 Y2guc3BsaXRsaW5lcygpOgotICAgICAgICAgICAgZm9yIHBhdGggaW4gcmVsZXZhbnRfcGF0aHM6 Ci0gICAgICAgICAgICAgICAgaWYgdHlwZShwYXRoKSA9PSBzdHI6Ci0gICAgICAgICAgICAgICAg ICAgIHBhdGggPSBwYXRoLmVuY29kZShlbmNvZGluZz0ndXRmLTgnLCBlcnJvcnM9J3JlcGxhY2Un KQorICAgICAgICAgICAgZm9yIHJlZ2V4IGluIHJlbGV2YW50X3JlZ2V4ZXM6CiAgICAgICAgICAg ICAgICAgaWYgdHlwZShjaGFuZ2UpID09IHN0cjoKICAgICAgICAgICAgICAgICAgICAgY2hhbmdl ID0gY2hhbmdlLmVuY29kZShlbmNvZGluZz0ndXRmLTgnLCBlcnJvcnM9J3JlcGxhY2UnKQotICAg ICAgICAgICAgICAgIGlmIHJlLnNlYXJjaChwYXRoLCBjaGFuZ2UsIHJlLklHTk9SRUNBU0UpOgor ICAgICAgICAgICAgICAgIGlmIHJlZ2V4LnNlYXJjaChjaGFuZ2UpOgogICAgICAgICAgICAgICAg ICAgICByZXR1cm4gVHJ1ZQorICAgICAgICAgICAgaWYgdGltZS50aW1lKCkgPiBzdGFydCArIHRp bWVvdXQ6CisgICAgICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAgICAgICAgIHJldHVybiBGYWxz ZQogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgo= 440105 2021-10-04 14:45:03 -0700 2021-10-04 16:44:41 -0700 Patch bug-231190-20211004144502.patch text/plain 6519 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNTE0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2M3MmRjZDY5ZWQwNDg0ZGFiY2ViOGRlNzEzZTJiNDIy ZmU4MjIyZi4uMWY4MjQ4NDQyMTFjNDIzYWJlNGNkODg3Mzc4NDcyYmU4YzAxYTI1NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTEwLTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZXdzLWJ1aWxkLndlYmtpdC5vcmddIGNoZWNrLXBhdGNoLXJlbGV2YW5jZSBjYW4g Z2V0IHN0dWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzExOTAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc3MzI3MTY4PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQ0lTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weToKKyAgICAgICAgKENoZWNrUGF0Y2hSZWxldmFuY2UpOiBDb21wdXRlIGFsbCBy ZWdleGVzIGluIGFkdmFuY2UuCisgICAgICAgIChDaGVja1BhdGNoUmVsZXZhbmNlLl9wYXRjaF9p c19yZWxldmFudCk6IFJlbHkgb24gcHJlLWNvbXB1dGVkIHJlZ2V4ZXMsCisgICAgICAgIGluY2x1 ZGUgYSBoYXJkLXRpbWVvdXQgc28gdGhhdCBhIHBhdGNoIGNhbiBuZXZlciBnZXQgRVdTIHN0dWNr LgorCiAyMDIxLTEwLTA0ICBKb2huIFBhc2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KIAogICAg ICAgICBbV2ViQXV0aG5dIEFkZCBTUEkgdG8gY2hhbmdlIHVzZXJuYW1lIG9mIGNyZWRlbnRpYWwK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkgYi9Ub29scy9D SVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CmluZGV4IDI3M2QwMjE0MTlkODY5NDUyNTBjMGEx ODQwNTdiMWZhZjRiYTQwZGQuLmFiYThhMDljODdiNDFjYTc0OTgyYTc5YzZhYjFiZmY1MDIxOTFh YjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKKysrIGIv VG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQpAQCAtMzgsNiArMzgsNyBAQCBpbXBv cnQgcmUKIGltcG9ydCByZXF1ZXN0cwogaW1wb3J0IHNvY2tldAogaW1wb3J0IHN5cworaW1wb3J0 IHRpbWUKIAogaWYgc3lzLnZlcnNpb25faW5mbyA8ICgzLCA1KToKICAgICBwcmludCgnRVJST1I6 IFBsZWFzZSB1c2UgUHl0aG9uIDMuIFRoaXMgY29kZSBpcyBub3QgY29tcGF0aWJsZSB3aXRoIFB5 dGhvbiAyLicpCkBAIC0zOTUsODEgKzM5Niw4MiBAQCBjbGFzcyBDaGVja1BhdGNoUmVsZXZhbmNl KEFuYWx5emVQYXRjaCk6CiAgICAgZGVzY3JpcHRpb24gPSBbJ2NoZWNrLXBhdGNoLXJlbGV2YW5j ZSBydW5uaW5nJ10KICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ1BhdGNoIGNvbnRhaW5zIHJlbGV2 YW50IGNoYW5nZXMnXQogCi0gICAgYmluZGluZ3NfcGF0aHMgPSBbCi0gICAgICAgICdTb3VyY2Uv V2ViQ29yZScsCi0gICAgICAgICdUb29scycsCisgICAgYmluZGluZ3NfcmVnZXhlcyA9IFsKKyAg ICAgICAgcmUuY29tcGlsZShyYidTb3VyY2UvV2ViQ29yZScsIHJlLklHTk9SRUNBU0UpLAorICAg ICAgICByZS5jb21waWxlKHJiJ1Rvb2xzJywgcmUuSUdOT1JFQ0FTRSksCiAgICAgXQogCi0gICAg c2VydmljZXNfcGF0aHMgPSBbCi0gICAgICAgICdUb29scy9DSVN1cHBvcnQvYnVpbGQtd2Via2l0 LW9yZycsCi0gICAgICAgICdUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkJywKLSAgICAgICAgJ1Rv b2xzL0NJU3VwcG9ydC9TaGFyZWQnLAotICAgICAgICAnVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv cmVzdWx0c2RicHknLAotICAgICAgICAnVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29y ZXB5JywKLSAgICAgICAgJ1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5JywKKyAg ICBzZXJ2aWNlc19yZWdleGVzID0gWworICAgICAgICByZS5jb21waWxlKHJiJ1Rvb2xzL0NJU3Vw cG9ydC9idWlsZC13ZWJraXQtb3JnJywgcmUuSUdOT1JFQ0FTRSksCisgICAgICAgIHJlLmNvbXBp bGUocmInVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZCcsIHJlLklHTk9SRUNBU0UpLAorICAgICAg ICByZS5jb21waWxlKHJiJ1Rvb2xzL0NJU3VwcG9ydC9TaGFyZWQnLCByZS5JR05PUkVDQVNFKSwK KyAgICAgICAgcmUuY29tcGlsZShyYidUb29scy9TY3JpcHRzL2xpYnJhcmllcy9yZXN1bHRzZGJw eScsIHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdGNvcmVweScsIHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21w aWxlKHJiJ1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5JywgcmUuSUdOT1JFQ0FT RSksCiAgICAgXQogCi0gICAganNjX3BhdGhzID0gWwotICAgICAgICAnLipqc2MuKicsCi0gICAg ICAgICcuKmphdmFzY3JpcHRjb3JlLionLAotICAgICAgICAnSlNUZXN0cy8nLAotICAgICAgICAn U291cmNlL1dURi8nLAotICAgICAgICAnU291cmNlL2JtYWxsb2MvJywKLSAgICAgICAgJy4qTWFr ZWZpbGUuKicsCi0gICAgICAgICdUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCcsCi0gICAgICAg ICdUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0nLAorICAgIGpzY19yZWdleGVzID0gWworICAg ICAgICByZS5jb21waWxlKHJiJy4qanNjLionLCByZS5JR05PUkVDQVNFKSwKKyAgICAgICAgcmUu Y29tcGlsZShyYicuKmphdmFzY3JpcHRjb3JlLionLCByZS5JR05PUkVDQVNFKSwKKyAgICAgICAg cmUuY29tcGlsZShyYidKU1Rlc3RzLycsIHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21w aWxlKHJiJ1NvdXJjZS9XVEYvJywgcmUuSUdOT1JFQ0FTRSksCisgICAgICAgIHJlLmNvbXBpbGUo cmInU291cmNlL2JtYWxsb2MvJywgcmUuSUdOT1JFQ0FTRSksCisgICAgICAgIHJlLmNvbXBpbGUo cmInLipNYWtlZmlsZS4qJywgcmUuSUdOT1JFQ0FTRSksCisgICAgICAgIHJlLmNvbXBpbGUocmIn VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQnLCByZS5JR05PUkVDQVNFKSwKKyAgICAgICAgcmUu Y29tcGlsZShyYidUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0nLCByZS5JR05PUkVDQVNFKSwK ICAgICBdCiAKLSAgICB3azFfcGF0aHMgPSBbCi0gICAgICAgICdTb3VyY2UvV2ViS2l0TGVnYWN5 JywKLSAgICAgICAgJ1NvdXJjZS9XZWJDb3JlJywKLSAgICAgICAgJ1NvdXJjZS9XZWJJbnNwZWN0 b3JVSScsCi0gICAgICAgICdTb3VyY2UvV2ViRHJpdmVyJywKLSAgICAgICAgJ1NvdXJjZS9XVEYn LAotICAgICAgICAnU291cmNlL2JtYWxsb2MnLAotICAgICAgICAnU291cmNlL0phdmFTY3JpcHRD b3JlJywKLSAgICAgICAgJ1NvdXJjZS9UaGlyZFBhcnR5JywKLSAgICAgICAgJ0xheW91dFRlc3Rz JywKLSAgICAgICAgJ1Rvb2xzJywKKyAgICB3azFfcmVnZXhlcyA9IFsKKyAgICAgICAgcmUuY29t cGlsZShyYidTb3VyY2UvV2ViS2l0TGVnYWN5JywgcmUuSUdOT1JFQ0FTRSksCisgICAgICAgIHJl LmNvbXBpbGUocmInU291cmNlL1dlYkNvcmUnLCByZS5JR05PUkVDQVNFKSwKKyAgICAgICAgcmUu Y29tcGlsZShyYidTb3VyY2UvV2ViSW5zcGVjdG9yVUknLCByZS5JR05PUkVDQVNFKSwKKyAgICAg ICAgcmUuY29tcGlsZShyYidTb3VyY2UvV2ViRHJpdmVyJywgcmUuSUdOT1JFQ0FTRSksCisgICAg ICAgIHJlLmNvbXBpbGUocmInU291cmNlL1dURicsIHJlLklHTk9SRUNBU0UpLAorICAgICAgICBy ZS5jb21waWxlKHJiJ1NvdXJjZS9ibWFsbG9jJywgcmUuSUdOT1JFQ0FTRSksCisgICAgICAgIHJl LmNvbXBpbGUocmInU291cmNlL0phdmFTY3JpcHRDb3JlJywgcmUuSUdOT1JFQ0FTRSksCisgICAg ICAgIHJlLmNvbXBpbGUocmInU291cmNlL1RoaXJkUGFydHknLCByZS5JR05PUkVDQVNFKSwKKyAg ICAgICAgcmUuY29tcGlsZShyYidMYXlvdXRUZXN0cycsIHJlLklHTk9SRUNBU0UpLAorICAgICAg ICByZS5jb21waWxlKHJiJ1Rvb2xzJywgcmUuSUdOT1JFQ0FTRSksCiAgICAgXQogCi0gICAgYmln X3N1cl9idWlsZGVyX3BhdGhzID0gWwotICAgICAgICAnU291cmNlLycsCi0gICAgICAgICdUb29s cy8nLAorICAgIGJpZ19zdXJfYnVpbGRlcl9yZWdleGVzID0gWworICAgICAgICByZS5jb21waWxl KHJiJ1NvdXJjZS8nLCByZS5JR05PUkVDQVNFKSwKKyAgICAgICAgcmUuY29tcGlsZShyYidUb29s cy8nLCByZS5JR05PUkVDQVNFKSwKICAgICBdCi0gICAgd2Via2l0cHlfcGF0aHMgPSBbCi0gICAg ICAgICdUb29scy9TY3JpcHRzL3dlYmtpdHB5JywKLSAgICAgICAgJ1Rvb2xzL1NjcmlwdHMvbGli cmFyaWVzJywKLSAgICAgICAgJ1Rvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3InLAotICAg ICAgICAnU291cmNlL1dlYktpdC9TY3JpcHRzJywKKyAgICB3ZWJraXRweV9yZWdleGVzID0gWwor ICAgICAgICByZS5jb21waWxlKHJiJ1Rvb2xzL1NjcmlwdHMvd2Via2l0cHknLCByZS5JR05PUkVD QVNFKSwKKyAgICAgICAgcmUuY29tcGlsZShyYidUb29scy9TY3JpcHRzL2xpYnJhcmllcycsIHJl LklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ1Rvb2xzL1NjcmlwdHMvY29tbWl0 LWxvZy1lZGl0b3InLCByZS5JR05PUkVDQVNFKSwKKyAgICAgICAgcmUuY29tcGlsZShyYidTb3Vy Y2UvV2ViS2l0L1NjcmlwdHMnLCByZS5JR05PUkVDQVNFKSwKICAgICBdCiAKICAgICBncm91cF90 b19wYXRoc19tYXBwaW5nID0gewotICAgICAgICAnYmluZGluZ3MnOiBiaW5kaW5nc19wYXRocywK LSAgICAgICAgJ2JpZ3N1ci1yZWxlYXNlLWJ1aWxkJzogYmlnX3N1cl9idWlsZGVyX3BhdGhzLAot ICAgICAgICAnc2VydmljZXMtZXdzJzogc2VydmljZXNfcGF0aHMsCi0gICAgICAgICdqc2MnOiBq c2NfcGF0aHMsCi0gICAgICAgICd3ZWJraXRweSc6IHdlYmtpdHB5X3BhdGhzLAotICAgICAgICAn d2sxLXRlc3RzJzogd2sxX3BhdGhzLAotICAgICAgICAnd2luZG93cyc6IHdrMV9wYXRocywKKyAg ICAgICAgJ2JpbmRpbmdzJzogYmluZGluZ3NfcmVnZXhlcywKKyAgICAgICAgJ2JpZ3N1ci1yZWxl YXNlLWJ1aWxkJzogYmlnX3N1cl9idWlsZGVyX3JlZ2V4ZXMsCisgICAgICAgICdzZXJ2aWNlcy1l d3MnOiBzZXJ2aWNlc19yZWdleGVzLAorICAgICAgICAnanNjJzoganNjX3JlZ2V4ZXMsCisgICAg ICAgICd3ZWJraXRweSc6IHdlYmtpdHB5X3JlZ2V4ZXMsCisgICAgICAgICd3azEtdGVzdHMnOiB3 azFfcmVnZXhlcywKKyAgICAgICAgJ3dpbmRvd3MnOiB3azFfcmVnZXhlcywKICAgICB9CiAKLSAg ICBkZWYgX3BhdGNoX2lzX3JlbGV2YW50KHNlbGYsIHBhdGNoLCBidWlsZGVyTmFtZSk6CisgICAg ZGVmIF9wYXRjaF9pc19yZWxldmFudChzZWxmLCBwYXRjaCwgYnVpbGRlck5hbWUsIHRpbWVvdXQ9 MzApOgogICAgICAgICBncm91cCA9IFtncm91cCBmb3IgZ3JvdXAgaW4gc2VsZi5ncm91cF90b19w YXRoc19tYXBwaW5nLmtleXMoKSBpZiBncm91cC5sb3dlcigpIGluIGJ1aWxkZXJOYW1lLmxvd2Vy KCldCiAgICAgICAgIGlmIG5vdCBncm91cDoKICAgICAgICAgICAgICMgVGhpcyBidWlsZGVyIGRv ZXNuJ3QgaGF2ZSBwYXRocyBkZWZpbmVkLCBhbGwgcGF0Y2hlcyBhcmUgcmVsZXZhbnQuCiAgICAg ICAgICAgICByZXR1cm4gVHJ1ZQogCi0gICAgICAgIHJlbGV2YW50X3BhdGhzID0gc2VsZi5ncm91 cF90b19wYXRoc19tYXBwaW5nW2dyb3VwWzBdXQorICAgICAgICByZWxldmFudF9yZWdleGVzID0g c2VsZi5ncm91cF90b19wYXRoc19tYXBwaW5nLmdldChncm91cFswXSwgW10pCisgICAgICAgIHN0 YXJ0ID0gdGltZS50aW1lKCkKIAogICAgICAgICBmb3IgY2hhbmdlIGluIHBhdGNoLnNwbGl0bGlu ZXMoKToKLSAgICAgICAgICAgIGZvciBwYXRoIGluIHJlbGV2YW50X3BhdGhzOgotICAgICAgICAg ICAgICAgIGlmIHR5cGUocGF0aCkgPT0gc3RyOgotICAgICAgICAgICAgICAgICAgICBwYXRoID0g cGF0aC5lbmNvZGUoZW5jb2Rpbmc9J3V0Zi04JywgZXJyb3JzPSdyZXBsYWNlJykKKyAgICAgICAg ICAgIGZvciByZWdleCBpbiByZWxldmFudF9yZWdleGVzOgogICAgICAgICAgICAgICAgIGlmIHR5 cGUoY2hhbmdlKSA9PSBzdHI6CiAgICAgICAgICAgICAgICAgICAgIGNoYW5nZSA9IGNoYW5nZS5l bmNvZGUoZW5jb2Rpbmc9J3V0Zi04JywgZXJyb3JzPSdyZXBsYWNlJykKLSAgICAgICAgICAgICAg ICBpZiByZS5zZWFyY2gocGF0aCwgY2hhbmdlLCByZS5JR05PUkVDQVNFKToKKyAgICAgICAgICAg ICAgICBpZiByZWdleC5zZWFyY2goY2hhbmdlWzoyNTBdKToKICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIFRydWUKKyAgICAgICAgICAgIGlmIHRpbWUudGltZSgpID4gc3RhcnQgKyB0aW1lb3V0 OgorICAgICAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAgICByZXR1cm4gRmFsc2UKIAog ICAgIGRlZiBzdGFydChzZWxmKToK 440124 2021-10-04 16:44:43 -0700 2021-10-04 17:52:31 -0700 Patch bug-231190-20211004164442.patch text/plain 6794 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNTI0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWE3OThkNmYwNWQ2NmJiMDMyM2FhNmIwMTFhZjJlZGJl MWRhMWVlYS4uZDI4YWQxYzdkMzE5MDNkN2NlMTQ0NDMzZDA2NTg2NGYwZWRmYWJhZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIxLTEwLTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZXdzLWJ1aWxkLndlYmtpdC5vcmddIGNoZWNrLXBhdGNoLXJlbGV2YW5jZSBjYW4g Z2V0IHN0dWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzExOTAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc3MzI3MTY4PgorCisgICAgICAgIFJl dmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCisKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdz LWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoQ2hlY2tQYXRjaFJlbGV2YW5jZSk6IENvbXB1dGUg YWxsIHJlZ2V4ZXMgaW4gYWR2YW5jZS4KKyAgICAgICAgKENoZWNrUGF0Y2hSZWxldmFuY2UuX3Bh dGNoX2lzX3JlbGV2YW50KTogUmVseSBvbiBwcmUtY29tcHV0ZWQgcmVnZXhlcywKKyAgICAgICAg bGltaXQgdGhlIG51bWJlciBvZiBjaGFyYWN0ZXJzIHRvIGNoZWNrIGluIGEgbGluZSB0byAyNTAg YW5kIGluY2x1ZGUgYQorICAgICAgICBoYXJkLXRpbWVvdXQgc28gdGhhdCBhIHBhdGNoIGNhbiBu ZXZlciBnZXQgRVdTIHN0dWNrLgorCiAyMDIxLTEwLTA0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CiAKICAgICAgICAgQWRkIFNQSSB0byBsYXVuY2ggYSBzZXJ2aWNlIHNlcnZpY2Ug d29ya2VyIGluIGEgV0tXZWJWaWV3IGFuZCBleHBvc2Ugc2VydmljZSB3b3JrZXIgdG8gaW5qZWN0 ZWQgYnVuZGxlCmRpZmYgLS1naXQgYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5 IGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQppbmRleCAyNzNkMDIxNDE5ZDg2 OTQ1MjUwYzBhMTg0MDU3YjFmYWY0YmE0MGRkLi5kYWRmOTkyYjU0OTlmZDVjYmY4MDM5NGI1Zjc4 ZmU5MDMzNDU3M2Q1IDEwMDY0NAotLS0gYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5CisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKQEAgLTM4LDYgKzM4 LDcgQEAgaW1wb3J0IHJlCiBpbXBvcnQgcmVxdWVzdHMKIGltcG9ydCBzb2NrZXQKIGltcG9ydCBz eXMKK2ltcG9ydCB0aW1lCiAKIGlmIHN5cy52ZXJzaW9uX2luZm8gPCAoMywgNSk6CiAgICAgcHJp bnQoJ0VSUk9SOiBQbGVhc2UgdXNlIFB5dGhvbiAzLiBUaGlzIGNvZGUgaXMgbm90IGNvbXBhdGli bGUgd2l0aCBQeXRob24gMi4nKQpAQCAtMzk0LDgyICszOTUsODQgQEAgY2xhc3MgQ2hlY2tQYXRj aFJlbGV2YW5jZShBbmFseXplUGF0Y2gpOgogICAgIG5hbWUgPSAnY2hlY2stcGF0Y2gtcmVsZXZh bmNlJwogICAgIGRlc2NyaXB0aW9uID0gWydjaGVjay1wYXRjaC1yZWxldmFuY2UgcnVubmluZydd CiAgICAgZGVzY3JpcHRpb25Eb25lID0gWydQYXRjaCBjb250YWlucyByZWxldmFudCBjaGFuZ2Vz J10KKyAgICBNQVhfTElORV9TSVpFID0gMjUwCiAKLSAgICBiaW5kaW5nc19wYXRocyA9IFsKLSAg ICAgICAgJ1NvdXJjZS9XZWJDb3JlJywKLSAgICAgICAgJ1Rvb2xzJywKKyAgICBiaW5kaW5nc19w YXRoX3JlZ2V4ZXMgPSBbCisgICAgICAgIHJlLmNvbXBpbGUocmInU291cmNlL1dlYkNvcmUnLCBy ZS5JR05PUkVDQVNFKSwKKyAgICAgICAgcmUuY29tcGlsZShyYidUb29scycsIHJlLklHTk9SRUNB U0UpLAogICAgIF0KIAotICAgIHNlcnZpY2VzX3BhdGhzID0gWwotICAgICAgICAnVG9vbHMvQ0lT dXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcnLAotICAgICAgICAnVG9vbHMvQ0lTdXBwb3J0L2V3cy1i dWlsZCcsCi0gICAgICAgICdUb29scy9DSVN1cHBvcnQvU2hhcmVkJywKLSAgICAgICAgJ1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3Jlc3VsdHNkYnB5JywKLSAgICAgICAgJ1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdGNvcmVweScsCi0gICAgICAgICdUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weScsCisgICAgc2VydmljZXNfcGF0aF9yZWdleGVzID0gWworICAgICAgICBy ZS5jb21waWxlKHJiJ1Rvb2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnJywgcmUuSUdOT1JF Q0FTRSksCisgICAgICAgIHJlLmNvbXBpbGUocmInVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZCcs IHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ1Rvb2xzL0NJU3VwcG9ydC9T aGFyZWQnLCByZS5JR05PUkVDQVNFKSwKKyAgICAgICAgcmUuY29tcGlsZShyYidUb29scy9TY3Jp cHRzL2xpYnJhcmllcy9yZXN1bHRzZGJweScsIHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5j b21waWxlKHJiJ1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweScsIHJlLklHTk9S RUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5JywgcmUuSUdOT1JFQ0FTRSksCiAgICAgXQogCi0gICAganNjX3BhdGhzID0gWwot ICAgICAgICAnLipqc2MuKicsCi0gICAgICAgICcuKmphdmFzY3JpcHRjb3JlLionLAotICAgICAg ICAnSlNUZXN0cy8nLAotICAgICAgICAnU291cmNlL1dURi8nLAotICAgICAgICAnU291cmNlL2Jt YWxsb2MvJywKLSAgICAgICAgJy4qTWFrZWZpbGUuKicsCi0gICAgICAgICdUb29scy9TY3JpcHRz L2J1aWxkLXdlYmtpdCcsCi0gICAgICAgICdUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0nLAor ICAgIGpzY19wYXRoX3JlZ2V4ZXMgPSBbCisgICAgICAgIHJlLmNvbXBpbGUocmInLipqc2MuKics IHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJy4qamF2YXNjcmlwdGNvcmUu KicsIHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ0pTVGVzdHMvJywgcmUu SUdOT1JFQ0FTRSksCisgICAgICAgIHJlLmNvbXBpbGUocmInU291cmNlL1dURi8nLCByZS5JR05P UkVDQVNFKSwKKyAgICAgICAgcmUuY29tcGlsZShyYidTb3VyY2UvYm1hbGxvYy8nLCByZS5JR05P UkVDQVNFKSwKKyAgICAgICAgcmUuY29tcGlsZShyYicuKk1ha2VmaWxlLionLCByZS5JR05PUkVD QVNFKSwKKyAgICAgICAgcmUuY29tcGlsZShyYidUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCcs IHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ1Rvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbScsIHJlLklHTk9SRUNBU0UpLAogICAgIF0KIAotICAgIHdrMV9wYXRocyA9IFsK LSAgICAgICAgJ1NvdXJjZS9XZWJLaXRMZWdhY3knLAotICAgICAgICAnU291cmNlL1dlYkNvcmUn LAotICAgICAgICAnU291cmNlL1dlYkluc3BlY3RvclVJJywKLSAgICAgICAgJ1NvdXJjZS9XZWJE cml2ZXInLAotICAgICAgICAnU291cmNlL1dURicsCi0gICAgICAgICdTb3VyY2UvYm1hbGxvYycs Ci0gICAgICAgICdTb3VyY2UvSmF2YVNjcmlwdENvcmUnLAotICAgICAgICAnU291cmNlL1RoaXJk UGFydHknLAotICAgICAgICAnTGF5b3V0VGVzdHMnLAotICAgICAgICAnVG9vbHMnLAorICAgIHdr MV9wYXRoX3JlZ2V4ZXMgPSBbCisgICAgICAgIHJlLmNvbXBpbGUocmInU291cmNlL1dlYktpdExl Z2FjeScsIHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ1NvdXJjZS9XZWJD b3JlJywgcmUuSUdOT1JFQ0FTRSksCisgICAgICAgIHJlLmNvbXBpbGUocmInU291cmNlL1dlYklu c3BlY3RvclVJJywgcmUuSUdOT1JFQ0FTRSksCisgICAgICAgIHJlLmNvbXBpbGUocmInU291cmNl L1dlYkRyaXZlcicsIHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ1NvdXJj ZS9XVEYnLCByZS5JR05PUkVDQVNFKSwKKyAgICAgICAgcmUuY29tcGlsZShyYidTb3VyY2UvYm1h bGxvYycsIHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ1NvdXJjZS9KYXZh U2NyaXB0Q29yZScsIHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ1NvdXJj ZS9UaGlyZFBhcnR5JywgcmUuSUdOT1JFQ0FTRSksCisgICAgICAgIHJlLmNvbXBpbGUocmInTGF5 b3V0VGVzdHMnLCByZS5JR05PUkVDQVNFKSwKKyAgICAgICAgcmUuY29tcGlsZShyYidUb29scycs IHJlLklHTk9SRUNBU0UpLAogICAgIF0KIAotICAgIGJpZ19zdXJfYnVpbGRlcl9wYXRocyA9IFsK LSAgICAgICAgJ1NvdXJjZS8nLAotICAgICAgICAnVG9vbHMvJywKKyAgICBiaWdfc3VyX2J1aWxk ZXJfcGF0aF9yZWdleGVzID0gWworICAgICAgICByZS5jb21waWxlKHJiJ1NvdXJjZS8nLCByZS5J R05PUkVDQVNFKSwKKyAgICAgICAgcmUuY29tcGlsZShyYidUb29scy8nLCByZS5JR05PUkVDQVNF KSwKICAgICBdCi0gICAgd2Via2l0cHlfcGF0aHMgPSBbCi0gICAgICAgICdUb29scy9TY3JpcHRz L3dlYmtpdHB5JywKLSAgICAgICAgJ1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzJywKLSAgICAgICAg J1Rvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3InLAotICAgICAgICAnU291cmNlL1dlYktp dC9TY3JpcHRzJywKKyAgICB3ZWJraXRweV9wYXRoX3JlZ2V4ZXMgPSBbCisgICAgICAgIHJlLmNv bXBpbGUocmInVG9vbHMvU2NyaXB0cy93ZWJraXRweScsIHJlLklHTk9SRUNBU0UpLAorICAgICAg ICByZS5jb21waWxlKHJiJ1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzJywgcmUuSUdOT1JFQ0FTRSks CisgICAgICAgIHJlLmNvbXBpbGUocmInVG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcics IHJlLklHTk9SRUNBU0UpLAorICAgICAgICByZS5jb21waWxlKHJiJ1NvdXJjZS9XZWJLaXQvU2Ny aXB0cycsIHJlLklHTk9SRUNBU0UpLAogICAgIF0KIAogICAgIGdyb3VwX3RvX3BhdGhzX21hcHBp bmcgPSB7Ci0gICAgICAgICdiaW5kaW5ncyc6IGJpbmRpbmdzX3BhdGhzLAotICAgICAgICAnYmln c3VyLXJlbGVhc2UtYnVpbGQnOiBiaWdfc3VyX2J1aWxkZXJfcGF0aHMsCi0gICAgICAgICdzZXJ2 aWNlcy1ld3MnOiBzZXJ2aWNlc19wYXRocywKLSAgICAgICAgJ2pzYyc6IGpzY19wYXRocywKLSAg ICAgICAgJ3dlYmtpdHB5Jzogd2Via2l0cHlfcGF0aHMsCi0gICAgICAgICd3azEtdGVzdHMnOiB3 azFfcGF0aHMsCi0gICAgICAgICd3aW5kb3dzJzogd2sxX3BhdGhzLAorICAgICAgICAnYmluZGlu Z3MnOiBiaW5kaW5nc19wYXRoX3JlZ2V4ZXMsCisgICAgICAgICdiaWdzdXItcmVsZWFzZS1idWls ZCc6IGJpZ19zdXJfYnVpbGRlcl9wYXRoX3JlZ2V4ZXMsCisgICAgICAgICdzZXJ2aWNlcy1ld3Mn OiBzZXJ2aWNlc19wYXRoX3JlZ2V4ZXMsCisgICAgICAgICdqc2MnOiBqc2NfcGF0aF9yZWdleGVz LAorICAgICAgICAnd2Via2l0cHknOiB3ZWJraXRweV9wYXRoX3JlZ2V4ZXMsCisgICAgICAgICd3 azEtdGVzdHMnOiB3azFfcGF0aF9yZWdleGVzLAorICAgICAgICAnd2luZG93cyc6IHdrMV9wYXRo X3JlZ2V4ZXMsCiAgICAgfQogCi0gICAgZGVmIF9wYXRjaF9pc19yZWxldmFudChzZWxmLCBwYXRj aCwgYnVpbGRlck5hbWUpOgorICAgIGRlZiBfcGF0Y2hfaXNfcmVsZXZhbnQoc2VsZiwgcGF0Y2gs IGJ1aWxkZXJOYW1lLCB0aW1lb3V0PTMwKToKICAgICAgICAgZ3JvdXAgPSBbZ3JvdXAgZm9yIGdy b3VwIGluIHNlbGYuZ3JvdXBfdG9fcGF0aHNfbWFwcGluZy5rZXlzKCkgaWYgZ3JvdXAubG93ZXIo KSBpbiBidWlsZGVyTmFtZS5sb3dlcigpXQogICAgICAgICBpZiBub3QgZ3JvdXA6CiAgICAgICAg ICAgICAjIFRoaXMgYnVpbGRlciBkb2Vzbid0IGhhdmUgcGF0aHMgZGVmaW5lZCwgYWxsIHBhdGNo ZXMgYXJlIHJlbGV2YW50LgogICAgICAgICAgICAgcmV0dXJuIFRydWUKIAotICAgICAgICByZWxl dmFudF9wYXRocyA9IHNlbGYuZ3JvdXBfdG9fcGF0aHNfbWFwcGluZ1tncm91cFswXV0KKyAgICAg ICAgcmVsZXZhbnRfcGF0aF9yZWdleGVzID0gc2VsZi5ncm91cF90b19wYXRoc19tYXBwaW5nLmdl dChncm91cFswXSwgW10pCisgICAgICAgIHN0YXJ0ID0gdGltZS50aW1lKCkKIAogICAgICAgICBm b3IgY2hhbmdlIGluIHBhdGNoLnNwbGl0bGluZXMoKToKLSAgICAgICAgICAgIGZvciBwYXRoIGlu IHJlbGV2YW50X3BhdGhzOgotICAgICAgICAgICAgICAgIGlmIHR5cGUocGF0aCkgPT0gc3RyOgot ICAgICAgICAgICAgICAgICAgICBwYXRoID0gcGF0aC5lbmNvZGUoZW5jb2Rpbmc9J3V0Zi04Jywg ZXJyb3JzPSdyZXBsYWNlJykKKyAgICAgICAgICAgIGZvciByZWdleCBpbiByZWxldmFudF9wYXRo X3JlZ2V4ZXM6CiAgICAgICAgICAgICAgICAgaWYgdHlwZShjaGFuZ2UpID09IHN0cjoKICAgICAg ICAgICAgICAgICAgICAgY2hhbmdlID0gY2hhbmdlLmVuY29kZShlbmNvZGluZz0ndXRmLTgnLCBl cnJvcnM9J3JlcGxhY2UnKQotICAgICAgICAgICAgICAgIGlmIHJlLnNlYXJjaChwYXRoLCBjaGFu Z2UsIHJlLklHTk9SRUNBU0UpOgorICAgICAgICAgICAgICAgIGlmIHJlZ2V4LnNlYXJjaChjaGFu Z2VbOnNlbGYuTUFYX0xJTkVfU0laRV0pOgogICAgICAgICAgICAgICAgICAgICByZXR1cm4gVHJ1 ZQorICAgICAgICAgICAgaWYgdGltZS50aW1lKCkgPiBzdGFydCArIHRpbWVvdXQ6CisgICAgICAg ICAgICAgICAgcmV0dXJuIEZhbHNlCiAgICAgICAgIHJldHVybiBGYWxzZQogCiAgICAgZGVmIHN0 YXJ0KHNlbGYpOgo=