205957 2020-01-08 14:28:30 -0800 We should pass in -parallelizeTargets for the JavaScriptCore xcodebuild 2020-01-09 17:45:37 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified REOPENED https://bugs.webkit.org/show_bug.cgi?id=206011 InRadar P2 Normal --- 1 saam saam ap benjamin commit-queue fpizlo ggaren gskachkov guijemont keith_miller krollin mark.lam msaboff rmorisset ticaiolima tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1604290 0 saam 2020-01-08 14:28:30 -0800 ... 1604304 1 387144 saam 2020-01-08 14:59:27 -0800 Created attachment 387144 patch 1604310 2 387144 keith_miller 2020-01-08 15:09:24 -0800 Comment on attachment 387144 patch r=me. 1604350 3 387144 commit-queue 2020-01-08 16:13:33 -0800 Comment on attachment 387144 patch Clearing flags on attachment: 387144 Committed r254234: <https://trac.webkit.org/changeset/254234> 1604351 4 commit-queue 2020-01-08 16:13:35 -0800 All reviewed patches have been landed. Closing bug. 1604352 5 webkit-bug-importer 2020-01-08 16:14:14 -0800 <rdar://problem/58425712> 1604474 6 ap 2020-01-08 19:16:49 -0800 Why only JavaScriptCore though? 1604475 7 keith_miller 2020-01-08 19:18:46 -0800 (In reply to Alexey Proskuryakov from comment #6) > Why only JavaScriptCore though? IIUC, the other projects' targets don't have their dependences correctly configured to work with parallel builds. 1604476 8 saam 2020-01-08 19:21:15 -0800 (In reply to Alexey Proskuryakov from comment #6) > Why only JavaScriptCore though? JavaScriptCore gets a lot of benefit since we have many test binaries we build after it. We should enable this for others too, eventually. Just need to go through to see which build targets would benefit 1604477 9 saam 2020-01-08 19:24:44 -0800 I forgot to mention in the changelog, but this saves 20 seconds of build time on my MBP with 6 cores 1604526 10 387144 saam 2020-01-08 22:43:51 -0800 Comment on attachment 387144 patch View in context: https://bugs.webkit.org/attachment.cgi?id=387144&action=review > Source/JavaScriptCore/ChangeLog:4 > + build-jsc should invoke make instead of calling xcodebuild directly > + https://bugs.webkit.org/show_bug.cgi?id=205960 oops, this was the wrong bug :( Sorry 1604655 11 ap 2020-01-09 08:50:44 -0800 Rolling back in bug 206011, because this broke production builds. > IIUC, the other projects' targets don't have their dependences correctly configured to work with parallel builds. In my testing, JavaScriptCore was the only one that wasn't correctly configured. Everything else built fine - although that could be accidental of course. > Just need to go through to see which build targets would benefit All of WebKit builds 80 seconds faster on an 18-core iMac Pro with this. 1604922 12 saam 2020-01-09 16:41:24 -0800 (In reply to Alexey Proskuryakov from comment #11) > Rolling back in bug 206011, because this broke production builds. > > > IIUC, the other projects' targets don't have their dependences correctly configured to work with parallel builds. > > In my testing, JavaScriptCore was the only one that wasn't correctly > configured. Everything else built fine - although that could be accidental > of course. > > > Just need to go through to see which build targets would benefit > > All of WebKit builds 80 seconds faster on an 18-core iMac Pro with this. Do you know if all of the benefit is inside JavaScriptCore? 1604924 13 saam 2020-01-09 16:43:11 -0800 This was rolled out because it broke some apple internal build infrastructure 1604925 14 saam 2020-01-09 16:48:42 -0800 (In reply to Saam Barati from comment #13) > This was rolled out because it broke some apple internal build infrastructure It was rolled out in: https://trac.webkit.org/changeset/254262 1604962 15 ap 2020-01-09 17:45:37 -0800 > Do you know if all of the benefit is inside JavaScriptCore? I do not know for sure, but my expectation is that it's in other projects too. 387144 2020-01-08 14:59:27 -0800 2020-01-08 16:13:33 -0800 patch c-backup.diff text/plain 10739 saam SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI1NDE4 MikKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDIwLTAx LTA4ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIGJ1aWxkLWpz YyBzaG91bGQgaW52b2tlIG1ha2UgaW5zdGVhZCBvZiBjYWxsaW5nIHhjb2RlYnVpbGQgZGlyZWN0 bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTk2 MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTWFr ZWZpbGUuc2hhcmVkOgorCiAyMDIwLTAxLTA3ICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJA YXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIHRlc3RpbmcgdGFyZ2V0IHRvIG1ha2UgdGhhdCBp cyByZWxlYXNlICsgYXNzZXJ0aW9ucwpJbmRleDogTWFrZWZpbGUuc2hhcmVkCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIE1ha2VmaWxlLnNoYXJlZAkocmV2aXNpb24gMjU0MTgyKQorKysgTWFrZWZpbGUuc2hhcmVk CSh3b3JraW5nIGNvcHkpCkBAIC0xLDcgKzEsNyBAQAogU0NSSVBUU19QQVRIID89IC4uL1Rvb2xz L1NjcmlwdHMKIAogU0VUX0NPTE9SX0RJQUdOT1NUSUNTX0FSRyA9IGlmIFtbIC10IDEgXV07IHRo ZW4gQ09MT1JfRElBR05PU1RJQ1NfQVJHPSJDT0xPUl9ESUFHTk9TVElDUz1ZRVMiOyBmaQotWENP REVfT1BUSU9OUyA9IGBwZXJsIC1JJChTQ1JJUFRTX1BBVEgpIC1Nd2Via2l0ZGlycyAtZSAncHJp bnQgWGNvZGVPcHRpb25TdHJpbmcoKScgLS0gJChCVUlMRF9XRUJLSVRfT1BUSU9OUylgICQke0NP TE9SX0RJQUdOT1NUSUNTX0FSR30gJChBUkdTKQorWENPREVfT1BUSU9OUyArPSBgcGVybCAtSSQo U0NSSVBUU19QQVRIKSAtTXdlYmtpdGRpcnMgLWUgJ3ByaW50IFhjb2RlT3B0aW9uU3RyaW5nKCkn IC0tICQoQlVJTERfV0VCS0lUX09QVElPTlMpYCAkJHtDT0xPUl9ESUFHTk9TVElDU19BUkd9ICQo QVJHUykKIAogaWZuZXEgKCwkKFNES1JPT1QpKQogCWlmbmVxICgsJChPVkVSUklERV9TREtST09U KSkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjU0MjI4KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4 IEBACisyMDIwLTAxLTA4ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAg ICAgIGJ1aWxkLWpzYyBzaG91bGQgaW52b2tlIG1ha2UgaW5zdGVhZCBvZiBjYWxsaW5nIHhjb2Rl YnVpbGQgZGlyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwNTk2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSB2YXJpb3VzIGpzYywgYW5kIHRlc3QqIGJpbmFyaWVzIGNhbiBhbGwgYmUgY29t cGlsZWQgaW4gcGFyYWxsZWwuCisgICAgICAgIFRoaXMgcGF0Y2ggbWFrZXMgdGhhdCBoYXBwZW4g d2hlbiBidWlsZGluZyB3aXRoIG1ha2UgdmlhIHRoZSBDTEkKKyAgICAgICAgdGhhdCB0aGVzZSBh cmUgYnVpbHQgaW4gcGFyYWxsZWwuIFRvIG1ha2UgdGhpcyB3b3JrLCBpbiBYY29kZSwgSSBuZWVk ZWQKKyAgICAgICAgdG8gbWFyayB0aGVzZSBiaW5hcmllcyBhcyBkZXBlbmRpbmcgb24gSmF2YVNj cmlwdENvcmUuZnJhbWV3b3JrLgorCisgICAgICAgICogSmF2YVNjcmlwdENvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBNYWtlZmlsZToKKwogMjAyMC0wMS0wOCAgTWlj aGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBUeXBlUHJvZmlsZXIu aDogTXVsdGlwbGljYXRpb24gcmVzdWx0IGNvbnZlcnRlZCB0byBsYXJnZXIgdHlwZQpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL01ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9NYWtlZmlsZQkocmV2aXNpb24gMjU0MTgyKQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL01ha2VmaWxlCSh3b3JraW5nIGNvcHkpCkBAIC0xICsxLDIgQEAKK1hDT0RFX09QVElP TlMgKz0gLXBhcmFsbGVsaXplVGFyZ2V0cwogaW5jbHVkZSAuLi9NYWtlZmlsZS5zaGFyZWQKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0 Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiAyNTQxODIpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agkod29ya2luZyBjb3B5KQpAQCAtMjA5MSw2ICsyMDkxLDc2IEBACiAJCQlyZW1vdGVHbG9iYWxJ RFN0cmluZyA9IDY1RkIzRjY2MDlEMTFFOTEwMEY0OURFQjsKIAkJCXJlbW90ZUluZm8gPSAiRGVy aXZlZCBTb3VyY2VzIjsKIAkJfTsKKwkJNTI1RDEzRDAyM0M2OTM2NjAwNDUyRDZGIC8qIFBCWENv bnRhaW5lckl0ZW1Qcm94eSAqLyA9IHsKKwkJCWlzYSA9IFBCWENvbnRhaW5lckl0ZW1Qcm94eTsK KwkJCWNvbnRhaW5lclBvcnRhbCA9IDA4NjdENjkwRkU4NDAyOEZDMDJBQUMwNyAvKiBQcm9qZWN0 IG9iamVjdCAqLzsKKwkJCXByb3h5VHlwZSA9IDE7CisJCQlyZW1vdGVHbG9iYWxJRFN0cmluZyA9 IDkzMkY1QjNFMDgyMkExQzcwMDczNjk3NTsKKwkJCXJlbW90ZUluZm8gPSBKYXZhU2NyaXB0Q29y ZTsKKwkJfTsKKwkJNTI1RDEzRDIyM0M2OTM2QjAwNDUyRDZGIC8qIFBCWENvbnRhaW5lckl0ZW1Q cm94eSAqLyA9IHsKKwkJCWlzYSA9IFBCWENvbnRhaW5lckl0ZW1Qcm94eTsKKwkJCWNvbnRhaW5l clBvcnRhbCA9IDA4NjdENjkwRkU4NDAyOEZDMDJBQUMwNyAvKiBQcm9qZWN0IG9iamVjdCAqLzsK KwkJCXByb3h5VHlwZSA9IDE7CisJCQlyZW1vdGVHbG9iYWxJRFN0cmluZyA9IDkzMkY1QjNFMDgy MkExQzcwMDczNjk3NTsKKwkJCXJlbW90ZUluZm8gPSBKYXZhU2NyaXB0Q29yZTsKKwkJfTsKKwkJ NTI1RDEzRDQyM0M2OTM3MDAwNDUyRDZGIC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLyA9IHsK KwkJCWlzYSA9IFBCWENvbnRhaW5lckl0ZW1Qcm94eTsKKwkJCWNvbnRhaW5lclBvcnRhbCA9IDA4 NjdENjkwRkU4NDAyOEZDMDJBQUMwNyAvKiBQcm9qZWN0IG9iamVjdCAqLzsKKwkJCXByb3h5VHlw ZSA9IDE7CisJCQlyZW1vdGVHbG9iYWxJRFN0cmluZyA9IDkzMkY1QjNFMDgyMkExQzcwMDczNjk3 NTsKKwkJCXJlbW90ZUluZm8gPSBKYXZhU2NyaXB0Q29yZTsKKwkJfTsKKwkJNTI1RDEzRDYyM0M2 OTM3NjAwNDUyRDZGIC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLyA9IHsKKwkJCWlzYSA9IFBC WENvbnRhaW5lckl0ZW1Qcm94eTsKKwkJCWNvbnRhaW5lclBvcnRhbCA9IDA4NjdENjkwRkU4NDAy OEZDMDJBQUMwNyAvKiBQcm9qZWN0IG9iamVjdCAqLzsKKwkJCXByb3h5VHlwZSA9IDE7CisJCQly ZW1vdGVHbG9iYWxJRFN0cmluZyA9IDkzMkY1QjNFMDgyMkExQzcwMDczNjk3NTsKKwkJCXJlbW90 ZUluZm8gPSBKYXZhU2NyaXB0Q29yZTsKKwkJfTsKKwkJNTI1RDEzRDgyM0M2OTM3QjAwNDUyRDZG IC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLyA9IHsKKwkJCWlzYSA9IFBCWENvbnRhaW5lckl0 ZW1Qcm94eTsKKwkJCWNvbnRhaW5lclBvcnRhbCA9IDA4NjdENjkwRkU4NDAyOEZDMDJBQUMwNyAv KiBQcm9qZWN0IG9iamVjdCAqLzsKKwkJCXByb3h5VHlwZSA9IDE7CisJCQlyZW1vdGVHbG9iYWxJ RFN0cmluZyA9IDkzMkY1QjNFMDgyMkExQzcwMDczNjk3NTsKKwkJCXJlbW90ZUluZm8gPSBKYXZh U2NyaXB0Q29yZTsKKwkJfTsKKwkJNTI1RDEzREEyM0M2OTM4NDAwNDUyRDZGIC8qIFBCWENvbnRh aW5lckl0ZW1Qcm94eSAqLyA9IHsKKwkJCWlzYSA9IFBCWENvbnRhaW5lckl0ZW1Qcm94eTsKKwkJ CWNvbnRhaW5lclBvcnRhbCA9IDA4NjdENjkwRkU4NDAyOEZDMDJBQUMwNyAvKiBQcm9qZWN0IG9i amVjdCAqLzsKKwkJCXByb3h5VHlwZSA9IDE7CisJCQlyZW1vdGVHbG9iYWxJRFN0cmluZyA9IDkz MkY1QjNFMDgyMkExQzcwMDczNjk3NTsKKwkJCXJlbW90ZUluZm8gPSBKYXZhU2NyaXB0Q29yZTsK KwkJfTsKKwkJNTI1RDEzREMyM0M2OTM4OTAwNDUyRDZGIC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94 eSAqLyA9IHsKKwkJCWlzYSA9IFBCWENvbnRhaW5lckl0ZW1Qcm94eTsKKwkJCWNvbnRhaW5lclBv cnRhbCA9IDA4NjdENjkwRkU4NDAyOEZDMDJBQUMwNyAvKiBQcm9qZWN0IG9iamVjdCAqLzsKKwkJ CXByb3h5VHlwZSA9IDE7CisJCQlyZW1vdGVHbG9iYWxJRFN0cmluZyA9IDkzMkY1QjNFMDgyMkEx QzcwMDczNjk3NTsKKwkJCXJlbW90ZUluZm8gPSBKYXZhU2NyaXB0Q29yZTsKKwkJfTsKKwkJNTI1 RDEzREUyM0M2OTM5MTAwNDUyRDZGIC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLyA9IHsKKwkJ CWlzYSA9IFBCWENvbnRhaW5lckl0ZW1Qcm94eTsKKwkJCWNvbnRhaW5lclBvcnRhbCA9IDA4NjdE NjkwRkU4NDAyOEZDMDJBQUMwNyAvKiBQcm9qZWN0IG9iamVjdCAqLzsKKwkJCXByb3h5VHlwZSA9 IDE7CisJCQlyZW1vdGVHbG9iYWxJRFN0cmluZyA9IDkzMkY1QjNFMDgyMkExQzcwMDczNjk3NTsK KwkJCXJlbW90ZUluZm8gPSBKYXZhU2NyaXB0Q29yZTsKKwkJfTsKKwkJNTI1RDEzRTAyM0M2OTM5 NzAwNDUyRDZGIC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLyA9IHsKKwkJCWlzYSA9IFBCWENv bnRhaW5lckl0ZW1Qcm94eTsKKwkJCWNvbnRhaW5lclBvcnRhbCA9IDA4NjdENjkwRkU4NDAyOEZD MDJBQUMwNyAvKiBQcm9qZWN0IG9iamVjdCAqLzsKKwkJCXByb3h5VHlwZSA9IDE7CisJCQlyZW1v dGVHbG9iYWxJRFN0cmluZyA9IDkzMkY1QjNFMDgyMkExQzcwMDczNjk3NTsKKwkJCXJlbW90ZUlu Zm8gPSBKYXZhU2NyaXB0Q29yZTsKKwkJfTsKKwkJNTI1RDEzRTIyM0M2OTM5QjAwNDUyRDZGIC8q IFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLyA9IHsKKwkJCWlzYSA9IFBCWENvbnRhaW5lckl0ZW1Q cm94eTsKKwkJCWNvbnRhaW5lclBvcnRhbCA9IDA4NjdENjkwRkU4NDAyOEZDMDJBQUMwNyAvKiBQ cm9qZWN0IG9iamVjdCAqLzsKKwkJCXByb3h5VHlwZSA9IDE7CisJCQlyZW1vdGVHbG9iYWxJRFN0 cmluZyA9IDkzMkY1QjNFMDgyMkExQzcwMDczNjk3NTsKKwkJCXJlbW90ZUluZm8gPSBKYXZhU2Ny aXB0Q29yZTsKKwkJfTsKIAkJNTJDRDBGNjUyMjQyRjVBMzAwNEExOEE1IC8qIFBCWENvbnRhaW5l ckl0ZW1Qcm94eSAqLyA9IHsKIAkJCWlzYSA9IFBCWENvbnRhaW5lckl0ZW1Qcm94eTsKIAkJCWNv bnRhaW5lclBvcnRhbCA9IDA4NjdENjkwRkU4NDAyOEZDMDJBQUMwNyAvKiBQcm9qZWN0IG9iamVj dCAqLzsKQEAgLTEwMzg1LDYgKzEwNDU1LDcgQEAKIAkJCWJ1aWxkUnVsZXMgPSAoCiAJCQkpOwog CQkJZGVwZW5kZW5jaWVzID0gKAorCQkJCTUyNUQxM0REMjNDNjkzODkwMDQ1MkQ2RiAvKiBQQlhU YXJnZXREZXBlbmRlbmN5ICovLAogCQkJCTE0Q0ZCMTEzMjMwMzVGNTgwMEYwMDQ4QyAvKiBQQlhU YXJnZXREZXBlbmRlbmN5ICovLAogCQkJKTsKIAkJCW5hbWUgPSB0ZXN0YWlyOwpAQCAtMTA0MDIs NiArMTA0NzMsNyBAQAogCQkJYnVpbGRSdWxlcyA9ICgKIAkJCSk7CiAJCQlkZXBlbmRlbmNpZXMg PSAoCisJCQkJNTI1RDEzREIyM0M2OTM4NDAwNDUyRDZGIC8qIFBCWFRhcmdldERlcGVuZGVuY3kg Ki8sCiAJCQkJMTRDRkIxMTEyMzAzNUY1MzAwRjAwNDhDIC8qIFBCWFRhcmdldERlcGVuZGVuY3kg Ki8sCiAJCQkpOwogCQkJbmFtZSA9IGR5bmJlbmNoOwpAQCAtMTA0MTksNiArMTA0OTEsNyBAQAog CQkJYnVpbGRSdWxlcyA9ICgKIAkJCSk7CiAJCQlkZXBlbmRlbmNpZXMgPSAoCisJCQkJNTI1RDEz RDkyM0M2OTM3QjAwNDUyRDZGIC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCiAJCQkJMTRDRkIx MEYyMzAzNUY0RDAwRjAwNDhDIC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCiAJCQkpOwogCQkJ bmFtZSA9IHRlc3RiMzsKQEAgLTEwNDU4LDYgKzEwNTMxLDcgQEAKIAkJCWJ1aWxkUnVsZXMgPSAo CiAJCQkpOwogCQkJZGVwZW5kZW5jaWVzID0gKAorCQkJCTUyNUQxM0QxMjNDNjkzNjYwMDQ1MkQ2 RiAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICovLAogCQkJCTE0Q0ZCMTAwMjMwMzVFRjMwMEYwMDQ4 QyAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICovLAogCQkJKTsKIAkJCW5hbWUgPSBtaW5pZG9tOwpA QCAtMTA0NzcsNiArMTA1NTEsNyBAQAogCQkJYnVpbGRSdWxlcyA9ICgKIAkJCSk7CiAJCQlkZXBl bmRlbmNpZXMgPSAoCisJCQkJNTI1RDEzRDMyM0M2OTM2QjAwNDUyRDZGIC8qIFBCWFRhcmdldERl cGVuZGVuY3kgKi8sCiAJCQkJMTRDRkIxMEIyMzAzNUYxQTAwRjAwNDhDIC8qIFBCWFRhcmdldERl cGVuZGVuY3kgKi8sCiAJCQkpOwogCQkJbmFtZSA9IHRlc3RhcGk7CkBAIC0xMDUxNCw2ICsxMDU4 OSw3IEBACiAJCQlidWlsZFJ1bGVzID0gKAogCQkJKTsKIAkJCWRlcGVuZGVuY2llcyA9ICgKKwkJ CQk1MjVEMTNFMzIzQzY5MzlCMDA0NTJENkYgLyogUEJYVGFyZ2V0RGVwZW5kZW5jeSAqLywKIAkJ CQkxNENGQjExOTIzMDM1RjY5MDBGMDA0OEMgLyogUEJYVGFyZ2V0RGVwZW5kZW5jeSAqLywKIAkJ CSk7CiAJCQluYW1lID0gdGVzdGRmZzsKQEAgLTEwNTMxLDYgKzEwNjA3LDcgQEAKIAkJCWJ1aWxk UnVsZXMgPSAoCiAJCQkpOwogCQkJZGVwZW5kZW5jaWVzID0gKAorCQkJCTUyNUQxM0Q3MjNDNjkz NzYwMDQ1MkQ2RiAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICovLAogCQkJCTE0Q0ZCMTBEMjMwMzVG NDYwMEYwMDQ4QyAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICovLAogCQkJKTsKIAkJCW5hbWUgPSB0 ZXN0UmVnRXhwOwpAQCAtMTA1NDksNiArMTA2MjYsNyBAQAogCQkJYnVpbGRSdWxlcyA9ICgKIAkJ CSk7CiAJCQlkZXBlbmRlbmNpZXMgPSAoCisJCQkJNTI1RDEzRTEyM0M2OTM5NzAwNDUyRDZGIC8q IFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCiAJCQkJMTRDRkIxMTcyMzAzNUY2MzAwRjAwNDhDIC8q IFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCiAJCQkpOwogCQkJbmFtZSA9IHRlc3RtZW07CkBAIC0x MDU5Nyw2ICsxMDY3NSw3IEBACiAJCQlidWlsZFJ1bGVzID0gKAogCQkJKTsKIAkJCWRlcGVuZGVu Y2llcyA9ICgKKwkJCQk1MjVEMTNENTIzQzY5MzcwMDA0NTJENkYgLyogUEJYVGFyZ2V0RGVwZW5k ZW5jeSAqLywKIAkJCQkxNEQ5RDlEQTIxODQ2MkI1MDA5MTI2QzIgLyogUEJYVGFyZ2V0RGVwZW5k ZW5jeSAqLywKIAkJCSk7CiAJCQluYW1lID0ganNjOwpAQCAtMTA2MTUsNiArMTA2OTQsNyBAQAog CQkJYnVpbGRSdWxlcyA9ICgKIAkJCSk7CiAJCQlkZXBlbmRlbmNpZXMgPSAoCisJCQkJNTI1RDEz REYyM0M2OTM5MTAwNDUyRDZGIC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCiAJCQkJMTRDRkIx MTUyMzAzNUY1RTAwRjAwNDhDIC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCiAJCQkpOwogCQkJ bmFtZSA9IHRlc3RtYXNtOwpAQCAtMTA2MjgsNyArMTA3MDgsNiBAQAogCQkwODY3RDY5MEZFODQw MjhGQzAyQUFDMDcgLyogUHJvamVjdCBvYmplY3QgKi8gPSB7CiAJCQlpc2EgPSBQQlhQcm9qZWN0 OwogCQkJYXR0cmlidXRlcyA9IHsKLQkJCQlCdWlsZEluZGVwZW5kZW50VGFyZ2V0c0luUGFyYWxs ZWwgPSBZRVM7CiAJCQkJRGVmYXVsdEJ1aWxkU3lzdGVtVHlwZUZvcldvcmtzcGFjZSA9IE9yaWdp bmFsOwogCQkJCUxhc3RTd2lmdFVwZGF0ZUNoZWNrID0gMDcwMDsKIAkJCQlMYXN0VXBncmFkZUNo ZWNrID0gMTAwMDsKQEAgLTExNDEyLDYgKzExNDkxLDU2IEBACiAJCQl0YXJnZXQgPSA2NUZCM0Y2 NjA5RDExRTkxMDBGNDlERUIgLyogRGVyaXZlZCBTb3VyY2VzICovOwogCQkJdGFyZ2V0UHJveHkg PSAxNEQ5RDlEOTIxODQ2MkI1MDA5MTI2QzIgLyogUEJYQ29udGFpbmVySXRlbVByb3h5ICovOwog CQl9OworCQk1MjVEMTNEMTIzQzY5MzY2MDA0NTJENkYgLyogUEJYVGFyZ2V0RGVwZW5kZW5jeSAq LyA9IHsKKwkJCWlzYSA9IFBCWFRhcmdldERlcGVuZGVuY3k7CisJCQl0YXJnZXQgPSA5MzJGNUIz RTA4MjJBMUM3MDA3MzY5NzUgLyogSmF2YVNjcmlwdENvcmUgKi87CisJCQl0YXJnZXRQcm94eSA9 IDUyNUQxM0QwMjNDNjkzNjYwMDQ1MkQ2RiAvKiBQQlhDb250YWluZXJJdGVtUHJveHkgKi87CisJ CX07CisJCTUyNUQxM0QzMjNDNjkzNkIwMDQ1MkQ2RiAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICov ID0geworCQkJaXNhID0gUEJYVGFyZ2V0RGVwZW5kZW5jeTsKKwkJCXRhcmdldCA9IDkzMkY1QjNF MDgyMkExQzcwMDczNjk3NSAvKiBKYXZhU2NyaXB0Q29yZSAqLzsKKwkJCXRhcmdldFByb3h5ID0g NTI1RDEzRDIyM0M2OTM2QjAwNDUyRDZGIC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLzsKKwkJ fTsKKwkJNTI1RDEzRDUyM0M2OTM3MDAwNDUyRDZGIC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8g PSB7CisJCQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OworCQkJdGFyZ2V0ID0gOTMyRjVCM0Uw ODIyQTFDNzAwNzM2OTc1IC8qIEphdmFTY3JpcHRDb3JlICovOworCQkJdGFyZ2V0UHJveHkgPSA1 MjVEMTNENDIzQzY5MzcwMDA0NTJENkYgLyogUEJYQ29udGFpbmVySXRlbVByb3h5ICovOworCQl9 OworCQk1MjVEMTNENzIzQzY5Mzc2MDA0NTJENkYgLyogUEJYVGFyZ2V0RGVwZW5kZW5jeSAqLyA9 IHsKKwkJCWlzYSA9IFBCWFRhcmdldERlcGVuZGVuY3k7CisJCQl0YXJnZXQgPSA5MzJGNUIzRTA4 MjJBMUM3MDA3MzY5NzUgLyogSmF2YVNjcmlwdENvcmUgKi87CisJCQl0YXJnZXRQcm94eSA9IDUy NUQxM0Q2MjNDNjkzNzYwMDQ1MkQ2RiAvKiBQQlhDb250YWluZXJJdGVtUHJveHkgKi87CisJCX07 CisJCTUyNUQxM0Q5MjNDNjkzN0IwMDQ1MkQ2RiAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICovID0g eworCQkJaXNhID0gUEJYVGFyZ2V0RGVwZW5kZW5jeTsKKwkJCXRhcmdldCA9IDkzMkY1QjNFMDgy MkExQzcwMDczNjk3NSAvKiBKYXZhU2NyaXB0Q29yZSAqLzsKKwkJCXRhcmdldFByb3h5ID0gNTI1 RDEzRDgyM0M2OTM3QjAwNDUyRDZGIC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLzsKKwkJfTsK KwkJNTI1RDEzREIyM0M2OTM4NDAwNDUyRDZGIC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8gPSB7 CisJCQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OworCQkJdGFyZ2V0ID0gOTMyRjVCM0UwODIy QTFDNzAwNzM2OTc1IC8qIEphdmFTY3JpcHRDb3JlICovOworCQkJdGFyZ2V0UHJveHkgPSA1MjVE MTNEQTIzQzY5Mzg0MDA0NTJENkYgLyogUEJYQ29udGFpbmVySXRlbVByb3h5ICovOworCQl9Owor CQk1MjVEMTNERDIzQzY5Mzg5MDA0NTJENkYgLyogUEJYVGFyZ2V0RGVwZW5kZW5jeSAqLyA9IHsK KwkJCWlzYSA9IFBCWFRhcmdldERlcGVuZGVuY3k7CisJCQl0YXJnZXQgPSA5MzJGNUIzRTA4MjJB MUM3MDA3MzY5NzUgLyogSmF2YVNjcmlwdENvcmUgKi87CisJCQl0YXJnZXRQcm94eSA9IDUyNUQx M0RDMjNDNjkzODkwMDQ1MkQ2RiAvKiBQQlhDb250YWluZXJJdGVtUHJveHkgKi87CisJCX07CisJ CTUyNUQxM0RGMjNDNjkzOTEwMDQ1MkQ2RiAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICovID0gewor CQkJaXNhID0gUEJYVGFyZ2V0RGVwZW5kZW5jeTsKKwkJCXRhcmdldCA9IDkzMkY1QjNFMDgyMkEx QzcwMDczNjk3NSAvKiBKYXZhU2NyaXB0Q29yZSAqLzsKKwkJCXRhcmdldFByb3h5ID0gNTI1RDEz REUyM0M2OTM5MTAwNDUyRDZGIC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLzsKKwkJfTsKKwkJ NTI1RDEzRTEyM0M2OTM5NzAwNDUyRDZGIC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8gPSB7CisJ CQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OworCQkJdGFyZ2V0ID0gOTMyRjVCM0UwODIyQTFD NzAwNzM2OTc1IC8qIEphdmFTY3JpcHRDb3JlICovOworCQkJdGFyZ2V0UHJveHkgPSA1MjVEMTNF MDIzQzY5Mzk3MDA0NTJENkYgLyogUEJYQ29udGFpbmVySXRlbVByb3h5ICovOworCQl9OworCQk1 MjVEMTNFMzIzQzY5MzlCMDA0NTJENkYgLyogUEJYVGFyZ2V0RGVwZW5kZW5jeSAqLyA9IHsKKwkJ CWlzYSA9IFBCWFRhcmdldERlcGVuZGVuY3k7CisJCQl0YXJnZXQgPSA5MzJGNUIzRTA4MjJBMUM3 MDA3MzY5NzUgLyogSmF2YVNjcmlwdENvcmUgKi87CisJCQl0YXJnZXRQcm94eSA9IDUyNUQxM0Uy MjNDNjkzOUIwMDQ1MkQ2RiAvKiBQQlhDb250YWluZXJJdGVtUHJveHkgKi87CisJCX07CiAJCTUy Q0QwRjY2MjI0MkY1QTMwMDRBMThBNSAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICovID0gewogCQkJ aXNhID0gUEJYVGFyZ2V0RGVwZW5kZW5jeTsKIAkJCXRhcmdldCA9IDUyQ0QwRjU5MjI0MkY1Njkw MDRBMThBNSAvKiB0ZXN0ZGZnICovOwo=