150647 2015-10-28 17:19:07 -0700 Web Inspector: Remove unused / duplicate WebSocket timeline records 2015-10-28 18:31:08 -0700 1 1 1 Unclassified WebKit Web Inspector Other All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1137368 0 joepeck 2015-10-28 17:19:07 -0700 * SUMMARY Remove unused / duplicate WebSocket timeline records. All of the WebSocket timeline events were duplicates of existing Network domain events. Remove the timeline specific versions which our frontend did not even display in the UI. 1137371 1 264273 joepeck 2015-10-28 17:22:22 -0700 Created attachment 264273 [PATCH] Proposed Fix 1137407 2 264273 commit-queue 2015-10-28 18:31:04 -0700 Comment on attachment 264273 [PATCH] Proposed Fix Clearing flags on attachment: 264273 Committed r191717: <http://trac.webkit.org/changeset/191717> 1137408 3 commit-queue 2015-10-28 18:31:08 -0700 All reviewed patches have been landed. Closing bug. 264273 2015-10-28 17:22:22 -0700 2015-10-28 18:31:04 -0700 [PATCH] Proposed Fix remove-websocket.patch text/plain 19924 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDZiMTc5MzguLjE5YWY4ZmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE1LTEwLTI4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3Zl IHVudXNlZCAvIGR1cGxpY2F0ZSBXZWJTb2NrZXQgdGltZWxpbmUgcmVjb3JkcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwNjQ3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvdG9j b2wvVGltZWxpbmUuanNvbjoKKwogMjAxNS0xMC0yOCAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBs ZS5jb20+CiAKICAgICAgICAgUmVuYW1lIE1hY3JvQXNzZW1ibGVyOjpjYWxsUHJvYmUoKSB0byBw cm9iZSgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90 b2NvbC9UaW1lbGluZS5qc29uIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90 b2NvbC9UaW1lbGluZS5qc29uCmluZGV4IDVmNWEwYjguLmYxYTFhN2IgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvVGltZWxpbmUuanNvbgorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1RpbWVsaW5lLmpzb24K QEAgLTI4LDExICsyOCw3IEBACiAgICAgICAgICAgICAgICAgIkNvbnNvbGVQcm9maWxlIiwKICAg ICAgICAgICAgICAgICAiUmVxdWVzdEFuaW1hdGlvbkZyYW1lIiwKICAgICAgICAgICAgICAgICAi Q2FuY2VsQW5pbWF0aW9uRnJhbWUiLAotICAgICAgICAgICAgICAgICJGaXJlQW5pbWF0aW9uRnJh bWUiLAotICAgICAgICAgICAgICAgICJXZWJTb2NrZXRDcmVhdGUiLAotICAgICAgICAgICAgICAg ICJXZWJTb2NrZXRTZW5kSGFuZHNoYWtlUmVxdWVzdCIsCi0gICAgICAgICAgICAgICAgIldlYlNv Y2tldFJlY2VpdmVIYW5kc2hha2VSZXNwb25zZSIsCi0gICAgICAgICAgICAgICAgIldlYlNvY2tl dERlc3Ryb3kiCisgICAgICAgICAgICAgICAgIkZpcmVBbmltYXRpb25GcmFtZSIKICAgICAgICAg ICAgIF0sCiAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiVGltZWxpbmUgcmVjb3JkIHR5cGUu IgogICAgICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGE1MjMzMmUuLjEwOTUxY2RhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsNDQgQEAKKzIwMTUtMTAtMjggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJv QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgdW51c2VkIC8gZHVw bGljYXRlIFdlYlNvY2tldCB0aW1lbGluZSByZWNvcmRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTA2NDcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXRD aGFubmVsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWw6OmNvbm5lY3Qp OgorICAgICAgICBPbmx5IHNlbmQgd2hhdCBpcyBuZWVkZWQgYnkgaW5zcGVjdG9yIG5vdy4KKwor ICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaDoKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkQ3JlYXRlV2ViU29ja2V0KToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbFNlbmRXZWJT b2NrZXRIYW5kc2hha2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlKToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkQ2xvc2VXZWJTb2NrZXQp OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZl V2ViU29ja2V0RnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpkaWRSZWNlaXZlV2ViU29ja2V0RnJhbWVFcnJvcik6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFNlbmRXZWJTb2NrZXRGcmFtZSk6CisgICAgICAg IFRoZXNlIGNhbiBhbGwgZmFzdCByZXR1cm4gaWYgdGhlcmUgaXMgbm8gZnJvbnRlbmQgYmVjYXVz ZSB0aGUgaW5zcGVjdG9yCisgICAgICAgIGRvZXNuJ3QgcmVjb3JkIGFueSBpbmZvcm1hdGlvbiBh Ym91dCB3ZWIgc29ja2V0cyB1bnRpbCBhIGZyb250ZW5kIGlzIGNvbm5lY3RlZC4KKyAgICAgICAg VGhlIGluc3BlY3RvciBpbiB0aGlzIGNhc2UganVzdCBzZW5kcyBldmVudHMgdG8gdGhlIGZyb250 ZW5kIHdoZW4gdGhpbmdzIGhhcHBlbi4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJ bnN0cnVtZW50YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjpkaWRDcmVhdGVXZWJTb2NrZXRJbXBsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0SW1w bCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2Vp dmVXZWJTb2NrZXRIYW5kc2hha2VSZXNwb25zZUltcGwpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDbG9zZVdlYlNvY2tldEltcGwpOgorICAgICAgICBT dG9wIG1lc3NhZ2luZyB0aGUgVGltZWxpbmUgYWdlbnQsIHdlIGFscmVhZHkgbWVzc2FnZSB0aGUg UmVzb3VyY2UgYWdlbnQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVB Z2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRD cmVhdGVXZWJTb2NrZXQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6d2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0KTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZFJlY2VpdmVXZWJT b2NrZXRIYW5kc2hha2VSZXNwb25zZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpkaWREZXN0cm95V2ViU29ja2V0KTogRGVsZXRlZC4KKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oOgorICAgICAgICAqIGluc3Bl Y3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVsaW5l UmVjb3JkRmFjdG9yeTo6Y3JlYXRlV2ViU29ja2V0Q3JlYXRlRGF0YSk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdlbmVyaWNXZWJTb2Nr ZXREYXRhKTogRGVsZXRlZC4KKyAgICAgICAgVGhpcyBpcyBhbGwgZHVwbGljYXRlIGluZm9ybWF0 aW9uIGZyb20gdGhlIG5ldHdvcmsgZG9tYWluLgorCiAyMDE1LTEwLTI4ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQXNzZXJ0aW9uIGZhaWx1cmUgaW4gV2ViQ29y ZTo6RnJhbWVMb2FkZXI6OnN0b3BMb2FkaW5nKCkgcnVubmluZyBmYXN0L2V2ZW50cyB0ZXN0cwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldENo YW5uZWwuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldENo YW5uZWwuY3BwCmluZGV4IDkyMGQ5MmQuLmYwODdhNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAKQEAgLTEwNCw3 ICsxMDQsNyBAQCB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmNvbm5lY3QoY29uc3QgVVJMJiB1cmws IGNvbnN0IFN0cmluZyYgcHJvdG9jb2wpCiAgICAgaWYgKG1fZGVmbGF0ZUZyYW1lci5jYW5EZWZs YXRlKCkpCiAgICAgICAgIG1faGFuZHNoYWtlLT5hZGRFeHRlbnNpb25Qcm9jZXNzb3IobV9kZWZs YXRlRnJhbWVyLmNyZWF0ZUV4dGVuc2lvblByb2Nlc3NvcigpKTsKICAgICBpZiAobV9pZGVudGlm aWVyKQotICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZENyZWF0ZVdlYlNvY2tl dChtX2RvY3VtZW50LCBtX2lkZW50aWZpZXIsIHVybCwgbV9kb2N1bWVudC0+dXJsKCksIHByb3Rv Y29sKTsKKyAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDcmVhdGVXZWJTb2Nr ZXQobV9kb2N1bWVudCwgbV9pZGVudGlmaWVyLCB1cmwpOwogCiAgICAgaWYgKEZyYW1lKiBmcmFt ZSA9IG1fZG9jdW1lbnQtPmZyYW1lKCkpIHsKICAgICAgICAgaWYgKE5ldHdvcmtpbmdDb250ZXh0 KiBuZXR3b3JraW5nQ29udGV4dCA9IGZyYW1lLT5sb2FkZXIoKS5uZXR3b3JraW5nQ29udGV4dCgp KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVt ZW50YXRpb24uY3BwCmluZGV4IGIxOTk0YzcuLjdmZjE5NTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCkBAIC05NjAs NTEgKzk2MCwzMSBAQCB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d29ya2VyR2xvYmFs U2NvcGVUZXJtaW5hdGVkSW1wbChJbnN0cnVtZW50aW5nQWdlbgogfQogCiAjaWYgRU5BQkxFKFdF Ql9TT0NLRVRTKQotdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZENyZWF0ZVdlYlNv Y2tldEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYgaW5zdHJ1bWVudGluZ0FnZW50cywgdW5zaWdu ZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBVUkwmIHJlcXVlc3RVUkwsIGNvbnN0IFVSTCYsIGNv bnN0IFN0cmluZyYgcHJvdG9jb2wsIERvY3VtZW50KiBkb2N1bWVudCkKK3ZvaWQgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpkaWRDcmVhdGVXZWJTb2NrZXRJbXBsKEluc3RydW1lbnRpbmdBZ2Vu dHMmIGluc3RydW1lbnRpbmdBZ2VudHMsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3Qg VVJMJiByZXF1ZXN0VVJMKQogewogICAgIGlmICghaW5zdHJ1bWVudGluZ0FnZW50cy5pbnNwZWN0 b3JFbnZpcm9ubWVudCgpLmRldmVsb3BlckV4dHJhc0VuYWJsZWQoKSkKICAgICAgICAgcmV0dXJu OwogCi0gICAgaWYgKCFkb2N1bWVudCkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgaWYgKEluc3Bl Y3RvclJlc291cmNlQWdlbnQqIHJlc291cmNlQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLmlu c3BlY3RvclJlc291cmNlQWdlbnQoKSkKICAgICAgICAgcmVzb3VyY2VBZ2VudC0+ZGlkQ3JlYXRl V2ViU29ja2V0KGlkZW50aWZpZXIsIHJlcXVlc3RVUkwpOwotICAgIGlmIChJbnNwZWN0b3JUaW1l bGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy5pbnNwZWN0b3JU aW1lbGluZUFnZW50KCkpCi0gICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZENyZWF0ZVdlYlNvY2tl dChpZGVudGlmaWVyLCByZXF1ZXN0VVJMLCBwcm90b2NvbCwgZG9jdW1lbnQtPmZyYW1lKCkpOwog fQogCi12b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbFNlbmRXZWJTb2NrZXRIYW5k c2hha2VSZXF1ZXN0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBpbnN0cnVtZW50aW5nQWdlbnRz LCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVz dCwgRG9jdW1lbnQqIGRvY3VtZW50KQordm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Ondp bGxTZW5kV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYg aW5zdHJ1bWVudGluZ0FnZW50cywgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7Ci0gICAgaWYgKCFkb2N1bWVudCkKLSAgICAgICAgcmV0 dXJuOwotCiAgICAgaWYgKEluc3BlY3RvclJlc291cmNlQWdlbnQqIHJlc291cmNlQWdlbnQgPSBp bnN0cnVtZW50aW5nQWdlbnRzLmluc3BlY3RvclJlc291cmNlQWdlbnQoKSkKICAgICAgICAgcmVz b3VyY2VBZ2VudC0+d2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0KGlkZW50aWZpZXIs IHJlcXVlc3QpOwotICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50 ID0gaW5zdHJ1bWVudGluZ0FnZW50cy5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCkpCi0gICAgICAg IHRpbWVsaW5lQWdlbnQtPndpbGxTZW5kV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdChpZGVudGlm aWVyLCBkb2N1bWVudC0+ZnJhbWUoKSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpkaWRSZWNlaXZlV2ViU29ja2V0SGFuZHNoYWtlUmVzcG9uc2VJbXBsKEluc3RydW1lbnRp bmdBZ2VudHMmIGluc3RydW1lbnRpbmdBZ2VudHMsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwg Y29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIERvY3VtZW50KiBkb2N1bWVudCkKK3Zv aWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlV2ViU29ja2V0SGFuZHNoYWtl UmVzcG9uc2VJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3RydW1lbnRpbmdBZ2VudHMsIHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2Up CiB7Ci0gICAgaWYgKCFkb2N1bWVudCkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgaWYgKEluc3Bl Y3RvclJlc291cmNlQWdlbnQqIHJlc291cmNlQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLmlu c3BlY3RvclJlc291cmNlQWdlbnQoKSkKICAgICAgICAgcmVzb3VyY2VBZ2VudC0+ZGlkUmVjZWl2 ZVdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlKGlkZW50aWZpZXIsIHJlc3BvbnNlKTsKLSAgICBp ZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IGluc3RydW1lbnRpbmdB Z2VudHMuaW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpKQotICAgICAgICB0aW1lbGluZUFnZW50LT5k aWRSZWNlaXZlV2ViU29ja2V0SGFuZHNoYWtlUmVzcG9uc2UoaWRlbnRpZmllciwgZG9jdW1lbnQt PmZyYW1lKCkpOwogfQogCi12b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkQ2xvc2VX ZWJTb2NrZXRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3RydW1lbnRpbmdBZ2VudHMsIHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnQqIGRvY3VtZW50KQordm9pZCBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb246OmRpZENsb3NlV2ViU29ja2V0SW1wbChJbnN0cnVtZW50aW5nQWdl bnRzJiBpbnN0cnVtZW50aW5nQWdlbnRzLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpCiB7Ci0g ICAgaWYgKCFkb2N1bWVudCkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgaWYgKEluc3BlY3RvclJl c291cmNlQWdlbnQqIHJlc291cmNlQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLmluc3BlY3Rv clJlc291cmNlQWdlbnQoKSkKICAgICAgICAgcmVzb3VyY2VBZ2VudC0+ZGlkQ2xvc2VXZWJTb2Nr ZXQoaWRlbnRpZmllcik7Ci0gICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5l QWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkKLSAg ICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkRGVzdHJveVdlYlNvY2tldChpZGVudGlmaWVyLCBkb2N1 bWVudC0+ZnJhbWUoKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRS ZWNlaXZlV2ViU29ja2V0RnJhbWVJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3RydW1lbnRp bmdBZ2VudHMsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgV2ViU29ja2V0RnJhbWUm IGZyYW1lKQpAQCAtMTAxMiwxMSArOTkyLDEzIEBAIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpkaWRSZWNlaXZlV2ViU29ja2V0RnJhbWVJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmCiAg ICAgaWYgKEluc3BlY3RvclJlc291cmNlQWdlbnQqIHJlc291cmNlQWdlbnQgPSBpbnN0cnVtZW50 aW5nQWdlbnRzLmluc3BlY3RvclJlc291cmNlQWdlbnQoKSkKICAgICAgICAgcmVzb3VyY2VBZ2Vu dC0+ZGlkUmVjZWl2ZVdlYlNvY2tldEZyYW1lKGlkZW50aWZpZXIsIGZyYW1lKTsKIH0KKwogdm9p ZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2VpdmVXZWJTb2NrZXRGcmFtZUVycm9y SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBpbnN0cnVtZW50aW5nQWdlbnRzLCB1bnNpZ25lZCBs b25nIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKQogewogICAgIGlmIChJ bnNwZWN0b3JSZXNvdXJjZUFnZW50KiByZXNvdXJjZUFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50 cy5pbnNwZWN0b3JSZXNvdXJjZUFnZW50KCkpCiAgICAgICAgIHJlc291cmNlQWdlbnQtPmRpZFJl Y2VpdmVXZWJTb2NrZXRGcmFtZUVycm9yKGlkZW50aWZpZXIsIGVycm9yTWVzc2FnZSk7CiB9CisK IHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRTZW5kV2ViU29ja2V0RnJhbWVJbXBs KEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3RydW1lbnRpbmdBZ2VudHMsIHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgY29uc3QgV2ViU29ja2V0RnJhbWUmIGZyYW1lKQogewogICAgIGlmIChJbnNw ZWN0b3JSZXNvdXJjZUFnZW50KiByZXNvdXJjZUFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy5p bnNwZWN0b3JSZXNvdXJjZUFnZW50KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggNGEzYmRhNS4uZjQ4YTRiMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlv bi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRp b24uaApAQCAtMjUzLDcgKzI1Myw3IEBAIHB1YmxpYzoKICNlbmRpZgogCiAjaWYgRU5BQkxFKFdF Ql9TT0NLRVRTKQotICAgIHN0YXRpYyB2b2lkIGRpZENyZWF0ZVdlYlNvY2tldChEb2N1bWVudCos IHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgVVJMJiByZXF1ZXN0VVJMLCBjb25zdCBV UkwmIGRvY3VtZW50VVJMLCBjb25zdCBTdHJpbmcmIHByb3RvY29sKTsKKyAgICBzdGF0aWMgdm9p ZCBkaWRDcmVhdGVXZWJTb2NrZXQoRG9jdW1lbnQqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIs IGNvbnN0IFVSTCYgcmVxdWVzdFVSTCk7CiAgICAgc3RhdGljIHZvaWQgd2lsbFNlbmRXZWJTb2Nr ZXRIYW5kc2hha2VSZXF1ZXN0KERvY3VtZW50KiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBj b25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKICAgICBzdGF0aWMgdm9pZCBkaWRSZWNlaXZlV2ViU29j a2V0SGFuZHNoYWtlUmVzcG9uc2UoRG9jdW1lbnQqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIs IGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKICAgICBzdGF0aWMgdm9pZCBkaWRDbG9zZVdlYlNv Y2tldChEb2N1bWVudCosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcik7CkBAIC00MjksMTAgKzQy OSwxMCBAQCBwcml2YXRlOgogI2VuZGlmCiAKICNpZiBFTkFCTEUoV0VCX1NPQ0tFVFMpCi0gICAg c3RhdGljIHZvaWQgZGlkQ3JlYXRlV2ViU29ja2V0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwg dW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBVUkwmIHJlcXVlc3RVUkwsIGNvbnN0IFVS TCYgZG9jdW1lbnRVUkwsIGNvbnN0IFN0cmluZyYgcHJvdG9jb2wsIERvY3VtZW50Kik7Ci0gICAg c3RhdGljIHZvaWQgd2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0SW1wbChJbnN0cnVt ZW50aW5nQWdlbnRzJiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJl cXVlc3QmLCBEb2N1bWVudCopOwotICAgIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVXZWJTb2NrZXRI YW5kc2hha2VSZXNwb25zZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIERvY3VtZW50Kik7Ci0gICAgc3Rh dGljIHZvaWQgZGlkQ2xvc2VXZWJTb2NrZXRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCB1bnNp Z25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50Kik7CisgICAgc3RhdGljIHZvaWQgZGlkQ3Jl YXRlV2ViU29ja2V0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwgdW5zaWduZWQgbG9uZyBpZGVu dGlmaWVyLCBjb25zdCBVUkwmIHJlcXVlc3RVUkwpOworICAgIHN0YXRpYyB2b2lkIHdpbGxTZW5k V2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7CisgICAgc3RhdGlj IHZvaWQgZGlkUmVjZWl2ZVdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlSW1wbChJbnN0cnVtZW50 aW5nQWdlbnRzJiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlc3Bv bnNlJik7CisgICAgc3RhdGljIHZvaWQgZGlkQ2xvc2VXZWJTb2NrZXRJbXBsKEluc3RydW1lbnRp bmdBZ2VudHMmLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpOwogICAgIHN0YXRpYyB2b2lkIGRp ZFJlY2VpdmVXZWJTb2NrZXRGcmFtZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIHVuc2lnbmVk IGxvbmcgaWRlbnRpZmllciwgY29uc3QgV2ViU29ja2V0RnJhbWUmKTsKICAgICBzdGF0aWMgdm9p ZCBkaWRTZW5kV2ViU29ja2V0RnJhbWVJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCB1bnNpZ25l ZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFdlYlNvY2tldEZyYW1lJik7CiAgICAgc3RhdGljIHZv aWQgZGlkUmVjZWl2ZVdlYlNvY2tldEZyYW1lRXJyb3JJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMm LCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYpOwpAQCAtMTEwNyw0NCAr MTEwNyw1MSBAQCBpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Ondvcmtlckds b2JhbFNjb3BlVGVybWluYXRlZChTY3JpcHRFeGVjdXRpbwogfQogCiAjaWYgRU5BQkxFKFdFQl9T T0NLRVRTKQotaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDcmVhdGVX ZWJTb2NrZXQoRG9jdW1lbnQqIGRvY3VtZW50LCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNv bnN0IFVSTCYgcmVxdWVzdFVSTCwgY29uc3QgVVJMJiBkb2N1bWVudFVSTCwgY29uc3QgU3RyaW5n JiBwcm90b2NvbCkKK2lubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkQ3Jl YXRlV2ViU29ja2V0KERvY3VtZW50KiBkb2N1bWVudCwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBjb25zdCBVUkwmIHJlcXVlc3RVUkwpCiB7CisgICAgRkFTVF9SRVRVUk5fSUZfTk9fRlJPTlRF TkRTKHZvaWQoKSk7CiAgICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdB Z2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yRG9jdW1lbnQoZG9jdW1lbnQpKQotICAgICAg ICBkaWRDcmVhdGVXZWJTb2NrZXRJbXBsKCppbnN0cnVtZW50aW5nQWdlbnRzLCBpZGVudGlmaWVy LCByZXF1ZXN0VVJMLCBkb2N1bWVudFVSTCwgcHJvdG9jb2wsIGRvY3VtZW50KTsKKyAgICAgICAg ZGlkQ3JlYXRlV2ViU29ja2V0SW1wbCgqaW5zdHJ1bWVudGluZ0FnZW50cywgaWRlbnRpZmllciwg cmVxdWVzdFVSTCk7CiB9CiAKIGlubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6 d2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0KERvY3VtZW50KiBkb2N1bWVudCwgdW5z aWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7 CisgICAgRkFTVF9SRVRVUk5fSUZfTk9fRlJPTlRFTkRTKHZvaWQoKSk7CiAgICAgaWYgKEluc3Ry dW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRz Rm9yRG9jdW1lbnQoZG9jdW1lbnQpKQotICAgICAgICB3aWxsU2VuZFdlYlNvY2tldEhhbmRzaGFr ZVJlcXVlc3RJbXBsKCppbnN0cnVtZW50aW5nQWdlbnRzLCBpZGVudGlmaWVyLCByZXF1ZXN0LCBk b2N1bWVudCk7CisgICAgICAgIHdpbGxTZW5kV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdEltcGwo Kmluc3RydW1lbnRpbmdBZ2VudHMsIGlkZW50aWZpZXIsIHJlcXVlc3QpOwogfQogCiBpbmxpbmUg dm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2VpdmVXZWJTb2NrZXRIYW5kc2hh a2VSZXNwb25zZShEb2N1bWVudCogZG9jdW1lbnQsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwg Y29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7CisgICAgRkFTVF9SRVRVUk5fSUZf Tk9fRlJPTlRFTkRTKHZvaWQoKSk7CiAgICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3Ry dW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yRG9jdW1lbnQoZG9jdW1lbnQp KQotICAgICAgICBkaWRSZWNlaXZlV2ViU29ja2V0SGFuZHNoYWtlUmVzcG9uc2VJbXBsKCppbnN0 cnVtZW50aW5nQWdlbnRzLCBpZGVudGlmaWVyLCByZXNwb25zZSwgZG9jdW1lbnQpOworICAgICAg ICBkaWRSZWNlaXZlV2ViU29ja2V0SGFuZHNoYWtlUmVzcG9uc2VJbXBsKCppbnN0cnVtZW50aW5n QWdlbnRzLCBpZGVudGlmaWVyLCByZXNwb25zZSk7CiB9CiAKIGlubGluZSB2b2lkIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6ZGlkQ2xvc2VXZWJTb2NrZXQoRG9jdW1lbnQqIGRvY3VtZW50LCB1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpCiB7CisgICAgRkFTVF9SRVRVUk5fSUZfTk9fRlJPTlRF TkRTKHZvaWQoKSk7CiAgICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdB Z2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yRG9jdW1lbnQoZG9jdW1lbnQpKQotICAgICAg ICBkaWRDbG9zZVdlYlNvY2tldEltcGwoKmluc3RydW1lbnRpbmdBZ2VudHMsIGlkZW50aWZpZXIs IGRvY3VtZW50KTsKKyAgICAgICAgZGlkQ2xvc2VXZWJTb2NrZXRJbXBsKCppbnN0cnVtZW50aW5n QWdlbnRzLCBpZGVudGlmaWVyKTsKIH0KIAogaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjpkaWRSZWNlaXZlV2ViU29ja2V0RnJhbWUoRG9jdW1lbnQqIGRvY3VtZW50LCB1bnNp Z25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFdlYlNvY2tldEZyYW1lJiBmcmFtZSkKIHsKKyAg ICBGQVNUX1JFVFVSTl9JRl9OT19GUk9OVEVORFModm9pZCgpKTsKICAgICBpZiAoSW5zdHJ1bWVu dGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHNGb3JE b2N1bWVudChkb2N1bWVudCkpCiAgICAgICAgIGRpZFJlY2VpdmVXZWJTb2NrZXRGcmFtZUltcGwo Kmluc3RydW1lbnRpbmdBZ2VudHMsIGlkZW50aWZpZXIsIGZyYW1lKTsKIH0KIAogaW5saW5lIHZv aWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlV2ViU29ja2V0RnJhbWVFcnJv cihEb2N1bWVudCogZG9jdW1lbnQsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgU3Ry aW5nJiBlcnJvck1lc3NhZ2UpCiB7CisgICAgRkFTVF9SRVRVUk5fSUZfTk9fRlJPTlRFTkRTKHZv aWQoKSk7CiAgICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMg PSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yRG9jdW1lbnQoZG9jdW1lbnQpKQogICAgICAgICBkaWRS ZWNlaXZlV2ViU29ja2V0RnJhbWVFcnJvckltcGwoKmluc3RydW1lbnRpbmdBZ2VudHMsIGlkZW50 aWZpZXIsIGVycm9yTWVzc2FnZSk7CiB9CiAKIGlubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6ZGlkU2VuZFdlYlNvY2tldEZyYW1lKERvY3VtZW50KiBkb2N1bWVudCwgdW5zaWdu ZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBXZWJTb2NrZXRGcmFtZSYgZnJhbWUpCiB7CisgICAg RkFTVF9SRVRVUk5fSUZfTk9fRlJPTlRFTkRTKHZvaWQoKSk7CiAgICAgaWYgKEluc3RydW1lbnRp bmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yRG9j dW1lbnQoZG9jdW1lbnQpKQogICAgICAgICBkaWRTZW5kV2ViU29ja2V0RnJhbWVJbXBsKCppbnN0 cnVtZW50aW5nQWdlbnRzLCBpZGVudGlmaWVyLCBmcmFtZSk7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKaW5kZXggOGZiYjlm Ny4uYjFlNzFiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clRpbWVsaW5lQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JUaW1lbGluZUFnZW50LmNwcApAQCAtNTIxLDI4ICs1MjEsNiBAQCB2b2lkIEluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OmRpZEZpcmVBbmltYXRpb25GcmFtZSgpCiAgICAgZGlkQ29tcGxldGVDdXJy ZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkVHlwZTo6RmlyZUFuaW1hdGlvbkZyYW1lKTsKIH0KIAot I2lmIEVOQUJMRShXRUJfU09DS0VUUykKLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlk Q3JlYXRlV2ViU29ja2V0KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgVVJMJiB1cmws IGNvbnN0IFN0cmluZyYgcHJvdG9jb2wsIEZyYW1lKiBmcmFtZSkKLXsKLSAgICBhcHBlbmRSZWNv cmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVXZWJTb2NrZXRDcmVhdGVEYXRhKGlkZW50 aWZpZXIsIHVybCwgcHJvdG9jb2wpLCBUaW1lbGluZVJlY29yZFR5cGU6OldlYlNvY2tldENyZWF0 ZSwgdHJ1ZSwgZnJhbWUpOwotfQotCi12b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxT ZW5kV2ViU29ja2V0SGFuZHNoYWtlUmVxdWVzdCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIEZy YW1lKiBmcmFtZSkKLXsKLSAgICBhcHBlbmRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5Ojpj cmVhdGVHZW5lcmljV2ViU29ja2V0RGF0YShpZGVudGlmaWVyKSwgVGltZWxpbmVSZWNvcmRUeXBl OjpXZWJTb2NrZXRTZW5kSGFuZHNoYWtlUmVxdWVzdCwgdHJ1ZSwgZnJhbWUpOwotfQotCi12b2lk IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZFJlY2VpdmVXZWJTb2NrZXRIYW5kc2hha2VSZXNw b25zZSh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIEZyYW1lKiBmcmFtZSkKLXsKLSAgICBhcHBl bmRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljV2ViU29ja2V0RGF0 YShpZGVudGlmaWVyKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpXZWJTb2NrZXRSZWNlaXZlSGFuZHNo YWtlUmVzcG9uc2UsIGZhbHNlLCBmcmFtZSk7Ci19Ci0KLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVB Z2VudDo6ZGlkRGVzdHJveVdlYlNvY2tldCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIEZyYW1l KiBmcmFtZSkKLXsKLSAgICBhcHBlbmRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVh dGVHZW5lcmljV2ViU29ja2V0RGF0YShpZGVudGlmaWVyKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpX ZWJTb2NrZXREZXN0cm95LCB0cnVlLCBmcmFtZSk7Ci19Ci0jZW5kaWYgLy8gRU5BQkxFKFdFQl9T T0NLRVRTKQotCiAvLyBTY3JpcHREZWJ1Z0xpc3RlbmVyCiAKIHZvaWQgSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6YnJlYWtwb2ludEFjdGlvblByb2JlKEpTQzo6RXhlY1N0YXRlKiBleGVjLCBjb25z dCBJbnNwZWN0b3I6OlNjcmlwdEJyZWFrcG9pbnRBY3Rpb24mIGFjdGlvbiwgdW5zaWduZWQgYmF0 Y2hJZCwgdW5zaWduZWQgc2FtcGxlSWQsIGNvbnN0IERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlJikK QEAgLTYwNiwxNSArNTg0LDYgQEAgc3RhdGljIEluc3BlY3Rvcjo6UHJvdG9jb2w6OlRpbWVsaW5l OjpFdmVudFR5cGUgdG9Qcm90b2NvbChUaW1lbGluZVJlY29yZFR5cGUgdHkKICAgICAgICAgcmV0 dXJuIEluc3BlY3Rvcjo6UHJvdG9jb2w6OlRpbWVsaW5lOjpFdmVudFR5cGU6OkNhbmNlbEFuaW1h dGlvbkZyYW1lOwogICAgIGNhc2UgVGltZWxpbmVSZWNvcmRUeXBlOjpGaXJlQW5pbWF0aW9uRnJh bWU6CiAgICAgICAgIHJldHVybiBJbnNwZWN0b3I6OlByb3RvY29sOjpUaW1lbGluZTo6RXZlbnRU eXBlOjpGaXJlQW5pbWF0aW9uRnJhbWU7Ci0KLSAgICBjYXNlIFRpbWVsaW5lUmVjb3JkVHlwZTo6 V2ViU29ja2V0Q3JlYXRlOgotICAgICAgICByZXR1cm4gSW5zcGVjdG9yOjpQcm90b2NvbDo6VGlt ZWxpbmU6OkV2ZW50VHlwZTo6V2ViU29ja2V0Q3JlYXRlOwotICAgIGNhc2UgVGltZWxpbmVSZWNv cmRUeXBlOjpXZWJTb2NrZXRTZW5kSGFuZHNoYWtlUmVxdWVzdDoKLSAgICAgICAgcmV0dXJuIElu c3BlY3Rvcjo6UHJvdG9jb2w6OlRpbWVsaW5lOjpFdmVudFR5cGU6OldlYlNvY2tldFNlbmRIYW5k c2hha2VSZXF1ZXN0OwotICAgIGNhc2UgVGltZWxpbmVSZWNvcmRUeXBlOjpXZWJTb2NrZXRSZWNl aXZlSGFuZHNoYWtlUmVzcG9uc2U6Ci0gICAgICAgIHJldHVybiBJbnNwZWN0b3I6OlByb3RvY29s OjpUaW1lbGluZTo6RXZlbnRUeXBlOjpXZWJTb2NrZXRSZWNlaXZlSGFuZHNoYWtlUmVzcG9uc2U7 Ci0gICAgY2FzZSBUaW1lbGluZVJlY29yZFR5cGU6OldlYlNvY2tldERlc3Ryb3k6Ci0gICAgICAg IHJldHVybiBJbnNwZWN0b3I6OlByb3RvY29sOjpUaW1lbGluZTo6RXZlbnRUeXBlOjpXZWJTb2Nr ZXREZXN0cm95OwogICAgIH0KIAogICAgIHJldHVybiBJbnNwZWN0b3I6OlByb3RvY29sOjpUaW1l bGluZTo6RXZlbnRUeXBlOjpUaW1lU3RhbXA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaAppbmRleCAzOWM0ZGJlLi5kODliY2Y5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgK QEAgLTkzLDExICs5Myw2IEBAIGVudW0gY2xhc3MgVGltZWxpbmVSZWNvcmRUeXBlIHsKICAgICBS ZXF1ZXN0QW5pbWF0aW9uRnJhbWUsCiAgICAgQ2FuY2VsQW5pbWF0aW9uRnJhbWUsCiAgICAgRmly ZUFuaW1hdGlvbkZyYW1lLAotCi0gICAgV2ViU29ja2V0Q3JlYXRlLAotICAgIFdlYlNvY2tldFNl bmRIYW5kc2hha2VSZXF1ZXN0LAotICAgIFdlYlNvY2tldFJlY2VpdmVIYW5kc2hha2VSZXNwb25z ZSwKLSAgICBXZWJTb2NrZXREZXN0cm95CiB9OwogCiBjbGFzcyBJbnNwZWN0b3JUaW1lbGluZUFn ZW50IGZpbmFsCkBAIC0xNTgsMTIgKzE1Myw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZEZpcmVB bmltYXRpb25GcmFtZSgpOwogICAgIHZvaWQgdGltZShGcmFtZSYsIGNvbnN0IFN0cmluZyYpOwog ICAgIHZvaWQgdGltZUVuZChGcmFtZSYsIGNvbnN0IFN0cmluZyYpOwotI2lmIEVOQUJMRShXRUJf U09DS0VUUykKLSAgICB2b2lkIGRpZENyZWF0ZVdlYlNvY2tldCh1bnNpZ25lZCBsb25nIGlkZW50 aWZpZXIsIGNvbnN0IFVSTCYsIGNvbnN0IFN0cmluZyYgcHJvdG9jb2wsIEZyYW1lKik7Ci0gICAg dm9pZCB3aWxsU2VuZFdlYlNvY2tldEhhbmRzaGFrZVJlcXVlc3QodW5zaWduZWQgbG9uZyBpZGVu dGlmaWVyLCBGcmFtZSopOwotICAgIHZvaWQgZGlkUmVjZWl2ZVdlYlNvY2tldEhhbmRzaGFrZVJl c3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRnJhbWUqKTsKLSAgICB2b2lkIGRpZERl c3Ryb3lXZWJTb2NrZXQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBGcmFtZSopOwotI2VuZGlm CiAKIHByb3RlY3RlZDoKICAgICAvLyBTY3JpcHREZWJ1Z0xpc3RlbmVyCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmggYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgKaW5kZXggM2I3MGJhOC4u ZTNlMGJmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVj b3JkRmFjdG9yeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29y ZEZhY3RvcnkuaApAQCAtODUsMjQgKzg1LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAg ICAgIHN0YXRpYyB2b2lkIGFwcGVuZFByb2ZpbGUoSW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Qq LCBSZWZQdHI8SlNDOjpQcm9maWxlPiYmKTsKIAotI2lmIEVOQUJMRShXRUJfU09DS0VUUykKLSAg ICAgICAgc3RhdGljIGlubGluZSBSZWY8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0 ZVdlYlNvY2tldENyZWF0ZURhdGEodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBVUkwm IHVybCwgY29uc3QgU3RyaW5nJiBwcm90b2NvbCkKLSAgICAgICAgewotICAgICAgICAgICAgUmVm PEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBkYXRhID0gSW5zcGVjdG9yOjpJbnNwZWN0b3JP YmplY3Q6OmNyZWF0ZSgpOwotICAgICAgICAgICAgZGF0YS0+c2V0SW50ZWdlcigiaWRlbnRpZmll ciIsIGlkZW50aWZpZXIpOwotICAgICAgICAgICAgZGF0YS0+c2V0U3RyaW5nKCJ1cmwiLCB1cmwu c3RyaW5nKCkpOwotICAgICAgICAgICAgaWYgKCFwcm90b2NvbC5pc051bGwoKSkKLSAgICAgICAg ICAgICAgICBkYXRhLT5zZXRTdHJpbmcoIndlYlNvY2tldFByb3RvY29sIiwgcHJvdG9jb2wpOwot ICAgICAgICAgICAgcmV0dXJuIFdURjo6bW92ZShkYXRhKTsKLSAgICAgICAgfQotCi0gICAgICAg IHN0YXRpYyBpbmxpbmUgUmVmPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBjcmVhdGVHZW5l cmljV2ViU29ja2V0RGF0YSh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpCi0gICAgICAgIHsKLSAg ICAgICAgICAgIFJlZjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gZGF0YSA9IEluc3BlY3Rv cjo6SW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKLSAgICAgICAgICAgIGRhdGEtPnNldEludGVn ZXIoImlkZW50aWZpZXIiLCBpZGVudGlmaWVyKTsKLSAgICAgICAgICAgIHJldHVybiBXVEY6Om1v dmUoZGF0YSk7Ci0gICAgICAgIH0KLSNlbmRpZgogICAgIHByaXZhdGU6CiAgICAgICAgIFRpbWVs aW5lUmVjb3JkRmFjdG9yeSgpIHsgfQogICAgIH07Cg==