158995 2016-06-21 11:52:47 -0700 Web Inspector: first heap snapshot taken when a page is reloaded happens before the reload navigation 2016-06-23 11:54:14 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg joepeck bburg joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1204227 0 bburg 2016-06-21 11:52:47 -0700 This is not so useful. If we can tell that a reload was initiated, maybe we should skip the initial snapshot or do it on the "load" event or DOMContentLoaded event. 1204228 1 webkit-bug-importer 2016-06-21 11:53:03 -0700 <rdar://problem/26923778> 1204682 2 281873 joepeck 2016-06-22 14:51:20 -0700 Created attachment 281873 [PATCH] Proposed Fix 1204683 3 joepeck 2016-06-22 14:53:10 -0700 As a by-product, this fixes console.profile/profileEnd while the inspector frontend is open. Previously a programmatic start would have caused the frontend to send Timeline.start() and trick the backend into thinking "enabledByFrontend" which would cause the console.profileEnd to not stop the recording. Now, the frontend doesn't send any Agent.start on a programmatic start. Now, the frontend doesn't send any Agent.stop on a programmatic stop. Which reduces traffic and just makes sense. 1204724 4 281873 bburg 2016-06-22 16:49:32 -0700 Comment on attachment 281873 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=281873&action=review Having trouble reviewing in review tool as it doesn't apply cleanly any more. > Source/WebCore/ChangeLog:13 > + AutoCapture happens on the backend happens when it is enabled This sentence doesn't make sense. > Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js:119 > + start(programmatic) Can we call this initiatedByAPI or something, anything other than 'programmatic'? 1204863 5 281873 bburg 2016-06-23 11:08:30 -0700 Comment on attachment 281873 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=281873&action=review r=me It would be nice to have a test for this, but unlikely to be worth it right now with the reload issues and other instability. > Source/WebCore/ChangeLog:11 > + until after the page does its first navigation. s/does/commits/ > Source/WebCore/ChangeLog:38 > + Update the auto capture phase progressions. s/progressions/transitions >> Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js:119 >> + start(programmatic) > > Can we call this initiatedByAPI or something, anything other than 'programmatic'? EDIT: I guess we have introduced this naming into the protocol already, so never mind. Still, I think it's rather vague and we should avoid it if possible. I prefer the initiatedByUser / initiatedByAPI dichotomy, which is similar to WebKit's userGesture terminology. 1204889 6 joepeck 2016-06-23 11:54:14 -0700 <http://trac.webkit.org/changeset/202384> 281873 2016-06-22 14:51:20 -0700 2016-06-23 11:08:30 -0700 [PATCH] Proposed Fix auto-capture-phase-1.patch text/plain 20373 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiNjY4NDVkLi43ZDQ1NWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDgg QEAKIDIwMTYtMDYtMjEgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBmaXJzdCBoZWFwIHNuYXBzaG90IHRha2VuIHdoZW4gYSBw YWdlIGlzIHJlbG9hZGVkIGhhcHBlbnMgYmVmb3JlIHRoZSByZWxvYWQgbmF2aWdhdGlvbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4OTk1CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8yNjkyMzc3OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZSAiSGVhcCIgaW5zdHJ1bWVudCBpcyBpbmNs dWRlZCBpbiB0aGUgVGltZWxpbmUgbGlzdAorICAgICAgICBvZiBpbnN0cnVtZW50cywgZGVmZXIg c3RhcnRpbmcgaXQgaW4gYW4gYXV0by1jYXB0dXJlIHNjZW5hcmlvCisgICAgICAgIHVudGlsIGFm dGVyIHRoZSBwYWdlIGRvZXMgaXRzIGZpcnN0IG5hdmlnYXRpb24uCisKKyAgICAgICAgQXV0b0Nh cHR1cmUgaGFwcGVucyBvbiB0aGUgYmFja2VuZCBoYXBwZW5zIHdoZW4gaXQgaXMgZW5hYmxlZAor ICAgICAgICBhdCB0aGUgbWFpbiByZXNvdXJjZSBzdGFydHMgbG9hZGluZy4gSW4gdGhhdCBjYXNl IGl0IHByb2NlZWRzCisgICAgICAgIHRocm91Z2ggdGhlIGZvbGxvd2luZyBwaGFzZXM6CisKKyAg ICAgICAgICAgIE5vIEF1dG8gQ2FwdHVyZToKKyAgICAgICAgICAgICAgICBOb25lCisKKyAgICAg ICAgICAgIEF1dG8gQ2FwdHVyZToKKyAgICAgICAgICAgICAgICBCZWZvcmVMb2FkIC0+IEZpcnN0 TmF2aWdhdGlvbiAtPiBBZnRlckZpcnN0TmF2aWdhdGlvbgorCisgICAgICAgIFdoZW4gdG9nZ2xp bmcgaW5zdHJ1bWVudHMgZm9yIHByb2dyYW1tYXRpYyBiYWNrZW5kIGNhcHR1cmUKKyAgICAgICAg bW9zdCBpbnN0cnVtZW50cyBkbyBub3QgY2FyZSBhbmQgd2lsbCBqdXN0IHN0YXJ0L3N0b3AuCisK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkQ29tbWl0TG9hZEltcGwp OgorICAgICAgICBJbmZvcm0gdGhlIFRpbWVsaW5lQWdlbnQgdGhhdCB0aGUgbWFpbiBmcmFtZSBu YXZpZ2F0ZWQuCisgICAgICAgIERvIHRoaXMgYWZ0ZXIgaW5mb3JtaW5nIHRoZSBIZWFwQWdlbnQg KHNvIGFueSBwb3RlbnRpYWwKKyAgICAgICAgc25hcHNob3QgZG9lcyBub3QgZ2V0IGNsZWFyZWQp IGFuZCBQYWdlQWdlbnQgKHNvIHRoZQorICAgICAgICBmcm9udGVuZCBrbm93cyB0aGUgcGFnZSBu YXZpZ2F0ZWQgYmVmb3JlIHRoZSBhZ2VudCBzdGFydHMpLgorCisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y VGltZWxpbmVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFn ZW50OjppbnRlcm5hbFN0b3ApOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVB Z2VudDo6bWFpbkZyYW1lU3RhcnRlZExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6bWFpbkZyYW1lTmF2aWdhdGVkKToKKyAgICAgICAgVXBkYXRlIHRo ZSBhdXRvIGNhcHR1cmUgcGhhc2UgcHJvZ3Jlc3Npb25zLgorCisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JUaW1lbGluZUFnZW50Ojp0b2dnbGVIZWFwSW5zdHJ1bWVudCk6CisgICAgICAgIE9u bHkgc3RhcnQgdGhlIGhlYXAgYWdlbnQgZHVyaW5nIHRoZSBOb25lIHBoYXNlIChjb25zb2xlLnBy b2ZpbGUpCisgICAgICAgIG9yIHdpdGggdGhlIGZpcnN0IG5hdmlnYXRpb24gKGF1dG8gY2FwdHVy ZSBwYWdlIG5hdmlnYXRpb24pLgorCisyMDE2LTA2LTIxICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNv cmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogU25hcHNob3RzIHNob3Vs ZCBiZSBjbGVhcmVkIGF0IHNvbWUgcG9pbnQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1NzkwNwogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjYzNzM2 MTA+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVt ZW50YXRpb24uY3BwCmluZGV4IGM4MDQxNDMuLmI5NmRkMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCkBAIC03NTQs NiArNzU0LDExIEBAIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDb21taXRMb2Fk SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBpbnN0cnVtZW50CiAgICAgaWYgKEluc3BlY3RvclBh Z2VBZ2VudCogcGFnZUFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy5pbnNwZWN0b3JQYWdlQWdl bnQoKSkKICAgICAgICAgcGFnZUFnZW50LT5mcmFtZU5hdmlnYXRlZChsb2FkZXIpOwogCisgICAg aWYgKGxvYWRlci0+ZnJhbWUoKS0+aXNNYWluRnJhbWUoKSkgeworICAgICAgICBpZiAoSW5zcGVj dG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMuaW5z cGVjdG9yVGltZWxpbmVBZ2VudCgpKQorICAgICAgICAgICAgdGltZWxpbmVBZ2VudC0+bWFpbkZy YW1lTmF2aWdhdGVkKCk7CisgICAgfQorCiAjaWYgRU5BQkxFKFdFQl9SRVBMQVkpCiAgICAgaWYg KEluc3BlY3RvclJlcGxheUFnZW50KiByZXBsYXlBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMu aW5zcGVjdG9yUmVwbGF5QWdlbnQoKSkKICAgICAgICAgcmVwbGF5QWdlbnQtPmZyYW1lTmF2aWdh dGVkKGxvYWRlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yVGltZWxpbmVBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y VGltZWxpbmVBZ2VudC5jcHAKaW5kZXggNDg0ODY4YS4uN2I0YWVmYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcApAQCAtMjM0 LDYgKzIzNCw3IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6aW50ZXJuYWxTdG9wKCkK IAogICAgIG1fZW5hYmxlZCA9IGZhbHNlOwogICAgIG1fc3RhcnRlZENvbXBvc2l0ZSA9IGZhbHNl OworICAgIG1fYXV0b0NhcHR1cmVQaGFzZSA9IEF1dG9DYXB0dXJlUGhhc2U6Ok5vbmU7CiAKICAg ICBtX2Zyb250ZW5kRGlzcGF0Y2hlci0+cmVjb3JkaW5nU3RvcHBlZCh0aW1lc3RhbXAoKSk7CiB9 CkBAIC00MzksNiArNDQwLDggQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjptYWluRnJh bWVTdGFydGVkTG9hZGluZygpCiAgICAgaWYgKG1faW5zdHJ1bWVudHMuaXNFbXB0eSgpKQogICAg ICAgICByZXR1cm47CiAKKyAgICBtX2F1dG9DYXB0dXJlUGhhc2UgPSBBdXRvQ2FwdHVyZVBoYXNl OjpCZWZvcmVMb2FkOworCiAgICAgLy8gUHJlLWVtcHRpdmVseSBkaXNhYmxlIGJyZWFrcG9pbnRz LiBUaGUgZnJvbnRlbmQgbXVzdCByZS1lbmFibGUgdGhlbS4KICAgICBpZiAoSW5zcGVjdG9yRGVi dWdnZXJBZ2VudCogZGVidWdnZXJBZ2VudCA9IG1faW5zdHJ1bWVudGluZ0FnZW50cy5pbnNwZWN0 b3JEZWJ1Z2dlckFnZW50KCkpIHsKICAgICAgICAgRXJyb3JTdHJpbmcgdW51c2VkOwpAQCAtNDUx LDYgKzQ1NCwxNSBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6Om1haW5GcmFtZVN0YXJ0 ZWRMb2FkaW5nKCkKICAgICB0b2dnbGVJbnN0cnVtZW50cyhJbnN0cnVtZW50U3RhdGU6OlN0YXJ0 KTsKIH0KIAordm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjptYWluRnJhbWVOYXZpZ2F0ZWQo KQoreworICAgIGlmIChtX2F1dG9DYXB0dXJlUGhhc2UgPT0gQXV0b0NhcHR1cmVQaGFzZTo6QmVm b3JlTG9hZCkgeworICAgICAgICBtX2F1dG9DYXB0dXJlUGhhc2UgPSBBdXRvQ2FwdHVyZVBoYXNl OjpGaXJzdE5hdmlnYXRpb247CisgICAgICAgIHRvZ2dsZUluc3RydW1lbnRzKEluc3RydW1lbnRT dGF0ZTo6U3RhcnQpOworICAgICAgICBtX2F1dG9DYXB0dXJlUGhhc2UgPSBBdXRvQ2FwdHVyZVBo YXNlOjpBZnRlckZpcnN0TmF2aWdhdGlvbjsKKyAgICB9Cit9CisKIHZvaWQgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6c3RhcnRQcm9ncmFtbWF0aWNDYXB0dXJlKCkKIHsKICAgICBBU1NFUlQoIW1f ZW5hYmxlZCk7CkBAIC01MzEsOSArNTQzLDEwIEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6dG9nZ2xlSGVhcEluc3RydW1lbnQoSW5zdHJ1bWVudFN0YXRlIHN0YXRlKQogewogICAgIGlm IChtX2hlYXBBZ2VudCkgewogICAgICAgICBFcnJvclN0cmluZyB1bnVzZWQ7Ci0gICAgICAgIGlm IChzdGF0ZSA9PSBJbnN0cnVtZW50U3RhdGU6OlN0YXJ0KQotICAgICAgICAgICAgbV9oZWFwQWdl bnQtPnN0YXJ0VHJhY2tpbmcodW51c2VkKTsKLSAgICAgICAgZWxzZQorICAgICAgICBpZiAoc3Rh dGUgPT0gSW5zdHJ1bWVudFN0YXRlOjpTdGFydCkgeworICAgICAgICAgICAgaWYgKG1fYXV0b0Nh cHR1cmVQaGFzZSA9PSBBdXRvQ2FwdHVyZVBoYXNlOjpOb25lIHx8IG1fYXV0b0NhcHR1cmVQaGFz ZSA9PSBBdXRvQ2FwdHVyZVBoYXNlOjpGaXJzdE5hdmlnYXRpb24pCisgICAgICAgICAgICAgICAg bV9oZWFwQWdlbnQtPnN0YXJ0VHJhY2tpbmcodW51c2VkKTsKKyAgICAgICAgfSBlbHNlCiAgICAg ICAgICAgICBtX2hlYXBBZ2VudC0+c3RvcFRyYWNraW5nKHVudXNlZCk7CiAgICAgfQogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQu aCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKaW5k ZXggNDU4MTNmZC4uZTVkMjFjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCkBAIC0xNDEsNiArMTQxLDcgQEAgcHVibGljOgogICAg IHZvaWQgdGltZShGcmFtZSYsIGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgdGltZUVuZChGcmFt ZSYsIGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgbWFpbkZyYW1lU3RhcnRlZExvYWRpbmcoKTsK KyAgICB2b2lkIG1haW5GcmFtZU5hdmlnYXRlZCgpOwogCiBwcml2YXRlOgogICAgIC8vIFNjcmlw dERlYnVnTGlzdGVuZXIKQEAgLTIyMiw2ICsyMjMsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9w cm9ncmFtbWF0aWNDYXB0dXJlUmVzdG9yZUJyZWFrcG9pbnRBY3RpdmVWYWx1ZSB7IGZhbHNlIH07 CiAKICAgICBib29sIG1fYXV0b0NhcHR1cmVFbmFibGVkIHsgZmFsc2UgfTsKKyAgICBlbnVtIGNs YXNzIEF1dG9DYXB0dXJlUGhhc2UgeyBOb25lLCBCZWZvcmVMb2FkLCBGaXJzdE5hdmlnYXRpb24s IEFmdGVyRmlyc3ROYXZpZ2F0aW9uIH07CisgICAgQXV0b0NhcHR1cmVQaGFzZSBtX2F1dG9DYXB0 dXJlUGhhc2UgeyBBdXRvQ2FwdHVyZVBoYXNlOjpOb25lIH07CiAgICAgVmVjdG9yPEluc3BlY3Rv cjo6UHJvdG9jb2w6OlRpbWVsaW5lOjpJbnN0cnVtZW50PiBtX2luc3RydW1lbnRzOwogCiAjaWYg UExBVEZPUk0oQ09DT0EpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdl TG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBiZmE3Y2Y0Li40N2I4 NTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsNSArMSw1OCBAQAogMjAxNi0wNi0y MSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCisgICAgICAgIFdlYiBJ bnNwZWN0b3I6IGZpcnN0IGhlYXAgc25hcHNob3QgdGFrZW4gd2hlbiBhIHBhZ2UgaXMgcmVsb2Fk ZWQgaGFwcGVucyBiZWZvcmUgdGhlIHJlbG9hZCBuYXZpZ2F0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTg5OTUKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzI2OTIzNzc4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIExldCBpbnN0cnVtZW50cyBkZWNpZGUgdG8gZG8gd29yayBvciBub3QgYmFzZWQg b24gcHJvZ3JhbW1hdGljCisgICAgICAgIChiYWNrZW5kIGluaXRpYXRlZCkgc3RhcnRzIGFuZCBz dG9wLgorCisgICAgICAgIFByb2dyYW1tYXRpYyBzdGFydCBjYW4gaGFwcGVuIGR1ZSB0byBBdXRv IENhcHR1cmUgb3IgY29uc29sZS5wcm9maWxlLgorICAgICAgICBQcm9ncmFtbWF0aWMgc3RvcCBj YW4gaGFwcGVuIGR1ZSB0byBjb25zb2xlLnByb2ZpbGVFbmQuCisKKyAgICAgICAgRm9yIGV4YW1w bGUsIHRoaXMgYWxsb3dzIHRoZSBmcm9udGVuZCB0byBhdm9pZCBzZW5kaW5nIGFnZW50cyBzdGFy dC9zdG9wCisgICAgICAgIG1lc3NhZ2VzIHdoZW4gdGhlIGJhY2tlbmQgd291bGQgaGF2ZSBhbHJl YWR5IHN0YXJ0ZWQvc3RvcHBlZCB0aGUgYWdlbnRzLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVNYW5hZ2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIu cHJvdG90eXBlLnN0YXJ0Q2FwdHVyaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGlu ZU1hbmFnZXIucHJvdG90eXBlLmNhcHR1cmluZ1N0b3BwZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUuYXV0b0NhcHR1cmVTdGFydGVkKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLnByb2dyYW1tYXRpY0Nh cHR1cmVTdGFydGVkKToKKyAgICAgICAgQ2FsbCBSZWNvcmRpbmcuc3RhcnQvc3RvcCB3aXRoIGEg cHJvZ3JhbW1hdGljIGZsYWcgc28gdGhlIGZyb250ZW5kCisgICAgICAgIGluc3RydW1lbnRzIGNh biBwZXJmb3JtIGEgbW9yZSBpbmZvcm1lZCBzdGFydC9zdG9wLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVSZWNvcmRpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGltZWxpbmVSZWNvcmRpbmcucHJvdG90eXBlLnN0YXJ0KToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZVJlY29yZGluZy5wcm90b3R5cGUuc3RvcCk6CisgICAgICAgIExldCB0aGUg aW5zdHJ1bWVudHMgZGVjaWRlIHRvIGRvIHdvcmsgYmFzZWQgb24gdGhlIHN0YXJ0L3N0b3AKKyAg ICAgICAgYmVpbmcgcHJvZ3JhbW1hdGljIG9yIG5vdC4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvTW9kZWxzL0hlYXBBbGxvY2F0aW9uc0luc3RydW1lbnQuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuSGVhcEFsbG9jYXRpb25zSW5zdHJ1bWVudC5wcm90b3R5cGUuc3RhcnRJbnN0cnVtZW50 YXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBBbGxvY2F0aW9uc0luc3RydW1lbnQu cHJvdG90eXBlLnN0b3BJbnN0cnVtZW50YXRpb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv TW9kZWxzL0luc3RydW1lbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSW5zdHJ1bWVudC5z dGFydExlZ2FjeVRpbWVsaW5lQWdlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkluc3RydW1l bnQucHJvdG90eXBlLnN0YXJ0SW5zdHJ1bWVudGF0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5JbnN0cnVtZW50LnByb3RvdHlwZS5zdG9wSW5zdHJ1bWVudGF0aW9uKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5JbnN0cnVtZW50KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9N ZW1vcnlJbnN0cnVtZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1lbW9yeUluc3RydW1l bnQucHJvdG90eXBlLnN0YXJ0SW5zdHJ1bWVudGF0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5NZW1vcnlJbnN0cnVtZW50LnByb3RvdHlwZS5zdG9wSW5zdHJ1bWVudGF0aW9uKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5NZW1vcnlJbnN0cnVtZW50KToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL01vZGVscy9OZXR3b3JrSW5zdHJ1bWVudC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L01vZGVscy9TY3JpcHRJbnN0cnVtZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlw dEluc3RydW1lbnQucHJvdG90eXBlLnN0YXJ0SW5zdHJ1bWVudGF0aW9uKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TY3JpcHRJbnN0cnVtZW50LnByb3RvdHlwZS5zdG9wSW5zdHJ1bWVudGF0aW9u KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRJbnN0cnVtZW50KToKKyAgICAgICAgQXZv aWQgc2VuZGluZyBzdGFydC9zdG9wIHRyYWNraW5nIG1lc3NhZ2VzIHdoZW4gcHJvZ3JhbW1hdGlj LgorICAgICAgICBUaGlzIHN0aWxsIGFsbG93cyB0aGUgaW5zdHJ1bWVudHMgdG8gZG8gdGhlaXIg b3duIGZyb250ZW5kIHRyYWNraW5nLAorICAgICAgICBzdWNoIGFzIHRoZSBIZWFwIGFnZW50IHRy aWdnZXJpbmcgcGVyaW9kaWMgc25hcHNob3RzLgorCisyMDE2LTA2LTIxICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogU25hcHNo b3RzIHNob3VsZCBiZSBjbGVhcmVkIGF0IHNvbWUgcG9pbnQKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzkwNwogICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMjYzNzM2MTA+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKaW5kZXggZDg2 ZTk2ZS4uZDcwZDBjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcwpAQCAt NDIsNiArNDIsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyID0gY2xhc3MgVGltZWxp bmVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICB0aGlzLl9wZXJz aXN0ZW50TmV0d29ya1RpbWVsaW5lID0gbmV3IFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmU7 CiAKICAgICAgICAgdGhpcy5faXNDYXB0dXJpbmcgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fcHJv Z3JhbW1hdGljU3RhcnQgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fcHJvZ3JhbW1hdGljU3RvcCA9 IGZhbHNlOwogICAgICAgICB0aGlzLl93YWl0aW5nRm9yQ2FwdHVyaW5nU3RhcnRlZEV2ZW50ID0g ZmFsc2U7CiAgICAgICAgIHRoaXMuX2lzQ2FwdHVyaW5nUGFnZVJlbG9hZCA9IGZhbHNlOwogICAg ICAgICB0aGlzLl9hdXRvQ2FwdHVyZU9uUGFnZUxvYWQgPSBmYWxzZTsKQEAgLTE3NSwxNCArMTc3 LDE0IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIgPSBjbGFzcyBUaW1lbGluZU1hbmFn ZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5FdmVudC5DYXB0dXJp bmdXaWxsU3RhcnQpOwogCi0gICAgICAgIHRoaXMuX2FjdGl2ZVJlY29yZGluZy5zdGFydCgpOwor ICAgICAgICB0aGlzLl9hY3RpdmVSZWNvcmRpbmcuc3RhcnQodGhpcy5fcHJvZ3JhbW1hdGljU3Rh cnQpOwogICAgIH0KIAogICAgIHN0b3BDYXB0dXJpbmcoKQogICAgIHsKICAgICAgICAgY29uc29s ZS5hc3NlcnQodGhpcy5faXNDYXB0dXJpbmcsICJUaW1lbGluZU1hbmFnZXIgaXMgbm90IGNhcHR1 cmluZy4iKTsKIAotICAgICAgICB0aGlzLl9hY3RpdmVSZWNvcmRpbmcuc3RvcCgpOworICAgICAg ICB0aGlzLl9hY3RpdmVSZWNvcmRpbmcuc3RvcCh0aGlzLl9wcm9ncmFtbWF0aWNTdG9wKTsKIAog ICAgICAgICAvLyBOT1RFOiBBbHdheXMgc3RvcCBpbW1lZGlhdGVseSBpbnN0ZWFkIG9mIHdhaXRp bmcgZm9yIGEgVGltZWxpbmUucmVjb3JkaW5nU3RvcHBlZCBldmVudC4KICAgICAgICAgLy8gVGhp cyB3YXkgdGhlIFVJIGZlZWxzIGFzIHJlc3BvbnNpdmUgdG8gYSBzdG9wIGFzIHBvc3NpYmxlLgpA QCAtMjU4LDYgKzI2MCw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIgPSBjbGFzcyBU aW1lbGluZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIHRoaXMu X2lzQ2FwdHVyaW5nUGFnZVJlbG9hZCA9IGZhbHNlOwogICAgICAgICB0aGlzLl9zaG91bGRTZXRB dXRvQ2FwdHVyaW5nTWFpblJlc291cmNlID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX21haW5SZXNv dXJjZUZvckF1dG9DYXB0dXJpbmcgPSBudWxsOworICAgICAgICB0aGlzLl9wcm9ncmFtbWF0aWNT dGFydCA9IGZhbHNlOworICAgICAgICB0aGlzLl9wcm9ncmFtbWF0aWNTdG9wID0gZmFsc2U7CiAK ICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVs aW5lTWFuYWdlci5FdmVudC5DYXB0dXJpbmdTdG9wcGVkLCB7ZW5kVGltZX0pOwogICAgIH0KQEAg LTI2OSw2ICsyNzMsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyID0gY2xhc3MgVGlt ZWxpbmVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICBpZiAodGhp cy5faXNDYXB0dXJpbmcpCiAgICAgICAgICAgICB0aGlzLnN0b3BDYXB0dXJpbmcoKTsKIAorICAg ICAgICB0aGlzLl9wcm9ncmFtbWF0aWNTdGFydCA9IHRydWU7CisKICAgICAgICAgLy8gV2UgbWF5 IGFscmVhZHkgaGF2ZSBhbiBmcmVzaCBUaW1lbGluZVJlY29yZGluZyBjcmVhdGVkIGlmIGF1dG9D YXB0dXJlU3RhcnRlZCBpcyByZWNlaXZlZAogICAgICAgICAvLyBiZXR3ZWVuIHNlbmRpbmcgdGhl IFRpbWVsaW5lLnN0YXJ0IGNvbW1hbmQgYW5kIHJlY2VpdmluZyBUaW1lbGluZS5jYXB0dXJpbmdT dGFydGVkIGV2ZW50LgogICAgICAgICAvLyBJbiB0aGF0IGNhc2UsIHRoZXJlIGlzIG5vIG5lZWQg dG8gY2FsbCBzdGFydENhcHR1cmluZyBhZ2Fpbi4gUmV1c2UgdGhlIGZyZXNoIHJlY29yZGluZy4K QEAgLTI4NCw2ICsyOTAsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyID0gY2xhc3Mg VGltZWxpbmVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgIHsKICAgICAg ICAgLy8gQ2FsbGVkIGZyb20gV2ViSW5zcGVjdG9yLlRpbWVsaW5lT2JzZXJ2ZXIuCiAKKyAgICAg ICAgdGhpcy5fcHJvZ3JhbW1hdGljU3RhcnQgPSB0cnVlOworCiAgICAgICAgIHRoaXMuX2FjdGl2 ZVJlY29yZGluZy5hZGRTY3JpcHRJbnN0cnVtZW50Rm9yUHJvZ3JhbW1hdGljQ2FwdHVyZSgpOwog CiAgICAgICAgIGNvbnN0IGNyZWF0ZU5ld1JlY29yZGluZyA9IGZhbHNlOwpAQCAtMjk0LDYgKzMw Miw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIgPSBjbGFzcyBUaW1lbGluZU1hbmFn ZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgewogICAgICAgICAvLyBDYWxsZWQg ZnJvbSBXZWJJbnNwZWN0b3IuVGltZWxpbmVPYnNlcnZlci4KIAorICAgICAgICB0aGlzLl9wcm9n cmFtbWF0aWNTdG9wID0gdHJ1ZTsKKwogICAgICAgICAvLyBGSVhNRTogVGhpcyBpcyBwdXJlbHkg dG8gYXZvaWQgYSBub2lzeSBhc3NlcnQuIFByZXZpb3VzbHkKICAgICAgICAgLy8gaXQgd2FzIGlt cG9zc2libGUgdG8gc3RvcCB3aXRob3V0IHN0b3BwaW5nIGZyb20gdGhlIFVJLgogICAgICAgICBj b25zb2xlLmFzc2VydCghdGhpcy5faXNDYXB0dXJpbmcpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0hlYXBBbGxvY2F0aW9uc0luc3RydW1l bnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvSGVhcEFs bG9jYXRpb25zSW5zdHJ1bWVudC5qcwppbmRleCAxNWJkMWViLi5mZWY1YmFhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvSGVhcEFsbG9jYXRp b25zSW5zdHJ1bWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvSGVhcEFsbG9jYXRpb25zSW5zdHJ1bWVudC5qcwpAQCAtNDksMjEgKzQ5LDIzIEBA IFdlYkluc3BlY3Rvci5IZWFwQWxsb2NhdGlvbnNJbnN0cnVtZW50ID0gY2xhc3MgSGVhcEFsbG9j YXRpb25zSW5zdHJ1bWVudCBleHRlbmRzCiAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVSZWNvcmQuVHlwZS5IZWFwQWxsb2NhdGlvbnM7CiAgICAgfQogCi0gICAgc3RhcnRJbnN0 cnVtZW50YXRpb24oKQorICAgIHN0YXJ0SW5zdHJ1bWVudGF0aW9uKHByb2dyYW1tYXRpYykKICAg ICB7CiAgICAgICAgIC8vIEZJWE1FOiBJbmNsdWRlIGEgInRyYWNrIGFsbG9jYXRpb25zIiBvcHRp b24gZm9yIHRoaXMgaW5zdHJ1bWVudC4KICAgICAgICAgLy8gRklYTUU6IEluY2x1ZGUgYSBwZXJp b2RpYyBzbmFwc2hvdCBpbnRlcnZhbCBvcHRpb24gZm9yIHRoaXMgaW5zdHJ1bWVudC4KIAotICAg ICAgICBIZWFwQWdlbnQuc3RhcnRUcmFja2luZygpOworICAgICAgICBpZiAoIXByb2dyYW1tYXRp YykKKyAgICAgICAgICAgIEhlYXBBZ2VudC5zdGFydFRyYWNraW5nKCk7CiAKICAgICAgICAgLy8g UGVyaW9kaWMgc25hcHNob3RzLgogICAgICAgICBjb25zdCBzbmFwc2hvdEludGVydmFsID0gMTAw MDA7CiAgICAgICAgIHRoaXMuX3NuYXBzaG90SW50ZXJ2YWxJZGVudGlmaWVyID0gc2V0SW50ZXJ2 YWwodGhpcy5fdGFrZUhlYXBTbmFwc2hvdC5iaW5kKHRoaXMpLCBzbmFwc2hvdEludGVydmFsKTsK ICAgICB9CiAKLSAgICBzdG9wSW5zdHJ1bWVudGF0aW9uKCkKKyAgICBzdG9wSW5zdHJ1bWVudGF0 aW9uKHByb2dyYW1tYXRpYykKICAgICB7Ci0gICAgICAgIEhlYXBBZ2VudC5zdG9wVHJhY2tpbmco KTsKKyAgICAgICAgaWYgKCFwcm9ncmFtbWF0aWMpCisgICAgICAgICAgICBIZWFwQWdlbnQuc3Rv cFRyYWNraW5nKCk7CiAKICAgICAgICAgd2luZG93LmNsZWFySW50ZXJ2YWwodGhpcy5fc25hcHNo b3RJbnRlcnZhbElkZW50aWZpZXIpOwogICAgICAgICB0aGlzLl9zbmFwc2hvdEludGVydmFsSWRl bnRpZmllciA9IHVuZGVmaW5lZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01vZGVscy9JbnN0cnVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL0luc3RydW1lbnQuanMKaW5kZXggNTc0ZGRhNi4uNmQ0NmRj ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxz L0luc3RydW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL0luc3RydW1lbnQuanMKQEAgLTQ4LDcgKzQ4LDcgQEAgV2ViSW5zcGVjdG9yLkluc3Ry dW1lbnQgPSBjbGFzcyBJbnN0cnVtZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAg ICAgICB9CiAgICAgfQogCi0gICAgc3RhdGljIHN0YXJ0TGVnYWN5VGltZWxpbmVBZ2VudCgpCisg ICAgc3RhdGljIHN0YXJ0TGVnYWN5VGltZWxpbmVBZ2VudChwcm9ncmFtbWF0aWMpCiAgICAgewog ICAgICAgICBjb25zb2xlLmFzc2VydCh3aW5kb3cuVGltZWxpbmVBZ2VudCwgIkF0dGVtcHRlZCB0 byBzdGFydCBsZWdhY3kgdGltZWxpbmUgYWdlbnQgd2l0aG91dCBUaW1lbGluZUFnZW50LiIpOwog CkBAIC01Nyw2ICs1Nyw5IEBAIFdlYkluc3BlY3Rvci5JbnN0cnVtZW50ID0gY2xhc3MgSW5zdHJ1 bWVudCBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKIAogICAgICAgICBXZWJJbnNwZWN0b3Iu SW5zdHJ1bWVudC5fbGVnYWN5VGltZWxpbmVBZ2VudFN0YXJ0ZWQgPSB0cnVlOwogCisgICAgICAg IGlmIChwcm9ncmFtbWF0aWMpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgbGV0IHJl c3VsdCA9IFRpbWVsaW5lQWdlbnQuc3RhcnQoKTsKIAogICAgICAgICAvLyBDT01QQVRJQklMSVRZ IChpT1MgNyk6IHJlY29yZGluZ1N0YXJ0ZWQgZXZlbnQgZGlkIG5vdCBleGlzdCB5ZXQuIFN0YXJ0 IGV4cGxpY2l0bHkuCkBAIC02NywxMyArNzAsMTYgQEAgV2ViSW5zcGVjdG9yLkluc3RydW1lbnQg PSBjbGFzcyBJbnN0cnVtZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICB9 CiAgICAgfQogCi0gICAgc3RhdGljIHN0b3BMZWdhY3lUaW1lbGluZUFnZW50KCkKKyAgICBzdGF0 aWMgc3RvcExlZ2FjeVRpbWVsaW5lQWdlbnQocHJvZ3JhbW1hdGljKQogICAgIHsKICAgICAgICAg aWYgKCFXZWJJbnNwZWN0b3IuSW5zdHJ1bWVudC5fbGVnYWN5VGltZWxpbmVBZ2VudFN0YXJ0ZWQp CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgV2ViSW5zcGVjdG9yLkluc3RydW1lbnQu X2xlZ2FjeVRpbWVsaW5lQWdlbnRTdGFydGVkID0gZmFsc2U7CiAKKyAgICAgICAgaWYgKHByb2dy YW1tYXRpYykKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBUaW1lbGluZUFnZW50LnN0 b3AoKTsKICAgICB9CiAKQEAgLTg0LDE0ICs5MCwxNCBAQCBXZWJJbnNwZWN0b3IuSW5zdHJ1bWVu dCA9IGNsYXNzIEluc3RydW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAg IHJldHVybiBudWxsOyAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzLgogICAgIH0KIAotICAg IHN0YXJ0SW5zdHJ1bWVudGF0aW9uKCkKKyAgICBzdGFydEluc3RydW1lbnRhdGlvbihwcm9ncmFt bWF0aWMpCiAgICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuSW5zdHJ1bWVudC5zdGFydExlZ2Fj eVRpbWVsaW5lQWdlbnQoKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLkluc3RydW1lbnQuc3RhcnRM ZWdhY3lUaW1lbGluZUFnZW50KHByb2dyYW1tYXRpYyk7CiAgICAgfQogCi0gICAgc3RvcEluc3Ry dW1lbnRhdGlvbigpCisgICAgc3RvcEluc3RydW1lbnRhdGlvbihwcm9ncmFtbWF0aWMpCiAgICAg ewotICAgICAgICBXZWJJbnNwZWN0b3IuSW5zdHJ1bWVudC5zdG9wTGVnYWN5VGltZWxpbmVBZ2Vu dCgpOworICAgICAgICBXZWJJbnNwZWN0b3IuSW5zdHJ1bWVudC5zdG9wTGVnYWN5VGltZWxpbmVB Z2VudChwcm9ncmFtbWF0aWMpOwogICAgIH0KIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9NZW1vcnlJbnN0cnVtZW50LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL01lbW9yeUluc3RydW1lbnQu anMKaW5kZXggZTRlNzgxNC4uYmNiZjc1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL01lbW9yeUluc3RydW1lbnQuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL01lbW9yeUluc3RydW1lbnQuanMK QEAgLTQ3LDEzICs0NywxNSBAQCBXZWJJbnNwZWN0b3IuTWVtb3J5SW5zdHJ1bWVudCA9IGNsYXNz IE1lbW9yeUluc3RydW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuSW5zdAogICAgICAgICByZXR1 cm4gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTWVtb3J5OwogICAgIH0KIAotICAg IHN0YXJ0SW5zdHJ1bWVudGF0aW9uKCkKKyAgICBzdGFydEluc3RydW1lbnRhdGlvbihwcm9ncmFt bWF0aWMpCiAgICAgewotICAgICAgICBNZW1vcnlBZ2VudC5zdGFydFRyYWNraW5nKCk7CisgICAg ICAgIGlmICghcHJvZ3JhbW1hdGljKQorICAgICAgICAgICAgTWVtb3J5QWdlbnQuc3RhcnRUcmFj a2luZygpOwogICAgIH0KIAotICAgIHN0b3BJbnN0cnVtZW50YXRpb24oKQorICAgIHN0b3BJbnN0 cnVtZW50YXRpb24ocHJvZ3JhbW1hdGljKQogICAgIHsKLSAgICAgICAgTWVtb3J5QWdlbnQuc3Rv cFRyYWNraW5nKCk7CisgICAgICAgIGlmICghcHJvZ3JhbW1hdGljKQorICAgICAgICAgICAgTWVt b3J5QWdlbnQuc3RvcFRyYWNraW5nKCk7CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9OZXR3b3JrSW5zdHJ1bWVudC5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9OZXR3b3JrSW5zdHJ1 bWVudC5qcwppbmRleCBiOTQ2ZGI1Li42NmQ4ODE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTmV0d29ya0luc3RydW1lbnQuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL05ldHdvcmtJbnN0cnVt ZW50LmpzCkBAIC0zMiwxMiArMzIsMTIgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtJbnN0cnVtZW50 ID0gY2xhc3MgTmV0d29ya0luc3RydW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuSW4KICAgICAg ICAgcmV0dXJuIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLk5ldHdvcms7CiAgICAg fQogCi0gICAgc3RhcnRJbnN0cnVtZW50YXRpb24oKQorICAgIHN0YXJ0SW5zdHJ1bWVudGF0aW9u KHByb2dyYW1tYXRpYykKICAgICB7CiAgICAgICAgIC8vIE5vdGhpbmcgdG8gZG8sIG5ldHdvcmsg aW5zdHJ1bWVudGF0aW9uIGlzIGFsd2F5cyBoYXBwZW5pbmcuCiAgICAgfQogCi0gICAgc3RvcElu c3RydW1lbnRhdGlvbigpCisgICAgc3RvcEluc3RydW1lbnRhdGlvbihwcm9ncmFtbWF0aWMpCiAg ICAgewogICAgICAgICAvLyBOb3RoaW5nIHRvIGRvLCBuZXR3b3JrIGluc3RydW1lbnRhdGlvbiBp cyBhbHdheXMgaGFwcGVuaW5nLgogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHRJbnN0cnVtZW50LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NjcmlwdEluc3RydW1lbnQuanMKaW5k ZXggNTY3MDQ4ZC4uZjFmZjliNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTW9kZWxzL1NjcmlwdEluc3RydW1lbnQuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NjcmlwdEluc3RydW1lbnQuanMKQEAgLTMy LDcgKzMyLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdEluc3RydW1lbnQgPSBjbGFzcyBTY3JpcHRJ bnN0cnVtZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLkluc3QKICAgICAgICAgcmV0dXJuIFdlYklu c3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlNjcmlwdDsKICAgICB9CiAKLSAgICBzdGFydElu c3RydW1lbnRhdGlvbigpCisgICAgc3RhcnRJbnN0cnVtZW50YXRpb24ocHJvZ3JhbW1hdGljKQog ICAgIHsKICAgICAgICAgLy8gQ09NUEFUSUJJTElUWSAoaU9TIDkpOiBMZWdhY3kgYmFja2VuZHMg ZGlkIG5vdCBoYXZlIFNjcmlwdFByb2ZpbGVyQWdlbnQuIFRoZXkgdXNlIFRpbWVsaW5lQWdlbnQu CiAgICAgICAgIGlmICghd2luZG93LlNjcmlwdFByb2ZpbGVyQWdlbnQpIHsKQEAgLTQzLDEwICs0 MywxMSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0SW5zdHJ1bWVudCA9IGNsYXNzIFNjcmlwdEluc3Ry dW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuSW5zdAogICAgICAgICAvLyBGSVhNRTogTWFrZSB0 aGlzIHNvbWUgVUkgdmlzaWJsZSBvcHRpb24uCiAgICAgICAgIGNvbnN0IGluY2x1ZGVTYW1wbGVz ID0gdHJ1ZTsKIAotICAgICAgICBTY3JpcHRQcm9maWxlckFnZW50LnN0YXJ0VHJhY2tpbmcoaW5j bHVkZVNhbXBsZXMpOworICAgICAgICBpZiAoIXByb2dyYW1tYXRpYykKKyAgICAgICAgICAgIFNj cmlwdFByb2ZpbGVyQWdlbnQuc3RhcnRUcmFja2luZyhpbmNsdWRlU2FtcGxlcyk7CiAgICAgfQog Ci0gICAgc3RvcEluc3RydW1lbnRhdGlvbigpCisgICAgc3RvcEluc3RydW1lbnRhdGlvbihwcm9n cmFtbWF0aWMpCiAgICAgewogICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgOSk6IExlZ2Fj eSBiYWNrZW5kcyBkaWQgbm90IGhhdmUgU2NyaXB0UHJvZmlsZXJBZ2VudC4gVGhleSB1c2UgVGlt ZWxpbmVBZ2VudC4KICAgICAgICAgaWYgKCF3aW5kb3cuU2NyaXB0UHJvZmlsZXJBZ2VudCkgewpA QCAtNTQsNiArNTUsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0SW5zdHJ1bWVudCA9IGNsYXNzIFNj cmlwdEluc3RydW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuSW5zdAogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgU2NyaXB0UHJvZmlsZXJBZ2VudC5zdG9wVHJhY2tp bmcoKTsKKyAgICAgICAgaWYgKCFwcm9ncmFtbWF0aWMpCisgICAgICAgICAgICBTY3JpcHRQcm9m aWxlckFnZW50LnN0b3BUcmFja2luZygpOwogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVSZWNvcmRpbmcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVSZWNv cmRpbmcuanMKaW5kZXggM2E0ZTdhNC4uNTIxN2NhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lUmVjb3JkaW5nLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9UaW1lbGluZVJlY29y ZGluZy5qcwpAQCAtMTE2LDcgKzExNiw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGlu ZyA9IGNsYXNzIFRpbWVsaW5lUmVjb3JkaW5nIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iCiAgICAg ICAgIHJldHVybiB0aGlzLl90b3BGdW5jdGlvbnNCb3R0b21VcENhbGxpbmdDb250ZXh0VHJlZTsK ICAgICB9CiAKLSAgICBzdGFydCgpCisgICAgc3RhcnQocHJvZ3JhbW1hdGljKQogICAgIHsKICAg ICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX2NhcHR1cmluZywgIkF0dGVtcHRlZCB0byBzdGFy dCBhbiBhbHJlYWR5IHN0YXJ0ZWQgc2Vzc2lvbi4iKTsKICAgICAgICAgY29uc29sZS5hc3NlcnQo IXRoaXMuX3JlYWRvbmx5LCAiQXR0ZW1wdGVkIHRvIHN0YXJ0IGEgcmVhZG9ubHkgc2Vzc2lvbi4i KTsKQEAgLTEyNCw3ICsxMjQsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcgPSBj bGFzcyBUaW1lbGluZVJlY29yZGluZyBleHRlbmRzIFdlYkluc3BlY3Rvci5PYgogICAgICAgICB0 aGlzLl9jYXB0dXJpbmcgPSB0cnVlOwogCiAgICAgICAgIGZvciAobGV0IGluc3RydW1lbnQgb2Yg dGhpcy5faW5zdHJ1bWVudHMpCi0gICAgICAgICAgICBpbnN0cnVtZW50LnN0YXJ0SW5zdHJ1bWVu dGF0aW9uKCk7CisgICAgICAgICAgICBpbnN0cnVtZW50LnN0YXJ0SW5zdHJ1bWVudGF0aW9uKHBy b2dyYW1tYXRpYyk7CiAgICAgfQogCiAgICAgc3RvcChwcm9ncmFtbWF0aWMpCkBAIC0xMzQsMTAg KzEzNCw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZyA9IGNsYXNzIFRpbWVsaW5l UmVjb3JkaW5nIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iCiAKICAgICAgICAgdGhpcy5fY2FwdHVy aW5nID0gZmFsc2U7CiAKLSAgICAgICAgaWYgKCFwcm9ncmFtbWF0aWMpIHsKLSAgICAgICAgICAg IGZvciAobGV0IGluc3RydW1lbnQgb2YgdGhpcy5faW5zdHJ1bWVudHMpCi0gICAgICAgICAgICAg ICAgaW5zdHJ1bWVudC5zdG9wSW5zdHJ1bWVudGF0aW9uKCk7Ci0gICAgICAgIH0KKyAgICAgICAg Zm9yIChsZXQgaW5zdHJ1bWVudCBvZiB0aGlzLl9pbnN0cnVtZW50cykKKyAgICAgICAgICAgIGlu c3RydW1lbnQuc3RvcEluc3RydW1lbnRhdGlvbihwcm9ncmFtbWF0aWMpOwogICAgIH0KIAogICAg IHNhdmVJZGVudGl0eVRvQ29va2llKCkK