174402 2017-07-11 16:16:24 -0700 Avoid duplicating default parameter values in [WKWebsiteDataStore _resourceLoadStatisticsResetToConsistentState] 2017-07-11 17:23:20 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=174333 P2 Normal --- 1 cdumez cdumez bfulgham commit-queue oldest_to_newest 1327816 0 cdumez 2017-07-11 16:16:24 -0700 Avoid duplicating default parameter values in [WKWebsiteDataStore _resourceLoadStatisticsResetToConsistentState]. 1327818 1 315183 cdumez 2017-07-11 16:17:32 -0700 Created attachment 315183 Patch 1327828 2 315183 bfulgham 2017-07-11 16:28:27 -0700 Comment on attachment 315183 Patch Excellent! r=me. 1327854 3 315183 commit-queue 2017-07-11 17:23:19 -0700 Comment on attachment 315183 Patch Clearing flags on attachment: 315183 Committed r219374: <http://trac.webkit.org/changeset/219374> 1327855 4 commit-queue 2017-07-11 17:23:20 -0700 All reviewed patches have been landed. Closing bug. 315183 2017-07-11 16:17:32 -0700 2017-07-11 17:23:19 -0700 Patch bug-174402-20170711161732.patch text/plain 17102 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTM3ZmMyZjA3YTc3NzQy ZDc4NTc3YzlkYTI0ZTdiZThiOWE5YzIzMS4uZWNmOGNmNzk5Y2VhZWE0MTI2NzEyNjRlM2E4Y2Zk YmQ2MzlmOThiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDE3LTA3LTExICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgQXZvaWQgZHVwbGljYXRpbmcg ZGVmYXVsdCBwYXJhbWV0ZXIgdmFsdWVzIGluIFtXS1dlYnNpdGVEYXRhU3RvcmUgX3Jlc291cmNl TG9hZFN0YXRpc3RpY3NSZXNldFRvQ29uc2lzdGVudFN0YXRlXQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0NDAyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi c2l0ZURhdGFTdG9yZS5tbToKKyAgICAgICAgKC1bV0tXZWJzaXRlRGF0YVN0b3JlIF9yZXNvdXJj ZUxvYWRTdGF0aXN0aWNzUmVzZXRUb0NvbnNpc3RlbnRTdGF0ZV0pOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OldlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZTo6cmVtb3ZlRGF0YVJlY29yZHMpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmU6OnByb2Nlc3NTdGF0aXN0aWNzQW5kRGF0YVJlY29yZHMpOgorICAgICAg ICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW5kZmF0aGVyRXhp c3RpbmdXZWJzaXRlRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZTo6cGVyZm9ybURhaWx5VGFza3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldFRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24pOgor ICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldFRpbWVU b0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlOjpzZXRNaW5pbXVtVGltZUJldHdlZW5EYXRhUmVjb3Jkc1JlbW92 YWwpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNl dEdyYW5kZmF0aGVyaW5nVGltZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZTo6c2hvdWxkUmVtb3ZlRGF0YVJlY29yZHMpOgorICAgICAgICAoV2ViS2l0 OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNob3VsZFBhcnRpdGlvbkNvb2tpZXMp OgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Omhhc1N0 YXRpc3RpY3NFeHBpcmVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpzZXRNYXhTdGF0aXN0aWNzRW50cmllcyk6CisgICAgICAgIChXZWJLaXQ6Oldl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0UHJ1bmVFbnRyaWVzRG93blRvKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpwcnVuZVN0YXRp c3RpY3NJZk5lZWRlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZTo6cmVzZXRQYXJhbWV0ZXJzVG9EZWZhdWx0VmFsdWVzKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmg6CisKKzIwMTctMDctMTEgIENo cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKwogICAgICAgICBTaW1wbGlmeSBwcmltYXJ5 IGRvbWFpbiBsYW1iZGEgY2FwdHVyZXMgaW4gV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQzODEK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNp dGVEYXRhU3RvcmUubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi c2l0ZURhdGFTdG9yZS5tbQppbmRleCBjMGUzMWQ1NGU4Zjg1ZDc3YjA1N2UzZTQ1ODhhM2ZhMDhl YTEwMTlkLi4xYTU5Yzc1MzAzODZmMWMwY2ZkMWQ3NTNmNzY3MjI0MmQ2YThlYmVmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9y ZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURh dGFTdG9yZS5tbQpAQCAtNDYzLDIwICs0NjMsMTMgQEAgLSAodm9pZClfcmVzb3VyY2VMb2FkU3Rh dGlzdGljc0NsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50U3RvcmVNb2RpZmllZFNpbmNlSG91cnMK IAogLSAodm9pZClfcmVzb3VyY2VMb2FkU3RhdGlzdGljc1Jlc2V0VG9Db25zaXN0ZW50U3RhdGUK IHsKKyAgICBXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NUZWxlbWV0cnk6OnNldE5v dGlmeVBhZ2VzV2hlblRlbGVtZXRyeVdhc0NhcHR1cmVkKGZhbHNlKTsKKwogICAgIGF1dG8qIHN0 b3JlID0gX3dlYnNpdGVEYXRhU3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKS5yZXNvdXJjZUxvYWRT dGF0aXN0aWNzKCk7CiAgICAgaWYgKCFzdG9yZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8g RklYTUU6IFRoZXNlIG5lZWRzIHRvIG1hdGNoIHRoZSBkZWZhdWx0IGRhdGEgbWVtYmVyIHZhbHVl cyBpbiBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLCB3aGljaCBpcyBmcmFnaWxlLgotICAgIHN0b3Jl LT5zZXRNYXhTdGF0aXN0aWNzRW50cmllcygxMDAwKTsKLSAgICBzdG9yZS0+c2V0UHJ1bmVFbnRy aWVzRG93blRvKDgwMCk7Ci0gICAgc3RvcmUtPnNldFRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24o c3RkOjpudWxsb3B0KTsKLSAgICBzdG9yZS0+c2V0VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZy ZWUoMjRfaCk7Ci0gICAgc3RvcmUtPnNldE1pbmltdW1UaW1lQmV0d2VlbkRhdGFSZWNvcmRzUmVt b3ZhbCgxX2gpOwotICAgIHN0b3JlLT5zZXRHcmFuZGZhdGhlcmluZ1RpbWUoMV9oKTsKLSAgICBz dG9yZS0+c2V0Tm90aWZ5UGFnZXNXaGVuRGF0YVJlY29yZHNXZXJlU2Nhbm5lZChmYWxzZSk7Ci0g ICAgV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzVGVsZW1ldHJ5OjpzZXROb3RpZnlQ YWdlc1doZW5UZWxlbWV0cnlXYXNDYXB0dXJlZChmYWxzZSk7Ci0gICAgc3RvcmUtPnNldFNob3Vs ZENsYXNzaWZ5UmVzb3VyY2VzQmVmb3JlRGF0YVJlY29yZHNSZW1vdmFsKHRydWUpOworICAgIHN0 b3JlLT5yZXNldFBhcmFtZXRlcnNUb0RlZmF1bHRWYWx1ZXMoKTsKICAgICBzdG9yZS0+c2NoZWR1 bGVDbGVhckluTWVtb3J5KCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggZDE5NjY3 MTkxOTZiYzFkZDk1NTMxMjA2ZDdkNmU2YmEwMDJkMDI4Ni4uMTg1YTE4Yjk2NmVjMDkyZmU5MTQ1 MmE5MWQyNTk5OWU0Y2FlMjE4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTk5LDcgKzk5 LDcgQEAgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpXZWJSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmUoY29uc3QgU3RyaW5nJiByZXMKICAgICAgICAgc3RhcnRNb25pdG9yaW5nU3Rh dGlzdGljc1N0b3JhZ2UoKTsKICAgICB9KTsKICAgICBtX3N0YXRpc3RpY3NRdWV1ZS0+ZGlzcGF0 Y2hBZnRlcig1X3MsIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldIHsKLSAg ICAgICAgaWYgKG1fc2hvdWxkU3VibWl0VGVsZW1ldHJ5KQorICAgICAgICBpZiAobV9wYXJhbWV0 ZXJzLnNob3VsZFN1Ym1pdFRlbGVtZXRyeSkKICAgICAgICAgICAgIFdlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NUZWxlbWV0cnk6OmNhbGN1bGF0ZUFuZFN1Ym1pdCgqdGhpcyk7CiAgICAgfSk7CiAK QEAgLTEyNCw3ICsxMjQsNyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 cmVtb3ZlRGF0YVJlY29yZHMoKQogICAgIHNldERhdGFSZWNvcmRzQmVpbmdSZW1vdmVkKHRydWUp OwogCiAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtwcmV2YWxlbnRSZXNvdXJjZURvbWFp bnMgPSBDcm9zc1RocmVhZENvcGllcjxWZWN0b3I8U3RyaW5nPj46OmNvcHkocHJldmFsZW50UmVz b3VyY2VEb21haW5zKSwgdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSAoKSBt dXRhYmxlIHsKLSAgICAgICAgV2ViUHJvY2Vzc1Byb3h5OjpkZWxldGVXZWJzaXRlRGF0YUZvclRv cFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zSW5BbGxQZXJzaXN0ZW50RGF0YVN0b3JlcyhkYXRh VHlwZXNUb1JlbW92ZSgpLCBXVEZNb3ZlKHByZXZhbGVudFJlc291cmNlRG9tYWlucyksIG1fc2hv dWxkTm90aWZ5UGFnZXNXaGVuRGF0YVJlY29yZHNXZXJlU2Nhbm5lZCwgW3RoaXMsIHByb3RlY3Rl ZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpXShjb25zdCBIYXNoU2V0PFN0cmluZz4mIGRv bWFpbnNXaXRoRGVsZXRlZFdlYnNpdGVEYXRhKSBtdXRhYmxlIHsKKyAgICAgICAgV2ViUHJvY2Vz c1Byb3h5OjpkZWxldGVXZWJzaXRlRGF0YUZvclRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5z SW5BbGxQZXJzaXN0ZW50RGF0YVN0b3JlcyhkYXRhVHlwZXNUb1JlbW92ZSgpLCBXVEZNb3ZlKHBy ZXZhbGVudFJlc291cmNlRG9tYWlucyksIG1fcGFyYW1ldGVycy5zaG91bGROb3RpZnlQYWdlc1do ZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVkLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUo cHJvdGVjdGVkVGhpcyldKGNvbnN0IEhhc2hTZXQ8U3RyaW5nPiYgZG9tYWluc1dpdGhEZWxldGVk V2Vic2l0ZURhdGEpIG11dGFibGUgewogICAgICAgICAgICAgbV9zdGF0aXN0aWNzUXVldWUtPmRp c3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgdG9w RG9tYWlucyA9IENyb3NzVGhyZWFkQ29waWVyPEhhc2hTZXQ8U3RyaW5nPj46OmNvcHkoZG9tYWlu c1dpdGhEZWxldGVkV2Vic2l0ZURhdGEpXSAoKSBtdXRhYmxlIHsKICAgICAgICAgICAgICAgICBm b3IgKGF1dG8mIHByZXZhbGVudFJlc291cmNlRG9tYWluIDogdG9wRG9tYWlucykgewogICAgICAg ICAgICAgICAgICAgICBhdXRvJiBzdGF0aXN0aWMgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NG b3JQcmltYXJ5RG9tYWluKHByZXZhbGVudFJlc291cmNlRG9tYWluKTsKQEAgLTEzOSw3ICsxMzks NyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVtb3ZlRGF0YVJlY29y ZHMoKQogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnByb2Nlc3NTdGF0aXN0 aWNzQW5kRGF0YVJlY29yZHMoKQogewogICAgIG1fc3RhdGlzdGljc1F1ZXVlLT5kaXNwYXRjaChb dGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSAoKSB7Ci0gICAgICAgIGlmICht X3Nob3VsZENsYXNzaWZ5UmVzb3VyY2VzQmVmb3JlRGF0YVJlY29yZHNSZW1vdmFsKSB7CisgICAg ICAgIGlmIChtX3BhcmFtZXRlcnMuc2hvdWxkQ2xhc3NpZnlSZXNvdXJjZXNCZWZvcmVEYXRhUmVj b3Jkc1JlbW92YWwpIHsKICAgICAgICAgICAgIGZvciAoYXV0byYgcmVzb3VyY2VTdGF0aXN0aWMg OiBtX3Jlc291cmNlU3RhdGlzdGljc01hcC52YWx1ZXMoKSkgewogICAgICAgICAgICAgICAgIGlm ICghcmVzb3VyY2VTdGF0aXN0aWMuaXNQcmV2YWxlbnRSZXNvdXJjZSAmJiBtX3Jlc291cmNlTG9h ZFN0YXRpc3RpY3NDbGFzc2lmaWVyLmhhc1ByZXZhbGVudFJlc291cmNlQ2hhcmFjdGVyaXN0aWNz KHJlc291cmNlU3RhdGlzdGljKSkKICAgICAgICAgICAgICAgICAgICAgcmVzb3VyY2VTdGF0aXN0 aWMuaXNQcmV2YWxlbnRSZXNvdXJjZSA9IHRydWU7CkBAIC0xNDksNyArMTQ5LDcgQEAgdm9pZCBX ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnByb2Nlc3NTdGF0aXN0aWNzQW5kRGF0YVJl Y29yZHMoKQogICAgICAgICAKICAgICAgICAgcHJ1bmVTdGF0aXN0aWNzSWZOZWVkZWQoKTsKIAot ICAgICAgICBpZiAobV9zaG91bGROb3RpZnlQYWdlc1doZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVk KSB7CisgICAgICAgIGlmIChtX3BhcmFtZXRlcnMuc2hvdWxkTm90aWZ5UGFnZXNXaGVuRGF0YVJl Y29yZHNXZXJlU2Nhbm5lZCkgewogICAgICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNo KFtdIHsKICAgICAgICAgICAgICAgICBXZWJQcm9jZXNzUHJveHk6Om5vdGlmeVBhZ2VTdGF0aXN0 aWNzQW5kRGF0YVJlY29yZHNQcm9jZXNzZWQoKTsKICAgICAgICAgICAgIH0pOwpAQCAtMTc0LDEz ICsxNzQsMTMgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW5kZmF0 aGVyRXhpc3RpbmdXZWJzaXRlRGF0YSgpCiAgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7 CiAKICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBt YWtlUmVmKCp0aGlzKV0gKCkgbXV0YWJsZSB7Ci0gICAgICAgIFdlYlByb2Nlc3NQcm94eTo6dG9w UHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnNXaXRoV2Vic2l0ZURhdGEoZGF0YVR5cGVzVG9SZW1v dmUoKSwgbV9zaG91bGROb3RpZnlQYWdlc1doZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVkLCBbdGhp cywgcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyldIChIYXNoU2V0PFN0cmlu Zz4mJiB0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluc1dpdGhXZWJzaXRlRGF0YSkgbXV0YWJs ZSB7CisgICAgICAgIFdlYlByb2Nlc3NQcm94eTo6dG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFp bnNXaXRoV2Vic2l0ZURhdGEoZGF0YVR5cGVzVG9SZW1vdmUoKSwgbV9wYXJhbWV0ZXJzLnNob3Vs ZE5vdGlmeVBhZ2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQsIFt0aGlzLCBwcm90ZWN0ZWRU aGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKV0gKEhhc2hTZXQ8U3RyaW5nPiYmIHRvcFByaXZh dGVseUNvbnRyb2xsZWREb21haW5zV2l0aFdlYnNpdGVEYXRhKSBtdXRhYmxlIHsKICAgICAgICAg ICAgIG1fc3RhdGlzdGljc1F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdU Rk1vdmUocHJvdGVjdGVkVGhpcyksIHRvcERvbWFpbnMgPSBDcm9zc1RocmVhZENvcGllcjxIYXNo U2V0PFN0cmluZz4+Ojpjb3B5KHRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zV2l0aFdlYnNp dGVEYXRhKV0gKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgZm9yIChhdXRvJiB0b3BQcml2 YXRlbHlDb250cm9sbGVkRG9tYWluIDogdG9wRG9tYWlucykgewogICAgICAgICAgICAgICAgICAg ICBhdXRvJiBzdGF0aXN0aWMgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9t YWluKHRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW4pOwogICAgICAgICAgICAgICAgICAgICBz dGF0aXN0aWMuZ3JhbmRmYXRoZXJlZCA9IHRydWU7CiAgICAgICAgICAgICAgICAgfQotICAgICAg ICAgICAgICAgIG1fZW5kT2ZHcmFuZGZhdGhlcmluZ1RpbWVzdGFtcCA9IFdhbGxUaW1lOjpub3co KSArIG1fZ3JhbmRmYXRoZXJpbmdUaW1lOworICAgICAgICAgICAgICAgIG1fZW5kT2ZHcmFuZGZh dGhlcmluZ1RpbWVzdGFtcCA9IFdhbGxUaW1lOjpub3coKSArIG1fcGFyYW1ldGVycy5ncmFuZGZh dGhlcmluZ1RpbWU7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfSk7CiAgICAgfSk7CkBAIC00 NDksNyArNDQ5LDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnBlcmZv cm1EYWlseVRhc2tzKCkKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogCiAgICAgaW5j bHVkZVRvZGF5QXNPcGVyYXRpbmdEYXRlSWZOZWNlc3NhcnkoKTsKLSAgICBpZiAobV9zaG91bGRT dWJtaXRUZWxlbWV0cnkpCisgICAgaWYgKG1fcGFyYW1ldGVycy5zaG91bGRTdWJtaXRUZWxlbWV0 cnkpCiAgICAgICAgIHN1Ym1pdFRlbGVtZXRyeSgpOwogfQogCkBAIC02NjUsMjggKzY2NSwyOCBA QCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2NoZWR1bGVDbGVhckluTWVt b3J5QW5kUGVyc2lzdGVudChzdGQ6OmNocgogICAgIHNjaGVkdWxlQ2xlYXJJbk1lbW9yeUFuZFBl cnNpc3RlbnQoKTsKIH0KIAotdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNl dFRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24oc3RkOjpvcHRpb25hbDxTZWNvbmRzPiBzZWNvbmRz KQordm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldFRpbWVUb0xpdmVVc2Vy SW50ZXJhY3Rpb24oU2Vjb25kcyBzZWNvbmRzKQogewotICAgIEFTU0VSVCghc2Vjb25kcyB8fCBz ZWNvbmRzLnZhbHVlKCkgPj0gMF9zKTsKLSAgICBtX3RpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24g PSBzZWNvbmRzOworICAgIEFTU0VSVChzZWNvbmRzID49IDBfcyk7CisgICAgbV9wYXJhbWV0ZXJz LnRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24gPSBzZWNvbmRzOwogfQogCiB2b2lkIFdlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUo U2Vjb25kcyBzZWNvbmRzKQogewogICAgIEFTU0VSVChzZWNvbmRzID49IDBfcyk7Ci0gICAgbV90 aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSA9IHNlY29uZHM7CisgICAgbV9wYXJhbWV0ZXJz LnRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlID0gc2Vjb25kczsKIH0KIAogdm9pZCBXZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldE1pbmltdW1UaW1lQmV0d2VlbkRhdGFSZWNv cmRzUmVtb3ZhbChTZWNvbmRzIHNlY29uZHMpCiB7CiAgICAgQVNTRVJUKHNlY29uZHMgPj0gMF9z KTsKLSAgICBtX21pbmltdW1UaW1lQmV0d2VlbkRhdGFSZWNvcmRzUmVtb3ZhbCA9IHNlY29uZHM7 CisgICAgbV9wYXJhbWV0ZXJzLm1pbmltdW1UaW1lQmV0d2VlbkRhdGFSZWNvcmRzUmVtb3ZhbCA9 IHNlY29uZHM7CiB9CiAKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRH cmFuZGZhdGhlcmluZ1RpbWUoU2Vjb25kcyBzZWNvbmRzKQogewogICAgIEFTU0VSVChzZWNvbmRz ID49IDBfcyk7Ci0gICAgbV9ncmFuZGZhdGhlcmluZ1RpbWUgPSBzZWNvbmRzOworICAgIG1fcGFy YW1ldGVycy5ncmFuZGZhdGhlcmluZ1RpbWUgPSBzZWNvbmRzOwogfQogCiBib29sIFdlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2hvdWxkUmVtb3ZlRGF0YVJlY29yZHMoKSBjb25zdApA QCAtNjk1LDcgKzY5NSw3IEBAIGJvb2wgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpz aG91bGRSZW1vdmVEYXRhUmVjb3JkcygpIGNvbnN0CiAgICAgaWYgKG1fZGF0YVJlY29yZHNCZWlu Z1JlbW92ZWQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJldHVybiAhbV9sYXN0VGlt ZURhdGFSZWNvcmRzV2VyZVJlbW92ZWQgfHwgTW9ub3RvbmljVGltZTo6bm93KCkgPj0gKG1fbGFz dFRpbWVEYXRhUmVjb3Jkc1dlcmVSZW1vdmVkICsgbV9taW5pbXVtVGltZUJldHdlZW5EYXRhUmVj b3Jkc1JlbW92YWwpOworICAgIHJldHVybiAhbV9sYXN0VGltZURhdGFSZWNvcmRzV2VyZVJlbW92 ZWQgfHwgTW9ub3RvbmljVGltZTo6bm93KCkgPj0gKG1fbGFzdFRpbWVEYXRhUmVjb3Jkc1dlcmVS ZW1vdmVkICsgbV9wYXJhbWV0ZXJzLm1pbmltdW1UaW1lQmV0d2VlbkRhdGFSZWNvcmRzUmVtb3Zh bCk7CiB9CiAKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXREYXRhUmVj b3Jkc0JlaW5nUmVtb3ZlZChib29sIHZhbHVlKQpAQCAtODA3LDcgKzgwNyw3IEBAIHZvaWQgV2Vi UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjptZXJnZVN0YXRpc3RpY3MoVmVjdG9yPFJlc291 cmNlTG9hZFN0YXRpc3RpCiAKIGlubGluZSBib29sIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6c2hvdWxkUGFydGl0aW9uQ29va2llcyhjb25zdCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNz JiBzdGF0aXN0aWMpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHN0YXRpc3RpYy5pc1ByZXZhbGVudFJl c291cmNlICYmICghc3RhdGlzdGljLmhhZFVzZXJJbnRlcmFjdGlvbiB8fCBXYWxsVGltZTo6bm93 KCkgPiBzdGF0aXN0aWMubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUgKyBtX3RpbWVUb0xp dmVDb29raWVQYXJ0aXRpb25GcmVlKTsKKyAgICByZXR1cm4gc3RhdGlzdGljLmlzUHJldmFsZW50 UmVzb3VyY2UgJiYgKCFzdGF0aXN0aWMuaGFkVXNlckludGVyYWN0aW9uIHx8IFdhbGxUaW1lOjpu b3coKSA+IHN0YXRpc3RpYy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZSArIG1fcGFyYW1l dGVycy50aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSk7CiB9CiAKIHZvaWQgV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjp1cGRhdGVDb29raWVQYXJ0aXRpb25pbmcoKQpAQCAtOTIz LDEwICs5MjMsOSBAQCBib29sIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFzU3Rh dGlzdGljc0V4cGlyZWQoY29uc3QgUmVzb3VyY2VMb2FkU3RhdAogICAgICAgICAgICAgcmV0dXJu IHRydWU7CiAgICAgfQogCi0gICAgLy8gSWYgd2UgZG9uJ3QgbWVldCB0aGUgcmVhbCBjcml0ZXJp YSBmb3IgYW4gZXhwaXJlZCBzdGF0aXN0aWMsIGNoZWNrIHRoZSB1c2VyCi0gICAgLy8gc2V0dGlu ZyBmb3IgYSB0aWdodGVyIHJlc3RyaWN0aW9uIChtYWlubHkgZm9yIHRlc3RpbmcpLgotICAgIGlm IChtX3RpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24pIHsKLSAgICAgICAgaWYgKFdhbGxUaW1lOjpu b3coKSA+IHJlc291cmNlU3RhdGlzdGljLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lICsg bV90aW1lVG9MaXZlVXNlckludGVyYWN0aW9uLnZhbHVlKCkpCisgICAgLy8gSWYgd2UgZG9uJ3Qg bWVldCB0aGUgcmVhbCBjcml0ZXJpYSBmb3IgYW4gZXhwaXJlZCBzdGF0aXN0aWMsIGNoZWNrIHRo ZSB1c2VyIHNldHRpbmcgZm9yIGEgdGlnaHRlciByZXN0cmljdGlvbiAobWFpbmx5IGZvciB0ZXN0 aW5nKS4KKyAgICBpZiAobV9wYXJhbWV0ZXJzLnRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24pIHsK KyAgICAgICAgaWYgKFdhbGxUaW1lOjpub3coKSA+IHJlc291cmNlU3RhdGlzdGljLm1vc3RSZWNl bnRVc2VySW50ZXJhY3Rpb25UaW1lICsgbV9wYXJhbWV0ZXJzLnRpbWVUb0xpdmVVc2VySW50ZXJh Y3Rpb24udmFsdWUoKSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIApAQCAtOTM1 LDEyICs5MzQsMTIgQEAgYm9vbCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Omhhc1N0 YXRpc3RpY3NFeHBpcmVkKGNvbnN0IFJlc291cmNlTG9hZFN0YXQKICAgICAKIHZvaWQgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRNYXhTdGF0aXN0aWNzRW50cmllcyhzaXplX3Qg bWF4aW11bUVudHJ5Q291bnQpCiB7Ci0gICAgbV9tYXhTdGF0aXN0aWNzRW50cmllcyA9IG1heGlt dW1FbnRyeUNvdW50OworICAgIG1fcGFyYW1ldGVycy5tYXhTdGF0aXN0aWNzRW50cmllcyA9IG1h eGltdW1FbnRyeUNvdW50OwogfQogICAgIAogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6OnNldFBydW5lRW50cmllc0Rvd25UbyhzaXplX3QgcHJ1bmVUYXJnZXRDb3VudCkKIHsK LSAgICBtX3BydW5lRW50cmllc0Rvd25UbyA9IHBydW5lVGFyZ2V0Q291bnQ7CisgICAgbV9wYXJh bWV0ZXJzLnBydW5lRW50cmllc0Rvd25UbyA9IHBydW5lVGFyZ2V0Q291bnQ7CiB9CiAgICAgCiBz dHJ1Y3QgU3RhdGlzdGljc0xhc3RTZWVuIHsKQEAgLTk3MywxMiArOTcyLDEyIEBAIHN0YXRpYyB1 bnNpZ25lZCBjb21wdXRlSW1wb3J0YW5jZShjb25zdCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJiBy ZXNvdXJjZVN0YXRpc3RpCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cHJ1 bmVTdGF0aXN0aWNzSWZOZWVkZWQoKQogewogICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkp OwotICAgIGlmIChtX3Jlc291cmNlU3RhdGlzdGljc01hcC5zaXplKCkgPD0gbV9tYXhTdGF0aXN0 aWNzRW50cmllcykKKyAgICBpZiAobV9yZXNvdXJjZVN0YXRpc3RpY3NNYXAuc2l6ZSgpIDw9IG1f cGFyYW1ldGVycy5tYXhTdGF0aXN0aWNzRW50cmllcykKICAgICAgICAgcmV0dXJuOwogCi0gICAg QVNTRVJUKG1fcHJ1bmVFbnRyaWVzRG93blRvIDw9IG1fbWF4U3RhdGlzdGljc0VudHJpZXMpOwor ICAgIEFTU0VSVChtX3BhcmFtZXRlcnMucHJ1bmVFbnRyaWVzRG93blRvIDw9IG1fcGFyYW1ldGVy cy5tYXhTdGF0aXN0aWNzRW50cmllcyk7CiAKLSAgICBzaXplX3QgbnVtYmVyT2ZFbnRyaWVzTGVm dFRvUHJ1bmUgPSBtX3Jlc291cmNlU3RhdGlzdGljc01hcC5zaXplKCkgLSBtX3BydW5lRW50cmll c0Rvd25UbzsKKyAgICBzaXplX3QgbnVtYmVyT2ZFbnRyaWVzTGVmdFRvUHJ1bmUgPSBtX3Jlc291 cmNlU3RhdGlzdGljc01hcC5zaXplKCkgLSBtX3BhcmFtZXRlcnMucHJ1bmVFbnRyaWVzRG93blRv OwogICAgIEFTU0VSVChudW1iZXJPZkVudHJpZXNMZWZ0VG9QcnVuZSk7CiAgICAgCiAgICAgVmVj dG9yPFN0YXRpc3RpY3NMYXN0U2Vlbj4gcmVzb3VyY2VzVG9QcnVuZVBlckltcG9ydGFuY2VbbWF4 SW1wb3J0YW5jZSArIDFdOwpAQCAtOTkwLDUgKzk4OSwxMCBAQCB2b2lkIFdlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZTo6cHJ1bmVTdGF0aXN0aWNzSWZOZWVkZWQoKQogCiAgICAgQVNTRVJU KCFudW1iZXJPZkVudHJpZXNMZWZ0VG9QcnVuZSk7CiB9CisKK3ZvaWQgV2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlOjpyZXNldFBhcmFtZXRlcnNUb0RlZmF1bHRWYWx1ZXMoKQoreworICAg IG1fcGFyYW1ldGVycyA9IHsgfTsKK30KICAgICAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZS5oCmluZGV4IDBmMjYxM2NiYjRjYWMxNjc2Mjk4MmIwMDc0NjFmZDNhMTVhNmYz YmEuLmFhZDllNmU4NDNmNzIwNTc3NjY0NWJhM2E3ODBmNzI1ZGJiYjVhN2EgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlLmgKQEAgLTY2LDkgKzY2LDkgQEAgcHVibGljOgogCiAgICAgfldlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZSgpOwogCi0gICAgdm9pZCBzZXROb3RpZnlQYWdlc1doZW5EYXRhUmVj b3Jkc1dlcmVTY2FubmVkKGJvb2wgdmFsdWUpIHsgbV9zaG91bGROb3RpZnlQYWdlc1doZW5EYXRh UmVjb3Jkc1dlcmVTY2FubmVkID0gdmFsdWU7IH0KLSAgICB2b2lkIHNldFNob3VsZENsYXNzaWZ5 UmVzb3VyY2VzQmVmb3JlRGF0YVJlY29yZHNSZW1vdmFsKGJvb2wgdmFsdWUpIHsgbV9zaG91bGRD bGFzc2lmeVJlc291cmNlc0JlZm9yZURhdGFSZWNvcmRzUmVtb3ZhbCA9IHZhbHVlOyB9Ci0gICAg dm9pZCBzZXRTaG91bGRTdWJtaXRUZWxlbWV0cnkoYm9vbCB2YWx1ZSkgeyBtX3Nob3VsZFN1Ym1p dFRlbGVtZXRyeSA9IHZhbHVlOyB9CisgICAgdm9pZCBzZXROb3RpZnlQYWdlc1doZW5EYXRhUmVj b3Jkc1dlcmVTY2FubmVkKGJvb2wgdmFsdWUpIHsgbV9wYXJhbWV0ZXJzLnNob3VsZE5vdGlmeVBh Z2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQgPSB2YWx1ZTsgfQorICAgIHZvaWQgc2V0U2hv dWxkQ2xhc3NpZnlSZXNvdXJjZXNCZWZvcmVEYXRhUmVjb3Jkc1JlbW92YWwoYm9vbCB2YWx1ZSkg eyBtX3BhcmFtZXRlcnMuc2hvdWxkQ2xhc3NpZnlSZXNvdXJjZXNCZWZvcmVEYXRhUmVjb3Jkc1Jl bW92YWwgPSB2YWx1ZTsgfQorICAgIHZvaWQgc2V0U2hvdWxkU3VibWl0VGVsZW1ldHJ5KGJvb2wg dmFsdWUpIHsgbV9wYXJhbWV0ZXJzLnNob3VsZFN1Ym1pdFRlbGVtZXRyeSA9IHZhbHVlOyB9CiAK ICAgICB2b2lkIHJlc291cmNlTG9hZFN0YXRpc3RpY3NVcGRhdGVkKFZlY3RvcjxXZWJDb3JlOjpS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzPiYmIG9yaWdpbnMpOwogCkBAIC05OCw3ICs5OCw3IEBAIHB1 YmxpYzoKICAgICB2b2lkIHNjaGVkdWxlQ2xlYXJJbk1lbW9yeUFuZFBlcnNpc3RlbnQoKTsKICAg ICB2b2lkIHNjaGVkdWxlQ2xlYXJJbk1lbW9yeUFuZFBlcnNpc3RlbnQoc3RkOjpjaHJvbm86OnN5 c3RlbV9jbG9jazo6dGltZV9wb2ludCBtb2RpZmllZFNpbmNlKTsKIAotICAgIHZvaWQgc2V0VGlt ZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbihzdGQ6Om9wdGlvbmFsPFNlY29uZHM+KTsKKyAgICB2b2lk IHNldFRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24oU2Vjb25kcyk7CiAgICAgdm9pZCBzZXRUaW1l VG9MaXZlQ29va2llUGFydGl0aW9uRnJlZShTZWNvbmRzKTsKICAgICB2b2lkIHNldE1pbmltdW1U aW1lQmV0d2VlbkRhdGFSZWNvcmRzUmVtb3ZhbChTZWNvbmRzKTsKICAgICB2b2lkIHNldEdyYW5k ZmF0aGVyaW5nVGltZShTZWNvbmRzKTsKQEAgLTEwNyw2ICsxMDcsOCBAQCBwdWJsaWM6CiAgICAg CiAgICAgdm9pZCBwcm9jZXNzU3RhdGlzdGljcyhjb25zdCBXVEY6OkZ1bmN0aW9uPHZvaWQgKGNv bnN0IFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3MmKT4mKSBjb25zdDsKICAgICB2b2lk IHBydW5lU3RhdGlzdGljc0lmTmVlZGVkKCk7CisKKyAgICB2b2lkIHJlc2V0UGFyYW1ldGVyc1Rv RGVmYXVsdFZhbHVlcygpOwogICAgIAogcHJpdmF0ZToKICAgICBXZWJSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmUoY29uc3QgU3RyaW5nJiwgVXBkYXRlQ29va2llUGFydGl0aW9uaW5nRm9yRG9t YWluc0hhbmRsZXImJik7CkBAIC0xNTcsNiArMTU5LDE4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBy ZWdpc3RlclVzZXJEZWZhdWx0c0lmTmVlZGVkKCk7CiAjZW5kaWYKIAorICAgIHN0cnVjdCBQYXJh bWV0ZXJzIHsKKyAgICAgICAgc2l6ZV90IHBydW5lRW50cmllc0Rvd25UbyB7IDgwMCB9OworICAg ICAgICBzaXplX3QgbWF4U3RhdGlzdGljc0VudHJpZXMgeyAxMDAwIH07CisgICAgICAgIHN0ZDo6 b3B0aW9uYWw8U2Vjb25kcz4gdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbjsKKyAgICAgICAgU2Vj b25kcyB0aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSB7IDI0X2ggfTsKKyAgICAgICAgU2Vj b25kcyBtaW5pbXVtVGltZUJldHdlZW5EYXRhUmVjb3Jkc1JlbW92YWwgeyAxX2ggfTsKKyAgICAg ICAgU2Vjb25kcyBncmFuZGZhdGhlcmluZ1RpbWUgeyAxX2ggfTsKKyAgICAgICAgYm9vbCBzaG91 bGROb3RpZnlQYWdlc1doZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVkIHsgZmFsc2UgfTsKKyAgICAg ICAgYm9vbCBzaG91bGRDbGFzc2lmeVJlc291cmNlc0JlZm9yZURhdGFSZWNvcmRzUmVtb3ZhbCB7 IHRydWUgfTsKKyAgICAgICAgYm9vbCBzaG91bGRTdWJtaXRUZWxlbWV0cnkgeyB0cnVlIH07Cisg ICAgfTsKKwogICAgIEhhc2hNYXA8U3RyaW5nLCBXZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzPiBtX3Jlc291cmNlU3RhdGlzdGljc01hcDsKICNpZiBIQVZFKENPUkVfUFJFRElDVElPTikK ICAgICBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzQ2xhc3NpZmllckNvY29hIG1fcmVzb3VyY2VMb2Fk U3RhdGlzdGljc0NsYXNzaWZpZXI7CkBAIC0xNzUsMTcgKzE4OSwxMSBAQCBwcml2YXRlOgogICAg IE1vbm90b25pY1RpbWUgbV9sYXN0U3RhdGlzdGljc1dyaXRlVGltZTsKICAgICBSdW5Mb29wOjpU aW1lcjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU+IG1fZGFpbHlUYXNrc1RpbWVyOwog ICAgIE1vbm90b25pY1RpbWUgbV9sYXN0VGltZURhdGFSZWNvcmRzV2VyZVJlbW92ZWQ7Ci0gICAg U2Vjb25kcyBtX21pbmltdW1UaW1lQmV0d2VlbkRhdGFSZWNvcmRzUmVtb3ZhbCB7IDFfaCB9Owot ICAgIHN0ZDo6b3B0aW9uYWw8U2Vjb25kcz4gbV90aW1lVG9MaXZlVXNlckludGVyYWN0aW9uOwot ICAgIFNlY29uZHMgbV90aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSB7IDI0X2ggfTsKLSAg ICBTZWNvbmRzIG1fZ3JhbmRmYXRoZXJpbmdUaW1lIHsgMV9oIH07Ci0gICAgc2l6ZV90IG1fbWF4 U3RhdGlzdGljc0VudHJpZXMgeyAxMDAwIH07Ci0gICAgc2l6ZV90IG1fcHJ1bmVFbnRyaWVzRG93 blRvIHsgODAwIH07CisKKyAgICBQYXJhbWV0ZXJzIG1fcGFyYW1ldGVyczsKKwogICAgIGJvb2wg bV9kYXRhUmVjb3Jkc0JlaW5nUmVtb3ZlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2RpZFNjaGVk dWxlV3JpdGUgeyBmYWxzZSB9OwotICAgIGJvb2wgbV9zaG91bGROb3RpZnlQYWdlc1doZW5EYXRh UmVjb3Jkc1dlcmVTY2FubmVkIHsgZmFsc2UgfTsKLSAgICBib29sIG1fc2hvdWxkQ2xhc3NpZnlS ZXNvdXJjZXNCZWZvcmVEYXRhUmVjb3Jkc1JlbW92YWwgeyB0cnVlIH07Ci0gICAgYm9vbCBtX3No b3VsZFN1Ym1pdFRlbGVtZXRyeSB7IHRydWUgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktp dAo=