205882 2020-01-07 12:50:32 -0800 Reformat WebProcessPool logging 2020-01-13 20:21:40 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=205679 InRadar P2 Normal --- 1 krollin krollin bfulgham cdumez commit-queue webkit-bug-importer oldest_to_newest 1603739 0 krollin 2020-01-07 12:50:32 -0800 Update the format used by WebProcessPool in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: <object-address> - [<values that help thread together operations>] <class>::<method>: <message and other useful values> So, for example: Using prewarmed process 0 becomes: 0x7f81e8804008 - WebProcessPool::processForRegistrableDomain: Using prewarmed process (process=0x1471c2a00, PID=64197) 1603740 1 webkit-bug-importer 2020-01-07 12:50:47 -0800 <rdar://problem/58384349> 1603749 2 387021 krollin 2020-01-07 12:59:57 -0800 Created attachment 387021 Patch 1603860 3 387021 bfulgham 2020-01-07 16:26:04 -0800 Comment on attachment 387021 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387021&action=review > Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:110 > +#define WEBPROCESSPOOL_RELEASE_LOG(channel, fmt, ...) RELEASE_LOG(channel, "%p - WebProcessPool::" fmt, this, ##__VA_ARGS__) Should we #undef this at the end of the file? > Source/WebKit/UIProcess/WebProcessPool.cpp:141 > +#define WEBPROCESSPOOL_RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), channel, "%p - WebProcessPool::" fmt, this, ##__VA_ARGS__) Should you be #undef these at the end, in case these get concatenated into UnifiedBuild? 1603868 4 krollin 2020-01-07 16:34:47 -0800 (In reply to Brent Fulgham from comment #3) > Comment on attachment 387021 [details] > Should you be #undef these at the end, in case these get concatenated into > UnifiedBuild? Good question. We #undef in the case where the macros we define are generic, such as RELEASE_LOG_IF_ALLOWED. However, I prefixed these with "WEBPROCESSPOOL_", creating a bit of a namespace that should prevent any collision with other unified files. I'm thinking of going forward with this approach on future files I modify, and going back to other files I've recently modified and ensuring they also take the same approach. 1606048 5 387021 bfulgham 2020-01-13 14:13:56 -0800 Comment on attachment 387021 Patch r=me 1606224 6 387021 commit-queue 2020-01-13 20:21:38 -0800 Comment on attachment 387021 Patch Clearing flags on attachment: 387021 Committed r254487: <https://trac.webkit.org/changeset/254487> 1606225 7 commit-queue 2020-01-13 20:21:40 -0800 All reviewed patches have been landed. Closing bug. 387021 2020-01-07 12:59:57 -0800 2020-01-13 20:21:38 -0800 Patch bug-205882-20200107125957.patch text/plain 16313 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU5YjgzNzJlMTk5OTA4YzRk ZGRhNzIyZjFkYjhkOTYzZmE4NjZlZDQuLmNlNTUzMTk4MzRjZGY3ZmIzOTQ1ODk3MDkyOGYyODYw OTg5MTg1YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQgQEAKKzIwMjAtMDEtMDcgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlZm9ybWF0IFdlYlByb2Nlc3NQ b29sIGxvZ2dpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwNTg4MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTgzODQzNDk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIHRoZSBmb3JtYXQg dXNlZCBieSBXZWJQcm9jZXNzUG9vbCBpbiBpdHMgUkVMRUFTRV9MT0cgbG9nZ2luZy4KKyAgICAg ICAgVXNlIHRoZSBmb3JtYXQgdXNlZCBieSBXZWJQYWdlUHJveHkgYW5kIE5ldHdvcmtSZXNvdXJj ZUxvYWRlciwgd2hpY2gKKyAgICAgICAgaXMgZ2VuZXJhbGx5IG9mIHRoZSBmb3JtOgorCisgICAg ICAgICAgICA8b2JqZWN0LWFkZHJlc3M+IC0gWzx2YWx1ZXMgdGhhdCBoZWxwIHRocmVhZCB0b2dl dGhlciBvcGVyYXRpb25zPl0gPGNsYXNzPjo6PG1ldGhvZD46IDxtZXNzYWdlIGFuZCBvdGhlciB1 c2VmdWwgdmFsdWVzPgorCisgICAgICAgIFNvLCBmb3IgZXhhbXBsZToKKworICAgICAgICAgICAg VXNpbmcgcHJld2FybWVkIHByb2Nlc3MgMAorCisgICAgICAgIGJlY29tZXM6CisKKyAgICAgICAg ICAgIDB4N2Y4MWU4ODA0MDA4IC0gV2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JSZWdpc3RyYWJs ZURvbWFpbjogVXNpbmcgcHJld2FybWVkIHByb2Nlc3MgKHByb2Nlc3M9MHgxNDcxYzJhMDAsIFBJ RD02NDE5NykKKworICAgICAgICBObyBuZXcgdGVzdHMgLSBubyBhZGRlZCBvciBjaGFuZ2VkIGZ1 bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xD b2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmFwcGxpY2F0aW9uSXNB Ym91dFRvU3VzcGVuZCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmVzdGFibGlzaFdvcmtlckNvbnRleHRD b25uZWN0aW9uVG9OZXR3b3JrUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQ b29sOjp0cnlUYWtlUHJld2FybWVkUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nl c3NQb29sOjpwcmV3YXJtUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29s Ojpwcm9jZXNzRm9yUmVnaXN0cmFibGVEb21haW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzUG9vbDo6ZGlkUmVhY2hHb29kVGltZVRvUHJld2FybSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3NQb29sOjpoYW5kbGVNZW1vcnlQcmVzc3VyZVdhcm5pbmcpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb24pOgorICAgICAgICAoV2Vi S2l0OjpXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRlcm5hbCk6CisgICAg ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpzZXRXZWJQcm9jZXNzSGFzVXBsb2Fkcyk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpjbGVhcldlYlByb2Nlc3NIYXNVcGxvYWRz KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnNldFdlYlByb2Nlc3NJc1BsYXlp bmdBdWRpYmxlTWVkaWEpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6Y2xlYXJX ZWJQcm9jZXNzSXNQbGF5aW5nQXVkaWJsZU1lZGlhKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Bvb2w6OnNldFVzZVNlcGFyYXRlU2VydmljZVdvcmtlclByb2Nlc3MpOgorCiAyMDIwLTAx LTA3ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBV bnJldmlld2VkLCByb2xsaW5nIG91dCByMjU0MTMyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0KaW5kZXggMzdhMTBhN2VkYTMz OTcwNDk1NDkyY2VlYzcyYTc1NThiYmMzNzRmYy4uYmE0MDRhMjcyZmE1Y2NjNDE3OGEzZTZjMTJh NjNlYjIwNmMxNjBiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev V2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv YS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCkBAIC0xMDcsNiArMTA3LDggQEAgU09GVF9MSU5LX1BS SVZBVEVfRlJBTUVXT1JLKEJhY2tCb2FyZFNlcnZpY2VzKQogU09GVF9MSU5LKEJhY2tCb2FyZFNl cnZpY2VzLCBCS1NEaXNwbGF5QnJpZ2h0bmVzc0dldEN1cnJlbnQsIGZsb2F0LCAoKSwgKCkpOwog I2VuZGlmCiAKKyNkZWZpbmUgV0VCUFJPQ0VTU1BPT0xfUkVMRUFTRV9MT0coY2hhbm5lbCwgZm10 LCAuLi4pIFJFTEVBU0VfTE9HKGNoYW5uZWwsICIlcCAtIFdlYlByb2Nlc3NQb29sOjoiIGZtdCwg dGhpcywgIyNfX1ZBX0FSR1NfXykKKwogbmFtZXNwYWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3Bh Y2UgV2ViQ29yZTsKIApAQCAtNjc5LDcgKzY4MSw3IEBAIGludCB3ZWJQcm9jZXNzVGhyb3VnaHB1 dFFPUygpCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmFw cGxpY2F0aW9uSXNBYm91dFRvU3VzcGVuZCgpCiB7Ci0gICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1 c3BlbnNpb24sICJXZWJQcm9jZXNzUG9vbDo6YXBwbGljYXRpb25Jc0Fib3V0VG9TdXNwZW5kKCkg VGVybWluYXRpbmcgbm9uLWNyaXRpY2FsIHByb2Nlc3NlcyIpOworICAgIFdFQlBST0NFU1NQT09M X1JFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiYXBwbGljYXRpb25Jc0Fib3V0VG9TdXNw ZW5kOiBUZXJtaW5hdGluZyBub24tY3JpdGljYWwgcHJvY2Vzc2VzIik7CiAKICAgICBtX2JhY2tG b3J3YXJkQ2FjaGUtPnBydW5lVG9TaXplKDEpOwogICAgIG1fd2ViUHJvY2Vzc0NhY2hlLT5jbGVh cigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wu Y3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IGMw YWQzY2U3MmE1NjM1OTc4MGZkM2QxZGNkYWRlM2ZkNGMwMTc3MjMuLmYyMmI0YjJjMmFhNzBiYjg4 MTk2MDQzNjA5ZTNjMzYwNzhkMGVlZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQb29sLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUG9vbC5jcHAKQEAgLTEzNiw2ICsxMzYsMTAgQEAKICNpbmNsdWRlIDx3dGYvUmVmQ291 bnRlZExlYWtDb3VudGVyLmg+CiAjZW5kaWYKIAorI2RlZmluZSBXRUJQUk9DRVNTUE9PTF9SRUxF QVNFX0xPRyhjaGFubmVsLCBmbXQsIC4uLikgUkVMRUFTRV9MT0coY2hhbm5lbCwgIiVwIC0gV2Vi UHJvY2Vzc1Bvb2w6OiIgZm10LCB0aGlzLCAjI19fVkFfQVJHU19fKQorI2RlZmluZSBXRUJQUk9D RVNTUE9PTF9SRUxFQVNFX0xPR19FUlJPUihjaGFubmVsLCBmbXQsIC4uLikgUkVMRUFTRV9MT0df RVJST1IoY2hhbm5lbCwgIiVwIC0gV2ViUHJvY2Vzc1Bvb2w6OiIgZm10LCB0aGlzLCAjI19fVkFf QVJHU19fKQorI2RlZmluZSBXRUJQUk9DRVNTUE9PTF9SRUxFQVNFX0xPR19JRl9BTExPV0VEKGNo YW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNFX0xPR19JRihzZXNzaW9uSUQuaXNBbHdheXNPbkxvZ2dp bmdBbGxvd2VkKCksIGNoYW5uZWwsICIlcCAtIFdlYlByb2Nlc3NQb29sOjoiIGZtdCwgdGhpcywg IyNfX1ZBX0FSR1NfXykKKwogbmFtZXNwYWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgV2Vi Q29yZTsKIApAQCAtNzM5LDcgKzc0Myw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmVzdGFibGlz aFdvcmtlckNvbnRleHRDb25uZWN0aW9uVG9OZXR3b3JrUHJvY2VzcyhOZXR3b3JrUHJvCiAKICAg ICBSZWdpc3RyYWJsZURvbWFpbldpdGhTZXNzaW9uSUQgcmVnaXN0cmFibGVEb21haW5XaXRoU2Vz c2lvbklEIHsgUmVnaXN0cmFibGVEb21haW4geyByZWdpc3RyYWJsZURvbWFpbiB9LCBzZXNzaW9u SUQgfTsKICAgICBpZiAobV9zZXJ2aWNlV29ya2VyUHJvY2Vzc2VzLmNvbnRhaW5zKHJlZ2lzdHJh YmxlRG9tYWluV2l0aFNlc3Npb25JRCkpIHsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUYoc2Vzc2lv bklELmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpLCBTZXJ2aWNlV29ya2VyLCAiV2ViUHJvY2Vz c1Bvb2w6OmVzdGFibGlzaFdvcmtlckNvbnRleHRDb25uZWN0aW9uVG9OZXR3b3JrUHJvY2VzcyBw cm9jZXNzIGFscmVhZHkgY3JlYXRlZCIpOworICAgICAgICBXRUJQUk9DRVNTUE9PTF9SRUxFQVNF X0xPR19JRl9BTExPV0VEKFNlcnZpY2VXb3JrZXIsICJlc3RhYmxpc2hXb3JrZXJDb250ZXh0Q29u bmVjdGlvblRvTmV0d29ya1Byb2Nlc3MgcHJvY2VzcyBhbHJlYWR5IGNyZWF0ZWQiKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIApAQCAtNzU5LDcgKzc2Myw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Bv b2w6OmVzdGFibGlzaFdvcmtlckNvbnRleHRDb25uZWN0aW9uVG9OZXR3b3JrUHJvY2VzcyhOZXR3 b3JrUHJvCiAgICAgICAgICAgICBzZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5ID0gcHJvY2Vzcy5n ZXQoKTsKICAgICAgICAgICAgIHNlcnZpY2VXb3JrZXJQcm9jZXNzUHJveHktPmVuYWJsZVNlcnZp Y2VXb3JrZXJzKHVzZXJDb250ZW50Q29udHJvbGxlcklkZW50aWZpZXJGb3JTZXJ2aWNlV29ya2Vy cygpKTsKIAotICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUYoc2Vzc2lvbklELmlzQWx3YXlzT25M b2dnaW5nQWxsb3dlZCgpLCBTZXJ2aWNlV29ya2VyLCAiV2ViUHJvY2Vzc1Bvb2w6OmVzdGFibGlz aFdvcmtlckNvbnRleHRDb25uZWN0aW9uVG9OZXR3b3JrUHJvY2VzcyByZXVzaW5nIGFuIGV4aXN0 aW5nIHdlYiBwcm9jZXNzICVwLCBwcm9jZXNzIGlkZW50aWZpZXIgJWQiLCBzZXJ2aWNlV29ya2Vy UHJvY2Vzc1Byb3h5LCBzZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5LT5wcm9jZXNzSWRlbnRpZmll cigpKTsKKyAgICAgICAgICAgIFdFQlBST0NFU1NQT09MX1JFTEVBU0VfTE9HX0lGX0FMTE9XRUQo U2VydmljZVdvcmtlciwgImVzdGFibGlzaFdvcmtlckNvbnRleHRDb25uZWN0aW9uVG9OZXR3b3Jr UHJvY2VzcyByZXVzaW5nIGFuIGV4aXN0aW5nIHdlYiBwcm9jZXNzIChwcm9jZXNzPSVwLCBQSUQ9 JWQpIiwgc2VydmljZVdvcmtlclByb2Nlc3NQcm94eSwgc2VydmljZVdvcmtlclByb2Nlc3NQcm94 eS0+cHJvY2Vzc0lkZW50aWZpZXIoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQog ICAgIH0KQEAgLTc2OCw3ICs3NzIsNyBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjplc3RhYmxpc2hX b3JrZXJDb250ZXh0Q29ubmVjdGlvblRvTmV0d29ya1Byb2Nlc3MoTmV0d29ya1BybwogICAgICAg ICBhdXRvIG5ld1Byb2Nlc3NQcm94eSA9IFdlYlByb2Nlc3NQcm94eTo6Y3JlYXRlRm9yU2Vydmlj ZVdvcmtlcnMoKnRoaXMsIFdURk1vdmUocmVnaXN0cmFibGVEb21haW4pLCAqd2Vic2l0ZURhdGFT dG9yZSk7CiAgICAgICAgIHNlcnZpY2VXb3JrZXJQcm9jZXNzUHJveHkgPSBuZXdQcm9jZXNzUHJv eHkucHRyKCk7CiAKLSAgICAgICAgUkVMRUFTRV9MT0dfSUYoc2Vzc2lvbklELmlzQWx3YXlzT25M b2dnaW5nQWxsb3dlZCgpLCBTZXJ2aWNlV29ya2VyLCAiV2ViUHJvY2Vzc1Bvb2w6OmVzdGFibGlz aFdvcmtlckNvbnRleHRDb25uZWN0aW9uVG9OZXR3b3JrUHJvY2VzcyBjcmVhdGluZyBhIG5ldyBz ZXJ2aWNlIHdvcmtlciBwcm9jZXNzICVwLCBwcm9jZXNzIGlkZW50aWZpZXIgJWQiLCBzZXJ2aWNl V29ya2VyUHJvY2Vzc1Byb3h5LCBzZXJ2aWNlV29ya2VyUHJvY2Vzc1Byb3h5LT5wcm9jZXNzSWRl bnRpZmllcigpKTsKKyAgICAgICAgV0VCUFJPQ0VTU1BPT0xfUkVMRUFTRV9MT0dfSUZfQUxMT1dF RChTZXJ2aWNlV29ya2VyLCAiZXN0YWJsaXNoV29ya2VyQ29udGV4dENvbm5lY3Rpb25Ub05ldHdv cmtQcm9jZXNzIGNyZWF0aW5nIGEgbmV3IHNlcnZpY2Ugd29ya2VyIHByb2Nlc3MgKHByb2Nlcz0l cCwgUElEPSVkKSIsIHNlcnZpY2VXb3JrZXJQcm9jZXNzUHJveHksIHNlcnZpY2VXb3JrZXJQcm9j ZXNzUHJveHktPnByb2Nlc3NJZGVudGlmaWVyKCkpOwogCiAgICAgICAgIGluaXRpYWxpemVOZXdX ZWJQcm9jZXNzKG5ld1Byb2Nlc3NQcm94eSwgd2Vic2l0ZURhdGFTdG9yZSk7CiAgICAgICAgIG1f cHJvY2Vzc2VzLmFwcGVuZChXVEZNb3ZlKG5ld1Byb2Nlc3NQcm94eSkpOwpAQCAtODQ3LDcgKzg1 MSw3IEBAIFJlZlB0cjxXZWJQcm9jZXNzUHJveHk+IFdlYlByb2Nlc3NQb29sOjp0cnlUYWtlUHJl d2FybWVkUHJvY2VzcyhXZWJzaXRlRGF0YVN0b3JlCiAgICAgLy8gVGhlcmUgaXMgc29tZXRpbWVz IGEgZGVsYXkgdW50aWwgd2UgZ2V0IG5vdGlmaWVkIHRoYXQgYSBwcmV3YXJtZWQgcHJvY2VzcyBo YXMgYmVlbiB0ZXJtaW5hdGVkIChlLmcuIGFmdGVyIHJlc3VtaW5nCiAgICAgLy8gZnJvbSBzdXNw ZW5zaW9uKSBzbyBtYWtlIHN1cmUgdGhlIHByb2Nlc3MgaXMgc3RpbGwgcnVubmluZyBoZXJlIGJl Zm9yZSBkZWNpZGluZyB0byB1c2UgaXQuCiAgICAgaWYgKG1fcHJld2FybWVkUHJvY2Vzcy0+d2Fz VGVybWluYXRlZCgpKSB7Ci0gICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3MsICJOb3Qg dXNpbmcgcHJld2FybWVkIHByb2Nlc3MgJWQgYmVjYXVzZSBpdCBoYXMgYmVlbiB0ZXJtaW5hdGVk IiwgbV9wcmV3YXJtZWRQcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpKTsKKyAgICAgICAgV0VC UFJPQ0VTU1BPT0xfUkVMRUFTRV9MT0dfRVJST1IoUHJvY2VzcywgInRyeVRha2VQcmV3YXJtZWRQ cm9jZXNzOiBOb3QgdXNpbmcgcHJld2FybWVkIHByb2Nlc3MgYmVjYXVzZSBpdCBoYXMgYmVlbiB0 ZXJtaW5hdGVkIChwcm9jZXNzPSVwLCBQSUQ9JWQpIiwgbV9wcmV3YXJtZWRQcm9jZXNzLCBtX3By ZXdhcm1lZFByb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCkpOwogICAgICAgICBtX3ByZXdhcm1l ZFByb2Nlc3MgPSBudWxscHRyOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CkBAIC0x MDc0LDcgKzEwNzgsNyBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpwcmV3YXJtUHJvY2VzcygpCiAg ICAgaWYgKG1fcHJld2FybWVkUHJvY2VzcykKICAgICAgICAgcmV0dXJuOwogCi0gICAgUkVMRUFT RV9MT0coUGVyZm9ybWFuY2VMb2dnaW5nLCAiUHJld2FybWluZyBhIFdlYlByb2Nlc3MgZm9yIHBl cmZvcm1hbmNlIik7CisgICAgV0VCUFJPQ0VTU1BPT0xfUkVMRUFTRV9MT0coUGVyZm9ybWFuY2VM b2dnaW5nLCAicHJld2FybVByb2Nlc3M6IFByZXdhcm1pbmcgYSBXZWJQcm9jZXNzIGZvciBwZXJm b3JtYW5jZSIpOwogICAgIGNyZWF0ZU5ld1dlYlByb2Nlc3MobnVsbHB0ciwgV2ViUHJvY2Vzc1By b3h5OjpJc1ByZXdhcm1lZDo6WWVzKTsKIH0KIApAQCAtMTE3NywxMyArMTE4MSwxMyBAQCBXZWJQ cm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQb29sOjpwcm9jZXNzRm9yUmVnaXN0cmFibGVEb21haW4o V2Vic2l0ZURhdGFTdG9yZSYgdwogCiAgICAgICAgIC8vIENoZWNrIGlmIHdlIGhhdmUgYSBzdXNw ZW5kZWQgcGFnZSBmb3IgdGhlIGdpdmVuIHJlZ2lzdHJhYmxlIGRvbWFpbiBhbmQgdXNlIGl0cyBw cm9jZXNzIGlmIHdlIGRvLCBmb3IgcGVyZm9ybWFuY2UgcmVhc29ucy4KICAgICAgICAgaWYgKGF1 dG8gcHJvY2VzcyA9IFN1c3BlbmRlZFBhZ2VQcm94eTo6ZmluZFJldXNhYmxlU3VzcGVuZGVkUGFn ZVByb2Nlc3MoKnRoaXMsIHJlZ2lzdHJhYmxlRG9tYWluLCB3ZWJzaXRlRGF0YVN0b3JlKSkgewot ICAgICAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5nLCAiVXNpbmcgV2ViUHJvY2Vz cyAlaSBmcm9tIGEgU3VzcGVuZGVkUGFnZSIsIHByb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCkp OworICAgICAgICAgICAgV0VCUFJPQ0VTU1BPT0xfUkVMRUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5n LCAicHJvY2Vzc0ZvclJlZ2lzdHJhYmxlRG9tYWluOiBVc2luZyBXZWJQcm9jZXNzIGZyb20gYSBT dXNwZW5kZWRQYWdlIChwcm9jZXNzPSVwLCBQSUQ9JWkpIiwgcHJvY2Vzcy5nZXQoKSwgcHJvY2Vz cy0+cHJvY2Vzc0lkZW50aWZpZXIoKSk7CiAgICAgICAgICAgICByZXR1cm4gKnByb2Nlc3M7CiAg ICAgICAgIH0KICAgICB9CiAKICAgICBpZiAoYXV0byBwcm9jZXNzID0gdHJ5VGFrZVByZXdhcm1l ZFByb2Nlc3Mod2Vic2l0ZURhdGFTdG9yZSkpIHsKLSAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vz c1N3YXBwaW5nLCAiVXNpbmcgcHJld2FybWVkIHByb2Nlc3MgJWkiLCBwcm9jZXNzLT5wcm9jZXNz SWRlbnRpZmllcigpKTsKKyAgICAgICAgV0VCUFJPQ0VTU1BPT0xfUkVMRUFTRV9MT0coUHJvY2Vz c1N3YXBwaW5nLCAicHJvY2Vzc0ZvclJlZ2lzdHJhYmxlRG9tYWluOiBVc2luZyBwcmV3YXJtZWQg cHJvY2VzcyAocHJvY2Vzcz0lcCwgUElEPSVpKSIsIHByb2Nlc3MuZ2V0KCksIHByb2Nlc3MtPnBy b2Nlc3NJZGVudGlmaWVyKCkpOwogICAgICAgICBpZiAoIXJlZ2lzdHJhYmxlRG9tYWluLmlzRW1w dHkoKSkKICAgICAgICAgICAgIHRyeVByZXdhcm1XaXRoRG9tYWluSW5mb3JtYXRpb24oKnByb2Nl c3MsIHJlZ2lzdHJhYmxlRG9tYWluKTsKICAgICAgICAgcmV0dXJuICpwcm9jZXNzOwpAQCAtMTM5 Nyw3ICsxNDAxLDcgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6ZGlkUmVhY2hHb29kVGltZVRvUHJl d2FybSgpCiAKICAgICBpZiAoTWVtb3J5UHJlc3N1cmVIYW5kbGVyOjpzaW5nbGV0b24oKS5pc1Vu ZGVyTWVtb3J5UHJlc3N1cmUoKSkgewogICAgICAgICBpZiAoIW1fcHJld2FybWVkUHJvY2VzcykK LSAgICAgICAgICAgIFJFTEVBU0VfTE9HKFBlcmZvcm1hbmNlTG9nZ2luZywgIk5vdCBhdXRvbWF0 aWNhbGx5IHByZXdhcm1pbmcgYSBXZWJQcm9jZXNzIGR1ZSB0byBtZW1vcnkgcHJlc3N1cmUiKTsK KyAgICAgICAgICAgIFdFQlBST0NFU1NQT09MX1JFTEVBU0VfTE9HKFBlcmZvcm1hbmNlTG9nZ2lu ZywgImRpZFJlYWNoR29vZFRpbWVUb1ByZXdhcm06IE5vdCBhdXRvbWF0aWNhbGx5IHByZXdhcm1p bmcgYSBXZWJQcm9jZXNzIGR1ZSB0byBtZW1vcnkgcHJlc3N1cmUiKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KIApAQCAtMTQxOCw3ICsxNDIyLDcgQEAgV2ViUHJvY2Vzc1Bvb2w6OlN0YXRpc3Rp Y3MmIFdlYlByb2Nlc3NQb29sOjpzdGF0aXN0aWNzKCkKIAogdm9pZCBXZWJQcm9jZXNzUG9vbDo6 aGFuZGxlTWVtb3J5UHJlc3N1cmVXYXJuaW5nKENyaXRpY2FsKQogewotICAgIFJFTEVBU0VfTE9H KFBlcmZvcm1hbmNlTG9nZ2luZywgIiVwIC0gV2ViUHJvY2Vzc1Bvb2w6OmhhbmRsZU1lbW9yeVBy ZXNzdXJlV2FybmluZyIsIHRoaXMpOworICAgIFdFQlBST0NFU1NQT09MX1JFTEVBU0VfTE9HKFBl cmZvcm1hbmNlTG9nZ2luZywgImhhbmRsZU1lbW9yeVByZXNzdXJlV2FybmluZzoiKTsKIAogICAg IC8vIENsZWFyIGJhY2svZm9yd2FyZCBjYWNoZSBmaXJzdCBhcyBwcm9jZXNzZXMgcmVtb3ZlZCBm cm9tIHRoZSBiYWNrL2ZvcndhcmQgY2FjaGUgd2lsbCBsaWtlbHkKICAgICAvLyBiZSBhZGRlZCB0 byB0aGUgV2ViUHJvY2VzcyBjYWNoZS4KQEAgLTIxMzYsNyArMjE0MCw3IEBAIHZvaWQgV2ViUHJv Y2Vzc1Bvb2w6OnByb2Nlc3NGb3JOYXZpZ2F0aW9uKFdlYlBhZ2VQcm94eSYgcGFnZSwgY29uc3Qg QVBJOjpOYXZpZ2F0CiAgICAgICAgIC8vIFdlIGFyZSBwcm9jZXNzLXN3YXBwaW5nIHNvIGF1dG9t YXRpYyBwcm9jZXNzIHByZXdhcm1pbmcgd291bGQgYmUgYmVuZWZpY2lhbCBpZiB0aGUgY2xpZW50 IGhhcyBub3QgZXhwbGljaXRseSBlbmFibGVkIC8gZGlzYWJsZWQgaXQuCiAgICAgICAgIGJvb2wg ZG9pbmdBbkF1dG9tYXRpY1Byb2Nlc3NTd2FwID0gcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCA9PSBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OjpObyAmJiBwcm9jZXNzLnB0cigpICE9 IHNvdXJjZVByb2Nlc3MucHRyKCk7CiAgICAgICAgIGlmIChkb2luZ0FuQXV0b21hdGljUHJvY2Vz c1N3YXAgJiYgIWNvbmZpZ3VyYXRpb24oKS53YXNBdXRvbWF0aWNQcm9jZXNzV2FybWluZ1NldEJ5 Q2xpZW50KCkgJiYgIWNvbmZpZ3VyYXRpb24oKS5jbGllbnRXb3VsZEJlbmVmaXRGcm9tQXV0b21h dGljUHJvY2Vzc1ByZXdhcm1pbmcoKSkgewotICAgICAgICAgICAgUkVMRUFTRV9MT0coUGVyZm9y bWFuY2VMb2dnaW5nLCAiQXV0b21hdGljYWxseSB0dXJuaW5nIG9uIHByb2Nlc3MgcHJld2FybWlu ZyBiZWNhdXNlIHRoZSBjbGllbnQgd291bGQgYmVuZWZpdCBmcm9tIGl0Iik7CisgICAgICAgICAg ICBXRUJQUk9DRVNTUE9PTF9SRUxFQVNFX0xPRyhQZXJmb3JtYW5jZUxvZ2dpbmcsICJwcm9jZXNz Rm9yTmF2aWdhdGlvbjogQXV0b21hdGljYWxseSB0dXJuaW5nIG9uIHByb2Nlc3MgcHJld2FybWlu ZyBiZWNhdXNlIHRoZSBjbGllbnQgd291bGQgYmVuZWZpdCBmcm9tIGl0Iik7CiAgICAgICAgICAg ICBjb25maWd1cmF0aW9uKCkuc2V0Q2xpZW50V291bGRCZW5lZml0RnJvbUF1dG9tYXRpY1Byb2Nl c3NQcmV3YXJtaW5nKHRydWUpOwogICAgICAgICB9CiAKQEAgLTIyMjQsNyArMjIyOCw3IEBAIHZv aWQgV2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JOYXZpZ2F0aW9uSW50ZXJuYWwoV2ViUGFnZVBy b3h5JiBwYWdlLCBjb25zdCBBUEk6CiAKICAgICBpZiAoc291cmNlVVJMLmlzRW1wdHkoKSAmJiBw YWdlLmNvbmZpZ3VyYXRpb24oKS5yZWxhdGVkUGFnZSgpKSB7CiAgICAgICAgIHNvdXJjZVVSTCA9 IFVSTCB7IHsgfSwgcGFnZS5jb25maWd1cmF0aW9uKCkucmVsYXRlZFBhZ2UoKS0+cGFnZUxvYWRT dGF0ZSgpLnVybCgpIH07Ci0gICAgICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTd2FwcGluZywgIlVz aW5nIHJlbGF0ZWQgcGFnZSAlcCdzIFVSTCBhcyBzb3VyY2UgVVJMIGZvciBwcm9jZXNzIHN3YXAg ZGVjaXNpb24iLCBwYWdlLmNvbmZpZ3VyYXRpb24oKS5yZWxhdGVkUGFnZSgpKTsKKyAgICAgICAg V0VCUFJPQ0VTU1BPT0xfUkVMRUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5nLCAicHJvY2Vzc0Zvck5h dmlnYXRpb25JbnRlcm5hbDogVXNpbmcgcmVsYXRlZCBwYWdlJ3MgVVJMIGFzIHNvdXJjZSBVUkwg Zm9yIHByb2Nlc3Mgc3dhcCBkZWNpc2lvbiAocGFnZT0lcCkiLCBwYWdlLmNvbmZpZ3VyYXRpb24o KS5yZWxhdGVkUGFnZSgpKTsKICAgICB9CiAKICAgICBpZiAoIXNvdXJjZVVSTC5pc1ZhbGlkKCkg fHwgIXRhcmdldFVSTC5pc1ZhbGlkKCkgfHwgc291cmNlVVJMLmlzRW1wdHkoKSB8fCBzb3VyY2VV UkwucHJvdG9jb2xJc0Fib3V0KCkgfHwgdGFyZ2V0UmVnaXN0cmFibGVEb21haW4ubWF0Y2hlcyhz b3VyY2VVUkwpKQpAQCAtMjM0NCwxMCArMjM0OCwxMCBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpz ZXRXZWJQcm9jZXNzSGFzVXBsb2FkcyhQcm9jZXNzSWRlbnRpZmllciBwcm9jZXNzSUQpCiAgICAg aWYgKCFwcm9jZXNzKQogICAgICAgICByZXR1cm47CiAKLSAgICBSRUxFQVNFX0xPRyhQcm9jZXNz U3VzcGVuc2lvbiwgIldlYiBwcm9jZXNzIHBpZCAldSBub3cgaGFzIHVwbG9hZHMgaW4gcHJvZ3Jl c3MiLCAodW5zaWduZWQpcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSk7CisgICAgV0VCUFJP Q0VTU1BPT0xfUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICJzZXRXZWJQcm9jZXNzSGFz VXBsb2FkczogV2ViIHByb2Nlc3Mgbm93IGhhcyB1cGxvYWRzIGluIHByb2dyZXNzIChwcm9jZXNz PSVwLCBQSUQ9JWkpIiwgcHJvY2VzcywgcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSk7CiAK ICAgICBpZiAobV9wcm9jZXNzZXNXaXRoVXBsb2Fkcy5pc0VtcHR5KCkpIHsKLSAgICAgICAgUkVM RUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICJUaGUgbnVtYmVyIG9mIHVwbG9hZHMgaW4gcHJv Z3Jlc3MgaXMgbm93IG9uZS4gVGFraW5nIE5ldHdvcmtpbmcgYW5kIFVJIHByb2Nlc3MgYXNzZXJ0 aW9ucy4iKTsKKyAgICAgICAgV0VCUFJPQ0VTU1BPT0xfUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3Bl bnNpb24sICJzZXRXZWJQcm9jZXNzSGFzVXBsb2FkczogVGhlIG51bWJlciBvZiB1cGxvYWRzIGlu IHByb2dyZXNzIGlzIG5vdyBvbmUuIFRha2luZyBOZXR3b3JraW5nIGFuZCBVSSBwcm9jZXNzIGFz c2VydGlvbnMuIik7CiAKICAgICAgICAgQVNTRVJUKG1fbmV0d29ya1Byb2Nlc3MpOwogICAgICAg ICBtX25ldHdvcmtQcm9jZXNzLT50YWtlVXBsb2FkQXNzZXJ0aW9uKCk7CkBAIC0yMzcwLDEwICsy Mzc0LDEwIEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmNsZWFyV2ViUHJvY2Vzc0hhc1VwbG9hZHMo UHJvY2Vzc0lkZW50aWZpZXIgcHJvY2Vzc0lEKQogCiAgICAgYXV0byogcHJvY2VzcyA9IFdlYlBy b2Nlc3NQcm94eTo6cHJvY2Vzc0ZvcklkZW50aWZpZXIocHJvY2Vzc0lEKTsKICAgICBBU1NFUlRf VU5VU0VEKHByb2Nlc3MsIHByb2Nlc3MpOwotICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5z aW9uLCAiV2ViIHByb2Nlc3MgcGlkICV1IG5vIGxvbmdlciBoYXMgdXBsb2FkcyBpbiBwcm9ncmVz cyIsICh1bnNpZ25lZClwcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpKTsKKyAgICBXRUJQUk9D RVNTUE9PTF9SRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgImNsZWFyV2ViUHJvY2Vzc0hh c1VwbG9hZHM6IFdlYiBwcm9jZXNzIG5vIGxvbmdlciBoYXMgdXBsb2FkcyBpbiBwcm9ncmVzcyAo cHJvY2Vzcz0lcCwgUElEPSVpKSIsIHByb2Nlc3MsIHByb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVy KCkpOwogCiAgICAgaWYgKG1fcHJvY2Vzc2VzV2l0aFVwbG9hZHMuaXNFbXB0eSgpKSB7Ci0gICAg ICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiVGhlIG51bWJlciBvZiB1cGxvYWRz IGluIHByb2dyZXNzIGlzIG5vdyB6ZXJvLiBSZWxlYXNpbmcgTmV0d29ya2luZyBhbmQgVUkgcHJv Y2VzcyBhc3NlcnRpb25zLiIpOworICAgICAgICBXRUJQUk9DRVNTUE9PTF9SRUxFQVNFX0xPRyhQ cm9jZXNzU3VzcGVuc2lvbiwgImNsZWFyV2ViUHJvY2Vzc0hhc1VwbG9hZHM6IFRoZSBudW1iZXIg b2YgdXBsb2FkcyBpbiBwcm9ncmVzcyBpcyBub3cgemVyby4gUmVsZWFzaW5nIE5ldHdvcmtpbmcg YW5kIFVJIHByb2Nlc3MgYXNzZXJ0aW9ucy4iKTsKIAogICAgICAgICBpZiAobV9uZXR3b3JrUHJv Y2VzcykKICAgICAgICAgICAgIG1fbmV0d29ya1Byb2Nlc3MtPmNsZWFyVXBsb2FkQXNzZXJ0aW9u KCk7CkBAIC0yMzg5LDEwICsyMzkzLDEwIEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnNldFdlYlBy b2Nlc3NJc1BsYXlpbmdBdWRpYmxlTWVkaWEoV2ViQ29yZTo6UHJvY2Vzc0lkZW50aWZpCiAgICAg YXV0byogcHJvY2VzcyA9IFdlYlByb2Nlc3NQcm94eTo6cHJvY2Vzc0ZvcklkZW50aWZpZXIocHJv Y2Vzc0lEKTsKICAgICBBU1NFUlQocHJvY2Vzcyk7CiAKLSAgICBSRUxFQVNFX0xPRyhQcm9jZXNz U3VzcGVuc2lvbiwgIldlYiBwcm9jZXNzIHBpZCAldSBpcyBub3cgcGxheWluZyBhdWRpYmxlIG1l ZGlhIiwgKHVuc2lnbmVkKXByb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCkpOworICAgIFdFQlBS T0NFU1NQT09MX1JFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAic2V0V2ViUHJvY2Vzc0lz UGxheWluZ0F1ZGlibGVNZWRpYTogV2ViIHByb2Nlc3MgaXMgbm93IHBsYXlpbmcgYXVkaWJsZSBt ZWRpYSAocHJvY2Vzcz0lcCwgUElEPSVpKSIsIHByb2Nlc3MsIHByb2Nlc3MtPnByb2Nlc3NJZGVu dGlmaWVyKCkpOwogCiAgICAgaWYgKG1fcHJvY2Vzc2VzUGxheWluZ0F1ZGlibGVNZWRpYS5pc0Vt cHR5KCkpIHsKLSAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICJUaGUgbnVt YmVyIG9mIHByb2Nlc3NlcyBwbGF5aW5nIGF1ZGlibGUgbWVkaWEgaXMgbm93IG9uZS4gVGFraW5n IFVJIHByb2Nlc3MgYXNzZXJ0aW9uLiIpOworICAgICAgICBXRUJQUk9DRVNTUE9PTF9SRUxFQVNF X0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgInNldFdlYlByb2Nlc3NJc1BsYXlpbmdBdWRpYmxlTWVk aWE6IFRoZSBudW1iZXIgb2YgcHJvY2Vzc2VzIHBsYXlpbmcgYXVkaWJsZSBtZWRpYSBpcyBub3cg b25lLiBUYWtpbmcgVUkgcHJvY2VzcyBhc3NlcnRpb24uIik7CiAKICAgICAgICAgQVNTRVJUKCFt X3VpUHJvY2Vzc01lZGlhUGxheWJhY2tBc3NlcnRpb24pOwogICAgICAgICBtX3VpUHJvY2Vzc01l ZGlhUGxheWJhY2tBc3NlcnRpb24gPSBtYWtlVW5pcXVlPFByb2Nlc3NBc3NlcnRpb24+KGdldEN1 cnJlbnRQcm9jZXNzSUQoKSwgIldlYktpdCBNZWRpYSBQbGF5YmFjayJfcywgQXNzZXJ0aW9uU3Rh dGU6OkZvcmVncm91bmQsIEFzc2VydGlvblJlYXNvbjo6TWVkaWFQbGF5YmFjayk7CkBAIC0yNDEx LDEwICsyNDE1LDEwIEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmNsZWFyV2ViUHJvY2Vzc0lzUGxh eWluZ0F1ZGlibGVNZWRpYShXZWJDb3JlOjpQcm9jZXNzSWRlbnRpCiAgICAgYXV0byogcHJvY2Vz cyA9IFdlYlByb2Nlc3NQcm94eTo6cHJvY2Vzc0ZvcklkZW50aWZpZXIocHJvY2Vzc0lEKTsKICAg ICBBU1NFUlRfVU5VU0VEKHByb2Nlc3MsIHByb2Nlc3MpOwogCi0gICAgUkVMRUFTRV9MT0coUHJv Y2Vzc1N1c3BlbnNpb24sICJXZWIgcHJvY2VzcyBwaWQgJXUgaXMgbm8gbG9uZ2VyIHBsYXlpbmcg YXVkaWJsZSBtZWRpYSIsICh1bnNpZ25lZClwcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpKTsK KyAgICBXRUJQUk9DRVNTUE9PTF9SRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgImNsZWFy V2ViUHJvY2Vzc0lzUGxheWluZ0F1ZGlibGVNZWRpYTogV2ViIHByb2Nlc3MgaXMgbm8gbG9uZ2Vy IHBsYXlpbmcgYXVkaWJsZSBtZWRpYSAocHJvY2Vzcz0lcCwgUElEPSVpKSIsIHByb2Nlc3MsIHBy b2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCkpOwogCiAgICAgaWYgKG1fcHJvY2Vzc2VzUGxheWlu Z0F1ZGlibGVNZWRpYS5pc0VtcHR5KCkpIHsKLSAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1 c3BlbnNpb24sICJUaGUgbnVtYmVyIG9mIHByb2Nlc3NlcyBwbGF5aW5nIGF1ZGlibGUgbWVkaWEg bm93IHplcm8uIFJlbGVhc2luZyBVSSBwcm9jZXNzIGFzc2VydGlvbi4iKTsKKyAgICAgICAgV0VC UFJPQ0VTU1BPT0xfUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICJjbGVhcldlYlByb2Nl c3NJc1BsYXlpbmdBdWRpYmxlTWVkaWE6IFRoZSBudW1iZXIgb2YgcHJvY2Vzc2VzIHBsYXlpbmcg YXVkaWJsZSBtZWRpYSBub3cgemVyby4gUmVsZWFzaW5nIFVJIHByb2Nlc3MgYXNzZXJ0aW9uLiIp OwogCiAgICAgICAgIEFTU0VSVChtX3VpUHJvY2Vzc01lZGlhUGxheWJhY2tBc3NlcnRpb24pOwog ICAgICAgICBtX3VpUHJvY2Vzc01lZGlhUGxheWJhY2tBc3NlcnRpb24gPSBudWxscHRyOwpAQCAt MjQyNiw3ICsyNDMwLDcgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6c2V0VXNlU2VwYXJhdGVTZXJ2 aWNlV29ya2VyUHJvY2Vzcyhib29sIHVzZVNlcGFyYXRlU2VydmljZVcKICAgICBpZiAobV91c2VT ZXBhcmF0ZVNlcnZpY2VXb3JrZXJQcm9jZXNzID09IHVzZVNlcGFyYXRlU2VydmljZVdvcmtlclBy b2Nlc3MpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJFTEVBU0VfTE9HKFNlcnZpY2VXb3JrZXIs ICJXZWJQcm9jZXNzUG9vbDo6c2V0VXNlU2VwYXJhdGVTZXJ2aWNlV29ya2VyUHJvY2VzcyAlZCIs IHVzZVNlcGFyYXRlU2VydmljZVdvcmtlclByb2Nlc3MpOworICAgIFdFQlBST0NFU1NQT09MX1JF TEVBU0VfTE9HKFNlcnZpY2VXb3JrZXIsICJzZXRVc2VTZXBhcmF0ZVNlcnZpY2VXb3JrZXJQcm9j ZXNzOiAodXNlU2VwYXJhdGVTZXJ2aWNlV29ya2VyUHJvY2Vzcz0lZCkiLCB1c2VTZXBhcmF0ZVNl cnZpY2VXb3JrZXJQcm9jZXNzKTsKIAogICAgIG1fdXNlU2VwYXJhdGVTZXJ2aWNlV29ya2VyUHJv Y2VzcyA9IHVzZVNlcGFyYXRlU2VydmljZVdvcmtlclByb2Nlc3M7CiAjaWYgRU5BQkxFKFNFUlZJ Q0VfV09SS0VSKQo=