79116 2012-02-21 08:41:25 -0800 Web Inspector: do not filter out requestAnimationFrame from timeline, implement stop on animation events. 2012-02-22 09:29:36 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo ossy pfeldman pmuellr rik timothy yurys oldest_to_newest 560909 0 pfeldman 2012-02-21 08:41:25 -0800 Patch to follow. 560911 1 127979 pfeldman 2012-02-21 08:43:19 -0800 Created attachment 127979 Patch 561828 2 127979 yurys 2012-02-22 04:05:01 -0800 Comment on attachment 127979 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=127979&action=review > Source/WebCore/dom/ScriptedAnimationController.cpp:88 > + InspectorInstrumentation::didRequestAnimationFrameCallback(m_document, id); didRequestAnimationFrameCallback -> didRequestAnimationFrame ? > Source/WebCore/inspector/InspectorInstrumentation.cpp:996 > +void InspectorInstrumentation::didRequestAnimationFrameCallbackImpl(InstrumentingAgents* instrumentingAgents, int callbackId) didRequestAnimationFrameCallbackImpl -> didRequestAnimationFrameImpl 561868 3 pfeldman 2012-02-22 05:12:49 -0800 Committed r108486: <http://trac.webkit.org/changeset/108486> 561872 4 ossy 2012-02-22 05:19:08 -0800 It broke (at least) the Qt build: ../../../../Source/WebCore/inspector/InspectorController.cpp:72:36: error: base/debug/stack_trace.h: No such file or directory 562040 5 ossy 2012-02-22 09:29:36 -0800 fix landed in http://trac.webkit.org/changeset/108488 127979 2012-02-21 08:43:19 -0800 2012-02-22 04:05:01 -0800 Patch bug-79116-20120221204316.patch text/plain 29924 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4MzU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzBkNzc3YTI1ZTFhNTll NWJjNTc0ZmFjODliOTczOWE4MmRjMmQ1Ny4uZDAxOGI5YTNiYjk4MGRmYTA3MDliNzJkMGEyNGYy NDM4YjMxNWMwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEyLTAyLTIxICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBkbyBub3QgZmlsdGVyIG91dCByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgZnJvbSB0aW1lbGluZSwg aW1wbGVtZW50IHN0b3Agb24gYW5pbWF0aW9uIGV2ZW50cy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MTE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanM6CisgICAgICAgICogZG9tL1NjcmlwdGVkQW5pbWF0aW9uQ29udHJvbGxlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JpcHRlZEFuaW1hdGlvbkNvbnRyb2xsZXI6OnJlZ2lzdGVyQ2Fs bGJhY2spOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3Bw OgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb246OmRpZFJlcXVlc3RBbmltYXRpb25GcmFtZUNhbGxiYWNrSW1wbCk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZENhbmNlbEFuaW1hdGlvbkZy YW1lQ2FsbGJhY2tJbXBsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRh dGlvbjo6d2lsbEZpcmVBbmltYXRpb25GcmFtZUV2ZW50SW1wbCk6CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oOgorICAgICAgICAoSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6 ZGlkUmVxdWVzdEFuaW1hdGlvbkZyYW1lQ2FsbGJhY2spOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcDoKKyAgICAgICAgKFRpbWVsaW5lUmVjb3JkVHlwZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRSZXF1ZXN0QW5p bWF0aW9uRnJhbWVDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpkaWRDYW5jZWxBbmltYXRpb25GcmFtZUNhbGxiYWNrKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxGaXJlQW5pbWF0aW9uRnJhbWVFdmVudCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRGaXJlQW5pbWF0 aW9uRnJhbWVFdmVudCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdl bnQuaDoKKyAgICAgICAgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5FdmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzU2lkZWJhclBhbmUuZXZlbnROYW1l Rm9yVUkpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5qczoK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVQYW5lbC5wcm90b3R5cGUuZ2V0IF9yZWNvcmRTdHlsZXMpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9maW5kUGFyZW50UmVjb3JkKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5faW5uZXJBZGRSZWNvcmRU b1RpbWVsaW5lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlw ZS5fb25SZWNvcmRzQ2xlYXJlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5l bC5Gb3JtYXR0ZWRSZWNvcmQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwu Rm9ybWF0dGVkUmVjb3JkLnByb3RvdHlwZS5fZ2VuZXJhdGVQb3B1cENvbnRlbnQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuRm9ybWF0dGVkUmVjb3JkLnByb3RvdHlwZS5f Z2V0UmVjb3JkRGV0YWlscyk6CisKIDIwMTItMDItMjEgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2 bG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbU3VnZ2VzdEJveF0g dGV4dFByb21wdC5jc3MgZGlzYWJsZW1lbnQgZGlzcGxheXMgZ2FyYmxlZCBzdWdnZXN0IGJveApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdz LmpzIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmlu ZGV4IDM4MzhmZDUzMDc5MGMxYmQ5OGNkYjIxZDFiZTIzYjJkNjRjMjQyY2UuLmMyZmQxYjQwYmRj N2UyNDY0NWJlZWM2ZWQxZjYxYTVkYzQyNTE4ZjAgMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVs dGEgMTUwCnpjbVpwPiVXfnV7T1QhayUlYmIoenJ8P1d5PTMqMz9GMy0pI0hGQFJ+ODZANzteOyhu aktrLWJqPHpmXkElWDJDKgp6IzQ7IV8qZko8ZyYqTmZMaDNFbVFuJEZHNXNLRHZRa2pZVFFramp1 VS1Hck1fY2U0Q2Bsai1MPDgzbUBGPTRSeUMKbHpMQUA7S25iS3lYITdwb0puVzdQY3xnXjxsTEFk QV5EcEledUMyIXk0Rks3PERlQ3xMCgpkZWx0YSAyMDQKemNtWD9kbSE8NzRPVCFrJSViZTN8eGZ5 djk2Jk1eREApJEIxYXYyZ0NOYFExZWtmKkBsNENMaGlWR0B1fFgyQG54CnpWdSVIYis1KWk+TGw4 cU1McG80cEY7SU9mTGxJQzZ1TCtaX15pOEx5YXh1enIhVlI0KXBmNWdzRT5NVWNFKEViPgp6QCY8 OTs+RmohcDBASm0qNzxte0tDaEo5dVBnbXQ7UkE2O3dDfVQqU1RwKj50eV5APTtNYD9QejklQ3Yx ezB1QyUKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0ZWRBbmltYXRpb25D b250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRlZEFuaW1hdGlvbkNvbnRy b2xsZXIuY3BwCmluZGV4IDg4NzVmNTU2ODBlOWI3ZWQxYTkxNmY4ZGY0MTlhNWVkZjUxNTA3ZWQu LjVhY2EwNDY4YjY1MTk1YzBkNjliZjVjYmUwMzRiZjhlMjA1ZTcwOWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRlZEFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRlZEFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCkBAIC04NSw3 ICs4NSw3IEBAIFNjcmlwdGVkQW5pbWF0aW9uQ29udHJvbGxlcjo6Q2FsbGJhY2tJZCBTY3JpcHRl ZEFuaW1hdGlvbkNvbnRyb2xsZXI6OnJlZ2lzdGVyQ2FsCiAgICAgY2FsbGJhY2stPm1fZWxlbWVu dCA9IGFuaW1hdGlvbkVsZW1lbnQ7CiAgICAgbV9jYWxsYmFja3MuYXBwZW5kKGNhbGxiYWNrKTsK IAotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVnaXN0ZXJBbmltYXRpb25GcmFt ZUNhbGxiYWNrKG1fZG9jdW1lbnQsIGlkKTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 OmRpZFJlcXVlc3RBbmltYXRpb25GcmFtZUNhbGxiYWNrKG1fZG9jdW1lbnQsIGlkKTsKIAogICAg IGlmICghbV9zdXNwZW5kQ291bnQpCiAgICAgICAgIHNjaGVkdWxlQW5pbWF0aW9uKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24u Y3BwCmluZGV4IDM3NzczNTZkYjRjOGY3MTVjZWVhOTBhNjgzNDI5OThhNzAzMTk4YTguLjUyNzIy Yjg0ZDIzMDcxMjhlODdhZDdiOGI5YjZiZTIxZWE2MTNjZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCkBAIC03MSw2 ICs3MSw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorc3RhdGljIGNvbnN0IGNoYXIqIGNv bnN0IHJlcXVlc3RBbmltYXRpb25GcmFtZUV2ZW50TmFtZSA9ICJyZXF1ZXN0QW5pbWF0aW9uRnJh bWUiOworc3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0IGNhbmNlbEFuaW1hdGlvbkZyYW1lRXZlbnRO YW1lID0gImNhbmNlbEFuaW1hdGlvbkZyYW1lIjsKK3N0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBh bmltYXRpb25GcmFtZUZpcmVkRXZlbnROYW1lID0gImFuaW1hdGlvbkZyYW1lRmlyZWQiOwogc3Rh dGljIGNvbnN0IGNoYXIqIGNvbnN0IHNldFRpbWVyRXZlbnROYW1lID0gInNldFRpbWVyIjsKIHN0 YXRpYyBjb25zdCBjaGFyKiBjb25zdCBjbGVhclRpbWVyRXZlbnROYW1lID0gImNsZWFyVGltZXIi Owogc3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0IHRpbWVyRmlyZWRFdmVudE5hbWUgPSAidGltZXJG aXJlZCI7CkBAIC05OTAsMjAgKzk5MywyNiBAQCB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6Y2FuY2VsUGF1c2VPbk5hdGl2ZUV2ZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGlucwogI2Vu ZGlmCiB9CiAKLXZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWdpc3RlckFuaW1h dGlvbkZyYW1lQ2FsbGJhY2tJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdB Z2VudHMsIGludCBjYWxsYmFja0lkKQordm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRp ZFJlcXVlc3RBbmltYXRpb25GcmFtZUNhbGxiYWNrSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBp bnN0cnVtZW50aW5nQWdlbnRzLCBpbnQgY2FsbGJhY2tJZCkKIHsKKyAgICBwYXVzZU9uTmF0aXZl RXZlbnRJZk5lZWRlZChpbnN0cnVtZW50aW5nQWdlbnRzLCBmYWxzZSwgcmVxdWVzdEFuaW1hdGlv bkZyYW1lRXZlbnROYW1lLCB0cnVlKTsKKwogICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50 KiB0aW1lbGluZUFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yVGltZWxpbmVB Z2VudCgpKQotICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRSZWdpc3RlckFuaW1hdGlvbkZyYW1l Q2FsbGJhY2soY2FsbGJhY2tJZCk7CisgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZFJlcXVlc3RB bmltYXRpb25GcmFtZUNhbGxiYWNrKGNhbGxiYWNrSWQpOwogfQogCiB2b2lkIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6ZGlkQ2FuY2VsQW5pbWF0aW9uRnJhbWVDYWxsYmFja0ltcGwoSW5zdHJ1 bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgaW50IGNhbGxiYWNrSWQpCiB7Cisg ICAgcGF1c2VPbk5hdGl2ZUV2ZW50SWZOZWVkZWQoaW5zdHJ1bWVudGluZ0FnZW50cywgZmFsc2Us IGNhbmNlbEFuaW1hdGlvbkZyYW1lRXZlbnROYW1lLCB0cnVlKTsKKwogICAgIGlmIChJbnNwZWN0 b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5z cGVjdG9yVGltZWxpbmVBZ2VudCgpKQogICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRDYW5jZWxB bmltYXRpb25GcmFtZUNhbGxiYWNrKGNhbGxiYWNrSWQpOwogfQogCiBJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb25Db29raWUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsRmlyZUFuaW1hdGlv bkZyYW1lRXZlbnRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMs IGludCBjYWxsYmFja0lkKQogeworICAgIHBhdXNlT25OYXRpdmVFdmVudElmTmVlZGVkKGluc3Ry dW1lbnRpbmdBZ2VudHMsIGZhbHNlLCBhbmltYXRpb25GcmFtZUZpcmVkRXZlbnROYW1lLCBmYWxz ZSk7CisKICAgICBpbnQgdGltZWxpbmVBZ2VudElkID0gMDsKICAgICBpZiAoSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3Rv clRpbWVsaW5lQWdlbnQoKSkgewogICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsRmlyZUFuaW1h dGlvbkZyYW1lRXZlbnQoY2FsbGJhY2tJZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggNWYwM2MzM2IzY2QxZWI3YjNk MzI3OWI2OTc3NTM4ZjA5ZDJmMTZjNC4uZjUxNjIyNjI2ZjBmNzQ4NWQ4YmUzZmY5ODQ4ODE5ODdj YTNhYzJiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvcklu c3RydW1lbnRhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJ bnN0cnVtZW50YXRpb24uaApAQCAtMTc0LDcgKzE3NCw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMg dm9pZCBzdG9wQ29uc29sZVRpbWluZyhQYWdlKiwgY29uc3QgU3RyaW5nJiB0aXRsZSwgUGFzc1Jl ZlB0cjxTY3JpcHRDYWxsU3RhY2s+KTsKICAgICBzdGF0aWMgdm9pZCBjb25zb2xlVGltZVN0YW1w KFBhZ2UqLCBQYXNzUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4pOwogCi0gICAgc3RhdGljIHZvaWQg ZGlkUmVnaXN0ZXJBbmltYXRpb25GcmFtZUNhbGxiYWNrKERvY3VtZW50KiwgaW50IGNhbGxiYWNr SWQpOworICAgIHN0YXRpYyB2b2lkIGRpZFJlcXVlc3RBbmltYXRpb25GcmFtZUNhbGxiYWNrKERv Y3VtZW50KiwgaW50IGNhbGxiYWNrSWQpOwogICAgIHN0YXRpYyB2b2lkIGRpZENhbmNlbEFuaW1h dGlvbkZyYW1lQ2FsbGJhY2soRG9jdW1lbnQqLCBpbnQgY2FsbGJhY2tJZCk7CiAgICAgc3RhdGlj IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsRmlyZUFuaW1hdGlvbkZyYW1lRXZl bnQoRG9jdW1lbnQqLCBpbnQgY2FsbGJhY2tJZCk7CiAgICAgc3RhdGljIHZvaWQgZGlkRmlyZUFu aW1hdGlvbkZyYW1lRXZlbnQoY29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llJik7 CkBAIC0zMjEsNyArMzIxLDcgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCBzdG9wQ29uc29s ZVRpbWluZ0ltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyosIGNvbnN0IFN0cmluZyYgdGl0bGUsIFBh c3NSZWZQdHI8U2NyaXB0Q2FsbFN0YWNrPik7CiAgICAgc3RhdGljIHZvaWQgY29uc29sZVRpbWVT dGFtcEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyosIFBhc3NSZWZQdHI8U2NyaXB0QXJndW1lbnRz Pik7CiAKLSAgICBzdGF0aWMgdm9pZCBkaWRSZWdpc3RlckFuaW1hdGlvbkZyYW1lQ2FsbGJhY2tJ bXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCBpbnQgY2FsbGJhY2tJZCk7CisgICAgc3RhdGljIHZv aWQgZGlkUmVxdWVzdEFuaW1hdGlvbkZyYW1lQ2FsbGJhY2tJbXBsKEluc3RydW1lbnRpbmdBZ2Vu dHMqLCBpbnQgY2FsbGJhY2tJZCk7CiAgICAgc3RhdGljIHZvaWQgZGlkQ2FuY2VsQW5pbWF0aW9u RnJhbWVDYWxsYmFja0ltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyosIGludCBjYWxsYmFja0lkKTsK ICAgICBzdGF0aWMgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIHdpbGxGaXJlQW5pbWF0 aW9uRnJhbWVFdmVudEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyosIGludCBjYWxsYmFja0lkKTsK ICAgICBzdGF0aWMgdm9pZCBkaWRGaXJlQW5pbWF0aW9uRnJhbWVFdmVudEltcGwoY29uc3QgSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llJik7CkBAIC0xMTczLDExICsxMTczLDExIEBAIGlu bGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6dXBkYXRlQXBwbGljYXRpb25DYWNo ZVN0YXR1cyhGcmFtZSogZnJhbWUpCiAjZW5kaWYKIH0KIAotaW5saW5lIHZvaWQgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpkaWRSZWdpc3RlckFuaW1hdGlvbkZyYW1lQ2FsbGJhY2soRG9jdW1l bnQqIGRvY3VtZW50LCBpbnQgY2FsbGJhY2tJZCkKK2lubGluZSB2b2lkIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6ZGlkUmVxdWVzdEFuaW1hdGlvbkZyYW1lQ2FsbGJhY2soRG9jdW1lbnQqIGRv Y3VtZW50LCBpbnQgY2FsbGJhY2tJZCkKIHsKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQogICAgIGlm IChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzID0gaW5zdHJ1bWVudGlu Z0FnZW50c0ZvckRvY3VtZW50KGRvY3VtZW50KSkKLSAgICAgICAgZGlkUmVnaXN0ZXJBbmltYXRp b25GcmFtZUNhbGxiYWNrSW1wbChpbnN0cnVtZW50aW5nQWdlbnRzLCBjYWxsYmFja0lkKTsKKyAg ICAgICAgZGlkUmVxdWVzdEFuaW1hdGlvbkZyYW1lQ2FsbGJhY2tJbXBsKGluc3RydW1lbnRpbmdB Z2VudHMsIGNhbGxiYWNrSWQpOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAppbmRleCBjOWZkNWZmNDRkMDFj YmE4ZGEyMzFlMWYwZTBmZjljMGE2ODNjYzE2Li4wMDM4YjI3ZWNmODA2MmRhMmI0ZDYzMzE5ODMy YmNjNTFkNjkyZjRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yVGltZWxpbmVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclRpbWVsaW5lQWdlbnQuY3BwCkBAIC04NSw5ICs4NSw5IEBAIHN0YXRpYyBjb25zdCBjaGFy IFhIUkxvYWRbXSA9ICJYSFJMb2FkIjsKIHN0YXRpYyBjb25zdCBjaGFyIEZ1bmN0aW9uQ2FsbFtd ID0gIkZ1bmN0aW9uQ2FsbCI7CiBzdGF0aWMgY29uc3QgY2hhciBHQ0V2ZW50W10gPSAiR0NFdmVu dCI7CiAKLXN0YXRpYyBjb25zdCBjaGFyIFJlZ2lzdGVyQW5pbWF0aW9uRnJhbWVDYWxsYmFja1td ID0gIlJlZ2lzdGVyQW5pbWF0aW9uRnJhbWVDYWxsYmFjayI7Ci1zdGF0aWMgY29uc3QgY2hhciBD YW5jZWxBbmltYXRpb25GcmFtZUNhbGxiYWNrW10gPSAiQ2FuY2VsQW5pbWF0aW9uRnJhbWVDYWxs YmFjayI7Ci1zdGF0aWMgY29uc3QgY2hhciBGaXJlQW5pbWF0aW9uRnJhbWVFdmVudFtdID0gIkZp cmVBbmltYXRpb25GcmFtZUV2ZW50IjsKK3N0YXRpYyBjb25zdCBjaGFyIFJlcXVlc3RBbmltYXRp b25GcmFtZVtdID0gIlJlcXVlc3RBbmltYXRpb25GcmFtZSI7CitzdGF0aWMgY29uc3QgY2hhciBD YW5jZWxBbmltYXRpb25GcmFtZVtdID0gIkNhbmNlbEFuaW1hdGlvbkZyYW1lIjsKK3N0YXRpYyBj b25zdCBjaGFyIEZpcmVBbmltYXRpb25GcmFtZVtdID0gIkZpcmVBbmltYXRpb25GcmFtZSI7CiB9 CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cHVzaEdDRXZlbnRSZWNvcmRzKCkKQEAg LTM0NywyNCArMzQ3LDI0IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ29tbWl0 TG9hZCgpCiAgICAgY2xlYXJSZWNvcmRTdGFjaygpOwogfQogCi12b2lkIEluc3BlY3RvclRpbWVs aW5lQWdlbnQ6OmRpZFJlZ2lzdGVyQW5pbWF0aW9uRnJhbWVDYWxsYmFjayhpbnQgY2FsbGJhY2tJ ZCkKK3ZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkUmVxdWVzdEFuaW1hdGlvbkZyYW1l Q2FsbGJhY2soaW50IGNhbGxiYWNrSWQpCiB7Ci0gICAgYXBwZW5kUmVjb3JkKFRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlQW5pbWF0aW9uRnJhbWVDYWxsYmFja0RhdGEoY2FsbGJhY2tJZCks IFRpbWVsaW5lUmVjb3JkVHlwZTo6UmVnaXN0ZXJBbmltYXRpb25GcmFtZUNhbGxiYWNrLCB0cnVl KTsKKyAgICBhcHBlbmRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVBbmltYXRp b25GcmFtZUNhbGxiYWNrRGF0YShjYWxsYmFja0lkKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpSZXF1 ZXN0QW5pbWF0aW9uRnJhbWUsIHRydWUpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OmRpZENhbmNlbEFuaW1hdGlvbkZyYW1lQ2FsbGJhY2soaW50IGNhbGxiYWNrSWQpCiB7Ci0g ICAgYXBwZW5kUmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlQW5pbWF0aW9uRnJh bWVDYWxsYmFja0RhdGEoY2FsbGJhY2tJZCksIFRpbWVsaW5lUmVjb3JkVHlwZTo6Q2FuY2VsQW5p bWF0aW9uRnJhbWVDYWxsYmFjaywgdHJ1ZSk7CisgICAgYXBwZW5kUmVjb3JkKFRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlQW5pbWF0aW9uRnJhbWVDYWxsYmFja0RhdGEoY2FsbGJhY2tJZCks IFRpbWVsaW5lUmVjb3JkVHlwZTo6Q2FuY2VsQW5pbWF0aW9uRnJhbWUsIHRydWUpOwogfQogCiB2 b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxGaXJlQW5pbWF0aW9uRnJhbWVFdmVudChp bnQgY2FsbGJhY2tJZCkKIHsKLSAgICBwdXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZUFuaW1hdGlvbkZyYW1lQ2FsbGJhY2tEYXRhKGNhbGxiYWNrSWQpLCBUaW1l bGluZVJlY29yZFR5cGU6OkZpcmVBbmltYXRpb25GcmFtZUV2ZW50LCBmYWxzZSk7CisgICAgcHVz aEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVBbmltYXRpb25GcmFt ZUNhbGxiYWNrRGF0YShjYWxsYmFja0lkKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpGaXJlQW5pbWF0 aW9uRnJhbWUsIGZhbHNlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRG aXJlQW5pbWF0aW9uRnJhbWVFdmVudCgpCiB7Ci0gICAgZGlkQ29tcGxldGVDdXJyZW50UmVjb3Jk KFRpbWVsaW5lUmVjb3JkVHlwZTo6RmlyZUFuaW1hdGlvbkZyYW1lRXZlbnQpOworICAgIGRpZENv bXBsZXRlQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZFR5cGU6OkZpcmVBbmltYXRpb25GcmFt ZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6YWRkUmVjb3JkVG9UaW1lbGlu ZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcHJwUmVjb3JkLCBjb25zdCBTdHJpbmcmIHR5 cGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxp bmVBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdl bnQuaAppbmRleCBjMDljZjY2NDA4YjkwOTk2MjA0YTM2ZmViYmNjMGYxZDA4MjEzNDU4Li4yNTk3 NTFkN2VlZDg3NTlkMTI0NzI2NzczMDYwY2MyZDdiNDdhOTA1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKQEAgLTEyMSw3ICsxMjEs NyBAQCBwdWJsaWM6CiAgICAgdm9pZCB3aWxsUmVjZWl2ZVJlc291cmNlRGF0YSh1bnNpZ25lZCBs b25nIGlkZW50aWZpZXIpOwogICAgIHZvaWQgZGlkUmVjZWl2ZVJlc291cmNlRGF0YSgpOwogCi0g ICAgdm9pZCBkaWRSZWdpc3RlckFuaW1hdGlvbkZyYW1lQ2FsbGJhY2soaW50IGNhbGxiYWNrSWQp OworICAgIHZvaWQgZGlkUmVxdWVzdEFuaW1hdGlvbkZyYW1lQ2FsbGJhY2soaW50IGNhbGxiYWNr SWQpOwogICAgIHZvaWQgZGlkQ2FuY2VsQW5pbWF0aW9uRnJhbWVDYWxsYmFjayhpbnQgY2FsbGJh Y2tJZCk7CiAgICAgdm9pZCB3aWxsRmlyZUFuaW1hdGlvbkZyYW1lRXZlbnQoaW50IGNhbGxiYWNr SWQpOwogICAgIHZvaWQgZGlkRmlyZUFuaW1hdGlvbkZyYW1lRXZlbnQoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFu ZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRl YmFyUGFuZS5qcwppbmRleCAzYmNmOGY1Y2MzZTE0MjgyYmJmMDJhOTU3ZjU2ZjkyMjBlYjkwYTgy Li5hZjQ4OWU2NGZhY2QxYmY4NTViY2VkMjI0YWQ3NTMzODUyY2IxZTczIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1Np ZGViYXJQYW5lLmpzCkBAIC00NjEsMTYgKzQ2MSwxNyBAQCBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0 ZW5lckJyZWFrcG9pbnRzU2lkZWJhclBhbmUgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5ib2R5RWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLmNhdGVnb3JpZXNFbGVtZW50KTsKIAogICAgIHRoaXMuX2Jy ZWFrcG9pbnRJdGVtcyA9IHt9OwotICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KFdlYkluc3BlY3Rv ci5VSVN0cmluZygiS2V5Ym9hcmQiKSwgdHJ1ZSwgWyJrZXlkb3duIiwgImtleXVwIiwgImtleXBy ZXNzIiwgInRleHRJbnB1dCJdKTsKLSAgICB0aGlzLl9jcmVhdGVDYXRlZ29yeShXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIk1vdXNlIiksIHRydWUsIFsiY2xpY2siLCAiZGJsY2xpY2siLCAibW91c2Vk b3duIiwgIm1vdXNldXAiLCAibW91c2VvdmVyIiwgIm1vdXNlbW92ZSIsICJtb3VzZW91dCIsICJt b3VzZXdoZWVsIl0pOwogICAgIC8vIEZJWE1FOiB1bmNvbW1lbnQgZm9sbG93aW5nIG9uY2UgaW5z cGVjdG9yIHN0b3BzIGJlaW5nIGRyb3AgdGFyZ2VyIGluIG1ham9yIHBvcnRzLgogICAgIC8vIE90 aGVyd2lzZSwgaW5zcGVjdG9yIHBhZ2UgcmVhY3RzIG9uIGRyb3AgZXZlbnQgYW5kIHRyaWVzIHRv IGxvYWQgdGhlIGV2ZW50IGRhdGEuCiAgICAgLy8gdGhpcy5fY3JlYXRlQ2F0ZWdvcnkoV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJEcmFnIiksIHRydWUsIFsiZHJhZyIsICJkcm9wIiwgImRyYWdzdGFy dCIsICJkcmFnZW5kIiwgImRyYWdlbnRlciIsICJkcmFnbGVhdmUiLCAiZHJhZ292ZXIiXSk7Cisg ICAgdGhpcy5fY3JlYXRlQ2F0ZWdvcnkoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBbmltYXRpb24i KSwgZmFsc2UsIFsicmVxdWVzdEFuaW1hdGlvbkZyYW1lIiwgImNhbmNlbEFuaW1hdGlvbkZyYW1l IiwgImFuaW1hdGlvbkZyYW1lRmlyZWQiXSk7CiAgICAgdGhpcy5fY3JlYXRlQ2F0ZWdvcnkoV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJDb250cm9sIiksIHRydWUsIFsicmVzaXplIiwgInNjcm9sbCIs ICJ6b29tIiwgImZvY3VzIiwgImJsdXIiLCAic2VsZWN0IiwgImNoYW5nZSIsICJzdWJtaXQiLCAi cmVzZXQiXSk7CiAgICAgdGhpcy5fY3JlYXRlQ2F0ZWdvcnkoV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJDbGlwYm9hcmQiKSwgdHJ1ZSwgWyJjb3B5IiwgImN1dCIsICJwYXN0ZSIsICJiZWZvcmVjb3B5 IiwgImJlZm9yZWN1dCIsICJiZWZvcmVwYXN0ZSJdKTsKLSAgICB0aGlzLl9jcmVhdGVDYXRlZ29y eShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvYWQiKSwgdHJ1ZSwgWyJsb2FkIiwgInVubG9hZCIs ICJhYm9ydCIsICJlcnJvciJdKTsKICAgICB0aGlzLl9jcmVhdGVDYXRlZ29yeShXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkRPTSBNdXRhdGlvbiIpLCB0cnVlLCBbIkRPTUFjdGl2YXRlIiwgIkRPTUZv Y3VzSW4iLCAiRE9NRm9jdXNPdXQiLCAiRE9NQXR0ck1vZGlmaWVkIiwgIkRPTUNoYXJhY3RlckRh dGFNb2RpZmllZCIsICJET01Ob2RlSW5zZXJ0ZWQiLCAiRE9NTm9kZUluc2VydGVkSW50b0RvY3Vt ZW50IiwgIkRPTU5vZGVSZW1vdmVkIiwgIkRPTU5vZGVSZW1vdmVkRnJvbURvY3VtZW50IiwgIkRP TVN1YnRyZWVNb2RpZmllZCIsICJET01Db250ZW50TG9hZGVkIl0pOwogICAgIHRoaXMuX2NyZWF0 ZUNhdGVnb3J5KFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGV2aWNlIiksIHRydWUsIFsiZGV2aWNl b3JpZW50YXRpb24iLCAiZGV2aWNlbW90aW9uIl0pOworICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5 KFdlYkluc3BlY3Rvci5VSVN0cmluZygiS2V5Ym9hcmQiKSwgdHJ1ZSwgWyJrZXlkb3duIiwgImtl eXVwIiwgImtleXByZXNzIiwgInRleHRJbnB1dCJdKTsKKyAgICB0aGlzLl9jcmVhdGVDYXRlZ29y eShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvYWQiKSwgdHJ1ZSwgWyJsb2FkIiwgInVubG9hZCIs ICJhYm9ydCIsICJlcnJvciJdKTsKKyAgICB0aGlzLl9jcmVhdGVDYXRlZ29yeShXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIk1vdXNlIiksIHRydWUsIFsiY2xpY2siLCAiZGJsY2xpY2siLCAibW91c2Vk b3duIiwgIm1vdXNldXAiLCAibW91c2VvdmVyIiwgIm1vdXNlbW92ZSIsICJtb3VzZW91dCIsICJt b3VzZXdoZWVsIl0pOwogICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KFdlYkluc3BlY3Rvci5VSVN0 cmluZygiVGltZXIiKSwgZmFsc2UsIFsic2V0VGltZXIiLCAiY2xlYXJUaW1lciIsICJ0aW1lckZp cmVkIl0pOwogICAgIHRoaXMuX2NyZWF0ZUNhdGVnb3J5KFdlYkluc3BlY3Rvci5VSVN0cmluZygi VG91Y2giKSwgdHJ1ZSwgWyJ0b3VjaHN0YXJ0IiwgInRvdWNobW92ZSIsICJ0b3VjaGVuZCIsICJ0 b3VjaGNhbmNlbCJdKTsKIApAQCAtNDg2LDcgKzQ4NywxMCBAQCBXZWJJbnNwZWN0b3IuRXZlbnRM aXN0ZW5lckJyZWFrcG9pbnRzU2lkZWJhclBhbmUuZXZlbnROYW1lRm9yVUkgPSBmdW5jdGlvbihl dmVudAogICAgICAgICBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzU2lkZWJh clBhbmUuX2V2ZW50TmFtZXNGb3JVSSA9IHsKICAgICAgICAgICAgICJpbnN0cnVtZW50YXRpb246 c2V0VGltZXIiOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNldCBUaW1lciIpLAogICAgICAgICAg ICAgImluc3RydW1lbnRhdGlvbjpjbGVhclRpbWVyIjogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJD bGVhciBUaW1lciIpLAotICAgICAgICAgICAgImluc3RydW1lbnRhdGlvbjp0aW1lckZpcmVkIjog V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lciBGaXJlZCIpCisgICAgICAgICAgICAiaW5zdHJ1 bWVudGF0aW9uOnRpbWVyRmlyZWQiOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpbWVyIEZpcmVk IiksCisgICAgICAgICAgICAiaW5zdHJ1bWVudGF0aW9uOnJlcXVlc3RBbmltYXRpb25GcmFtZSI6 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVxdWVzdCBBbmltYXRpb24gRnJhbWUiKSwKKyAgICAg ICAgICAgICJpbnN0cnVtZW50YXRpb246Y2FuY2VsQW5pbWF0aW9uRnJhbWUiOiBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkNhbmNlbCBBbmltYXRpb24gRnJhbWUiKSwKKyAgICAgICAgICAgICJpbnN0 cnVtZW50YXRpb246YW5pbWF0aW9uRnJhbWVGaXJlZCI6IFdlYkluc3BlY3Rvci5VSVN0cmluZygi QW5pbWF0aW9uIEZyYW1lIEZpcmVkIikKICAgICAgICAgfTsKICAgICB9CiAgICAgcmV0dXJuIFdl Ykluc3BlY3Rvci5FdmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5fZXZlbnROYW1l c0ZvclVJW2V2ZW50TmFtZV0gfHwgZXZlbnROYW1lLnN1YnN0cmluZyhldmVudE5hbWUuaW5kZXhP ZigiOiIpICsgMSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1RpbWVsaW5lQWdlbnQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1RpbWVsaW5lQWdlbnQuanMKaW5kZXggOTc5ZDZkZmU4MmU5NWM5OTVmMGQ2MTI3ZjgyNjdkOTM4 YjdiZWUyZS4uNDZhZDdlYWUwYzhlODY2YzMyNDQ2NjMxOGExODVkODlmY2IxZWUyMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50Lmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5q cwpAQCAtNjYsNyArNjYsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBl ID0gewogICAgIEZ1bmN0aW9uQ2FsbDogIkZ1bmN0aW9uQ2FsbCIsCiAgICAgR0NFdmVudDogIkdD RXZlbnQiLAogCi0gICAgUmVnaXN0ZXJBbmltYXRpb25GcmFtZUNhbGxiYWNrOiAiUmVnaXN0ZXJB bmltYXRpb25GcmFtZUNhbGxiYWNrIiwKLSAgICBDYW5jZWxBbmltYXRpb25GcmFtZUNhbGxiYWNr OiAiQ2FuY2VsQW5pbWF0aW9uRnJhbWVDYWxsYmFjayIsCi0gICAgRmlyZUFuaW1hdGlvbkZyYW1l RXZlbnQ6ICJGaXJlQW5pbWF0aW9uRnJhbWVFdmVudCIKKyAgICBSZXF1ZXN0QW5pbWF0aW9uRnJh bWU6ICJSZXF1ZXN0QW5pbWF0aW9uRnJhbWUiLAorICAgIENhbmNlbEFuaW1hdGlvbkZyYW1lOiAi Q2FuY2VsQW5pbWF0aW9uRnJhbWUiLAorICAgIEZpcmVBbmltYXRpb25GcmFtZTogIkZpcmVBbmlt YXRpb25GcmFtZSIKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVGltZWxpbmVQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGltZWxpbmVQYW5lbC5qcwppbmRleCA1ZDBiN2Y3ZTQ0ZWFlZDdjOWJiNDVjMDdmN2U5Mjgx OTFhZTUwNzFlLi5mMmUyYzE5OWY4MGY2NTRhNDgxYTc0ZmFiZDlkOTdjNzFlMmFkYmE2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVs LmpzCkBAIC0xMDIsNyArMTAyLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwgPSBmdW5j dGlvbigpCiAgICAgdGhpcy5fc2VuZFJlcXVlc3RSZWNvcmRzID0ge307CiAgICAgdGhpcy5fc2No ZWR1bGVkUmVzb3VyY2VSZXF1ZXN0cyA9IHt9OwogICAgIHRoaXMuX3RpbWVyUmVjb3JkcyA9IHt9 OwotICAgIHRoaXMuX3JlZ2lzdGVyZWRBbmltYXRpb25DYWxsYmFja1JlY29yZHMgPSB7fTsKKyAg ICB0aGlzLl9yZXF1ZXN0QW5pbWF0aW9uRnJhbWVSZWNvcmRzID0ge307CiAKICAgICB0aGlzLl9j YWxjdWxhdG9yID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZUNhbGN1bGF0b3IoKTsKICAgICB2 YXIgc2hvcnRSZWNvcmRUaHJlc2hvbGRUaXRsZSA9IE51bWJlci5zZWNvbmRzVG9TdHJpbmcoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuc2hvcnRSZWNvcmRUaHJlc2hvbGQpOwpAQCAtMjM5LDkg KzIzOSw5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHJlY29yZFN0eWxlc1tyZWNvcmRUeXBlcy5NYXJrRE9NQ29udGVudF0gPSB7IHRpdGxl OiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRPTUNvbnRlbnQgZXZlbnQiKSwgY2F0ZWdvcnk6IGNh dGVnb3JpZXNbInNjcmlwdGluZyJdIH07CiAgICAgICAgICAgICByZWNvcmRTdHlsZXNbcmVjb3Jk VHlwZXMuTWFya0xvYWRdID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2FkIGV2 ZW50IiksIGNhdGVnb3J5OiBjYXRlZ29yaWVzWyJzY3JpcHRpbmciXSB9OwogICAgICAgICAgICAg cmVjb3JkU3R5bGVzW3JlY29yZFR5cGVzLlNjaGVkdWxlUmVzb3VyY2VSZXF1ZXN0XSA9IHsgdGl0 bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2NoZWR1bGUgUmVxdWVzdCIpLCBjYXRlZ29yeTog Y2F0ZWdvcmllc1sibG9hZGluZyJdIH07Ci0gICAgICAgICAgICByZWNvcmRTdHlsZXNbcmVjb3Jk VHlwZXMuUmVnaXN0ZXJBbmltYXRpb25GcmFtZUNhbGxiYWNrXSA9IHsgdGl0bGU6IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiUmVnaXN0ZXIgQW5pbWF0aW9uIENhbGxiYWNrIiksIGNhdGVnb3J5OiBj YXRlZ29yaWVzWyJzY3JpcHRpbmciXSB9OwotICAgICAgICAgICAgcmVjb3JkU3R5bGVzW3JlY29y ZFR5cGVzLkNhbmNlbEFuaW1hdGlvbkZyYW1lQ2FsbGJhY2tdID0geyB0aXRsZTogV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJDYW5jZWwgQW5pbWF0aW9uIENhbGxiYWNrIiksIGNhdGVnb3J5OiBjYXRl Z29yaWVzWyJzY3JpcHRpbmciXSB9OwotICAgICAgICAgICAgcmVjb3JkU3R5bGVzW3JlY29yZFR5 cGVzLkZpcmVBbmltYXRpb25GcmFtZUV2ZW50XSA9IHsgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiQW5pbWF0aW9uIEZyYW1lIEV2ZW50IiksIGNhdGVnb3J5OiBjYXRlZ29yaWVzWyJzY3Jp cHRpbmciXSB9OworICAgICAgICAgICAgcmVjb3JkU3R5bGVzW3JlY29yZFR5cGVzLlJlcXVlc3RB bmltYXRpb25GcmFtZV0gPSB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlcXVlc3Qg QW5pbWF0aW9uIEZyYW1lIiksIGNhdGVnb3J5OiBjYXRlZ29yaWVzWyJzY3JpcHRpbmciXSB9Owor ICAgICAgICAgICAgcmVjb3JkU3R5bGVzW3JlY29yZFR5cGVzLkNhbmNlbEFuaW1hdGlvbkZyYW1l XSA9IHsgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2FuY2VsIEFuaW1hdGlvbiBGcmFt ZSIpLCBjYXRlZ29yeTogY2F0ZWdvcmllc1sic2NyaXB0aW5nIl0gfTsKKyAgICAgICAgICAgIHJl Y29yZFN0eWxlc1tyZWNvcmRUeXBlcy5GaXJlQW5pbWF0aW9uRnJhbWVdID0geyB0aXRsZTogV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJBbmltYXRpb24gRnJhbWUgRmlyZWQiKSwgY2F0ZWdvcnk6IGNh dGVnb3JpZXNbInNjcmlwdGluZyJdIH07CiAgICAgICAgICAgICB0aGlzLl9yZWNvcmRTdHlsZXNB cnJheSA9IHJlY29yZFN0eWxlczsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gdGhpcy5fcmVj b3JkU3R5bGVzQXJyYXk7CkBAIC00NjcsNiArNDY3LDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgcGFyZW50UmVjb3JkID0gdGhpcy5fdGlt ZXJSZWNvcmRzW3JlY29yZC5kYXRhWyJ0aW1lcklkIl1dOwogICAgICAgICBlbHNlIGlmIChyZWNv cmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuUmVzb3VyY2VTZW5kUmVxdWVzdCkKICAgICAgICAgICAg IHBhcmVudFJlY29yZCA9IHRoaXMuX3NjaGVkdWxlZFJlc291cmNlUmVxdWVzdHNbcmVjb3JkLmRh dGFbInVybCJdXTsKKyAgICAgICAgZWxzZSBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVz LkZpcmVBbmltYXRpb25GcmFtZSkKKyAgICAgICAgICAgIHBhcmVudFJlY29yZCA9IHRoaXMuX3Jl cXVlc3RBbmltYXRpb25GcmFtZVJlY29yZHNbcmVjb3JkLmRhdGFbImlkIl1dOwogICAgICAgICBy ZXR1cm4gcGFyZW50UmVjb3JkOwogICAgIH0sCiAKQEAgLTQ3NSwxMSArNDc3LDYgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2YXIgY29ubmVjdGVk VG9PbGRSZWNvcmQgPSBmYWxzZTsKICAgICAgICAgdmFyIHJlY29yZFR5cGVzID0gV2ViSW5zcGVj dG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZTsKIAotICAgICAgICBpZiAocmVjb3JkLnR5cGUg PT09IHJlY29yZFR5cGVzLlJlZ2lzdGVyQW5pbWF0aW9uRnJhbWVDYWxsYmFjaykgewotICAgICAg ICAgICAgdGhpcy5fcmVnaXN0ZXJlZEFuaW1hdGlvbkNhbGxiYWNrUmVjb3Jkc1tyZWNvcmQuZGF0 YVsiaWQiXV0gPSByZWNvcmQ7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQogICAg ICAgICBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLk1hcmtET01Db250ZW50IHx8IHJl Y29yZC50eXBlID09PSByZWNvcmRUeXBlcy5NYXJrTG9hZCkKICAgICAgICAgICAgIHBhcmVudFJl Y29yZCA9IG51bGw7IC8vIE5vIGJhciBlbnRyeSBmb3IgbG9hZCBldmVudHMuCiAgICAgICAgIGVs c2UgaWYgKHBhcmVudFJlY29yZCA9PT0gdGhpcy5fcm9vdFJlY29yZCB8fApAQCAtNTAyLDcgKzQ5 OSw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIH0KICAgICAgICAgfTsKIAotICAgICAgICBpZiAoKHJlY29yZC50eXBlID09PSByZWNvcmRU eXBlcy5UaW1lckZpcmUgfHwgcmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLkZpcmVBbmltYXRp b25GcmFtZUV2ZW50KSAmJiBjaGlsZHJlbiAmJiBjaGlsZHJlbi5sZW5ndGgpIHsKKyAgICAgICAg aWYgKChyZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuVGltZXJGaXJlIHx8IHJlY29yZC50eXBl ID09PSByZWNvcmRUeXBlcy5GaXJlQW5pbWF0aW9uRnJhbWUpICYmIGNoaWxkcmVuICYmIGNoaWxk cmVuLmxlbmd0aCkgewogICAgICAgICAgICAgdmFyIGNoaWxkUmVjb3JkID0gY2hpbGRyZW5bMF07 CiAgICAgICAgICAgICBpZiAoY2hpbGRSZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuRnVuY3Rp b25DYWxsKSB7CiAgICAgICAgICAgICAgICAgc2NyaXB0RGV0YWlscyA9IHsKQEAgLTU4OSw3ICs1 ODYsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAg IHRoaXMuX3NlbmRSZXF1ZXN0UmVjb3JkcyA9IHt9OwogICAgICAgICB0aGlzLl9zY2hlZHVsZWRS ZXNvdXJjZVJlcXVlc3RzID0ge307CiAgICAgICAgIHRoaXMuX3RpbWVyUmVjb3JkcyA9IHt9Owot ICAgICAgICB0aGlzLl9yZWdpc3RlcmVkQW5pbWF0aW9uQ2FsbGJhY2tSZWNvcmRzID0ge307Cisg ICAgICAgIHRoaXMuX3JlcXVlc3RBbmltYXRpb25GcmFtZVJlY29yZHMgPSB7fTsKICAgICAgICAg dGhpcy5fcm9vdFJlY29yZCA9IHRoaXMuX2NyZWF0ZVJvb3RSZWNvcmQoKTsKICAgICAgICAgdGhp cy5fYm91bmRhcmllc0FyZVZhbGlkID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3UGFu ZS5yZXNldCgpOwpAQCAtMTEwNiwxMCArMTEwMywxMiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQ YW5lbC5Gb3JtYXR0ZWRSZWNvcmQgPSBmdW5jdGlvbihyZWNvcmQsIHBhcmVudFJlY29yZCwgcGFu ZQogICAgICAgICAgICAgdGhpcy50aW1lb3V0ID0gdGltZXJJbnN0YWxsZWRSZWNvcmQudGltZW91 dDsKICAgICAgICAgICAgIHRoaXMuc2luZ2xlU2hvdCA9IHRpbWVySW5zdGFsbGVkUmVjb3JkLnNp bmdsZVNob3Q7CiAgICAgICAgIH0KLSAgICB9IGVsc2UgaWYgKHJlY29yZC50eXBlID09PSByZWNv cmRUeXBlcy5GaXJlQW5pbWF0aW9uRnJhbWVFdmVudCkgewotICAgICAgICB2YXIgcmVnaXN0ZXJD YWxsYmFja1JlY29yZCA9IHBhbmVsLl9yZWdpc3RlcmVkQW5pbWF0aW9uQ2FsbGJhY2tSZWNvcmRz W3JlY29yZC5kYXRhWyJpZCJdXTsKLSAgICAgICAgaWYgKHJlZ2lzdGVyQ2FsbGJhY2tSZWNvcmQp Ci0gICAgICAgICAgICB0aGlzLmNhbGxTaXRlU3RhY2tUcmFjZSA9IHJlZ2lzdGVyQ2FsbGJhY2tS ZWNvcmQuc3RhY2tUcmFjZTsKKyAgICB9IGVsc2UgaWYgKHJlY29yZC50eXBlID09PSByZWNvcmRU eXBlcy5SZXF1ZXN0QW5pbWF0aW9uRnJhbWUpIHsKKyAgICAgICAgcGFuZWwuX3JlcXVlc3RBbmlt YXRpb25GcmFtZVJlY29yZHNbcmVjb3JkLmRhdGFbImlkIl1dID0gdGhpczsKKyAgICB9IGVsc2Ug aWYgKHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5GaXJlQW5pbWF0aW9uRnJhbWUpIHsKKyAg ICAgICAgdmFyIHJlcXVlc3RBbmltYXRpb25SZWNvcmQgPSBwYW5lbC5fcmVxdWVzdEFuaW1hdGlv bkZyYW1lUmVjb3Jkc1tyZWNvcmQuZGF0YVsiaWQiXV07CisgICAgICAgIGlmIChyZXF1ZXN0QW5p bWF0aW9uUmVjb3JkKQorICAgICAgICAgICAgdGhpcy5jYWxsU2l0ZVN0YWNrVHJhY2UgPSByZXF1 ZXN0QW5pbWF0aW9uUmVjb3JkLnN0YWNrVHJhY2U7CiAgICAgfQogICAgIHRoaXMuX3JlZnJlc2hE ZXRhaWxzKCk7CiB9CkBAIC0xMTY5LDcgKzExNjgsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQ YW5lbC5Gb3JtYXR0ZWRSZWNvcmQucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICBj b250ZW50SGVscGVyLl9hcHBlbmRUZXh0Um93KFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVwZWF0 cyIpLCAhdGhpcy5zaW5nbGVTaG90KTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIHJlY29yZFR5cGVzLkZpcmVBbmltYXRpb25GcmFt ZUV2ZW50OgorICAgICAgICAgICAgY2FzZSByZWNvcmRUeXBlcy5GaXJlQW5pbWF0aW9uRnJhbWU6 CiAgICAgICAgICAgICAgICAgY29udGVudEhlbHBlci5fYXBwZW5kVGV4dFJvdyhXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkNhbGxiYWNrIElEIiksIHRoaXMuZGF0YVsiaWQiXSk7CiAgICAgICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIHJlY29yZFR5cGVzLkZ1bmN0aW9uQ2FsbDoK QEAgLTEyMzIsNyArMTIzMSw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRl ZFJlY29yZC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuc2NyaXB0 TmFtZSA/IHRoaXMuX3BhbmVsLl9saW5raWZ5TG9jYXRpb24odGhpcy5zY3JpcHROYW1lLCB0aGlz LnNjcmlwdExpbmUsIDApIDogdGhpcy5kYXRhWyJ0aW1lcklkIl07CiAgICAgICAgICAgICBjYXNl IFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuRnVuY3Rpb25DYWxsOgogICAg ICAgICAgICAgICAgIHJldHVybiB0aGlzLnNjcmlwdE5hbWUgPyB0aGlzLl9wYW5lbC5fbGlua2lm eUxvY2F0aW9uKHRoaXMuc2NyaXB0TmFtZSwgdGhpcy5zY3JpcHRMaW5lLCAwKSA6IG51bGw7Ci0g ICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuRmly ZUFuaW1hdGlvbkZyYW1lRXZlbnQ6CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1l bGluZUFnZW50LlJlY29yZFR5cGUuRmlyZUFuaW1hdGlvbkZyYW1lOgogICAgICAgICAgICAgICAg IHJldHVybiB0aGlzLnNjcmlwdE5hbWUgPyB0aGlzLl9wYW5lbC5fbGlua2lmeUxvY2F0aW9uKHRo aXMuc2NyaXB0TmFtZSwgdGhpcy5zY3JpcHRMaW5lLCAwKSA6IHRoaXMuZGF0YVsiaWQiXTsKICAg ICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5FdmVu dERpc3BhdGNoOgogICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLmRhdGEgPyB0aGlzLmRhdGFb InR5cGUiXSA6IG51bGw7CkBAIC0xMjQxLDggKzEyNDAsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQucHJvdG90eXBlID0gewogICAgICAgICAgICAgY2FzZSBX ZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlLlRpbWVySW5zdGFsbDoKICAgICAg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5UaW1lclJl bW92ZToKICAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5zdGFja1RyYWNlID8gdGhpcy5fcGFu ZWwuX2xpbmtpZnlDYWxsRnJhbWUodGhpcy5zdGFja1RyYWNlWzBdKSA6IHRoaXMuZGF0YVsidGlt ZXJJZCJdOwotICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNv cmRUeXBlLlJlZ2lzdGVyQW5pbWF0aW9uRnJhbWVDYWxsYmFjazoKLSAgICAgICAgICAgIGNhc2Ug V2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5DYW5jZWxBbmltYXRpb25GcmFt ZUNhbGxiYWNrOgorICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5S ZWNvcmRUeXBlLlJlcXVlc3RBbmltYXRpb25GcmFtZToKKyAgICAgICAgICAgIGNhc2UgV2ViSW5z cGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5DYW5jZWxBbmltYXRpb25GcmFtZToKICAg ICAgICAgICAgICAgICByZXR1cm4gdGhpcy5zdGFja1RyYWNlID8gdGhpcy5fcGFuZWwuX2xpbmtp ZnlDYWxsRnJhbWUodGhpcy5zdGFja1RyYWNlWzBdKSA6IHRoaXMuZGF0YVsiaWQiXTsKICAgICAg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5QYXJzZUhU TUw6CiAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5 cGUuUmVjYWxjdWxhdGVTdHlsZXM6CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjRkMzJiOTkwMGU3NmIyMWYyMDZjMDA3YWJj ZGM2MTUxNWYyY2QxMi4uNjljMjczNDJiNDhkYWE2NDRlNzcwYTcyZTE5YTUxYThkMTNiZmEyNCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAyLTIxICBQYXZlbCBGZWxkbWFuICA8cGZlbGRt YW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBkbyBub3QgZmlsdGVyIG91 dCByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgZnJvbSB0aW1lbGluZSwgaW1wbGVtZW50IHN0b3Agb24g YW5pbWF0aW9uIGV2ZW50cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTc5MTE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBpbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtYW5pbWF0aW9uLWZyYW1lLWV4 cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtYW5pbWF0 aW9uLWZyYW1lLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWVu dW0tc3RhYmlsaXR5LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9p bnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtYW5pbWF0aW9uLWZyYW1lLWV4cGVjdGVkLnR4dDoK KwogMjAxMi0wMi0yMSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFtRdF0gVW5yZXZpZXdlZCBnYXJkZW5pbmcsIHNraXAgbmV3IGZhaWxpbmcgYW5kIGNy YXNoaW5nIHRlc3QgdG8gcGFpbnQgdGhlIGJvdCBncmVlbi4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2luc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1hbmltYXRpb24tZnJhbWUtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWFuaW1hdGlvbi1m cmFtZS1leHBlY3RlZC50eHQKaW5kZXggOGRkMTJhYzVhY2Y5NWU5M2U0NTJmNzhiZGJhYjcwMDMy NDBmMGIxMi4uMzk3NTUxOTc2ZGRjNjYxNDVmZmY3YTdkNGYxMGMwNmVjNjc0MjljYyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWFuaW1hdGlvbi1m cmFtZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3Rp bWVsaW5lLWFuaW1hdGlvbi1mcmFtZS1leHBlY3RlZC50eHQKQEAgLTEsMTYgKzEsMTYgQEAKIFRl c3RzIHRoZSBUaW1lbGluZSBldmVudHMgZm9yIEFuaW1hdGlvbiBGcmFtZSBmZWF0dXJlCiAKLVJl Z2lzdGVyQW5pbWF0aW9uRnJhbWVDYWxsYmFjayBQcm9wZXJ0aWVzOgorUmVxdWVzdEFuaW1hdGlv bkZyYW1lIFByb3BlcnRpZXM6CiB7CiAgICAgc3RhcnRUaW1lIDogPG51bWJlcj4KICAgICBkYXRh IDogewogICAgICAgICBpZCA6IDxudW1iZXI+CiAgICAgfQotICAgIHR5cGUgOiAiUmVnaXN0ZXJB bmltYXRpb25GcmFtZUNhbGxiYWNrIgorICAgIHR5cGUgOiAiUmVxdWVzdEFuaW1hdGlvbkZyYW1l IgogICAgIHVzZWRIZWFwU2l6ZSA6IDxudW1iZXI+CiAgICAgdG90YWxIZWFwU2l6ZSA6IDxudW1i ZXI+CiB9Ci1GaXJlQW5pbWF0aW9uRnJhbWVFdmVudCBQcm9wZXJ0aWVzOgorRmlyZUFuaW1hdGlv bkZyYW1lIFByb3BlcnRpZXM6CiB7CiAgICAgc3RhcnRUaW1lIDogPG51bWJlcj4KICAgICBkYXRh IDogewpAQCAtMTgsMTcgKzE4LDE3IEBAIEZpcmVBbmltYXRpb25GcmFtZUV2ZW50IFByb3BlcnRp ZXM6CiAgICAgfQogICAgIGNoaWxkcmVuIDogPG9iamVjdD4KICAgICBlbmRUaW1lIDogPG51bWJl cj4KLSAgICB0eXBlIDogIkZpcmVBbmltYXRpb25GcmFtZUV2ZW50IgorICAgIHR5cGUgOiAiRmly ZUFuaW1hdGlvbkZyYW1lIgogICAgIHVzZWRIZWFwU2l6ZSA6IDxudW1iZXI+CiAgICAgdG90YWxI ZWFwU2l6ZSA6IDxudW1iZXI+CiB9Ci1DYW5jZWxBbmltYXRpb25GcmFtZUNhbGxiYWNrIFByb3Bl cnRpZXM6CitDYW5jZWxBbmltYXRpb25GcmFtZSBQcm9wZXJ0aWVzOgogewogICAgIHN0YXJ0VGlt ZSA6IDxudW1iZXI+CiAgICAgZGF0YSA6IHsKICAgICAgICAgaWQgOiA8bnVtYmVyPgogICAgIH0K LSAgICB0eXBlIDogIkNhbmNlbEFuaW1hdGlvbkZyYW1lQ2FsbGJhY2siCisgICAgdHlwZSA6ICJD YW5jZWxBbmltYXRpb25GcmFtZSIKICAgICB1c2VkSGVhcFNpemUgOiA8bnVtYmVyPgogICAgIHRv dGFsSGVhcFNpemUgOiA8bnVtYmVyPgogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3RpbWVsaW5lL3RpbWVsaW5lLWFuaW1hdGlvbi1mcmFtZS5odG1sIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWFuaW1hdGlvbi1mcmFtZS5odG1sCmluZGV4IGZl ZWIyMmNlOWRmNTc5ZjBiY2Q3OTM3ZTRhYTJiYWMyMDhhZDAyZTMuLmIxNjQ0NDMyMmI2Yzc2OGNj M2IzMGRkNDdmNGRhYjQxOGVmZjg0ZDggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci90aW1lbGluZS90aW1lbGluZS1hbmltYXRpb24tZnJhbWUuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtYW5pbWF0aW9uLWZyYW1lLmh0bWwKQEAgLTIz LDEzICsyMywxMyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFs dWF0ZUluUGFnZSgicGVyZm9ybUFjdGlvbnMoKSIpOwogICAgIH0pOwogCi0gICAgSW5zcGVjdG9y VGVzdC53YWl0Rm9yUmVjb3JkVHlwZSgiQ2FuY2VsQW5pbWF0aW9uRnJhbWVDYWxsYmFjayIsIGZp bmlzaCk7CisgICAgSW5zcGVjdG9yVGVzdC53YWl0Rm9yUmVjb3JkVHlwZSgiQ2FuY2VsQW5pbWF0 aW9uRnJhbWUiLCBmaW5pc2gpOwogCiAgICAgZnVuY3Rpb24gZmluaXNoKCkKICAgICB7Ci0gICAg ICAgIEluc3BlY3RvclRlc3QucHJpbnRUaW1lbGluZVJlY29yZHMoIlJlZ2lzdGVyQW5pbWF0aW9u RnJhbWVDYWxsYmFjayIpOwotICAgICAgICBJbnNwZWN0b3JUZXN0LnByaW50VGltZWxpbmVSZWNv cmRzKCJGaXJlQW5pbWF0aW9uRnJhbWVFdmVudCIpOwotICAgICAgICBJbnNwZWN0b3JUZXN0LnBy aW50VGltZWxpbmVSZWNvcmRzKCJDYW5jZWxBbmltYXRpb25GcmFtZUNhbGxiYWNrIik7CisgICAg ICAgIEluc3BlY3RvclRlc3QucHJpbnRUaW1lbGluZVJlY29yZHMoIlJlcXVlc3RBbmltYXRpb25G cmFtZSIpOworICAgICAgICBJbnNwZWN0b3JUZXN0LnByaW50VGltZWxpbmVSZWNvcmRzKCJGaXJl QW5pbWF0aW9uRnJhbWUiKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5wcmludFRpbWVsaW5lUmVj b3JkcygiQ2FuY2VsQW5pbWF0aW9uRnJhbWUiKTsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5jb21w bGV0ZVRlc3QoKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv dGltZWxpbmUvdGltZWxpbmUtZW51bS1zdGFiaWxpdHktZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWVudW0tc3RhYmlsaXR5LWV4cGVjdGVkLnR4 dAppbmRleCA3ZmYxMGFjZTZlMWI0NWYxMjIxNDRkZmU5MmM5ZjdmMzgxZGM5MTllLi4xNDdmNzZj MzU5Y2ZlNTk3ZGU1MDQ4YTdiZDM3MjZlZTA3YjU2NGZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtZW51bS1zdGFiaWxpdHktZXhwZWN0ZWQudHh0 CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1lbnVtLXN0YWJp bGl0eS1leHBlY3RlZC50eHQKQEAgLTI0LDggKzI0LDggQEAgQXBwbGljYXRpb25zIG91dHNpZGUg b2YgV2ViS2l0IGRlcGVuZCBvbiB0aGUgc3RhYmlsaXR5IG9mIHRoZSBtYXBwaW5nIG9mIHRoZXNl IHQKICAgICBSZXNvdXJjZUZpbmlzaCA6ICJSZXNvdXJjZUZpbmlzaCIKICAgICBGdW5jdGlvbkNh bGwgOiAiRnVuY3Rpb25DYWxsIgogICAgIEdDRXZlbnQgOiAiR0NFdmVudCIKLSAgICBSZWdpc3Rl ckFuaW1hdGlvbkZyYW1lQ2FsbGJhY2sgOiAiUmVnaXN0ZXJBbmltYXRpb25GcmFtZUNhbGxiYWNr IgotICAgIENhbmNlbEFuaW1hdGlvbkZyYW1lQ2FsbGJhY2sgOiAiQ2FuY2VsQW5pbWF0aW9uRnJh bWVDYWxsYmFjayIKLSAgICBGaXJlQW5pbWF0aW9uRnJhbWVFdmVudCA6ICJGaXJlQW5pbWF0aW9u RnJhbWVFdmVudCIKKyAgICBSZXF1ZXN0QW5pbWF0aW9uRnJhbWUgOiAiUmVxdWVzdEFuaW1hdGlv bkZyYW1lIgorICAgIENhbmNlbEFuaW1hdGlvbkZyYW1lIDogIkNhbmNlbEFuaW1hdGlvbkZyYW1l IgorICAgIEZpcmVBbmltYXRpb25GcmFtZSA6ICJGaXJlQW5pbWF0aW9uRnJhbWUiCiB9CiAKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL2luc3BlY3Rvci90aW1lbGlu ZS90aW1lbGluZS1hbmltYXRpb24tZnJhbWUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vY2hyb21pdW0vaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWFuaW1hdGlvbi1mcmFt ZS1leHBlY3RlZC50eHQKaW5kZXggYmUzNTJkZThjMTk5MjM1Mjc5ZGMyYzMwOTFkYTQ3NzM5ODJl YWJmNi4uZjM2YzRkYWMxNmJjOWVjMTFkYWI5MmM2ZjdiZjdmMzlhNmI2MDgzMyAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVs aW5lLWFuaW1hdGlvbi1mcmFtZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vY2hyb21pdW0vaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWFuaW1hdGlvbi1mcmFtZS1l eHBlY3RlZC50eHQKQEAgLTEsMTcgKzEsMTcgQEAKIFRlc3RzIHRoZSBUaW1lbGluZSBldmVudHMg Zm9yIEFuaW1hdGlvbiBGcmFtZSBmZWF0dXJlCiAKLVJlZ2lzdGVyQW5pbWF0aW9uRnJhbWVDYWxs YmFjayBQcm9wZXJ0aWVzOgorUmVxdWVzdEFuaW1hdGlvbkZyYW1lIFByb3BlcnRpZXM6CiB7CiAg ICAgc3RhcnRUaW1lIDogPG51bWJlcj4KICAgICBzdGFja1RyYWNlIDogPG9iamVjdD4KICAgICBk YXRhIDogewogICAgICAgICBpZCA6IDxudW1iZXI+CiAgICAgfQotICAgIHR5cGUgOiAiUmVnaXN0 ZXJBbmltYXRpb25GcmFtZUNhbGxiYWNrIgorICAgIHR5cGUgOiAiUmVxdWVzdEFuaW1hdGlvbkZy YW1lIgogICAgIHVzZWRIZWFwU2l6ZSA6IDxudW1iZXI+CiAgICAgdG90YWxIZWFwU2l6ZSA6IDxu dW1iZXI+CiB9Ci1GaXJlQW5pbWF0aW9uRnJhbWVFdmVudCBQcm9wZXJ0aWVzOgorRmlyZUFuaW1h dGlvbkZyYW1lIFByb3BlcnRpZXM6CiB7CiAgICAgc3RhcnRUaW1lIDogPG51bWJlcj4KICAgICBk YXRhIDogewpAQCAtMTksMTggKzE5LDE4IEBAIEZpcmVBbmltYXRpb25GcmFtZUV2ZW50IFByb3Bl cnRpZXM6CiAgICAgfQogICAgIGNoaWxkcmVuIDogPG9iamVjdD4KICAgICBlbmRUaW1lIDogPG51 bWJlcj4KLSAgICB0eXBlIDogIkZpcmVBbmltYXRpb25GcmFtZUV2ZW50IgorICAgIHR5cGUgOiAi RmlyZUFuaW1hdGlvbkZyYW1lIgogICAgIHVzZWRIZWFwU2l6ZSA6IDxudW1iZXI+CiAgICAgdG90 YWxIZWFwU2l6ZSA6IDxudW1iZXI+CiB9Ci1DYW5jZWxBbmltYXRpb25GcmFtZUNhbGxiYWNrIFBy b3BlcnRpZXM6CitDYW5jZWxBbmltYXRpb25GcmFtZSBQcm9wZXJ0aWVzOgogewogICAgIHN0YXJ0 VGltZSA6IDxudW1iZXI+CiAgICAgc3RhY2tUcmFjZSA6IDxvYmplY3Q+CiAgICAgZGF0YSA6IHsK ICAgICAgICAgaWQgOiA8bnVtYmVyPgogICAgIH0KLSAgICB0eXBlIDogIkNhbmNlbEFuaW1hdGlv bkZyYW1lQ2FsbGJhY2siCisgICAgdHlwZSA6ICJDYW5jZWxBbmltYXRpb25GcmFtZSIKICAgICB1 c2VkSGVhcFNpemUgOiA8bnVtYmVyPgogICAgIHRvdGFsSGVhcFNpemUgOiA8bnVtYmVyPgogfQo=