150605 2015-10-27 14:37:19 -0700 Web Inspector: Remove unused / duplicated XHR timeline instrumentation 2015-10-27 15:08:54 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1136930 0 joepeck 2015-10-27 14:37:19 -0700 * SUMMARY Remove unused / duplicated XHR timeline instrumentation. There are two Timeline Events for XHRs (XHRReadyStateChange and XHRLoad) that are themselves unused. These Timeline Events are only ever created if there are Event Listeners, and always contain an "EventDispatch" record followed by "FunctionCall" meaning that the XHR records and their associated data is never actually used by the frontend. If we do something for XHRs, we should use a newer type of timeline data construction. 1136934 1 264160 joepeck 2015-10-27 14:40:00 -0700 Created attachment 264160 [PATCH] Proposed Fix 1136951 2 264160 commit-queue 2015-10-27 15:08:50 -0700 Comment on attachment 264160 [PATCH] Proposed Fix Clearing flags on attachment: 264160 Committed r191643: <http://trac.webkit.org/changeset/191643> 1136952 3 commit-queue 2015-10-27 15:08:54 -0700 All reviewed patches have been landed. Closing bug. 264160 2015-10-27 14:40:00 -0700 2015-10-27 15:08:50 -0700 [PATCH] Proposed Fix rm-xhr.patch text/plain 20650 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDI1ZWE0N2IuLjEzZjIzMzggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE1LTEwLTI3ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3Zl IHVudXNlZCAvIGR1cGxpY2F0ZWQgWEhSIHRpbWVsaW5lIGluc3RydW1lbnRhdGlvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwNjA1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJv dG9jb2wvVGltZWxpbmUuanNvbjoKKwogMjAxNS0xMC0yNCAgQnJpYW4gQnVyZyAgPGJidXJnQGFw cGxlLmNvbT4KIAogICAgICAgICBUZWFjaCBjcmVhdGVfaGFzaF90YWJsZSB0byBvbWl0IGJ1aWx0 aW5zIG1hY3JvcyB3aGVuIGdlbmVyYXRpbmcgdGFibGVzIGZvciBuYXRpdmUtb25seSBvYmplY3Rz CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1Rp bWVsaW5lLmpzb24gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1Rp bWVsaW5lLmpzb24KaW5kZXggZDZiNDFjNS4uZWFkZjI3NSAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9UaW1lbGluZS5qc29uCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvVGltZWxpbmUuanNvbgpAQCAtMjUs OCArMjUsNiBAQAogICAgICAgICAgICAgICAgICJUaW1lU3RhbXAiLAogICAgICAgICAgICAgICAg ICJUaW1lIiwKICAgICAgICAgICAgICAgICAiVGltZUVuZCIsCi0gICAgICAgICAgICAgICAgIlhI UlJlYWR5U3RhdGVDaGFuZ2UiLAotICAgICAgICAgICAgICAgICJYSFJMb2FkIiwKICAgICAgICAg ICAgICAgICAiRnVuY3Rpb25DYWxsIiwKICAgICAgICAgICAgICAgICAiUHJvYmVTYW1wbGUiLAog ICAgICAgICAgICAgICAgICJDb25zb2xlUHJvZmlsZSIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjVjNTNkNi4u MjRhNmViNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQxIEBACiAyMDE1LTEwLTI3ICBKb3NlcGgg UGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog UmVtb3ZlIHVudXNlZCAvIGR1cGxpY2F0ZWQgWEhSIHRpbWVsaW5lIGluc3RydW1lbnRhdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwNjA1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlc2UgcmVj b3JkcyBhcmUganVzdCBkdXBsaWNhdGVzIG9mICJFdmVudERpc3BhdGNoIiByZWNvcmRzIGZvciBY SFIKKyAgICAgICAgbG9hZCBhbmQgcmVhZHlzdGF0ZWNoYW5nZSBldmVudHMuIER1ZSB0byB0aGUg bmVzdGluZywgdGhlIFhIUiByZWNvcmRzCisgICAgICAgIHdlcmUgdGhlbXNlbHZlcyBuZXZlciBn ZXR0aW5nIGxvb2tlZCBhdCwgYW5kIHRoZWlyIGRhdGEgKFVSTCAvIHJlYWR5U3RhdGUpCisgICAg ICAgIG5vdCBzaG93biBpbiB0aGUgZnJvbnRlbmQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6d2lsbERpc3BhdGNoWEhSUmVhZHlTdGF0ZUNoYW5nZUV2ZW50SW1wbCk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRp ZERpc3BhdGNoWEhSUmVhZHlTdGF0ZUNoYW5nZUV2ZW50SW1wbCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxEaXNwYXRjaFhIUkxvYWRF dmVudEltcGwpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjpkaWREaXNwYXRjaFhIUkxvYWRFdmVudEltcGwpOiBEZWxldGVkLgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbERpc3BhdGNoWEhSUmVhZHlTdGF0ZUNoYW5n ZUV2ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRh dGlvbjo6ZGlkRGlzcGF0Y2hYSFJSZWFkeVN0YXRlQ2hhbmdlRXZlbnQpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsRGlzcGF0Y2hYSFJM b2FkRXZlbnQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjpkaWREaXNwYXRjaFhIUkxvYWRFdmVudCk6IERlbGV0ZWQuCisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbERpc3BhdGNoWEhSUmVhZHlTdGF0ZUNoYW5nZUV2ZW50 KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRp ZERpc3BhdGNoWEhSUmVhZHlTdGF0ZUNoYW5nZUV2ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxEaXNwYXRjaFhIUkxvYWRFdmVudCk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRE aXNwYXRjaFhIUkxvYWRFdmVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjp0b1Byb3Rv Y29sKTogRGVsZXRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dC5oOgorICAgICAgICAqIGluc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVYSFJSZWFkeVN0YXRl Q2hhbmdlRGF0YSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZVhIUkxvYWREYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3Iv VGltZWxpbmVSZWNvcmRGYWN0b3J5Lmg6CisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpjYWxsUmVhZHlTdGF0ZUNoYW5n ZUxpc3RlbmVyKTogRGVsZXRlZC4KKworMjAxNS0xMC0yNyAgSm9zZXBoIFBlY29yYXJvICA8cGVj b3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IERvIG5vdCBzZW5kIFJl bmRlcmluZ0ZyYW1lIFRpbWVsaW5lUmVjb3JkcyB0aGF0IGhhdmUgbm8gY2hpbGRyZW4KICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDYwMAogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24u Y3BwCmluZGV4IGZkYmVjN2MuLjA2YjU1NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCkBAIC0zNDUsMjMgKzM0NSw2 IEBAIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDYWxsRnVuY3Rpb25JbXBsKGNv bnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZENh bGxGdW5jdGlvbihmcmFtZUZvclNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoY29udGV4dCkpOwogfQog Ci1JbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u Ojp3aWxsRGlzcGF0Y2hYSFJSZWFkeVN0YXRlQ2hhbmdlRXZlbnRJbXBsKEluc3RydW1lbnRpbmdB Z2VudHMmIGluc3RydW1lbnRpbmdBZ2VudHMsIFhNTEh0dHBSZXF1ZXN0JiByZXF1ZXN0LCBTY3Jp cHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0KQotewotICAgIGludCB0aW1lbGluZUFnZW50SWQg PSAwOwotICAgIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBpbnN0cnVt ZW50aW5nQWdlbnRzLmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKTsKLSAgICBpZiAodGltZWxpbmVB Z2VudCAmJiByZXF1ZXN0Lmhhc0V2ZW50TGlzdGVuZXJzKGV2ZW50TmFtZXMoKS5yZWFkeXN0YXRl Y2hhbmdlRXZlbnQpKSB7Ci0gICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxEaXNwYXRjaFhIUlJl YWR5U3RhdGVDaGFuZ2VFdmVudChyZXF1ZXN0LnVybCgpLnN0cmluZygpLCByZXF1ZXN0LnJlYWR5 U3RhdGUoKSwgZnJhbWVGb3JTY3JpcHRFeGVjdXRpb25Db250ZXh0KGNvbnRleHQpKTsKLSAgICAg ICAgdGltZWxpbmVBZ2VudElkID0gdGltZWxpbmVBZ2VudC0+aWQoKTsKLSAgICB9Ci0gICAgcmV0 dXJuIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZShpbnN0cnVtZW50aW5nQWdlbnRzLCB0 aW1lbGluZUFnZW50SWQpOwotfQotCi12b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlk RGlzcGF0Y2hYSFJSZWFkeVN0YXRlQ2hhbmdlRXZlbnRJbXBsKGNvbnN0IEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbkNvb2tpZSYgY29va2llKQotewotICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFn ZW50KiB0aW1lbGluZUFnZW50ID0gcmV0cmlldmVUaW1lbGluZUFnZW50KGNvb2tpZSkpCi0gICAg ICAgIHRpbWVsaW5lQWdlbnQtPmRpZERpc3BhdGNoWEhSUmVhZHlTdGF0ZUNoYW5nZUV2ZW50KCk7 Ci19Ci0KIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OndpbGxEaXNwYXRjaEV2ZW50SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBpbnN0cnVt ZW50aW5nQWdlbnRzLCBEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IEV2ZW50JiBldmVudCwgYm9v bCBoYXNFdmVudExpc3RlbmVycykKIHsKICAgICBpbnQgdGltZWxpbmVBZ2VudElkID0gMDsKQEAg LTQ4NCwyMyArNDY3LDYgQEAgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZExheW91 dEltcGwoY29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2kKICAgICAgICAgcGFnZUFn ZW50LT5kaWRMYXlvdXQoKTsKIH0KIAotSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbERpc3BhdGNoWEhSTG9hZEV2ZW50SW1wbChJbnN0 cnVtZW50aW5nQWdlbnRzJiBpbnN0cnVtZW50aW5nQWdlbnRzLCBYTUxIdHRwUmVxdWVzdCYgcmVx dWVzdCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCkKLXsKLSAgICBpbnQgdGltZWxp bmVBZ2VudElkID0gMDsKLSAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50 ID0gaW5zdHJ1bWVudGluZ0FnZW50cy5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCk7Ci0gICAgaWYg KHRpbWVsaW5lQWdlbnQgJiYgcmVxdWVzdC5oYXNFdmVudExpc3RlbmVycyhldmVudE5hbWVzKCku bG9hZEV2ZW50KSkgewotICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsRGlzcGF0Y2hYSFJMb2Fk RXZlbnQocmVxdWVzdC51cmwoKSwgZnJhbWVGb3JTY3JpcHRFeGVjdXRpb25Db250ZXh0KGNvbnRl eHQpKTsKLSAgICAgICAgdGltZWxpbmVBZ2VudElkID0gdGltZWxpbmVBZ2VudC0+aWQoKTsKLSAg ICB9Ci0gICAgcmV0dXJuIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZShpbnN0cnVtZW50 aW5nQWdlbnRzLCB0aW1lbGluZUFnZW50SWQpOwotfQotCi12b2lkIEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6ZGlkRGlzcGF0Y2hYSFJMb2FkRXZlbnRJbXBsKGNvbnN0IEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbkNvb2tpZSYgY29va2llKQotewotICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFn ZW50KiB0aW1lbGluZUFnZW50ID0gcmV0cmlldmVUaW1lbGluZUFnZW50KGNvb2tpZSkpCi0gICAg ICAgIHRpbWVsaW5lQWdlbnQtPmRpZERpc3BhdGNoWEhSTG9hZEV2ZW50KCk7Ci19Ci0KIHZvaWQg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsQ29tcG9zaXRlSW1wbChJbnN0cnVtZW50aW5n QWdlbnRzJiBpbnN0cnVtZW50aW5nQWdlbnRzLCBGcmFtZSYgZnJhbWUpCiB7CiAgICAgaWYgKElu c3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRz Lmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAppbmRleCA5N2ZmMzY0Li40YTNiZGE1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRh dGlvbi5oCkBAIC0xNDYsOCArMTQ2LDYgQEAgcHVibGljOgogCiAgICAgc3RhdGljIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsQ2FsbEZ1bmN0aW9uKFNjcmlwdEV4ZWN1dGlvbkNv bnRleHQqLCBjb25zdCBTdHJpbmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5lKTsKICAgICBz dGF0aWMgdm9pZCBkaWRDYWxsRnVuY3Rpb24oY29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u Q29va2llJiwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCopOwotICAgIHN0YXRpYyBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb25Db29raWUgd2lsbERpc3BhdGNoWEhSUmVhZHlTdGF0ZUNoYW5nZUV2ZW50 KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBYTUxIdHRwUmVxdWVzdCYpOwotICAgIHN0YXRpYyB2 b2lkIGRpZERpc3BhdGNoWEhSUmVhZHlTdGF0ZUNoYW5nZUV2ZW50KGNvbnN0IEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbkNvb2tpZSYpOwogICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b25Db29raWUgd2lsbERpc3BhdGNoRXZlbnQoRG9jdW1lbnQmLCBjb25zdCBFdmVudCYsIGJvb2wg aGFzRXZlbnRMaXN0ZW5lcnMpOwogICAgIHN0YXRpYyB2b2lkIGRpZERpc3BhdGNoRXZlbnQoY29u c3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llJik7CiAgICAgc3RhdGljIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsSGFuZGxlRXZlbnQoU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCosIGNvbnN0IEV2ZW50Jik7CkBAIC0xNjMsOCArMTYxLDYgQEAgcHVibGljOgogICAgIHN0 YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgd2lsbExheW91dChGcmFtZSYpOwog ICAgIHN0YXRpYyB2b2lkIGRpZExheW91dChjb25zdCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25D b29raWUmLCBSZW5kZXJPYmplY3QqKTsKICAgICBzdGF0aWMgdm9pZCBkaWRTY3JvbGwoUGFnZSYp OwotICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgd2lsbERpc3BhdGNo WEhSTG9hZEV2ZW50KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBYTUxIdHRwUmVxdWVzdCYpOwot ICAgIHN0YXRpYyB2b2lkIGRpZERpc3BhdGNoWEhSTG9hZEV2ZW50KGNvbnN0IEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbkNvb2tpZSYpOwogICAgIHN0YXRpYyB2b2lkIHdpbGxDb21wb3NpdGUoRnJh bWUmKTsKICAgICBzdGF0aWMgdm9pZCBkaWRDb21wb3NpdGUoRnJhbWUmKTsKICAgICBzdGF0aWMg dm9pZCB3aWxsUGFpbnQoUmVuZGVyT2JqZWN0Kik7CkBAIC0zMjcsOCArMzIzLDYgQEAgcHJpdmF0 ZToKIAogICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgd2lsbENhbGxG dW5jdGlvbkltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIGNvbnN0IFN0cmluZyYgc2NyaXB0TmFt ZSwgaW50IHNjcmlwdExpbmUsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqKTsKICAgICBzdGF0aWMg dm9pZCBkaWRDYWxsRnVuY3Rpb25JbXBsKGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNv b2tpZSYsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqKTsKLSAgICBzdGF0aWMgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uQ29va2llIHdpbGxEaXNwYXRjaFhIUlJlYWR5U3RhdGVDaGFuZ2VFdmVudElt cGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIFhNTEh0dHBSZXF1ZXN0JiwgU2NyaXB0RXhlY3V0aW9u Q29udGV4dCopOwotICAgIHN0YXRpYyB2b2lkIGRpZERpc3BhdGNoWEhSUmVhZHlTdGF0ZUNoYW5n ZUV2ZW50SW1wbChjb25zdCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUmKTsKICAgICBz dGF0aWMgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIHdpbGxEaXNwYXRjaEV2ZW50SW1w bChJbnN0cnVtZW50aW5nQWdlbnRzJiwgRG9jdW1lbnQmLCBjb25zdCBFdmVudCYsIGJvb2wgaGFz RXZlbnRMaXN0ZW5lcnMpOwogICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29r aWUgd2lsbEhhbmRsZUV2ZW50SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwgY29uc3QgRXZlbnQm KTsKICAgICBzdGF0aWMgdm9pZCBkaWRIYW5kbGVFdmVudEltcGwoY29uc3QgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uQ29va2llJik7CkBAIC0zNDQsOCArMzM4LDYgQEAgcHJpdmF0ZToKICAgICBz dGF0aWMgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIHdpbGxMYXlvdXRJbXBsKEluc3Ry dW1lbnRpbmdBZ2VudHMmLCBGcmFtZSYpOwogICAgIHN0YXRpYyB2b2lkIGRpZExheW91dEltcGwo Y29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llJiwgUmVuZGVyT2JqZWN0Kik7CiAg ICAgc3RhdGljIHZvaWQgZGlkU2Nyb2xsSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJik7Ci0gICAg c3RhdGljIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsRGlzcGF0Y2hYSFJMb2Fk RXZlbnRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCBYTUxIdHRwUmVxdWVzdCYsIFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqKTsKLSAgICBzdGF0aWMgdm9pZCBkaWREaXNwYXRjaFhIUkxvYWRFdmVu dEltcGwoY29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llJik7CiAgICAgc3RhdGlj IHZvaWQgd2lsbENvbXBvc2l0ZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIEZyYW1lJik7CiAg ICAgc3RhdGljIHZvaWQgZGlkQ29tcG9zaXRlSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJik7CiAg ICAgc3RhdGljIHZvaWQgd2lsbFBhaW50SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwgUmVuZGVy T2JqZWN0Kik7CkBAIC03MDUsMjEgKzY5Nyw2IEBAIGlubGluZSB2b2lkIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6ZGlkQ2FsbEZ1bmN0aW9uKGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhCiAg ICAgICAgIGRpZENhbGxGdW5jdGlvbkltcGwoY29va2llLCBjb250ZXh0KTsKIH0KIAotaW5saW5l IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 OndpbGxEaXNwYXRjaFhIUlJlYWR5U3RhdGVDaGFuZ2VFdmVudChTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiBjb250ZXh0LCBYTUxIdHRwUmVxdWVzdCYgcmVxdWVzdCkKLXsKLSAgICBGQVNUX1JFVFVS Tl9JRl9OT19GUk9OVEVORFMoSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llKCkpOwotICAg IGlmIChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzID0gaW5zdHJ1bWVu dGluZ0FnZW50c0ZvckNvbnRleHQoY29udGV4dCkpCi0gICAgICAgIHJldHVybiB3aWxsRGlzcGF0 Y2hYSFJSZWFkeVN0YXRlQ2hhbmdlRXZlbnRJbXBsKCppbnN0cnVtZW50aW5nQWdlbnRzLCByZXF1 ZXN0LCBjb250ZXh0KTsKLSAgICByZXR1cm4gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2ll KCk7Ci19Ci0KLWlubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRGlzcGF0 Y2hYSFJSZWFkeVN0YXRlQ2hhbmdlRXZlbnQoY29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u Q29va2llJiBjb29raWUpCi17Ci0gICAgRkFTVF9SRVRVUk5fSUZfTk9fRlJPTlRFTkRTKHZvaWQo KSk7Ci0gICAgaWYgKGNvb2tpZS5pc1ZhbGlkKCkpCi0gICAgICAgIGRpZERpc3BhdGNoWEhSUmVh ZHlTdGF0ZUNoYW5nZUV2ZW50SW1wbChjb29raWUpOwotfQotCiBpbmxpbmUgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uQ29va2llIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbERpc3BhdGNo RXZlbnQoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBFdmVudCYgZXZlbnQsIGJvb2wgaGFzRXZl bnRMaXN0ZW5lcnMpCiB7CiAgICAgRkFTVF9SRVRVUk5fSUZfTk9fRlJPTlRFTkRTKEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbkNvb2tpZSgpKTsKQEAgLTgyOSwyMSArODA2LDYgQEAgaW5saW5lIHZv aWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRTY3JvbGwoUGFnZSYgcGFnZSkKICAgICBk aWRTY3JvbGxJbXBsKGluc3RydW1lbnRpbmdBZ2VudHNGb3JQYWdlKHBhZ2UpKTsKIH0KIAotaW5s aW5lIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OndpbGxEaXNwYXRjaFhIUkxvYWRFdmVudChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250 ZXh0LCBYTUxIdHRwUmVxdWVzdCYgcmVxdWVzdCkKLXsKLSAgICBGQVNUX1JFVFVSTl9JRl9OT19G Uk9OVEVORFMoSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llKCkpOwotICAgIGlmIChJbnN0 cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzID0gaW5zdHJ1bWVudGluZ0FnZW50 c0ZvckNvbnRleHQoY29udGV4dCkpCi0gICAgICAgIHJldHVybiB3aWxsRGlzcGF0Y2hYSFJMb2Fk RXZlbnRJbXBsKCppbnN0cnVtZW50aW5nQWdlbnRzLCByZXF1ZXN0LCBjb250ZXh0KTsKLSAgICBy ZXR1cm4gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llKCk7Ci19Ci0KLWlubGluZSB2b2lk IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRGlzcGF0Y2hYSFJMb2FkRXZlbnQoY29uc3Qg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llJiBjb29raWUpCi17Ci0gICAgRkFTVF9SRVRV Uk5fSUZfTk9fRlJPTlRFTkRTKHZvaWQoKSk7Ci0gICAgaWYgKGNvb2tpZS5pc1ZhbGlkKCkpCi0g ICAgICAgIGRpZERpc3BhdGNoWEhSTG9hZEV2ZW50SW1wbChjb29raWUpOwotfQotCiBpbmxpbmUg dm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxDb21wb3NpdGUoRnJhbWUmIGZyYW1l KQogewogICAgIEZBU1RfUkVUVVJOX0lGX05PX0ZST05URU5EUyh2b2lkKCkpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCmluZGV4 IGY2MzMzMzQuLmY1N2MyNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKQEAgLTQ0OSwyNiArNDQ5LDYgQEAgdm9pZCBJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpkaWRGaXJlVGltZXIoKQogICAgIGRpZENvbXBsZXRlQ3VycmVu dFJlY29yZChUaW1lbGluZVJlY29yZFR5cGU6OlRpbWVyRmlyZSk7CiB9CiAKLXZvaWQgSW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6d2lsbERpc3BhdGNoWEhSUmVhZHlTdGF0ZUNoYW5nZUV2ZW50KGNv bnN0IFN0cmluZyYgdXJsLCBpbnQgcmVhZHlTdGF0ZSwgRnJhbWUqIGZyYW1lKQotewotICAgIHB1 c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlWEhSUmVhZHlTdGF0 ZUNoYW5nZURhdGEodXJsLCByZWFkeVN0YXRlKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpYSFJSZWFk eVN0YXRlQ2hhbmdlLCBmYWxzZSwgZnJhbWUpOwotfQotCi12b2lkIEluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OmRpZERpc3BhdGNoWEhSUmVhZHlTdGF0ZUNoYW5nZUV2ZW50KCkKLXsKLSAgICBkaWRD b21wbGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRUeXBlOjpYSFJSZWFkeVN0YXRlQ2hh bmdlKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsRGlzcGF0Y2hYSFJM b2FkRXZlbnQoY29uc3QgU3RyaW5nJiB1cmwsIEZyYW1lKiBmcmFtZSkKLXsKLSAgICBwdXNoQ3Vy cmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhIUkxvYWREYXRhKHVybCks IFRpbWVsaW5lUmVjb3JkVHlwZTo6WEhSTG9hZCwgdHJ1ZSwgZnJhbWUpOwotfQotCi12b2lkIElu c3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZERpc3BhdGNoWEhSTG9hZEV2ZW50KCkKLXsKLSAgICBk aWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRUeXBlOjpYSFJMb2FkKTsKLX0K LQogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsRXZhbHVhdGVTY3JpcHQoY29uc3Qg U3RyaW5nJiB1cmwsIGludCBsaW5lTnVtYmVyLCBGcmFtZSYgZnJhbWUpCiB7CiAgICAgcHVzaEN1 cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdERh dGEodXJsLCBsaW5lTnVtYmVyKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpFdmFsdWF0ZVNjcmlwdCwg dHJ1ZSwgJmZyYW1lKTsKQEAgLTYyOCwxMSArNjA4LDYgQEAgc3RhdGljIEluc3BlY3Rvcjo6UHJv dG9jb2w6OlRpbWVsaW5lOjpFdmVudFR5cGUgdG9Qcm90b2NvbChUaW1lbGluZVJlY29yZFR5cGUg dHkKICAgICBjYXNlIFRpbWVsaW5lUmVjb3JkVHlwZTo6VGltZUVuZDoKICAgICAgICAgcmV0dXJu IEluc3BlY3Rvcjo6UHJvdG9jb2w6OlRpbWVsaW5lOjpFdmVudFR5cGU6OlRpbWVFbmQ7CiAKLSAg ICBjYXNlIFRpbWVsaW5lUmVjb3JkVHlwZTo6WEhSUmVhZHlTdGF0ZUNoYW5nZToKLSAgICAgICAg cmV0dXJuIEluc3BlY3Rvcjo6UHJvdG9jb2w6OlRpbWVsaW5lOjpFdmVudFR5cGU6OlhIUlJlYWR5 U3RhdGVDaGFuZ2U7Ci0gICAgY2FzZSBUaW1lbGluZVJlY29yZFR5cGU6OlhIUkxvYWQ6Ci0gICAg ICAgIHJldHVybiBJbnNwZWN0b3I6OlByb3RvY29sOjpUaW1lbGluZTo6RXZlbnRUeXBlOjpYSFJM b2FkOwotCiAgICAgY2FzZSBUaW1lbGluZVJlY29yZFR5cGU6OkZ1bmN0aW9uQ2FsbDoKICAgICAg ICAgcmV0dXJuIEluc3BlY3Rvcjo6UHJvdG9jb2w6OlRpbWVsaW5lOjpFdmVudFR5cGU6OkZ1bmN0 aW9uQ2FsbDsKICAgICBjYXNlIFRpbWVsaW5lUmVjb3JkVHlwZTo6UHJvYmVTYW1wbGU6CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5o IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaAppbmRl eCA5NWM5NzQ1Li5jMjQwYmFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JUaW1lbGluZUFnZW50LmgKQEAgLTg5LDkgKzg5LDYgQEAgZW51bSBjbGFzcyBUaW1l bGluZVJlY29yZFR5cGUgewogICAgIFRpbWUsCiAgICAgVGltZUVuZCwKIAotICAgIFhIUlJlYWR5 U3RhdGVDaGFuZ2UsCi0gICAgWEhSTG9hZCwKLQogICAgIEZ1bmN0aW9uQ2FsbCwKICAgICBQcm9i ZVNhbXBsZSwKICAgICBDb25zb2xlUHJvZmlsZSwKQEAgLTE0MSw4ICsxMzgsNiBAQCBwdWJsaWM6 CiAgICAgdm9pZCBkaWRGaXJlVGltZXIoKTsKICAgICB2b2lkIHdpbGxDYWxsRnVuY3Rpb24oY29u c3QgU3RyaW5nJiBzY3JpcHROYW1lLCBpbnQgc2NyaXB0TGluZSwgRnJhbWUqKTsKICAgICB2b2lk IGRpZENhbGxGdW5jdGlvbihGcmFtZSopOwotICAgIHZvaWQgd2lsbERpc3BhdGNoWEhSUmVhZHlT dGF0ZUNoYW5nZUV2ZW50KGNvbnN0IFN0cmluZyYsIGludCwgRnJhbWUqKTsKLSAgICB2b2lkIGRp ZERpc3BhdGNoWEhSUmVhZHlTdGF0ZUNoYW5nZUV2ZW50KCk7CiAgICAgdm9pZCB3aWxsRGlzcGF0 Y2hFdmVudChjb25zdCBFdmVudCYsIEZyYW1lKik7CiAgICAgdm9pZCBkaWREaXNwYXRjaEV2ZW50 KCk7CiAgICAgdm9pZCB3aWxsRXZhbHVhdGVTY3JpcHQoY29uc3QgU3RyaW5nJiwgaW50LCBGcmFt ZSYpOwpAQCAtMTUwLDggKzE0NSw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZEludmFsaWRhdGVM YXlvdXQoRnJhbWUmKTsKICAgICB2b2lkIHdpbGxMYXlvdXQoRnJhbWUmKTsKICAgICB2b2lkIGRp ZExheW91dChSZW5kZXJPYmplY3QqKTsKLSAgICB2b2lkIHdpbGxEaXNwYXRjaFhIUkxvYWRFdmVu dChjb25zdCBTdHJpbmcmLCBGcmFtZSopOwotICAgIHZvaWQgZGlkRGlzcGF0Y2hYSFJMb2FkRXZl bnQoKTsKICAgICB2b2lkIHdpbGxDb21wb3NpdGUoRnJhbWUmKTsKICAgICB2b2lkIGRpZENvbXBv c2l0ZSgpOwogICAgIHZvaWQgd2lsbFBhaW50KEZyYW1lJik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwCmluZGV4IGNjZGI5Y2IuLjVk YzMzOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29y ZEZhY3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29y ZEZhY3RvcnkuY3BwCkBAIC0xMTYsMjEgKzExNiw2IEBAIFJlZjxJbnNwZWN0b3JPYmplY3Q+IFRp bWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlVGltZXJJbnN0YWxsRGF0YShpbnQgdGltZXJJZCwK ICAgICByZXR1cm4gV1RGOjptb3ZlKGRhdGEpOwogfQogCi1SZWY8SW5zcGVjdG9yT2JqZWN0PiBU aW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhIUlJlYWR5U3RhdGVDaGFuZ2VEYXRhKGNvbnN0 IFN0cmluZyYgdXJsLCBpbnQgcmVhZHlTdGF0ZSkKLXsKLSAgICBSZWY8SW5zcGVjdG9yT2JqZWN0 PiBkYXRhID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKLSAgICBkYXRhLT5zZXRTdHJpbmco InVybCIsIHVybCk7Ci0gICAgZGF0YS0+c2V0SW50ZWdlcigicmVhZHlTdGF0ZSIsIHJlYWR5U3Rh dGUpOwotICAgIHJldHVybiBXVEY6Om1vdmUoZGF0YSk7Ci19Ci0KLVJlZjxJbnNwZWN0b3JPYmpl Y3Q+IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlWEhSTG9hZERhdGEoY29uc3QgU3RyaW5n JiB1cmwpCi17Ci0gICAgUmVmPEluc3BlY3Rvck9iamVjdD4gZGF0YSA9IEluc3BlY3Rvck9iamVj dDo6Y3JlYXRlKCk7Ci0gICAgZGF0YS0+c2V0U3RyaW5nKCJ1cmwiLCB1cmwpOwotICAgIHJldHVy biBXVEY6Om1vdmUoZGF0YSk7Ci19Ci0KIFJlZjxJbnNwZWN0b3JPYmplY3Q+IFRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlRXZhbHVhdGVTY3JpcHREYXRhKGNvbnN0IFN0cmluZyYgdXJsLCBk b3VibGUgbGluZU51bWJlcikKIHsKICAgICBSZWY8SW5zcGVjdG9yT2JqZWN0PiBkYXRhID0gSW5z cGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9U aW1lbGluZVJlY29yZEZhY3RvcnkuaAppbmRleCA2YmQxOWZiLi41YTkwZmUzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCkBAIC02OSwx MCArNjksNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgc3RhdGljIFJlZjxJbnNw ZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gY3JlYXRlVGltZXJJbnN0YWxsRGF0YShpbnQgdGltZXJJ ZCwgaW50IHRpbWVvdXQsIGJvb2wgc2luZ2xlU2hvdCk7CiAKLSAgICAgICAgc3RhdGljIFJlZjxJ bnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gY3JlYXRlWEhSUmVhZHlTdGF0ZUNoYW5nZURhdGEo Y29uc3QgU3RyaW5nJiB1cmwsIGludCByZWFkeVN0YXRlKTsKLQotICAgICAgICBzdGF0aWMgUmVm PEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBjcmVhdGVYSFJMb2FkRGF0YShjb25zdCBTdHJp bmcmIHVybCk7Ci0KICAgICAgICAgc3RhdGljIFJlZjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVj dD4gY3JlYXRlRXZhbHVhdGVTY3JpcHREYXRhKGNvbnN0IFN0cmluZyYsIGRvdWJsZSBsaW5lTnVt YmVyKTsKIAogICAgICAgICBzdGF0aWMgUmVmPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBj cmVhdGVUaW1lU3RhbXBEYXRhKGNvbnN0IFN0cmluZyYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRw UmVxdWVzdC5jcHAKaW5kZXggZDY0MjhmZS4uMGUyN2IyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1M SHR0cFJlcXVlc3QuY3BwCkBAIC0zNzMsMTYgKzM3MywxMSBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0 OjpjYWxsUmVhZHlTdGF0ZUNoYW5nZUxpc3RlbmVyKCkKICAgICBpZiAoIXNjcmlwdEV4ZWN1dGlv bkNvbnRleHQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uQ29va2llIGNvb2tpZSA9IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbERpc3BhdGNo WEhSUmVhZHlTdGF0ZUNoYW5nZUV2ZW50KHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgKnRoaXMp OwotCiAgICAgaWYgKG1fYXN5bmMgfHwgKG1fc3RhdGUgPD0gT1BFTkVEIHx8IG1fc3RhdGUgPT0g RE9ORSkpCiAgICAgICAgIG1fcHJvZ3Jlc3NFdmVudFRocm90dGxlLmRpc3BhdGNoUmVhZHlTdGF0 ZUNoYW5nZUV2ZW50KEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnJlYWR5c3RhdGVjaGFuZ2VF dmVudCwgZmFsc2UsIGZhbHNlKSwgbV9zdGF0ZSA9PSBET05FID8gRmx1c2hQcm9ncmVzc0V2ZW50 IDogRG9Ob3RGbHVzaFByb2dyZXNzRXZlbnQpOwogCi0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpkaWREaXNwYXRjaFhIUlJlYWR5U3RhdGVDaGFuZ2VFdmVudChjb29raWUpOwogICAgIGlm IChtX3N0YXRlID09IERPTkUgJiYgIW1fZXJyb3IpIHsKLSAgICAgICAgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uQ29va2llIGNvb2tpZSA9IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbERp c3BhdGNoWEhSTG9hZEV2ZW50KHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgKnRoaXMpOwogICAg ICAgICBtX3Byb2dyZXNzRXZlbnRUaHJvdHRsZS5kaXNwYXRjaFByb2dyZXNzRXZlbnQoZXZlbnRO YW1lcygpLmxvYWRFdmVudCk7Ci0gICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlk RGlzcGF0Y2hYSFJMb2FkRXZlbnQoY29va2llKTsKICAgICAgICAgbV9wcm9ncmVzc0V2ZW50VGhy b3R0bGUuZGlzcGF0Y2hQcm9ncmVzc0V2ZW50KGV2ZW50TmFtZXMoKS5sb2FkZW5kRXZlbnQpOwog ICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDE3NDY4ZWEuLjM0ODEwMjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE1LTEwLTI3ICBKb3Nl cGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVtb3ZlIHVudXNlZCAvIGR1cGxpY2F0ZWQgWEhSIHRpbWVsaW5lIGluc3RydW1lbnRhdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwNjA1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLl9wcm9jZXNzUmVjb3JkKToKKyAgICAg ICAgUmVtb3ZlIHVudXNlZCBldmVudHMgYW5kIGFkZCBhbiBhc3NlcnQgdGhhdCB3ZSBkb24ndCBt aXNzCisgICAgICAgIGFueSBzY3JpcHQgZW1iZWRkZXJzLgorCiAyMDE1LTEwLTI2ICBKb3NlcGgg UGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog U3BhY2ViYXIgdG8gc3RhcnQgcmVjb3JkaW5nIHNob3VsZCBub3QgY2F1c2Ugc3lzdGVtIGJlZXAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xs ZXJzL1RpbWVsaW5lTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcwppbmRleCA4M2E4MjQ4Li4zMmFhY2Jh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9UaW1lbGluZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCkBAIC0zNDksMTIgKzM0OSwx MCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyID0gY2xhc3MgVGltZWxpbmVNYW5hZ2Vy IGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICAgICAgICAgIHJldHVybiBuZXcg V2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkKFdlYkluc3BlY3Rvci5TY3JpcHRUaW1l bGluZVJlY29yZC5FdmVudFR5cGUuVGltZXJGaXJlZCwgc3RhcnRUaW1lLCBlbmRUaW1lLCBjYWxs RnJhbWVzLCBzb3VyY2VDb2RlTG9jYXRpb24sIHBhcmVudFJlY29yZFBheWxvYWQuZGF0YS50aW1l cklkLCBwcm9maWxlRGF0YSk7CiAgICAgICAgICAgICBjYXNlIFRpbWVsaW5lQWdlbnQuRXZlbnRU eXBlLkV2ZW50RGlzcGF0Y2g6CiAgICAgICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0 b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQoV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3Jk LkV2ZW50VHlwZS5FdmVudERpc3BhdGNoZWQsIHN0YXJ0VGltZSwgZW5kVGltZSwgY2FsbEZyYW1l cywgc291cmNlQ29kZUxvY2F0aW9uLCBwYXJlbnRSZWNvcmRQYXlsb2FkLmRhdGEudHlwZSwgcHJv ZmlsZURhdGEpOwotICAgICAgICAgICAgY2FzZSBUaW1lbGluZUFnZW50LkV2ZW50VHlwZS5YSFJM b2FkOgotICAgICAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVs aW5lUmVjb3JkKFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuRXZl bnREaXNwYXRjaGVkLCBzdGFydFRpbWUsIGVuZFRpbWUsIGNhbGxGcmFtZXMsIHNvdXJjZUNvZGVM b2NhdGlvbiwgImxvYWQiLCBwcm9maWxlRGF0YSk7Ci0gICAgICAgICAgICBjYXNlIFRpbWVsaW5l QWdlbnQuRXZlbnRUeXBlLlhIUlJlYWR5U3RhdGVDaGFuZ2U6Ci0gICAgICAgICAgICAgICAgcmV0 dXJuIG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQoV2ViSW5zcGVjdG9yLlNj cmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5FdmVudERpc3BhdGNoZWQsIHN0YXJ0VGltZSwg ZW5kVGltZSwgY2FsbEZyYW1lcywgc291cmNlQ29kZUxvY2F0aW9uLCAicmVhZHlzdGF0ZWNoYW5n ZSIsIHByb2ZpbGVEYXRhKTsKICAgICAgICAgICAgIGNhc2UgVGltZWxpbmVBZ2VudC5FdmVudFR5 cGUuRmlyZUFuaW1hdGlvbkZyYW1lOgogICAgICAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5z cGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkKFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJl Y29yZC5FdmVudFR5cGUuQW5pbWF0aW9uRnJhbWVGaXJlZCwgc3RhcnRUaW1lLCBlbmRUaW1lLCBj YWxsRnJhbWVzLCBzb3VyY2VDb2RlTG9jYXRpb24sIHBhcmVudFJlY29yZFBheWxvYWQuZGF0YS5p ZCwgcHJvZmlsZURhdGEpOworICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICBj b25zb2xlLmFzc2VydChmYWxzZSwgIk1pc3NlZCBGdW5jdGlvbkNhbGwgZW1iZWRkZWQgaW5zaWRl IG9mOiAiICsgcGFyZW50UmVjb3JkUGF5bG9hZC50eXBlKTsKICAgICAgICAgICAgIH0KIAogICAg ICAgICAgICAgYnJlYWs7Cg==