205683 2020-01-02 00:28:07 -0800 Reformat WebProcessCache logging 2020-01-02 13:43:38 -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 achristensen cdumez commit-queue webkit-bug-importer oldest_to_newest 1602137 0 krollin 2020-01-02 00:28:07 -0800 Update the format used by WebProcessCache 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: 0x1145ed208 - WebProcessCache::canCacheProcess(): Not caching process 83671 because it does not have an associated registrable domain becomes: 0x1145ed208 - [PID=83671] WebProcessCache::canCacheProcess: Not caching process because it does not have an associated registrable domain 1602138 1 webkit-bug-importer 2020-01-02 00:28:16 -0800 <rdar://problem/58269352> 1602139 2 386598 krollin 2020-01-02 00:30:02 -0800 Created attachment 386598 Patch 1602218 3 386598 commit-queue 2020-01-02 13:43:36 -0800 Comment on attachment 386598 Patch Clearing flags on attachment: 386598 Committed r253981: <https://trac.webkit.org/changeset/253981> 1602219 4 commit-queue 2020-01-02 13:43:38 -0800 All reviewed patches have been landed. Closing bug. 386598 2020-01-02 00:30:02 -0800 2020-01-02 13:43:36 -0800 Patch bug-205683-20200102003001.patch text/plain 13303 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzODg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYwZjg0YzEzOTNmNGYyOTg1 YWE2NmM1YjVmZjg3MWQyYTYzYmMzMmMuLmRkZDEyNmY2ZTlhNWQ3NjAyMGRhYjFkYTg5ZTM2MmM4 YmMxOWZiZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMjAtMDEtMDIgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlZm9ybWF0IFdlYlByb2Nlc3ND YWNoZSBsb2dnaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDU2ODMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4MjY5MzUyPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB0aGUgZm9ybWF0 IHVzZWQgYnkgV2ViUHJvY2Vzc0NhY2hlIGluIGl0cyBSRUxFQVNFX0xPRyBsb2dnaW5nLgorICAg ICAgICBVc2UgdGhlIGZvcm1hdCB1c2VkIGJ5IFdlYlBhZ2VQcm94eSBhbmQgTmV0d29ya1Jlc291 cmNlTG9hZGVyLCB3aGljaAorICAgICAgICBpcyBnZW5lcmFsbHkgb2YgdGhlIGZvcm06CisKKyAg ICAgICAgICAgIDxvYmplY3QtYWRkcmVzcz4gLSBbPHZhbHVlcyB0aGF0IGhlbHAgdGhyZWFkIHRv Z2V0aGVyIG9wZXJhdGlvbnM+XSA8Y2xhc3M+Ojo8bWV0aG9kPjogPG1lc3NhZ2UgYW5kIG90aGVy IHVzZWZ1bCB2YWx1ZXM+CisKKyAgICAgICAgU28sIGZvciBleGFtcGxlOgorCisgICAgICAgICAg ICAweDExNDVlZDIwOCAtIFdlYlByb2Nlc3NDYWNoZTo6Y2FuQ2FjaGVQcm9jZXNzKCk6IE5vdCBj YWNoaW5nIHByb2Nlc3MgODM2NzEgYmVjYXVzZSBpdCBkb2VzIG5vdCBoYXZlIGFuIGFzc29jaWF0 ZWQgcmVnaXN0cmFibGUgZG9tYWluCisKKyAgICAgICAgYmVjb21lczoKKworICAgICAgICAgICAg MHgxMTQ1ZWQyMDggLSBbUElEPTgzNjcxXSBXZWJQcm9jZXNzQ2FjaGU6OmNhbkNhY2hlUHJvY2Vz czogTm90IGNhY2hpbmcgcHJvY2VzcyBiZWNhdXNlIGl0IGRvZXMgbm90IGhhdmUgYW4gYXNzb2Np YXRlZCByZWdpc3RyYWJsZSBkb21haW4KKworICAgICAgICBObyBuZXcgdGVzdHMgLSBubyBhZGRl ZCBvciBjaGFuZ2VkIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJv Y2Vzc0NhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NhY2hlOjpjYW5DYWNo ZVByb2Nlc3MgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ2FjaGU6OmFkZFBy b2Nlc3NJZlBvc3NpYmxlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NhY2hlOjphZGRQ cm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0NhY2hlOjp0YWtlUHJvY2Vzcyk6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDYWNoZTo6dXBkYXRlQ2FwYWNpdHkpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ2FjaGU6OmNsZWFyKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzc0NhY2hlOjpjbGVhckFsbFByb2Nlc3Nlc0ZvclNlc3Npb24pOgorICAgICAgICAo V2ViS2l0OjpXZWJQcm9jZXNzQ2FjaGU6OnNldEFwcGxpY2F0aW9uSXNBY3RpdmUpOgorICAgICAg ICAoV2ViS2l0OjpXZWJQcm9jZXNzQ2FjaGU6OnJlbW92ZVByb2Nlc3MpOgorCiAyMDIwLTAxLTAx ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWZvcm1hdCBX ZWJSZXNvdXJjZUxvYWRlciBsb2dnaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzQ2FjaGUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc0NhY2hlLmNwcAppbmRleCAyZTkyZDBmNDY2NWY4YjRjY2Y5NGUzOTVhNTQ5NDc1ZTMyYjNk Y2QzLi4xYzgwNjMxZTNhMTYyMTAxODNlNjQ5MzFhYmJmYzkwNTQyNjVlYzNhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzQ2FjaGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NDYWNoZS5jcHAKQEAgLTMzLDYgKzMzLDkgQEAK ICNpbmNsdWRlIDx3dGYvUkFNU2l6ZS5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4K IAorI2RlZmluZSBXRUJQUk9DRVNTQ0FDSEVfUkVMRUFTRV9MT0coZm10LCAuLi4pIFJFTEVBU0Vf TE9HKFByb2Nlc3NTd2FwcGluZywgIiVwIC0gW1BJRD0lZF0gV2ViUHJvY2Vzc0NhY2hlOjoiIGZt dCwgdGhpcywgIyNfX1ZBX0FSR1NfXykKKyNkZWZpbmUgV0VCUFJPQ0VTU0NBQ0hFX1JFTEVBU0Vf TE9HX0VSUk9SKGZtdCwgLi4uKSBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3dhcHBpbmcsICIl cCAtIFtQSUQ9JWRdIFdlYlByb2Nlc3NDYWNoZTo6IiBmbXQsIHRoaXMsICMjX19WQV9BUkdTX18p CisKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBTZWNvbmRzIFdlYlByb2Nlc3NDYWNoZTo6Y2FjaGVk UHJvY2Vzc0xpZmV0aW1lIHsgMzBfbWluIH07CkBAIC01MywyMiArNTYsMjQgQEAgV2ViUHJvY2Vz c0NhY2hlOjpXZWJQcm9jZXNzQ2FjaGUoV2ViUHJvY2Vzc1Bvb2wmIHByb2Nlc3NQb29sKQogCiBi b29sIFdlYlByb2Nlc3NDYWNoZTo6Y2FuQ2FjaGVQcm9jZXNzKFdlYlByb2Nlc3NQcm94eSYgcHJv Y2VzcykgY29uc3QKIHsKLSAgICBpZiAoIWNhcGFjaXR5KCkpCisgICAgaWYgKCFjYXBhY2l0eSgp KSB7CisgICAgICAgIFdFQlBST0NFU1NDQUNIRV9SRUxFQVNFX0xPRygiY2FuQ2FjaGVQcm9jZXNz OiBOb3QgY2FjaGluZyBwcm9jZXNzIGJlY2F1c2UgdGhlIGNhY2hlIGhhcyBubyBjYXBhY2l0eSIs IHByb2Nlc3MucHJvY2Vzc0lkZW50aWZpZXIoKSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICB9CiAKICAgICBpZiAocHJvY2Vzcy5yZWdpc3RyYWJsZURvbWFpbigpLmlzRW1wdHkoKSkgewot ICAgICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3dhcHBpbmcsICIlcCAtIFdlYlByb2Nlc3NDYWNo ZTo6Y2FuQ2FjaGVQcm9jZXNzKCk6IE5vdCBjYWNoaW5nIHByb2Nlc3MgJWkgYmVjYXVzZSBpdCBk b2VzIG5vdCBoYXZlIGFuIGFzc29jaWF0ZWQgcmVnaXN0cmFibGUgZG9tYWluIiwgdGhpcywgcHJv Y2Vzcy5wcm9jZXNzSWRlbnRpZmllcigpKTsKKyAgICAgICAgV0VCUFJPQ0VTU0NBQ0hFX1JFTEVB U0VfTE9HKCJjYW5DYWNoZVByb2Nlc3M6IE5vdCBjYWNoaW5nIHByb2Nlc3MgYmVjYXVzZSBpdCBk b2VzIG5vdCBoYXZlIGFuIGFzc29jaWF0ZWQgcmVnaXN0cmFibGUgZG9tYWluIiwgcHJvY2Vzcy5w cm9jZXNzSWRlbnRpZmllcigpKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAogICAg IGlmIChNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnNpbmdsZXRvbigpLmlzVW5kZXJNZW1vcnlQcmVz c3VyZSgpKSB7Ci0gICAgICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTd2FwcGluZywgIiVwIC0gV2Vi UHJvY2Vzc0NhY2hlOjpjYW5DYWNoZVByb2Nlc3MoKTogTm90IGNhY2hpbmcgcHJvY2VzcyAlaSBi ZWNhdXNlIHdlIGFyZSB1bmRlciBtZW1vcnkgcHJlc3N1cmUiLCB0aGlzLCBwcm9jZXNzLnByb2Nl c3NJZGVudGlmaWVyKCkpOworICAgICAgICBXRUJQUk9DRVNTQ0FDSEVfUkVMRUFTRV9MT0coImNh bkNhY2hlUHJvY2VzczogTm90IGNhY2hpbmcgcHJvY2VzcyBiZWNhdXNlIHdlIGFyZSB1bmRlciBt ZW1vcnkgcHJlc3N1cmUiLCBwcm9jZXNzLnByb2Nlc3NJZGVudGlmaWVyKCkpOwogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgYXV0byBzZXNzaW9uSUQgPSBwcm9jZXNzLndlYnNp dGVEYXRhU3RvcmUoKS5zZXNzaW9uSUQoKTsKICAgICBpZiAoc2Vzc2lvbklELmlzRXBoZW1lcmFs KCkgJiYgIXByb2Nlc3MucHJvY2Vzc1Bvb2woKS5oYXNQYWdlc1VzaW5nV2Vic2l0ZURhdGFTdG9y ZShwcm9jZXNzLndlYnNpdGVEYXRhU3RvcmUoKSkpIHsKLSAgICAgICAgUkVMRUFTRV9MT0coUHJv Y2Vzc1N3YXBwaW5nLCAiJXAgLSBXZWJQcm9jZXNzQ2FjaGU6OmNhbkNhY2hlUHJvY2VzcygpOiBO b3QgY2FjaGluZyBwcm9jZXNzICVpIGJlY2F1c2UgdGhpcyBzZXNzaW9uIGhhcyBiZWVuIGRlc3Ry b3llZCIsIHRoaXMsIHByb2Nlc3MucHJvY2Vzc0lkZW50aWZpZXIoKSk7CisgICAgICAgIFdFQlBS T0NFU1NDQUNIRV9SRUxFQVNFX0xPRygiY2FuQ2FjaGVQcm9jZXNzOiBOb3QgY2FjaGluZyBwcm9j ZXNzIGJlY2F1c2UgdGhpcyBzZXNzaW9uIGhhcyBiZWVuIGRlc3Ryb3llZCIsIHByb2Nlc3MucHJv Y2Vzc0lkZW50aWZpZXIoKSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKQEAgLTg3 LDE0ICs5MiwxNCBAQCBib29sIFdlYlByb2Nlc3NDYWNoZTo6YWRkUHJvY2Vzc0lmUG9zc2libGUo UmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzKQogICAgIHVpbnQ2NF90IHJlcXVlc3RJZGVu dGlmaWVyID0gZ2VuZXJhdGVBZGRSZXF1ZXN0SWRlbnRpZmllcigpOwogICAgIG1fcGVuZGluZ0Fk ZFJlcXVlc3RzLmFkZChyZXF1ZXN0SWRlbnRpZmllciwgbWFrZVVuaXF1ZTxDYWNoZWRQcm9jZXNz Pihwcm9jZXNzLmNvcHlSZWYoKSkpOwogCi0gICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5n LCAiJXAgLSBXZWJQcm9jZXNzQ2FjaGU6OmFkZFByb2Nlc3NJZlBvc3NpYmxlKCk6IENoZWNraW5n IGlmIHByb2Nlc3MgJWkgaXMgcmVzcG9uc2l2ZSBiZWZvcmUgY2FjaGluZyBpdC4uLiIsIHRoaXMs IHByb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCkpOworICAgIFdFQlBST0NFU1NDQUNIRV9SRUxF QVNFX0xPRygiYWRkUHJvY2Vzc0lmUG9zc2libGU6IENoZWNraW5nIGlmIHByb2Nlc3MgaXMgcmVz cG9uc2l2ZSBiZWZvcmUgY2FjaGluZyBpdCIsIHByb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCkp OwogICAgIHByb2Nlc3MtPmlzUmVzcG9uc2l2ZShbdGhpcywgcHJvY2Vzc1Bvb2wgPSBtYWtlUmVm KHByb2Nlc3MtPnByb2Nlc3NQb29sKCkpLCByZXF1ZXN0SWRlbnRpZmllcl0oYm9vbCBpc1Jlc3Bv bnNpdmUpIHsKICAgICAgICAgYXV0byBjYWNoZWRQcm9jZXNzID0gbV9wZW5kaW5nQWRkUmVxdWVz dHMudGFrZShyZXF1ZXN0SWRlbnRpZmllcik7CiAgICAgICAgIGlmICghY2FjaGVkUHJvY2VzcykK ICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBpZiAoIWlzUmVzcG9uc2l2ZSkgewotICAg ICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoUHJvY2Vzc1N3YXBwaW5nLCAiJXAgLSBXZWJQcm9j ZXNzQ2FjaGU6OmFkZFByb2Nlc3NJZlBvc3NpYmxlKCk6IE5vdCBjYWNoaW5nIHByb2Nlc3MgJWkg YmVjYXVzZSBpdCBpcyBub3QgcmVzcG9uc2l2ZSIsICZwcm9jZXNzUG9vbC0+d2ViUHJvY2Vzc0Nh Y2hlKCksIGNhY2hlZFByb2Nlc3MtPnByb2Nlc3MoKS5wcm9jZXNzSWRlbnRpZmllcigpKTsKKyAg ICAgICAgICAgIFdFQlBST0NFU1NDQUNIRV9SRUxFQVNFX0xPR19FUlJPUigiYWRkUHJvY2Vzc0lm UG9zc2libGUoKTogTm90IGNhY2hpbmcgcHJvY2VzcyBiZWNhdXNlIGl0IGlzIG5vdCByZXNwb25z aXZlIiwgY2FjaGVkUHJvY2Vzcy0+cHJvY2VzcygpLnByb2Nlc3NJZGVudGlmaWVyKCkpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIHByb2Nlc3NQb29sLT53ZWJQcm9j ZXNzQ2FjaGUoKS5hZGRQcm9jZXNzKFdURk1vdmUoY2FjaGVkUHJvY2VzcykpOwpAQCAtMTE1LDE1 ICsxMjAsMTUgQEAgYm9vbCBXZWJQcm9jZXNzQ2FjaGU6OmFkZFByb2Nlc3Moc3RkOjp1bmlxdWVf cHRyPENhY2hlZFByb2Nlc3M+JiYgY2FjaGVkUHJvY2VzcykKICAgICBSRUxFQVNFX0FTU0VSVCgh cmVnaXN0cmFibGVEb21haW4uaXNFbXB0eSgpKTsKIAogICAgIGlmIChhdXRvIHByZXZpb3VzUHJv Y2VzcyA9IG1fcHJvY2Vzc2VzUGVyUmVnaXN0cmFibGVEb21haW4udGFrZShyZWdpc3RyYWJsZURv bWFpbikpCi0gICAgICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTd2FwcGluZywgIiVwIC0gV2ViUHJv Y2Vzc0NhY2hlOjphZGRQcm9jZXNzKCk6IEV2aWN0aW5nIHByb2Nlc3MgJWkgZnJvbSBXZWJQcm9j ZXNzIGNhY2hlIGJlY2F1c2UgYSBuZXcgcHJvY2VzcyB3YXMgYWRkZWQgZm9yIHRoZSBzYW1lIGRv bWFpbiIsIHRoaXMsIHByZXZpb3VzUHJvY2Vzcy0+cHJvY2VzcygpLnByb2Nlc3NJZGVudGlmaWVy KCkpOworICAgICAgICBXRUJQUk9DRVNTQ0FDSEVfUkVMRUFTRV9MT0coImFkZFByb2Nlc3M6IEV2 aWN0aW5nIHByb2Nlc3MgZnJvbSBXZWJQcm9jZXNzIGNhY2hlIGJlY2F1c2UgYSBuZXcgcHJvY2Vz cyB3YXMgYWRkZWQgZm9yIHRoZSBzYW1lIGRvbWFpbiIsIHByZXZpb3VzUHJvY2Vzcy0+cHJvY2Vz cygpLnByb2Nlc3NJZGVudGlmaWVyKCkpOwogCiAgICAgd2hpbGUgKG1fcHJvY2Vzc2VzUGVyUmVn aXN0cmFibGVEb21haW4uc2l6ZSgpID49IGNhcGFjaXR5KCkpIHsKICAgICAgICAgYXV0byBpdCA9 IG1fcHJvY2Vzc2VzUGVyUmVnaXN0cmFibGVEb21haW4ucmFuZG9tKCk7Ci0gICAgICAgIFJFTEVB U0VfTE9HKFByb2Nlc3NTd2FwcGluZywgIiVwIC0gV2ViUHJvY2Vzc0NhY2hlOjphZGRQcm9jZXNz KCk6IEV2aWN0aW5nIHByb2Nlc3MgJWkgZnJvbSBXZWJQcm9jZXNzIGNhY2hlIGJlY2F1c2UgY2Fw YWNpdHkgd2FzIHJlYWNoZWQiLCB0aGlzLCBpdC0+dmFsdWUtPnByb2Nlc3MoKS5wcm9jZXNzSWRl bnRpZmllcigpKTsKKyAgICAgICAgV0VCUFJPQ0VTU0NBQ0hFX1JFTEVBU0VfTE9HKCJhZGRQcm9j ZXNzOiBFdmljdGluZyBwcm9jZXNzIGZyb20gV2ViUHJvY2VzcyBjYWNoZSBiZWNhdXNlIGNhcGFj aXR5IHdhcyByZWFjaGVkIiwgaXQtPnZhbHVlLT5wcm9jZXNzKCkucHJvY2Vzc0lkZW50aWZpZXIo KSk7CiAgICAgICAgIG1fcHJvY2Vzc2VzUGVyUmVnaXN0cmFibGVEb21haW4ucmVtb3ZlKGl0KTsK ICAgICB9CiAKLSAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3dhcHBpbmcsICIlcCAtIFdlYlByb2Nl c3NDYWNoZTo6YWRkUHJvY2VzczogQWRkZWQgcHJvY2VzcyAlaSB0byBXZWJQcm9jZXNzIGNhY2hl LCBjYWNoZSBzaXplOiBbJXUgLyAldV0iLCB0aGlzLCBjYWNoZWRQcm9jZXNzLT5wcm9jZXNzKCku cHJvY2Vzc0lkZW50aWZpZXIoKSwgc2l6ZSgpICsgMSwgY2FwYWNpdHkoKSk7CisgICAgV0VCUFJP Q0VTU0NBQ0hFX1JFTEVBU0VfTE9HKCJhZGRQcm9jZXNzOiBBZGRlZCBwcm9jZXNzIHRvIFdlYlBy b2Nlc3MgY2FjaGUgKHNpemU9JXUsIGNhcGFjaXR5PSV1KSIsIGNhY2hlZFByb2Nlc3MtPnByb2Nl c3MoKS5wcm9jZXNzSWRlbnRpZmllcigpLCBzaXplKCkgKyAxLCBjYXBhY2l0eSgpKTsKICAgICBt X3Byb2Nlc3Nlc1BlclJlZ2lzdHJhYmxlRG9tYWluLmFkZChyZWdpc3RyYWJsZURvbWFpbiwgV1RG TW92ZShjYWNoZWRQcm9jZXNzKSk7CiAKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTE0MCw3ICsxNDUs NyBAQCBSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNzQ2FjaGU6OnRha2VQcm9jZXNz KGNvbnN0IFdlYkNvcmU6OlJlZ2lzdHJhYmxlRAogCiAgICAgYXV0byBwcm9jZXNzID0gaXQtPnZh bHVlLT50YWtlUHJvY2VzcygpOwogICAgIG1fcHJvY2Vzc2VzUGVyUmVnaXN0cmFibGVEb21haW4u cmVtb3ZlKGl0KTsKLSAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3dhcHBpbmcsICIlcCAtIFdlYlBy b2Nlc3NDYWNoZTo6dGFrZVByb2Nlc3M6IFRha2luZyBwcm9jZXNzICVpIGZyb20gV2ViUHJvY2Vz cyBjYWNoZSwgY2FjaGUgc2l6ZTogWyV1IC8gJXVdIiwgdGhpcywgcHJvY2Vzcy0+cHJvY2Vzc0lk ZW50aWZpZXIoKSwgc2l6ZSgpLCBjYXBhY2l0eSgpKTsKKyAgICBXRUJQUk9DRVNTQ0FDSEVfUkVM RUFTRV9MT0coInRha2VQcm9jZXNzOiBUYWtpbmcgcHJvY2VzcyBmcm9tIFdlYlByb2Nlc3MgY2Fj aGUgKHNpemU9JXUsIGNhcGFjaXR5PSV1KSIsIHByb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCks IHNpemUoKSwgY2FwYWNpdHkoKSk7CiAKICAgICBBU1NFUlQoIXByb2Nlc3MtPnBhZ2VDb3VudCgp KTsKICAgICBBU1NFUlQoIXByb2Nlc3MtPnByb3Zpc2lvbmFsUGFnZUNvdW50KCkpOwpAQCAtMTUz LDIxICsxNTgsMjEgQEAgdm9pZCBXZWJQcm9jZXNzQ2FjaGU6OnVwZGF0ZUNhcGFjaXR5KFdlYlBy b2Nlc3NQb29sJiBwcm9jZXNzUG9vbCkKIHsKICAgICBpZiAoIXByb2Nlc3NQb29sLmNvbmZpZ3Vy YXRpb24oKS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb24oKSB8fCAhcHJvY2Vzc1Bvb2wuY29uZmln dXJhdGlvbigpLnVzZXNXZWJQcm9jZXNzQ2FjaGUoKSB8fCBMZWdhY3lHbG9iYWxTZXR0aW5nczo6 c2luZ2xldG9uKCkuY2FjaGVNb2RlbCgpICE9IENhY2hlTW9kZWw6OlByaW1hcnlXZWJCcm93c2Vy KSB7CiAgICAgICAgIGlmICghcHJvY2Vzc1Bvb2wuY29uZmlndXJhdGlvbigpLnByb2Nlc3NTd2Fw c09uTmF2aWdhdGlvbigpKQotICAgICAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5n LCAiJXAgLSBXZWJQcm9jZXNzQ2FjaGU6OnVwZGF0ZUNhcGFjaXR5OiBDYWNoZSBpcyBkaXNhYmxl ZCBiZWNhdXNlIHByb2Nlc3Mgc3dhcCBvbiBuYXZpZ2F0aW9uIGlzIGRpc2FibGVkIiwgdGhpcyk7 CisgICAgICAgICAgICBXRUJQUk9DRVNTQ0FDSEVfUkVMRUFTRV9MT0coInVwZGF0ZUNhcGFjaXR5 OiBDYWNoZSBpcyBkaXNhYmxlZCBiZWNhdXNlIHByb2Nlc3Mgc3dhcCBvbiBuYXZpZ2F0aW9uIGlz IGRpc2FibGVkIiwgMCk7CiAgICAgICAgIGVsc2UgaWYgKCFwcm9jZXNzUG9vbC5jb25maWd1cmF0 aW9uKCkudXNlc1dlYlByb2Nlc3NDYWNoZSgpKQotICAgICAgICAgICAgUkVMRUFTRV9MT0coUHJv Y2Vzc1N3YXBwaW5nLCAiJXAgLSBXZWJQcm9jZXNzQ2FjaGU6OnVwZGF0ZUNhcGFjaXR5OiBDYWNo ZSBpcyBkaXNhYmxlZCBieSBjbGllbnQiLCB0aGlzKTsKKyAgICAgICAgICAgIFdFQlBST0NFU1ND QUNIRV9SRUxFQVNFX0xPRygidXBkYXRlQ2FwYWNpdHk6IENhY2hlIGlzIGRpc2FibGVkIGJ5IGNs aWVudCIsIDApOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBSRUxFQVNFX0xPRyhQcm9jZXNz U3dhcHBpbmcsICIlcCAtIFdlYlByb2Nlc3NDYWNoZTo6dXBkYXRlQ2FwYWNpdHk6IENhY2hlIGlz IGRpc2FibGVkIGJlY2F1c2UgY2FjaGUgbW9kZWwgaXMgbm90IFByaW1hcnlXZWJCcm93c2VyIiwg dGhpcyk7CisgICAgICAgICAgICBXRUJQUk9DRVNTQ0FDSEVfUkVMRUFTRV9MT0coInVwZGF0ZUNh cGFjaXR5OiBDYWNoZSBpcyBkaXNhYmxlZCBiZWNhdXNlIGNhY2hlIG1vZGVsIGlzIG5vdCBQcmlt YXJ5V2ViQnJvd3NlciIsIDApOwogICAgICAgICBtX2NhcGFjaXR5ID0gMDsKICAgICB9IGVsc2Ug ewogICAgICAgICBzaXplX3QgbWVtb3J5U2l6ZSA9IHJhbVNpemUoKSAvIEdCOwogICAgICAgICBp ZiAobWVtb3J5U2l6ZSA8IDMpIHsKICAgICAgICAgICAgIG1fY2FwYWNpdHkgPSAwOwotICAgICAg ICAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5nLCAiJXAgLSBXZWJQcm9jZXNzQ2FjaGU6 OnVwZGF0ZUNhcGFjaXR5OiBDYWNoZSBpcyBkaXNhYmxlZCBiZWNhdXNlIGRldmljZSBkb2VzIG5v dCBoYXZlIGVub3VnaCBSQU0iLCB0aGlzKTsKKyAgICAgICAgICAgIFdFQlBST0NFU1NDQUNIRV9S RUxFQVNFX0xPRygidXBkYXRlQ2FwYWNpdHk6IENhY2hlIGlzIGRpc2FibGVkIGJlY2F1c2UgZGV2 aWNlIGRvZXMgbm90IGhhdmUgZW5vdWdoIFJBTSIsIDApOwogICAgICAgICB9IGVsc2UgewogICAg ICAgICAgICAgLy8gQWxsb3cgNCBwcm9jZXNzZXMgaW4gdGhlIGNhY2hlIHBlciBHQiBvZiBSQU0s IHVwIHRvIDMwIHByb2Nlc3Nlcy4KICAgICAgICAgICAgIG1fY2FwYWNpdHkgPSBzdGQ6Om1pbjx1 bnNpZ25lZD4obWVtb3J5U2l6ZSAqIDQsIDMwKTsKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HKFBy b2Nlc3NTd2FwcGluZywgIiVwIC0gV2ViUHJvY2Vzc0NhY2hlOjp1cGRhdGVDYXBhY2l0eTogQ2Fj aGUgaGFzIGEgY2FwYWNpdHkgb2YgJXUgcHJvY2Vzc2VzIiwgdGhpcywgY2FwYWNpdHkoKSk7Cisg ICAgICAgICAgICBXRUJQUk9DRVNTQ0FDSEVfUkVMRUFTRV9MT0coInVwZGF0ZUNhcGFjaXR5OiBD YWNoZSBoYXMgYSBjYXBhY2l0eSBvZiAldSBwcm9jZXNzZXMiLCAwLCBjYXBhY2l0eSgpKTsKICAg ICAgICAgfQogICAgIH0KIApAQCAtMTgwLDcgKzE4NSw3IEBAIHZvaWQgV2ViUHJvY2Vzc0NhY2hl OjpjbGVhcigpCiAgICAgaWYgKG1fcGVuZGluZ0FkZFJlcXVlc3RzLmlzRW1wdHkoKSAmJiBtX3By b2Nlc3Nlc1BlclJlZ2lzdHJhYmxlRG9tYWluLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5nLCAiJXAgLSBXZWJQcm9jZXNzQ2FjaGU6 OmNsZWFyKCkgZXZpY3RpbmcgJXUgcHJvY2Vzc2VzIiwgdGhpcywgbV9wZW5kaW5nQWRkUmVxdWVz dHMuc2l6ZSgpICsgbV9wcm9jZXNzZXNQZXJSZWdpc3RyYWJsZURvbWFpbi5zaXplKCkpOworICAg IFdFQlBST0NFU1NDQUNIRV9SRUxFQVNFX0xPRygiY2xlYXI6IEV2aWN0aW5nICV1IHByb2Nlc3Nl cyIsIDAsIG1fcGVuZGluZ0FkZFJlcXVlc3RzLnNpemUoKSArIG1fcHJvY2Vzc2VzUGVyUmVnaXN0 cmFibGVEb21haW4uc2l6ZSgpKTsKICAgICBtX3BlbmRpbmdBZGRSZXF1ZXN0cy5jbGVhcigpOwog ICAgIG1fcHJvY2Vzc2VzUGVyUmVnaXN0cmFibGVEb21haW4uY2xlYXIoKTsKIH0KQEAgLTE5MCw3 ICsxOTUsNyBAQCB2b2lkIFdlYlByb2Nlc3NDYWNoZTo6Y2xlYXJBbGxQcm9jZXNzZXNGb3JTZXNz aW9uKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkKICAgICBWZWN0b3I8V2ViQ29yZTo6UmVnaXN0 cmFibGVEb21haW4+IGtleXNUb1JlbW92ZTsKICAgICBmb3IgKGF1dG8mIHBhaXIgOiBtX3Byb2Nl c3Nlc1BlclJlZ2lzdHJhYmxlRG9tYWluKSB7CiAgICAgICAgIGlmIChwYWlyLnZhbHVlLT5wcm9j ZXNzKCkud2Vic2l0ZURhdGFTdG9yZSgpLnNlc3Npb25JRCgpID09IHNlc3Npb25JRCkgewotICAg ICAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5nLCAiJXAgLSBXZWJQcm9jZXNzQ2Fj aGU6OmNsZWFyQWxsUHJvY2Vzc2VzRm9yU2Vzc2lvbigpIGV2aWN0aW5nIHByb2Nlc3MgJWkgYmVj YXVzZSBpdHMgc2Vzc2lvbiB3YXMgZGVzdHJveWVkIiwgdGhpcywgcGFpci52YWx1ZS0+cHJvY2Vz cygpLnByb2Nlc3NJZGVudGlmaWVyKCkpOworICAgICAgICAgICAgV0VCUFJPQ0VTU0NBQ0hFX1JF TEVBU0VfTE9HKCJjbGVhckFsbFByb2Nlc3Nlc0ZvclNlc3Npb246IEV2aWN0aW5nIHByb2Nlc3Mg YmVjYXVzZSBpdHMgc2Vzc2lvbiB3YXMgZGVzdHJveWVkIiwgcGFpci52YWx1ZS0+cHJvY2Vzcygp LnByb2Nlc3NJZGVudGlmaWVyKCkpOwogICAgICAgICAgICAga2V5c1RvUmVtb3ZlLmFwcGVuZChw YWlyLmtleSk7CiAgICAgICAgIH0KICAgICB9CkBAIC0yMDAsNyArMjA1LDcgQEAgdm9pZCBXZWJQ cm9jZXNzQ2FjaGU6OmNsZWFyQWxsUHJvY2Vzc2VzRm9yU2Vzc2lvbihQQUw6OlNlc3Npb25JRCBz ZXNzaW9uSUQpCiAgICAgVmVjdG9yPHVpbnQ2NF90PiBwZW5kaW5nUmVxdWVzdHNUb1JlbW92ZTsK ICAgICBmb3IgKGF1dG8mIHBhaXIgOiBtX3BlbmRpbmdBZGRSZXF1ZXN0cykgewogICAgICAgICBp ZiAocGFpci52YWx1ZS0+cHJvY2VzcygpLndlYnNpdGVEYXRhU3RvcmUoKS5zZXNzaW9uSUQoKSA9 PSBzZXNzaW9uSUQpIHsKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTd2FwcGluZywg IiVwIC0gV2ViUHJvY2Vzc0NhY2hlOjpjbGVhckFsbFByb2Nlc3Nlc0ZvclNlc3Npb24oKSBldmlj dGluZyBwcm9jZXNzICVpIGJlY2F1c2UgaXRzIHNlc3Npb24gd2FzIGRlc3Ryb3llZCIsIHRoaXMs IHBhaXIudmFsdWUtPnByb2Nlc3MoKS5wcm9jZXNzSWRlbnRpZmllcigpKTsKKyAgICAgICAgICAg IFdFQlBST0NFU1NDQUNIRV9SRUxFQVNFX0xPRygiY2xlYXJBbGxQcm9jZXNzZXNGb3JTZXNzaW9u OiBFdmljdGluZyBwcm9jZXNzIGJlY2F1c2UgaXRzIHNlc3Npb24gd2FzIGRlc3Ryb3llZCIsIHBh aXIudmFsdWUtPnByb2Nlc3MoKS5wcm9jZXNzSWRlbnRpZmllcigpKTsKICAgICAgICAgICAgIHBl bmRpbmdSZXF1ZXN0c1RvUmVtb3ZlLmFwcGVuZChwYWlyLmtleSk7CiAgICAgICAgIH0KICAgICB9 CkBAIC0yMTAsNyArMjE1LDcgQEAgdm9pZCBXZWJQcm9jZXNzQ2FjaGU6OmNsZWFyQWxsUHJvY2Vz c2VzRm9yU2Vzc2lvbihQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQpCiAKIHZvaWQgV2ViUHJvY2Vz c0NhY2hlOjpzZXRBcHBsaWNhdGlvbklzQWN0aXZlKGJvb2wgaXNBY3RpdmUpCiB7Ci0gICAgUkVM RUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5nLCAiJXAgLSBXZWJQcm9jZXNzQ2FjaGU6OnNldEFwcGxp Y2F0aW9uSXNBY3RpdmUoJWQpIiwgdGhpcywgaXNBY3RpdmUpOworICAgIFdFQlBST0NFU1NDQUNI RV9SRUxFQVNFX0xPRygic2V0QXBwbGljYXRpb25Jc0FjdGl2ZTogKGlzQWN0aXZlPSVkKSIsIDAs IGlzQWN0aXZlKTsKICAgICBpZiAoaXNBY3RpdmUpCiAgICAgICAgIG1fZXZpY3Rpb25UaW1lci5z dG9wKCk7CiAgICAgZWxzZSBpZiAoIW1fcHJvY2Vzc2VzUGVyUmVnaXN0cmFibGVEb21haW4uaXNF bXB0eSgpKQpAQCAtMjIwLDcgKzIyNSw3IEBAIHZvaWQgV2ViUHJvY2Vzc0NhY2hlOjpzZXRBcHBs aWNhdGlvbklzQWN0aXZlKGJvb2wgaXNBY3RpdmUpCiB2b2lkIFdlYlByb2Nlc3NDYWNoZTo6cmVt b3ZlUHJvY2VzcyhXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIFNob3VsZFNodXREb3duUHJvY2Vz cyBzaG91bGRTaHV0RG93blByb2Nlc3MpCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQoIXByb2Nlc3Mu cmVnaXN0cmFibGVEb21haW4oKS5pc0VtcHR5KCkpOwotICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NT d2FwcGluZywgIiVwIC0gV2ViUHJvY2Vzc0NhY2hlOjpldmljdFByb2Nlc3MoKTogRXZpY3Rpbmcg cHJvY2VzcyAlaSBmcm9tIFdlYlByb2Nlc3MgY2FjaGUgYmVjYXVzZSBpdCBleHBpcmVkIiwgdGhp cywgcHJvY2Vzcy5wcm9jZXNzSWRlbnRpZmllcigpKTsKKyAgICBXRUJQUk9DRVNTQ0FDSEVfUkVM RUFTRV9MT0coInJlbW92ZVByb2Nlc3M6IEV2aWN0aW5nIHByb2Nlc3MgZnJvbSBXZWJQcm9jZXNz IGNhY2hlIGJlY2F1c2UgaXQgZXhwaXJlZCIsIHByb2Nlc3MucHJvY2Vzc0lkZW50aWZpZXIoKSk7 CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8Q2FjaGVkUHJvY2Vzcz4gY2FjaGVkUHJvY2VzczsKICAg ICBhdXRvIGl0ID0gbV9wcm9jZXNzZXNQZXJSZWdpc3RyYWJsZURvbWFpbi5maW5kKHByb2Nlc3Mu cmVnaXN0cmFibGVEb21haW4oKSk7Cg==