189530 2018-09-11 16:47:06 -0700 [Curl] Bug fix on some inaccurate values in NetworkLoadMetrics. 2018-09-14 17:47:38 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke achristensen basuke commit-queue darin ews-watchlist fujii galpeter pvollan webkit-bug-importer youennf oldest_to_newest 1458783 0 basuke 2018-09-11 16:47:06 -0700 The timing information curl returns is calculated based on the curl_ease_perform(), which is invoked in background thread. The real metrics should be started at the timing of request handler (CurlRequest) started timing. 1459918 1 349815 basuke 2018-09-14 15:17:47 -0700 Created attachment 349815 PATCH responseEnd was implemented correctly. Also initial delay caused by the gap from main thread to curl thread was adjusted. 1459924 2 349819 basuke 2018-09-14 15:31:13 -0700 Created attachment 349819 PATCH 1459993 3 349819 commit-queue 2018-09-14 17:46:54 -0700 Comment on attachment 349819 PATCH Clearing flags on attachment: 349819 Committed r236029: <https://trac.webkit.org/changeset/236029> 1459994 4 commit-queue 2018-09-14 17:46:56 -0700 All reviewed patches have been landed. Closing bug. 1459995 5 webkit-bug-importer 2018-09-14 17:47:38 -0700 <rdar://problem/44475694> 349815 2018-09-14 15:17:47 -0700 2018-09-14 15:19:16 -0700 PATCH 189530.diff text/plain 14618 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1OTM4MDRiNmZkYS4uODE4Yjc4NTg4N2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAxOC0wOS0xNCAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29u eS5jb20+CisKKyAgICAgICAgW0N1cmxdIEJ1ZyBmaXggb24gc29tZSBpbmFjY3VyYXRlIHZhbHVl cyBpbiBOZXR3b3JrTG9hZE1ldHJpY3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODk1MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDdXJsIHBvcnQgdXNlcyB0aGUgc3RhcnQgdGltZSBsaWJjdXJsIHBy b3ZpZGVkLiBCdXQgdGhlcmUncyBhIGx1ZyBiZXR3ZWVuIG1haW4gdGhyZWFkIGFuZCBDdXJsIHRo cmVhZC4KKyAgICAgICAgUmVjb3JkIHRoZSBzdGFydCB0aW1lIG9mIHJlcXVlc3QgaW5zdGVhZCBv ZiBsaWJjdXJsJ3Mgc3RhcnQgdGltaW5nIGFuZCB1c2UgaXQgdG8gbWVhc3VyZSB0aGUgbWV0cmlj cy4KKyAgICAgICAgQWxzbyByZXNwb25kRW5kIHdhcyBub3QgY29ycmVjdGx5IHJlY29yZGVkIGFu ZCBmaXhlZC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBpdCBjYW5ub3QgYmUgbWVh c3VyZWQgZnJvbSBEUlQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFu ZGxlSW50ZXJuYWwuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRl eHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q3VybEhhbmRsZTo6Z2V0TmV0d29ya0xvYWRNZXRy aWNzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q3VybFJlcXVlc3Q6OnN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1 ZXN0OjpzZXR1cFRyYW5zZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1ZXN0OjpkaWRD b21wbGV0ZVRyYW5zZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1ZXN0Ojp1cGRhdGVO ZXR3b3JrTG9hZE1ldHJpY3MpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJs UmVxdWVzdC5oOgorICAgICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3Q6OnNldFN0YXJ0VGltZSk6 CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6c3RhcnQpOgorICAgICAgICAoV2Vi Q29yZTo6UmVzb3VyY2VIYW5kbGU6OnJlc3RhcnRSZXF1ZXN0V2l0aENyZWRlbnRpYWwpOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtTG9hZFJlc291cmNlU3luY2hy b25vdXNseSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6d2lsbFNlbmRSZXF1 ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpjb250aW51ZUFmdGVyV2ls bFNlbmRSZXF1ZXN0KToKKwogMjAxOC0wOS0xMCAgWXVzdWtlIFN1enVraSAgPHl1c3VrZXN1enVr aUBzbG93c3RhcnQub3JnPgogCiAgICAgICAgIFtXVEZdIEFkZCBNYXJrYWJsZTxULCBUcmFpdHM+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFu ZGxlSW50ZXJuYWwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VI YW5kbGVJbnRlcm5hbC5oCmluZGV4IDc3ZTI2ZTczMTdiLi4yNDNkZTlmODI2NSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFs LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUlu dGVybmFsLmgKQEAgLTQwLDYgKzQwLDcgQEAKICNpZiBVU0UoQ1VSTCkKICNpbmNsdWRlICJDdXJs UmVxdWVzdC5oIgogI2luY2x1ZGUgPHd0Zi9NZXNzYWdlUXVldWUuaD4KKyNpbmNsdWRlIDx3dGYv TW9ub3RvbmljVGltZS5oPgogI2VuZGlmCiAKICNpZiBQTEFURk9STShDT0NPQSkKQEAgLTEyNSw2 ICsxMjYsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBtX2FkZGVkQ2FjaGVWYWxpZGF0aW9uSGVhZGVy cyB7IGZhbHNlIH07CiAgICAgUmVmUHRyPEN1cmxSZXF1ZXN0PiBtX2N1cmxSZXF1ZXN0OwogICAg IE1lc3NhZ2VRdWV1ZTxXVEY6OkZ1bmN0aW9uPHZvaWQoKT4+KiBtX21lc3NhZ2VRdWV1ZSB7IH07 CisgICAgTW9ub3RvbmljVGltZSBtX3N0YXJ0VGltZTsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0o Q09DT0EpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwv Q3VybENvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1 cmxDb250ZXh0LmNwcAppbmRleCA2NGI4MzhjOWQ1ZC4uZDM2NDc4ZWJmY2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ29udGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxDb250ZXh0LmNwcApA QCAtNzMxLDcgKzczMSw3IEBAIHN0ZDo6b3B0aW9uYWw8bG9uZz4gQ3VybEhhbmRsZTo6Z2V0SHR0 cFZlcnNpb24oKQogICAgIHJldHVybiB2ZXJzaW9uOwogfQogCi1zdGQ6Om9wdGlvbmFsPE5ldHdv cmtMb2FkTWV0cmljcz4gQ3VybEhhbmRsZTo6Z2V0TmV0d29ya0xvYWRNZXRyaWNzKCkKK3N0ZDo6 b3B0aW9uYWw8TmV0d29ya0xvYWRNZXRyaWNzPiBDdXJsSGFuZGxlOjpnZXROZXR3b3JrTG9hZE1l dHJpY3MoY29uc3QgV1RGOjpTZWNvbmRzJiBkb21haW5Mb29rdXBTdGFydCkKIHsKICAgICBkb3Vi bGUgbmFtZUxvb2t1cCA9IDAuMDsKICAgICBkb3VibGUgY29ubmVjdCA9IDAuMDsKQEAgLTc5NSwx OCArNzk1LDE4IEBAIHN0ZDo6b3B0aW9uYWw8TmV0d29ya0xvYWRNZXRyaWNzPiBDdXJsSGFuZGxl OjpnZXROZXR3b3JrTG9hZE1ldHJpY3MoKQogCiAgICAgTmV0d29ya0xvYWRNZXRyaWNzIG5ldHdv cmtMb2FkTWV0cmljczsKIAotICAgIG5ldHdvcmtMb2FkTWV0cmljcy5kb21haW5Mb29rdXBTdGFy dCA9IFNlY29uZHMoMCk7Ci0gICAgbmV0d29ya0xvYWRNZXRyaWNzLmRvbWFpbkxvb2t1cEVuZCA9 IFNlY29uZHMobmFtZUxvb2t1cCk7Ci0gICAgbmV0d29ya0xvYWRNZXRyaWNzLmNvbm5lY3RTdGFy dCA9IFNlY29uZHMobmFtZUxvb2t1cCk7Ci0gICAgbmV0d29ya0xvYWRNZXRyaWNzLmNvbm5lY3RF bmQgPSBTZWNvbmRzKGNvbm5lY3QpOworICAgIG5ldHdvcmtMb2FkTWV0cmljcy5kb21haW5Mb29r dXBTdGFydCA9IGRvbWFpbkxvb2t1cFN0YXJ0OworICAgIG5ldHdvcmtMb2FkTWV0cmljcy5kb21h aW5Mb29rdXBFbmQgPSBkb21haW5Mb29rdXBTdGFydCArIFNlY29uZHMobmFtZUxvb2t1cCk7Cisg ICAgbmV0d29ya0xvYWRNZXRyaWNzLmNvbm5lY3RTdGFydCA9IGRvbWFpbkxvb2t1cFN0YXJ0ICsg U2Vjb25kcyhuYW1lTG9va3VwKTsKKyAgICBuZXR3b3JrTG9hZE1ldHJpY3MuY29ubmVjdEVuZCA9 IGRvbWFpbkxvb2t1cFN0YXJ0ICsgU2Vjb25kcyhjb25uZWN0KTsKIAogICAgIGlmIChhcHBDb25u ZWN0ID4gMC4wKSB7Ci0gICAgICAgIG5ldHdvcmtMb2FkTWV0cmljcy5zZWN1cmVDb25uZWN0aW9u U3RhcnQgPSBTZWNvbmRzKGNvbm5lY3QpOwotICAgICAgICBuZXR3b3JrTG9hZE1ldHJpY3MuY29u bmVjdEVuZCA9IFNlY29uZHMoYXBwQ29ubmVjdCk7CisgICAgICAgIG5ldHdvcmtMb2FkTWV0cmlj cy5zZWN1cmVDb25uZWN0aW9uU3RhcnQgPSBkb21haW5Mb29rdXBTdGFydCArIFNlY29uZHMoY29u bmVjdCk7CisgICAgICAgIG5ldHdvcmtMb2FkTWV0cmljcy5jb25uZWN0RW5kID0gZG9tYWluTG9v a3VwU3RhcnQgKyBTZWNvbmRzKGFwcENvbm5lY3QpOwogICAgIH0KIAogICAgIG5ldHdvcmtMb2Fk TWV0cmljcy5yZXF1ZXN0U3RhcnQgPSBuZXR3b3JrTG9hZE1ldHJpY3MuY29ubmVjdEVuZDsKLSAg ICBuZXR3b3JrTG9hZE1ldHJpY3MucmVzcG9uc2VTdGFydCA9IFNlY29uZHMoc3RhcnRUcmFuc2Zl cik7CisgICAgbmV0d29ya0xvYWRNZXRyaWNzLnJlc3BvbnNlU3RhcnQgPSBkb21haW5Mb29rdXBT dGFydCArIFNlY29uZHMoc3RhcnRUcmFuc2Zlcik7CiAKICAgICBuZXR3b3JrTG9hZE1ldHJpY3Mu cmVxdWVzdEhlYWRlckJ5dGVzU2VudCA9IHJlcXVlc3RIZWFkZXJTaXplOwogICAgIG5ldHdvcmtM b2FkTWV0cmljcy5yZXF1ZXN0Qm9keUJ5dGVzU2VudCA9IHJlcXVlc3RCb2R5U2l6ZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ29udGV4dC5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxDb250ZXh0LmgKaW5k ZXggNWMxMjZhZjExMDEuLjhhOTQ1MjBlNjdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuaApAQCAtMjgyLDcgKzI4Miw3IEBAIHB1 YmxpYzoKICAgICBzdGQ6Om9wdGlvbmFsPGxvbmc+IGdldEh0dHBBdXRoQXZhaWwoKTsKICAgICBz dGQ6Om9wdGlvbmFsPGxvbmc+IGdldFByb3h5QXV0aEF2YWlsKCk7CiAgICAgc3RkOjpvcHRpb25h bDxsb25nPiBnZXRIdHRwVmVyc2lvbigpOwotICAgIHN0ZDo6b3B0aW9uYWw8TmV0d29ya0xvYWRN ZXRyaWNzPiBnZXROZXR3b3JrTG9hZE1ldHJpY3MoKTsKKyAgICBzdGQ6Om9wdGlvbmFsPE5ldHdv cmtMb2FkTWV0cmljcz4gZ2V0TmV0d29ya0xvYWRNZXRyaWNzKGNvbnN0IFdURjo6U2Vjb25kcyYg ZG9tYWluTG9va3VwU3RhcnQpOwogCiAgICAgaW50IHNzbEVycm9ycygpIGNvbnN0OwogICAgIHN0 ZDo6b3B0aW9uYWw8Q2VydGlmaWNhdGVJbmZvPiBjZXJ0aWZpY2F0ZUluZm8oKSBjb25zdDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVxdWVz dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3Qu Y3BwCmluZGV4IDVkMDYxY2ExYzM4Li4yZDhhZmYyYzliNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3QuY3BwCkBAIC04MCw2ICs4 MCw5IEBAIHZvaWQgQ3VybFJlcXVlc3Q6OnN0YXJ0KCkKIAogICAgIGF1dG8gdXJsID0gbV9yZXF1 ZXN0LnVybCgpLmlzb2xhdGVkQ29weSgpOwogCisgICAgaWYgKHN0ZDo6aXNuYW4obV9yZXF1ZXN0 U3RhcnRUaW1lKSkKKyAgICAgICAgbV9yZXF1ZXN0U3RhcnRUaW1lID0gTW9ub3RvbmljVGltZTo6 bm93KCk7CisKICAgICBpZiAodXJsLmlzTG9jYWxGaWxlKCkpCiAgICAgICAgIGludm9rZURpZFJl Y2VpdmVSZXNwb25zZUZvckZpbGUodXJsKTsKICAgICBlbHNlCkBAIC0xOTUsNiArMTk4LDggQEAg Q1VSTCogQ3VybFJlcXVlc3Q6OnNldHVwVHJhbnNmZXIoKQogICAgIGlmIChtX3Nob3VsZFN1c3Bl bmQpCiAgICAgICAgIHNldFJlcXVlc3RQYXVzZWQodHJ1ZSk7CiAKKyAgICBtX3BlcmZvcm1TdGFy dFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3coKTsKKwogICAgIHJldHVybiBtX2N1cmxIYW5kbGUt PmhhbmRsZSgpOwogfQogCkBAIC00MDUsNyArNDEwLDEwIEBAIHZvaWQgQ3VybFJlcXVlc3Q6OmRp ZENvbXBsZXRlVHJhbnNmZXIoQ1VSTGNvZGUgcmVzdWx0KQogICAgICAgICB1cGRhdGVOZXR3b3Jr TG9hZE1ldHJpY3MoKTsKIAogICAgICAgICBmaW5hbGl6ZVRyYW5zZmVyKCk7Ci0gICAgICAgIGNh bGxDbGllbnQoW10oQ3VybFJlcXVlc3QmIHJlcXVlc3QsIEN1cmxSZXF1ZXN0Q2xpZW50JiBjbGll bnQpIHsKKyAgICAgICAgY2FsbENsaWVudChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYo KnRoaXMpXShDdXJsUmVxdWVzdCYgcmVxdWVzdCwgQ3VybFJlcXVlc3RDbGllbnQmIGNsaWVudCkg eworICAgICAgICAgICAgbV9uZXR3b3JrTG9hZE1ldHJpY3MucmVzcG9uc2VFbmQgPSBNb25vdG9u aWNUaW1lOjpub3coKSAtIG1fcmVxdWVzdFN0YXJ0VGltZTsKKyAgICAgICAgICAgIG1fbmV0d29y a0xvYWRNZXRyaWNzLm1hcmtDb21wbGV0ZSgpOworCiAgICAgICAgICAgICBjbGllbnQuY3VybERp ZENvbXBsZXRlKHJlcXVlc3QpOwogICAgICAgICB9KTsKICAgICB9IGVsc2UgewpAQCAtNjM4LDcg KzY0Niw5IEBAIGJvb2wgQ3VybFJlcXVlc3Q6OmlzSGFuZGxlUGF1c2VkKCkgY29uc3QKIAogdm9p ZCBDdXJsUmVxdWVzdDo6dXBkYXRlTmV0d29ya0xvYWRNZXRyaWNzKCkKIHsKLSAgICBpZiAoYXV0 byBtZXRyaWNzID0gbV9jdXJsSGFuZGxlLT5nZXROZXR3b3JrTG9hZE1ldHJpY3MoKSkKKyAgICBh dXRvIGRvbWFpbkxvb2t1cFN0YXJ0ID0gbV9wZXJmb3JtU3RhcnRUaW1lIC0gbV9yZXF1ZXN0U3Rh cnRUaW1lOworCisgICAgaWYgKGF1dG8gbWV0cmljcyA9IG1fY3VybEhhbmRsZS0+Z2V0TmV0d29y a0xvYWRNZXRyaWNzKGRvbWFpbkxvb2t1cFN0YXJ0KSkKICAgICAgICAgbV9uZXR3b3JrTG9hZE1l dHJpY3MgPSAqbWV0cmljczsKIAogICAgIG1fbmV0d29ya0xvYWRNZXRyaWNzLnJlcXVlc3RIZWFk ZXJzID0gbV9yZXF1ZXN0Lmh0dHBIZWFkZXJGaWVsZHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVxdWVzdC5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0LmgKaW5kZXggZDYxMWIxMTNjMDMu Ljk1OGM3NzdiNzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2N1cmwvQ3VybFJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2N1cmwvQ3VybFJlcXVlc3QuaApAQCAtMzYsNiArMzYsNyBAQAogI2luY2x1ZGUgIk5ldHdvcmtM b2FkTWV0cmljcy5oIgogI2luY2x1ZGUgIlJlc291cmNlUmVxdWVzdC5oIgogI2luY2x1ZGUgPHd0 Zi9NZXNzYWdlUXVldWUuaD4KKyNpbmNsdWRlIDx3dGYvTW9ub3RvbmljVGltZS5oPgogI2luY2x1 ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC02Nyw2ICs2 OCw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgaW52YWxpZGF0ZUNsaWVudCgpOwogICAgIFdFQkNP UkVfRVhQT1JUIHZvaWQgc2V0VXNlclBhc3MoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJik7 CisgICAgdm9pZCBzZXRTdGFydFRpbWUoY29uc3QgTW9ub3RvbmljVGltZSYgc3RhcnRUaW1lKSB7 IG1fcmVxdWVzdFN0YXJ0VGltZSA9IHN0YXJ0VGltZTsgfQogCiAgICAgdm9pZCBzdGFydCgpOwog ICAgIHZvaWQgY2FuY2VsKCk7CkBAIC0xOTcsNiArMTk5LDggQEAgcHJpdmF0ZToKIAogICAgIENl cnRpZmljYXRlSW5mbyBtX2NlcnRpZmljYXRlSW5mbzsKICAgICBOZXR3b3JrTG9hZE1ldHJpY3Mg bV9uZXR3b3JrTG9hZE1ldHJpY3M7CisgICAgTW9ub3RvbmljVGltZSBtX3JlcXVlc3RTdGFydFRp bWUgeyBNb25vdG9uaWNUaW1lOjpuYW4oKSB9OworICAgIE1vbm90b25pY1RpbWUgbV9wZXJmb3Jt U3RhcnRUaW1lOwogICAgIHNpemVfdCBtX3RvdGFsUmVjZWl2ZWRTaXplIHsgMCB9OwogfTsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNl SGFuZGxlQ3VybC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVz b3VyY2VIYW5kbGVDdXJsLmNwcAppbmRleCBjNDJhZGMzNzhhNi4uOTlmZTFjMTQ0OGEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRs ZUN1cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNv dXJjZUhhbmRsZUN1cmwuY3BwCkBAIC04MSwxMSArODEsMTQgQEAgYm9vbCBSZXNvdXJjZUhhbmRs ZTo6c3RhcnQoKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKKyAgICBkLT5tX3N0YXJ0 VGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygpOworCiAgICAgZC0+bV9jdXJsUmVxdWVzdCA9IGNy ZWF0ZUN1cmxSZXF1ZXN0KFdURk1vdmUocmVxdWVzdCkpOwogCiAgICAgaWYgKGF1dG8gY3JlZGVu dGlhbCA9IGdldENyZWRlbnRpYWwoZC0+bV9maXJzdFJlcXVlc3QsIGZhbHNlKSkKICAgICAgICAg ZC0+bV9jdXJsUmVxdWVzdC0+c2V0VXNlclBhc3MoY3JlZGVudGlhbC0+Zmlyc3QsIGNyZWRlbnRp YWwtPnNlY29uZCk7CiAKKyAgICBkLT5tX2N1cmxSZXF1ZXN0LT5zZXRTdGFydFRpbWUoZC0+bV9z dGFydFRpbWUpOwogICAgIGQtPm1fY3VybFJlcXVlc3QtPnN0YXJ0KCk7CiAKICAgICByZXR1cm4g dHJ1ZTsKQEAgLTM3NSw2ICszNzgsNyBAQCB2b2lkIFJlc291cmNlSGFuZGxlOjpyZXN0YXJ0UmVx dWVzdFdpdGhDcmVkZW50aWFsKGNvbnN0IFN0cmluZyYgdXNlciwgY29uc3QgU3RyaQogCiAgICAg ZC0+bV9jdXJsUmVxdWVzdCA9IGNyZWF0ZUN1cmxSZXF1ZXN0KFdURk1vdmUocHJldmlvdXNSZXF1 ZXN0KSwgUmVxdWVzdFN0YXR1czo6UmV1c2VkUmVxdWVzdCk7CiAgICAgZC0+bV9jdXJsUmVxdWVz dC0+c2V0VXNlclBhc3ModXNlciwgcGFzc3dvcmQpOworICAgIGQtPm1fY3VybFJlcXVlc3QtPnNl dFN0YXJ0VGltZShkLT5tX3N0YXJ0VGltZSk7CiAgICAgZC0+bV9jdXJsUmVxdWVzdC0+c3RhcnQo KTsKIH0KIApAQCAtMzg4LDYgKzM5Miw3IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OnBsYXRmb3Jt TG9hZFJlc291cmNlU3luY2hyb25vdXNseShOZXR3b3JraW5nQ29udGV4dCogY29udGV4CiAgICAg Ym9vbCBzaG91bGRDb250ZW50RW5jb2RpbmdTbmlmZiA9IHRydWU7CiAgICAgUmVmUHRyPFJlc291 cmNlSGFuZGxlPiBoYW5kbGUgPSBhZG9wdFJlZihuZXcgUmVzb3VyY2VIYW5kbGUoY29udGV4dCwg cmVxdWVzdCwgJmNsaWVudCwgZGVmZXJzTG9hZGluZywgc2hvdWxkQ29udGVudFNuaWZmLCBzaG91 bGRDb250ZW50RW5jb2RpbmdTbmlmZikpOwogICAgIGhhbmRsZS0+ZC0+bV9tZXNzYWdlUXVldWUg PSAmY2xpZW50Lm1lc3NhZ2VRdWV1ZSgpOworICAgIGhhbmRsZS0+ZC0+bV9zdGFydFRpbWUgPSBN b25vdG9uaWNUaW1lOjpub3coKTsKIAogICAgIGlmIChyZXF1ZXN0LnVybCgpLnByb3RvY29sSXNE YXRhKCkpIHsKICAgICAgICAgaGFuZGxlLT5oYW5kbGVEYXRhVVJMKCk7CkBAIC0zOTYsNiArNDAx LDcgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6cGxhdGZvcm1Mb2FkUmVzb3VyY2VTeW5jaHJvbm91 c2x5KE5ldHdvcmtpbmdDb250ZXh0KiBjb250ZXgKIAogICAgIGF1dG8gcmVxdWVzdENvcHkgPSBo YW5kbGUtPmZpcnN0UmVxdWVzdCgpOwogICAgIGhhbmRsZS0+ZC0+bV9jdXJsUmVxdWVzdCA9IGhh bmRsZS0+Y3JlYXRlQ3VybFJlcXVlc3QoV1RGTW92ZShyZXF1ZXN0Q29weSkpOworICAgIGhhbmRs ZS0+ZC0+bV9jdXJsUmVxdWVzdC0+c2V0U3RhcnRUaW1lKGhhbmRsZS0+ZC0+bV9zdGFydFRpbWUp OwogICAgIGhhbmRsZS0+ZC0+bV9jdXJsUmVxdWVzdC0+c3RhcnQoKTsKIAogICAgIGRvIHsKQEAg LTQ4Myw2ICs0ODksNyBAQCB2b2lkIFJlc291cmNlSGFuZGxlOjp3aWxsU2VuZFJlcXVlc3QoKQog ICAgICAgICAvLyBpbiBhIGNyb3NzLW9yaWdpbiByZWRpcmVjdCwgd2Ugd2FudCB0byBjbGVhciB0 aG9zZSBoZWFkZXJzIGhlcmUuIAogICAgICAgICBuZXdSZXF1ZXN0LmNsZWFySFRUUEF1dGhvcml6 YXRpb24oKTsKICAgICAgICAgbmV3UmVxdWVzdC5jbGVhckhUVFBPcmlnaW4oKTsKKyAgICAgICAg ZC0+bV9zdGFydFRpbWUgPSBXVEY6Ok1vbm90b25pY1RpbWU6Om5vdygpOwogICAgIH0KIAogICAg IFJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2VDb3B5ID0gZGVsZWdhdGUoKS0+cmVzcG9uc2UoKTsK QEAgLTUxMyw2ICs1MjAsNyBAQCB2b2lkIFJlc291cmNlSGFuZGxlOjpjb250aW51ZUFmdGVyV2ls bFNlbmRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QpCiAgICAgaWYgKHNob3VsZEZv cndhcmRDcmVkZW50aWFsICYmIGNyZWRlbnRpYWwpCiAgICAgICAgIGQtPm1fY3VybFJlcXVlc3Qt PnNldFVzZXJQYXNzKGNyZWRlbnRpYWwtPmZpcnN0LCBjcmVkZW50aWFsLT5zZWNvbmQpOwogCisg ICAgZC0+bV9jdXJsUmVxdWVzdC0+c2V0U3RhcnRUaW1lKGQtPm1fc3RhcnRUaW1lKTsKICAgICBk LT5tX2N1cmxSZXF1ZXN0LT5zdGFydCgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIzMzQwNGMwZmJhLi5i ZDQzMGYzMTlmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxOC0wOS0xNCAgQmFzdWtl IFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW0N1cmxdIEJ1ZyBm aXggb24gc29tZSBpbmFjY3VyYXRlIHZhbHVlcyBpbiBOZXR3b3JrTG9hZE1ldHJpY3MuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODk1MzAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJsIHBvcnQgdXNl cyB0aGUgc3RhcnQgdGltZSBsaWJjdXJsIHByb3ZpZGVkLiBCdXQgdGhlcmUncyBhIGx1ZyBiZXR3 ZWVuIG1haW4gdGhyZWFkIGFuZCBDdXJsIHRocmVhZC4KKyAgICAgICAgUmVjb3JkIHRoZSBzdGFy dCB0aW1lIG9mIHJlcXVlc3QgaW5zdGVhZCBvZiBsaWJjdXJsJ3Mgc3RhcnQgdGltaW5nIGFuZCB1 c2UgaXQgdG8gbWVhc3VyZSB0aGUgbWV0cmljcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L2N1cmwvTmV0d29ya0RhdGFUYXNrQ3VybC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtE YXRhVGFza0N1cmw6Ok5ldHdvcmtEYXRhVGFza0N1cmwpOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrRGF0YVRhc2tDdXJsOjp3aWxsUGVyZm9ybUhUVFBSZWRpcmVjdGlvbik6CisgICAgICAgIChX ZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza0N1cmw6OnJlc3RhcnRXaXRoQ3JlZGVudGlhbCk6CisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRhc2tDdXJsLmg6CisKIDIwMTgt MDktMTAgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAg VHJ5IHRvIGZpeCB0aGUgYnVpbGQgYWZ0ZXIgcjIzNTg1MApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtEYXRhVGFza0N1cmwuY3BwIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtEYXRhVGFza0N1cmwuY3BwCmluZGV4 IGY3ZDQ5YzI4MmIxLi45OGE3N2IyY2JiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtEYXRhVGFza0N1cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRhc2tDdXJsLmNwcApAQCAtNDYsNiAr NDYsOCBAQCBOZXR3b3JrRGF0YVRhc2tDdXJsOjpOZXR3b3JrRGF0YVRhc2tDdXJsKE5ldHdvcmtT ZXNzaW9uJiBzZXNzaW9uLCBOZXR3b3JrRGF0YVRhcwogICAgIGlmIChtX3NjaGVkdWxlZEZhaWx1 cmVUeXBlICE9IE5vRmFpbHVyZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgbV9zdGFydFRpbWUg PSBNb25vdG9uaWNUaW1lOjpub3coKTsKKwogICAgIGF1dG8gcmVxdWVzdCA9IHJlcXVlc3RXaXRo Q3JlZGVudGlhbHM7CiAgICAgaWYgKHJlcXVlc3QudXJsKCkucHJvdG9jb2xJc0luSFRUUEZhbWls eSgpKSB7CiAgICAgICAgIGlmIChtX3N0b3JlZENyZWRlbnRpYWxzUG9saWN5ID09IFN0b3JlZENy ZWRlbnRpYWxzUG9saWN5OjpVc2UpIHsKQEAgLTY0LDYgKzY2LDcgQEAgTmV0d29ya0RhdGFUYXNr Q3VybDo6TmV0d29ya0RhdGFUYXNrQ3VybChOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29y a0RhdGFUYXMKICAgICBtX2N1cmxSZXF1ZXN0ID0gY3JlYXRlQ3VybFJlcXVlc3QoV1RGTW92ZShy ZXF1ZXN0KSk7CiAgICAgaWYgKCFtX2luaXRpYWxDcmVkZW50aWFsLmlzRW1wdHkoKSkKICAgICAg ICAgbV9jdXJsUmVxdWVzdC0+c2V0VXNlclBhc3MobV9pbml0aWFsQ3JlZGVudGlhbC51c2VyKCks IG1faW5pdGlhbENyZWRlbnRpYWwucGFzc3dvcmQoKSk7CisgICAgbV9jdXJsUmVxdWVzdC0+c2V0 U3RhcnRUaW1lKG1fc3RhcnRUaW1lKTsKICAgICBtX2N1cmxSZXF1ZXN0LT5zdGFydCgpOwogfQog CkBAIC0yOTEsMTcgKzI5NCwyMSBAQCB2b2lkIE5ldHdvcmtEYXRhVGFza0N1cmw6OndpbGxQZXJm b3JtSFRUUFJlZGlyZWN0aW9uKCkKICAgICB9CiAKICAgICBhdXRvIHJlc3BvbnNlID0gUmVzb3Vy Y2VSZXNwb25zZShtX3Jlc3BvbnNlKTsKLSAgICBtX2NsaWVudC0+d2lsbFBlcmZvcm1IVFRQUmVk aXJlY3Rpb24oV1RGTW92ZShyZXNwb25zZSksIFdURk1vdmUocmVxdWVzdCksIFt0aGlzLCBwcm90 ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGRpZENoYW5nZUNyZWRlbnRpYWxdKGNvbnN0IFJl c291cmNlUmVxdWVzdCYgbmV3UmVxdWVzdCkgeworICAgIG1fY2xpZW50LT53aWxsUGVyZm9ybUhU VFBSZWRpcmVjdGlvbihXVEZNb3ZlKHJlc3BvbnNlKSwgV1RGTW92ZShyZXF1ZXN0KSwgW3RoaXMs IHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZGlkQ2hhbmdlQ3JlZGVudGlhbCwgaXND cm9zc09yaWdpbl0oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBuZXdSZXF1ZXN0KSB7CiAgICAgICAg IGlmIChuZXdSZXF1ZXN0LmlzTnVsbCgpIHx8IG1fc3RhdGUgPT0gU3RhdGU6OkNhbmNlbGluZykK ICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBpZiAobV9jdXJsUmVxdWVzdCkKICAgICAg ICAgICAgIG1fY3VybFJlcXVlc3QtPmNhbmNlbCgpOwogCisgICAgICAgIGlmIChuZXdSZXF1ZXN0 LnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSAmJiBpc0Nyb3NzT3JpZ2luKQorICAgICAg ICAgICAgbV9zdGFydFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3coKTsKKwogICAgICAgICBhdXRv IHJlcXVlc3RDb3B5ID0gbmV3UmVxdWVzdDsKICAgICAgICAgbV9jdXJsUmVxdWVzdCA9IGNyZWF0 ZUN1cmxSZXF1ZXN0KFdURk1vdmUocmVxdWVzdENvcHkpKTsKICAgICAgICAgaWYgKGRpZENoYW5n ZUNyZWRlbnRpYWwgJiYgIW1faW5pdGlhbENyZWRlbnRpYWwuaXNFbXB0eSgpKQogICAgICAgICAg ICAgbV9jdXJsUmVxdWVzdC0+c2V0VXNlclBhc3MobV9pbml0aWFsQ3JlZGVudGlhbC51c2VyKCks IG1faW5pdGlhbENyZWRlbnRpYWwucGFzc3dvcmQoKSk7CisgICAgICAgIG1fY3VybFJlcXVlc3Qt PnNldFN0YXJ0VGltZShtX3N0YXJ0VGltZSk7CiAgICAgICAgIG1fY3VybFJlcXVlc3QtPnN0YXJ0 KCk7CiAKICAgICAgICAgaWYgKG1fc3RhdGUgIT0gU3RhdGU6OlN1c3BlbmRlZCkgewpAQCAtMzkz LDYgKzQwMCw3IEBAIHZvaWQgTmV0d29ya0RhdGFUYXNrQ3VybDo6cmVzdGFydFdpdGhDcmVkZW50 aWFsKGNvbnN0IENyZWRlbnRpYWwmIGNyZWRlbnRpYWwpCiAKICAgICBtX2N1cmxSZXF1ZXN0ID0g Y3JlYXRlQ3VybFJlcXVlc3QoV1RGTW92ZShwcmV2aW91c1JlcXVlc3QpLCBSZXF1ZXN0U3RhdHVz OjpSZXVzZWRSZXF1ZXN0KTsKICAgICBtX2N1cmxSZXF1ZXN0LT5zZXRVc2VyUGFzcyhjcmVkZW50 aWFsLnVzZXIoKSwgY3JlZGVudGlhbC5wYXNzd29yZCgpKTsKKyAgICBtX2N1cmxSZXF1ZXN0LT5z ZXRTdGFydFRpbWUobV9zdGFydFRpbWUpOwogICAgIG1fY3VybFJlcXVlc3QtPnN0YXJ0KCk7CiAK ICAgICBpZiAobV9zdGF0ZSAhPSBTdGF0ZTo6U3VzcGVuZGVkKSB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya0RhdGFUYXNrQ3VybC5oIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtEYXRhVGFza0N1cmwuaAppbmRl eCBmY2M0ZDM0ZTRkNi4uZjBkYjhkM2I4NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRhc2tDdXJsLmgKKysrIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtEYXRhVGFza0N1cmwuaApAQCAtODUsNiArODUs OCBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UgbV9yZXNwb25zZTsK ICAgICB1bnNpZ25lZCBtX3JlZGlyZWN0Q291bnQgeyAwIH07CiAgICAgdW5zaWduZWQgbV9hdXRo RmFpbHVyZUNvdW50IHsgMCB9OworCisgICAgTW9ub3RvbmljVGltZSBtX3N0YXJ0VGltZTsKIH07 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo= 349819 2018-09-14 15:31:13 -0700 2018-09-14 17:46:54 -0700 PATCH 189530.diff text/plain 14685 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0NGE3Y2ZjZjk4ZC4uMzAyMDUzNDI5M2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAxOC0wOS0xNCAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29u eS5jb20+CisKKyAgICAgICAgW0N1cmxdIEJ1ZyBmaXggb24gc29tZSBpbmFjY3VyYXRlIHZhbHVl cyBpbiBOZXR3b3JrTG9hZE1ldHJpY3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODk1MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDdXJsIHBvcnQgdXNlcyB0aGUgc3RhcnQgdGltZSBsaWJjdXJsIHBy b3ZpZGVkLiBCdXQgdGhlcmUncyBhIGx1ZyBiZXR3ZWVuIG1haW4gdGhyZWFkIGFuZCBDdXJsIHRo cmVhZC4KKyAgICAgICAgUmVjb3JkIHRoZSBzdGFydCB0aW1lIG9mIHJlcXVlc3QgaW5zdGVhZCBv ZiBsaWJjdXJsJ3Mgc3RhcnQgdGltaW5nIGFuZCB1c2UgaXQgdG8gbWVhc3VyZSB0aGUgbWV0cmlj cy4KKyAgICAgICAgQWxzbyByZXNwb25kRW5kIHdhcyBub3QgY29ycmVjdGx5IHJlY29yZGVkIGFu ZCBmaXhlZC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBpdCBjYW5ub3QgYmUgbWVh c3VyZWQgZnJvbSBEUlQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFu ZGxlSW50ZXJuYWwuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRl eHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q3VybEhhbmRsZTo6Z2V0TmV0d29ya0xvYWRNZXRy aWNzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q3VybFJlcXVlc3Q6OnN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1 ZXN0OjpzZXR1cFRyYW5zZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1ZXN0OjpkaWRD b21wbGV0ZVRyYW5zZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1ZXN0Ojp1cGRhdGVO ZXR3b3JrTG9hZE1ldHJpY3MpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJs UmVxdWVzdC5oOgorICAgICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3Q6OnNldFN0YXJ0VGltZSk6 CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6c3RhcnQpOgorICAgICAgICAoV2Vi Q29yZTo6UmVzb3VyY2VIYW5kbGU6OnJlc3RhcnRSZXF1ZXN0V2l0aENyZWRlbnRpYWwpOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtTG9hZFJlc291cmNlU3luY2hy b25vdXNseSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6d2lsbFNlbmRSZXF1 ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpjb250aW51ZUFmdGVyV2ls bFNlbmRSZXF1ZXN0KToKKwogMjAxOC0wOS0xNCAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFw cGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBhdHRlbXB0IHRvIGZpeCB0aGUgaU9TTWFj IGJ1aWxkIGFmdGVyIHIyMzYwMTUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlSW50ZXJuYWwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5oCmluZGV4IDc3ZTI2ZTczMTdiLi4y NDNkZTlmODI2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9S ZXNvdXJjZUhhbmRsZUludGVybmFsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgKQEAgLTQwLDYgKzQwLDcgQEAKICNpZiBVU0Uo Q1VSTCkKICNpbmNsdWRlICJDdXJsUmVxdWVzdC5oIgogI2luY2x1ZGUgPHd0Zi9NZXNzYWdlUXVl dWUuaD4KKyNpbmNsdWRlIDx3dGYvTW9ub3RvbmljVGltZS5oPgogI2VuZGlmCiAKICNpZiBQTEFU Rk9STShDT0NPQSkKQEAgLTEyNSw2ICsxMjYsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBtX2FkZGVk Q2FjaGVWYWxpZGF0aW9uSGVhZGVycyB7IGZhbHNlIH07CiAgICAgUmVmUHRyPEN1cmxSZXF1ZXN0 PiBtX2N1cmxSZXF1ZXN0OwogICAgIE1lc3NhZ2VRdWV1ZTxXVEY6OkZ1bmN0aW9uPHZvaWQoKT4+ KiBtX21lc3NhZ2VRdWV1ZSB7IH07CisgICAgTW9ub3RvbmljVGltZSBtX3N0YXJ0VGltZTsKICNl bmRpZgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9jdXJsL0N1cmxDb250ZXh0LmNwcAppbmRleCA2NGI4MzhjOWQ1ZC4uZDM2 NDc4ZWJmY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy bC9DdXJsQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j dXJsL0N1cmxDb250ZXh0LmNwcApAQCAtNzMxLDcgKzczMSw3IEBAIHN0ZDo6b3B0aW9uYWw8bG9u Zz4gQ3VybEhhbmRsZTo6Z2V0SHR0cFZlcnNpb24oKQogICAgIHJldHVybiB2ZXJzaW9uOwogfQog Ci1zdGQ6Om9wdGlvbmFsPE5ldHdvcmtMb2FkTWV0cmljcz4gQ3VybEhhbmRsZTo6Z2V0TmV0d29y a0xvYWRNZXRyaWNzKCkKK3N0ZDo6b3B0aW9uYWw8TmV0d29ya0xvYWRNZXRyaWNzPiBDdXJsSGFu ZGxlOjpnZXROZXR3b3JrTG9hZE1ldHJpY3MoY29uc3QgV1RGOjpTZWNvbmRzJiBkb21haW5Mb29r dXBTdGFydCkKIHsKICAgICBkb3VibGUgbmFtZUxvb2t1cCA9IDAuMDsKICAgICBkb3VibGUgY29u bmVjdCA9IDAuMDsKQEAgLTc5NSwxOCArNzk1LDE4IEBAIHN0ZDo6b3B0aW9uYWw8TmV0d29ya0xv YWRNZXRyaWNzPiBDdXJsSGFuZGxlOjpnZXROZXR3b3JrTG9hZE1ldHJpY3MoKQogCiAgICAgTmV0 d29ya0xvYWRNZXRyaWNzIG5ldHdvcmtMb2FkTWV0cmljczsKIAotICAgIG5ldHdvcmtMb2FkTWV0 cmljcy5kb21haW5Mb29rdXBTdGFydCA9IFNlY29uZHMoMCk7Ci0gICAgbmV0d29ya0xvYWRNZXRy aWNzLmRvbWFpbkxvb2t1cEVuZCA9IFNlY29uZHMobmFtZUxvb2t1cCk7Ci0gICAgbmV0d29ya0xv YWRNZXRyaWNzLmNvbm5lY3RTdGFydCA9IFNlY29uZHMobmFtZUxvb2t1cCk7Ci0gICAgbmV0d29y a0xvYWRNZXRyaWNzLmNvbm5lY3RFbmQgPSBTZWNvbmRzKGNvbm5lY3QpOworICAgIG5ldHdvcmtM b2FkTWV0cmljcy5kb21haW5Mb29rdXBTdGFydCA9IGRvbWFpbkxvb2t1cFN0YXJ0OworICAgIG5l dHdvcmtMb2FkTWV0cmljcy5kb21haW5Mb29rdXBFbmQgPSBkb21haW5Mb29rdXBTdGFydCArIFNl Y29uZHMobmFtZUxvb2t1cCk7CisgICAgbmV0d29ya0xvYWRNZXRyaWNzLmNvbm5lY3RTdGFydCA9 IGRvbWFpbkxvb2t1cFN0YXJ0ICsgU2Vjb25kcyhuYW1lTG9va3VwKTsKKyAgICBuZXR3b3JrTG9h ZE1ldHJpY3MuY29ubmVjdEVuZCA9IGRvbWFpbkxvb2t1cFN0YXJ0ICsgU2Vjb25kcyhjb25uZWN0 KTsKIAogICAgIGlmIChhcHBDb25uZWN0ID4gMC4wKSB7Ci0gICAgICAgIG5ldHdvcmtMb2FkTWV0 cmljcy5zZWN1cmVDb25uZWN0aW9uU3RhcnQgPSBTZWNvbmRzKGNvbm5lY3QpOwotICAgICAgICBu ZXR3b3JrTG9hZE1ldHJpY3MuY29ubmVjdEVuZCA9IFNlY29uZHMoYXBwQ29ubmVjdCk7CisgICAg ICAgIG5ldHdvcmtMb2FkTWV0cmljcy5zZWN1cmVDb25uZWN0aW9uU3RhcnQgPSBkb21haW5Mb29r dXBTdGFydCArIFNlY29uZHMoY29ubmVjdCk7CisgICAgICAgIG5ldHdvcmtMb2FkTWV0cmljcy5j b25uZWN0RW5kID0gZG9tYWluTG9va3VwU3RhcnQgKyBTZWNvbmRzKGFwcENvbm5lY3QpOwogICAg IH0KIAogICAgIG5ldHdvcmtMb2FkTWV0cmljcy5yZXF1ZXN0U3RhcnQgPSBuZXR3b3JrTG9hZE1l dHJpY3MuY29ubmVjdEVuZDsKLSAgICBuZXR3b3JrTG9hZE1ldHJpY3MucmVzcG9uc2VTdGFydCA9 IFNlY29uZHMoc3RhcnRUcmFuc2Zlcik7CisgICAgbmV0d29ya0xvYWRNZXRyaWNzLnJlc3BvbnNl U3RhcnQgPSBkb21haW5Mb29rdXBTdGFydCArIFNlY29uZHMoc3RhcnRUcmFuc2Zlcik7CiAKICAg ICBuZXR3b3JrTG9hZE1ldHJpY3MucmVxdWVzdEhlYWRlckJ5dGVzU2VudCA9IHJlcXVlc3RIZWFk ZXJTaXplOwogICAgIG5ldHdvcmtMb2FkTWV0cmljcy5yZXF1ZXN0Qm9keUJ5dGVzU2VudCA9IHJl cXVlc3RCb2R5U2l6ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY3VybC9DdXJsQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j dXJsL0N1cmxDb250ZXh0LmgKaW5kZXggNWMxMjZhZjExMDEuLjhhOTQ1MjBlNjdmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuaApA QCAtMjgyLDcgKzI4Miw3IEBAIHB1YmxpYzoKICAgICBzdGQ6Om9wdGlvbmFsPGxvbmc+IGdldEh0 dHBBdXRoQXZhaWwoKTsKICAgICBzdGQ6Om9wdGlvbmFsPGxvbmc+IGdldFByb3h5QXV0aEF2YWls KCk7CiAgICAgc3RkOjpvcHRpb25hbDxsb25nPiBnZXRIdHRwVmVyc2lvbigpOwotICAgIHN0ZDo6 b3B0aW9uYWw8TmV0d29ya0xvYWRNZXRyaWNzPiBnZXROZXR3b3JrTG9hZE1ldHJpY3MoKTsKKyAg ICBzdGQ6Om9wdGlvbmFsPE5ldHdvcmtMb2FkTWV0cmljcz4gZ2V0TmV0d29ya0xvYWRNZXRyaWNz KGNvbnN0IFdURjo6U2Vjb25kcyYgZG9tYWluTG9va3VwU3RhcnQpOwogCiAgICAgaW50IHNzbEVy cm9ycygpIGNvbnN0OwogICAgIHN0ZDo6b3B0aW9uYWw8Q2VydGlmaWNhdGVJbmZvPiBjZXJ0aWZp Y2F0ZUluZm8oKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvY3VybC9DdXJsUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2N1cmwvQ3VybFJlcXVlc3QuY3BwCmluZGV4IDVkMDYxY2ExYzM4Li4yZDhhZmYyYzliNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1 ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJl cXVlc3QuY3BwCkBAIC04MCw2ICs4MCw5IEBAIHZvaWQgQ3VybFJlcXVlc3Q6OnN0YXJ0KCkKIAog ICAgIGF1dG8gdXJsID0gbV9yZXF1ZXN0LnVybCgpLmlzb2xhdGVkQ29weSgpOwogCisgICAgaWYg KHN0ZDo6aXNuYW4obV9yZXF1ZXN0U3RhcnRUaW1lKSkKKyAgICAgICAgbV9yZXF1ZXN0U3RhcnRU aW1lID0gTW9ub3RvbmljVGltZTo6bm93KCk7CisKICAgICBpZiAodXJsLmlzTG9jYWxGaWxlKCkp CiAgICAgICAgIGludm9rZURpZFJlY2VpdmVSZXNwb25zZUZvckZpbGUodXJsKTsKICAgICBlbHNl CkBAIC0xOTUsNiArMTk4LDggQEAgQ1VSTCogQ3VybFJlcXVlc3Q6OnNldHVwVHJhbnNmZXIoKQog ICAgIGlmIChtX3Nob3VsZFN1c3BlbmQpCiAgICAgICAgIHNldFJlcXVlc3RQYXVzZWQodHJ1ZSk7 CiAKKyAgICBtX3BlcmZvcm1TdGFydFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3coKTsKKwogICAg IHJldHVybiBtX2N1cmxIYW5kbGUtPmhhbmRsZSgpOwogfQogCkBAIC00MDUsNyArNDEwLDEwIEBA IHZvaWQgQ3VybFJlcXVlc3Q6OmRpZENvbXBsZXRlVHJhbnNmZXIoQ1VSTGNvZGUgcmVzdWx0KQog ICAgICAgICB1cGRhdGVOZXR3b3JrTG9hZE1ldHJpY3MoKTsKIAogICAgICAgICBmaW5hbGl6ZVRy YW5zZmVyKCk7Ci0gICAgICAgIGNhbGxDbGllbnQoW10oQ3VybFJlcXVlc3QmIHJlcXVlc3QsIEN1 cmxSZXF1ZXN0Q2xpZW50JiBjbGllbnQpIHsKKyAgICAgICAgY2FsbENsaWVudChbdGhpcywgcHJv dGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXShDdXJsUmVxdWVzdCYgcmVxdWVzdCwgQ3VybFJl cXVlc3RDbGllbnQmIGNsaWVudCkgeworICAgICAgICAgICAgbV9uZXR3b3JrTG9hZE1ldHJpY3Mu cmVzcG9uc2VFbmQgPSBNb25vdG9uaWNUaW1lOjpub3coKSAtIG1fcmVxdWVzdFN0YXJ0VGltZTsK KyAgICAgICAgICAgIG1fbmV0d29ya0xvYWRNZXRyaWNzLm1hcmtDb21wbGV0ZSgpOworCiAgICAg ICAgICAgICBjbGllbnQuY3VybERpZENvbXBsZXRlKHJlcXVlc3QpOwogICAgICAgICB9KTsKICAg ICB9IGVsc2UgewpAQCAtNjM4LDcgKzY0Niw5IEBAIGJvb2wgQ3VybFJlcXVlc3Q6OmlzSGFuZGxl UGF1c2VkKCkgY29uc3QKIAogdm9pZCBDdXJsUmVxdWVzdDo6dXBkYXRlTmV0d29ya0xvYWRNZXRy aWNzKCkKIHsKLSAgICBpZiAoYXV0byBtZXRyaWNzID0gbV9jdXJsSGFuZGxlLT5nZXROZXR3b3Jr TG9hZE1ldHJpY3MoKSkKKyAgICBhdXRvIGRvbWFpbkxvb2t1cFN0YXJ0ID0gbV9wZXJmb3JtU3Rh cnRUaW1lIC0gbV9yZXF1ZXN0U3RhcnRUaW1lOworCisgICAgaWYgKGF1dG8gbWV0cmljcyA9IG1f Y3VybEhhbmRsZS0+Z2V0TmV0d29ya0xvYWRNZXRyaWNzKGRvbWFpbkxvb2t1cFN0YXJ0KSkKICAg ICAgICAgbV9uZXR3b3JrTG9hZE1ldHJpY3MgPSAqbWV0cmljczsKIAogICAgIG1fbmV0d29ya0xv YWRNZXRyaWNzLnJlcXVlc3RIZWFkZXJzID0gbV9yZXF1ZXN0Lmh0dHBIZWFkZXJGaWVsZHMoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVx dWVzdC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0 LmgKaW5kZXggZDYxMWIxMTNjMDMuLjk1OGM3NzdiNzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3QuaApAQCAtMzYsNiArMzYsNyBA QAogI2luY2x1ZGUgIk5ldHdvcmtMb2FkTWV0cmljcy5oIgogI2luY2x1ZGUgIlJlc291cmNlUmVx dWVzdC5oIgogI2luY2x1ZGUgPHd0Zi9NZXNzYWdlUXVldWUuaD4KKyNpbmNsdWRlIDx3dGYvTW9u b3RvbmljVGltZS5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CkBAIC02Nyw2ICs2OCw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgaW52YWxpZGF0 ZUNsaWVudCgpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0VXNlclBhc3MoY29uc3QgU3Ry aW5nJiwgY29uc3QgU3RyaW5nJik7CisgICAgdm9pZCBzZXRTdGFydFRpbWUoY29uc3QgTW9ub3Rv bmljVGltZSYgc3RhcnRUaW1lKSB7IG1fcmVxdWVzdFN0YXJ0VGltZSA9IHN0YXJ0VGltZTsgfQog CiAgICAgdm9pZCBzdGFydCgpOwogICAgIHZvaWQgY2FuY2VsKCk7CkBAIC0xOTcsNiArMTk5LDgg QEAgcHJpdmF0ZToKIAogICAgIENlcnRpZmljYXRlSW5mbyBtX2NlcnRpZmljYXRlSW5mbzsKICAg ICBOZXR3b3JrTG9hZE1ldHJpY3MgbV9uZXR3b3JrTG9hZE1ldHJpY3M7CisgICAgTW9ub3Rvbmlj VGltZSBtX3JlcXVlc3RTdGFydFRpbWUgeyBNb25vdG9uaWNUaW1lOjpuYW4oKSB9OworICAgIE1v bm90b25pY1RpbWUgbV9wZXJmb3JtU3RhcnRUaW1lOwogICAgIHNpemVfdCBtX3RvdGFsUmVjZWl2 ZWRTaXplIHsgMCB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsLmNwcAppbmRleCBjNDJhZGMzNzhh Ni4uOTlmZTFjMTQ0OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY3VybC9SZXNvdXJjZUhhbmRsZUN1cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZUN1cmwuY3BwCkBAIC04MSwxMSArODEsMTQg QEAgYm9vbCBSZXNvdXJjZUhhbmRsZTo6c3RhcnQoKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICB9CiAKKyAgICBkLT5tX3N0YXJ0VGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygpOworCiAgICAg ZC0+bV9jdXJsUmVxdWVzdCA9IGNyZWF0ZUN1cmxSZXF1ZXN0KFdURk1vdmUocmVxdWVzdCkpOwog CiAgICAgaWYgKGF1dG8gY3JlZGVudGlhbCA9IGdldENyZWRlbnRpYWwoZC0+bV9maXJzdFJlcXVl c3QsIGZhbHNlKSkKICAgICAgICAgZC0+bV9jdXJsUmVxdWVzdC0+c2V0VXNlclBhc3MoY3JlZGVu dGlhbC0+Zmlyc3QsIGNyZWRlbnRpYWwtPnNlY29uZCk7CiAKKyAgICBkLT5tX2N1cmxSZXF1ZXN0 LT5zZXRTdGFydFRpbWUoZC0+bV9zdGFydFRpbWUpOwogICAgIGQtPm1fY3VybFJlcXVlc3QtPnN0 YXJ0KCk7CiAKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTM3NSw2ICszNzgsNyBAQCB2b2lkIFJlc291 cmNlSGFuZGxlOjpyZXN0YXJ0UmVxdWVzdFdpdGhDcmVkZW50aWFsKGNvbnN0IFN0cmluZyYgdXNl ciwgY29uc3QgU3RyaQogCiAgICAgZC0+bV9jdXJsUmVxdWVzdCA9IGNyZWF0ZUN1cmxSZXF1ZXN0 KFdURk1vdmUocHJldmlvdXNSZXF1ZXN0KSwgUmVxdWVzdFN0YXR1czo6UmV1c2VkUmVxdWVzdCk7 CiAgICAgZC0+bV9jdXJsUmVxdWVzdC0+c2V0VXNlclBhc3ModXNlciwgcGFzc3dvcmQpOworICAg IGQtPm1fY3VybFJlcXVlc3QtPnNldFN0YXJ0VGltZShkLT5tX3N0YXJ0VGltZSk7CiAgICAgZC0+ bV9jdXJsUmVxdWVzdC0+c3RhcnQoKTsKIH0KIApAQCAtMzg4LDYgKzM5Miw3IEBAIHZvaWQgUmVz b3VyY2VIYW5kbGU6OnBsYXRmb3JtTG9hZFJlc291cmNlU3luY2hyb25vdXNseShOZXR3b3JraW5n Q29udGV4dCogY29udGV4CiAgICAgYm9vbCBzaG91bGRDb250ZW50RW5jb2RpbmdTbmlmZiA9IHRy dWU7CiAgICAgUmVmUHRyPFJlc291cmNlSGFuZGxlPiBoYW5kbGUgPSBhZG9wdFJlZihuZXcgUmVz b3VyY2VIYW5kbGUoY29udGV4dCwgcmVxdWVzdCwgJmNsaWVudCwgZGVmZXJzTG9hZGluZywgc2hv dWxkQ29udGVudFNuaWZmLCBzaG91bGRDb250ZW50RW5jb2RpbmdTbmlmZikpOwogICAgIGhhbmRs ZS0+ZC0+bV9tZXNzYWdlUXVldWUgPSAmY2xpZW50Lm1lc3NhZ2VRdWV1ZSgpOworICAgIGhhbmRs ZS0+ZC0+bV9zdGFydFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3coKTsKIAogICAgIGlmIChyZXF1 ZXN0LnVybCgpLnByb3RvY29sSXNEYXRhKCkpIHsKICAgICAgICAgaGFuZGxlLT5oYW5kbGVEYXRh VVJMKCk7CkBAIC0zOTYsNiArNDAxLDcgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6cGxhdGZvcm1M b2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KE5ldHdvcmtpbmdDb250ZXh0KiBjb250ZXgKIAogICAg IGF1dG8gcmVxdWVzdENvcHkgPSBoYW5kbGUtPmZpcnN0UmVxdWVzdCgpOwogICAgIGhhbmRsZS0+ ZC0+bV9jdXJsUmVxdWVzdCA9IGhhbmRsZS0+Y3JlYXRlQ3VybFJlcXVlc3QoV1RGTW92ZShyZXF1 ZXN0Q29weSkpOworICAgIGhhbmRsZS0+ZC0+bV9jdXJsUmVxdWVzdC0+c2V0U3RhcnRUaW1lKGhh bmRsZS0+ZC0+bV9zdGFydFRpbWUpOwogICAgIGhhbmRsZS0+ZC0+bV9jdXJsUmVxdWVzdC0+c3Rh cnQoKTsKIAogICAgIGRvIHsKQEAgLTQ4Myw2ICs0ODksNyBAQCB2b2lkIFJlc291cmNlSGFuZGxl Ojp3aWxsU2VuZFJlcXVlc3QoKQogICAgICAgICAvLyBpbiBhIGNyb3NzLW9yaWdpbiByZWRpcmVj dCwgd2Ugd2FudCB0byBjbGVhciB0aG9zZSBoZWFkZXJzIGhlcmUuIAogICAgICAgICBuZXdSZXF1 ZXN0LmNsZWFySFRUUEF1dGhvcml6YXRpb24oKTsKICAgICAgICAgbmV3UmVxdWVzdC5jbGVhckhU VFBPcmlnaW4oKTsKKyAgICAgICAgZC0+bV9zdGFydFRpbWUgPSBXVEY6Ok1vbm90b25pY1RpbWU6 Om5vdygpOwogICAgIH0KIAogICAgIFJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2VDb3B5ID0gZGVs ZWdhdGUoKS0+cmVzcG9uc2UoKTsKQEAgLTUxMyw2ICs1MjAsNyBAQCB2b2lkIFJlc291cmNlSGFu ZGxlOjpjb250aW51ZUFmdGVyV2lsbFNlbmRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYmIHJlcXVl c3QpCiAgICAgaWYgKHNob3VsZEZvcndhcmRDcmVkZW50aWFsICYmIGNyZWRlbnRpYWwpCiAgICAg ICAgIGQtPm1fY3VybFJlcXVlc3QtPnNldFVzZXJQYXNzKGNyZWRlbnRpYWwtPmZpcnN0LCBjcmVk ZW50aWFsLT5zZWNvbmQpOwogCisgICAgZC0+bV9jdXJsUmVxdWVzdC0+c2V0U3RhcnRUaW1lKGQt Pm1fc3RhcnRUaW1lKTsKICAgICBkLT5tX2N1cmxSZXF1ZXN0LT5zdGFydCgpOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CmluZGV4IGZjZWI4ZDg3N2NmLi5iMzNkYTU1ZWU1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBA QAorMjAxOC0wOS0xNCAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisK KyAgICAgICAgW0N1cmxdIEJ1ZyBmaXggb24gc29tZSBpbmFjY3VyYXRlIHZhbHVlcyBpbiBOZXR3 b3JrTG9hZE1ldHJpY3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODk1MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDdXJsIHBvcnQgdXNlcyB0aGUgc3RhcnQgdGltZSBsaWJjdXJsIHByb3ZpZGVkLiBC dXQgdGhlcmUncyBhIGx1ZyBiZXR3ZWVuIG1haW4gdGhyZWFkIGFuZCBDdXJsIHRocmVhZC4KKyAg ICAgICAgUmVjb3JkIHRoZSBzdGFydCB0aW1lIG9mIHJlcXVlc3QgaW5zdGVhZCBvZiBsaWJjdXJs J3Mgc3RhcnQgdGltaW5nIGFuZCB1c2UgaXQgdG8gbWVhc3VyZSB0aGUgbWV0cmljcy4KKworICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya0RhdGFUYXNrQ3VybC5jcHA6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza0N1cmw6Ok5ldHdvcmtEYXRhVGFza0N1cmwpOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2tDdXJsOjp3aWxsUGVyZm9ybUhUVFBSZWRp cmVjdGlvbik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza0N1cmw6OnJlc3RhcnRX aXRoQ3JlZGVudGlhbCk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0 YVRhc2tDdXJsLmg6CisKIDIwMTgtMDktMTQgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5z ZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZWZhY3RvcmluZyByZWxhdGVkIHRvIFNhZmUgQnJv d3NpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3 b3JrRGF0YVRhc2tDdXJsLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9O ZXR3b3JrRGF0YVRhc2tDdXJsLmNwcAppbmRleCBhMTRkZDEyNjFiZi4uMTgzYjIxOWI2YmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRh c2tDdXJsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29y a0RhdGFUYXNrQ3VybC5jcHAKQEAgLTQ2LDYgKzQ2LDggQEAgTmV0d29ya0RhdGFUYXNrQ3VybDo6 TmV0d29ya0RhdGFUYXNrQ3VybChOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29ya0RhdGFU YXMKICAgICBpZiAobV9zY2hlZHVsZWRGYWlsdXJlVHlwZSAhPSBOb0ZhaWx1cmUpCiAgICAgICAg IHJldHVybjsKIAorICAgIG1fc3RhcnRUaW1lID0gTW9ub3RvbmljVGltZTo6bm93KCk7CisKICAg ICBhdXRvIHJlcXVlc3QgPSByZXF1ZXN0V2l0aENyZWRlbnRpYWxzOwogICAgIGlmIChyZXF1ZXN0 LnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkgewogICAgICAgICBpZiAobV9zdG9yZWRD cmVkZW50aWFsc1BvbGljeSA9PSBTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6VXNlKSB7CkBAIC02 NCw2ICs2Niw3IEBAIE5ldHdvcmtEYXRhVGFza0N1cmw6Ok5ldHdvcmtEYXRhVGFza0N1cmwoTmV0 d29ya1Nlc3Npb24mIHNlc3Npb24sIE5ldHdvcmtEYXRhVGFzCiAgICAgbV9jdXJsUmVxdWVzdCA9 IGNyZWF0ZUN1cmxSZXF1ZXN0KFdURk1vdmUocmVxdWVzdCkpOwogICAgIGlmICghbV9pbml0aWFs Q3JlZGVudGlhbC5pc0VtcHR5KCkpCiAgICAgICAgIG1fY3VybFJlcXVlc3QtPnNldFVzZXJQYXNz KG1faW5pdGlhbENyZWRlbnRpYWwudXNlcigpLCBtX2luaXRpYWxDcmVkZW50aWFsLnBhc3N3b3Jk KCkpOworICAgIG1fY3VybFJlcXVlc3QtPnNldFN0YXJ0VGltZShtX3N0YXJ0VGltZSk7CiAgICAg bV9jdXJsUmVxdWVzdC0+c3RhcnQoKTsKIH0KIApAQCAtMjk2LDE3ICsyOTksMjEgQEAgdm9pZCBO ZXR3b3JrRGF0YVRhc2tDdXJsOjp3aWxsUGVyZm9ybUhUVFBSZWRpcmVjdGlvbigpCiAgICAgfQog CiAgICAgYXV0byByZXNwb25zZSA9IFJlc291cmNlUmVzcG9uc2UobV9yZXNwb25zZSk7Ci0gICAg bV9jbGllbnQtPndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uKFdURk1vdmUocmVzcG9uc2UpLCBX VEZNb3ZlKHJlcXVlc3QpLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBk aWRDaGFuZ2VDcmVkZW50aWFsXShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIG5ld1JlcXVlc3QpIHsK KyAgICBtX2NsaWVudC0+d2lsbFBlcmZvcm1IVFRQUmVkaXJlY3Rpb24oV1RGTW92ZShyZXNwb25z ZSksIFdURk1vdmUocmVxdWVzdCksIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhp cyksIGRpZENoYW5nZUNyZWRlbnRpYWwsIGlzQ3Jvc3NPcmlnaW5dKGNvbnN0IFJlc291cmNlUmVx dWVzdCYgbmV3UmVxdWVzdCkgewogICAgICAgICBpZiAobmV3UmVxdWVzdC5pc051bGwoKSB8fCBt X3N0YXRlID09IFN0YXRlOjpDYW5jZWxpbmcpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAg ICAgaWYgKG1fY3VybFJlcXVlc3QpCiAgICAgICAgICAgICBtX2N1cmxSZXF1ZXN0LT5jYW5jZWwo KTsKIAorICAgICAgICBpZiAobmV3UmVxdWVzdC51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5 KCkgJiYgaXNDcm9zc09yaWdpbikKKyAgICAgICAgICAgIG1fc3RhcnRUaW1lID0gTW9ub3Rvbmlj VGltZTo6bm93KCk7CisKICAgICAgICAgYXV0byByZXF1ZXN0Q29weSA9IG5ld1JlcXVlc3Q7CiAg ICAgICAgIG1fY3VybFJlcXVlc3QgPSBjcmVhdGVDdXJsUmVxdWVzdChXVEZNb3ZlKHJlcXVlc3RD b3B5KSk7CiAgICAgICAgIGlmIChkaWRDaGFuZ2VDcmVkZW50aWFsICYmICFtX2luaXRpYWxDcmVk ZW50aWFsLmlzRW1wdHkoKSkKICAgICAgICAgICAgIG1fY3VybFJlcXVlc3QtPnNldFVzZXJQYXNz KG1faW5pdGlhbENyZWRlbnRpYWwudXNlcigpLCBtX2luaXRpYWxDcmVkZW50aWFsLnBhc3N3b3Jk KCkpOworICAgICAgICBtX2N1cmxSZXF1ZXN0LT5zZXRTdGFydFRpbWUobV9zdGFydFRpbWUpOwog ICAgICAgICBtX2N1cmxSZXF1ZXN0LT5zdGFydCgpOwogCiAgICAgICAgIGlmIChtX3N0YXRlICE9 IFN0YXRlOjpTdXNwZW5kZWQpIHsKQEAgLTQxNSw2ICs0MjIsNyBAQCB2b2lkIE5ldHdvcmtEYXRh VGFza0N1cmw6OnJlc3RhcnRXaXRoQ3JlZGVudGlhbChjb25zdCBDcmVkZW50aWFsJiBjcmVkZW50 aWFsKQogCiAgICAgbV9jdXJsUmVxdWVzdCA9IGNyZWF0ZUN1cmxSZXF1ZXN0KFdURk1vdmUocHJl dmlvdXNSZXF1ZXN0KSwgUmVxdWVzdFN0YXR1czo6UmV1c2VkUmVxdWVzdCk7CiAgICAgbV9jdXJs UmVxdWVzdC0+c2V0VXNlclBhc3MoY3JlZGVudGlhbC51c2VyKCksIGNyZWRlbnRpYWwucGFzc3dv cmQoKSk7CisgICAgbV9jdXJsUmVxdWVzdC0+c2V0U3RhcnRUaW1lKG1fc3RhcnRUaW1lKTsKICAg ICBtX2N1cmxSZXF1ZXN0LT5zdGFydCgpOwogCiAgICAgaWYgKG1fc3RhdGUgIT0gU3RhdGU6OlN1 c3BlbmRlZCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJs L05ldHdvcmtEYXRhVGFza0N1cmwuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3Vy bC9OZXR3b3JrRGF0YVRhc2tDdXJsLmgKaW5kZXggYWEwYmE2Y2ZkZWQuLjI1YzFhODNkN2NmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya0RhdGFU YXNrQ3VybC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3Jr RGF0YVRhc2tDdXJsLmgKQEAgLTg5LDYgKzg5LDcgQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBt X2F1dGhGYWlsdXJlQ291bnQgeyAwIH07CiAgICAgYm9vbCBtX2RpZENoYWxsZW5nZUVtcHR5Q3Jl ZGVudGlhbEZvckF1dGggeyBmYWxzZSB9OwogICAgIGJvb2wgbV9kaWRDaGFsbGVuZ2VFbXB0eUNy ZWRlbnRpYWxGb3JQcm94eUF1dGggeyBmYWxzZSB9OworICAgIE1vbm90b25pY1RpbWUgbV9zdGFy dFRpbWU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK