131184 2014-04-03 15:03:33 -0700 Web Inspector: remove unused metrics and commands from the Timeline agent 2014-04-29 14:33:20 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 burg burg cmarcelo commit-queue graouts joepeck kondapallykalyan luiz noam timothy webkit-bug-importer oldest_to_newest 997320 0 burg 2014-04-03 15:03:33 -0700 This is a nontrivial amount of data (unsigned long per record) and we don't do anything with it. Any use of it would probably part of a more comprehensive feature. 997322 1 webkit-bug-importer 2014-04-03 15:04:10 -0700 <rdar://problem/16517540> 997403 2 timothy 2014-04-03 17:56:29 -0700 Sounds good. 997844 3 burg 2014-04-04 23:34:15 -0700 This includes: - used heap size for every timeline record - begin/cancel frame messages, which were broken - runtime querying of feature support for features nobody implements 997846 4 228662 burg 2014-04-04 23:51:52 -0700 Created attachment 228662 the patch 997896 5 228662 timothy 2014-04-05 09:15:34 -0700 Comment on attachment 228662 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=228662&action=review > Source/WebCore/inspector/InspectorController.h:129 > void willComposite(); This too isn't used. > Source/WebCore/inspector/InspectorController.h:130 > void didComposite(); Ditto. > Source/WebCore/inspector/protocol/Timeline.json:-19 > - { "name": "usedHeapSize", "type": "integer", "optional": true, "description": "Current size of JS heap." } These should be removed from iOS 7 protocol files too. 997897 6 timothy 2014-04-05 09:16:33 -0700 I do want to track rendered frames, but we can add it back at that time (likely with a better design.) 997902 7 burg 2014-04-05 11:23:11 -0700 (In reply to comment #6) > I do want to track rendered frames, but we can add it back at that time (likely with a better design.) Right. I kept the enum value in there because it would be useful to have this functionality. Just none of the existing plumbing works. 997903 8 burg 2014-04-05 11:25:45 -0700 (In reply to comment #5) > (From update of attachment 228662 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=228662&action=review > > > Source/WebCore/inspector/InspectorController.h:129 > > void willComposite(); > > This too isn't used. > > > Source/WebCore/inspector/InspectorController.h:130 > > void didComposite(); > > Ditto. > > > Source/WebCore/inspector/protocol/Timeline.json:-19 > > - { "name": "usedHeapSize", "type": "integer", "optional": true, "description": "Current size of JS heap." } > > These should be removed from iOS 7 protocol files too. What about counters and other heap- and frame-related stuff in the protocol file that has never been used in the current inspector UI? 997909 9 228679 burg 2014-04-05 12:33:07 -0700 Created attachment 228679 the patch, now with less didComposite 997923 10 timothy 2014-04-05 13:47:14 -0700 (In reply to comment #8) > (In reply to comment #5) > > (From update of attachment 228662 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=228662&action=review > > > > > Source/WebCore/inspector/InspectorController.h:129 > > > void willComposite(); > > > > This too isn't used. > > > > > Source/WebCore/inspector/InspectorController.h:130 > > > void didComposite(); > > > > Ditto. > > > > > Source/WebCore/inspector/protocol/Timeline.json:-19 > > > - { "name": "usedHeapSize", "type": "integer", "optional": true, "description": "Current size of JS heap." } > > > > These should be removed from iOS 7 protocol files too. > > What about counters and other heap- and frame-related stuff in the protocol file that has never been used in the current inspector UI? Yes, anything we have removed from TOT should be removed from the old protocols versions too. That way if we want to use those names in the future, we can feature check the protocol and only get the new version. We likely have missed some thing during removal. I pulled some things out the other day that I missed when cleaning up the profiler. 997924 11 timothy 2014-04-05 13:48:05 -0700 (In reply to comment #7) > (In reply to comment #6) > > I do want to track rendered frames, but we can add it back at that time (likely with a better design.) > > Right. I kept the enum value in there because it would be useful to have this functionality. Just none of the existing plumbing works. We probably should remove the enums too — for completeness. Easy to add back later when needed. 997925 12 228679 timothy 2014-04-05 13:49:52 -0700 Comment on attachment 228679 the patch, now with less didComposite View in context: https://bugs.webkit.org/attachment.cgi?id=228679&action=review > Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js:-238 > -InspectorBackend.registerCommand("Timeline.supportsFrameInstrumentation", [], ["result"]); > -InspectorBackend.registerCommand("Timeline.canMonitorMainThread", [], ["result"]); This should be removed from the .json file in WebInspectorUI/Versions too. 997954 13 228687 burg 2014-04-05 17:07:14 -0700 Created attachment 228687 the patch, with old protocols fixed 997968 14 burg 2014-04-05 17:51:41 -0700 Committed r166846: <http://trac.webkit.org/changeset/166846> 228662 2014-04-04 23:51:52 -0700 2014-04-05 12:33:03 -0700 the patch bug-131184-20140404235132.patch text/plain 20066 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2ODI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2I0ZDk1YTE4MTVhZGQy MmU3ZTFhZTA4MTU3MWZlYWIzNzk1ZjhlMy4uZTUzMDk0NzYwM2MyNGNiZDhmZDg3NGYxYTEzNDg0 MmZkNjdlYTI1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1IEBACisyMDE0LTA0LTA0ICBCcmlh biBKLiBCdXJnICA8YnVyZ0Bjcy53YXNoaW5ndG9uLmVkdT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiByZW1vdmUgdW51c2VkIG1ldHJpY3MgYW5kIGNvbW1hbmRzIGZyb20gdGhlIFRpbWVsaW5l IGFnZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzExODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIHBhdGNoIHJlbW92ZXMgc2V2ZXJhbCBpbnN0cnVtZW50YXRpb24gaG9va3MgdGhhdCBhcmUg bm90IGJlaW5nCisgICAgICAgIHVzZWQgYnkgdGhlIGZyb250ZW5kIGluIGFueSB3YXkuIE1vc3Qg b2YgdGhlbSBhcmUgbm90IGhvb2tlZCB1cCB0bworICAgICAgICBwcm9kdWNlIGFueSBkYXRhLCBz byB0aGV5IGp1c3QgY2x1dHRlciB1cCBJbnNwZWN0b3JDbGllbnQgYW5kIHRoZSBhZ2VudC4KKwor ICAgICAgICAqIFdlYkNvcmUuZXhwLmluOiBSZW1vdmUgZGlkQmVnaW5GcmFtZS9kaWRDYW5jZWxG cmFtZS4KKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ2xpZW50Lmg6IFJlbW92ZSBjbGll bnQgbWV0aG9kcyB0aGF0IGFyZSBuZXZlciBvdmVycmlkZGVuLgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQ2xpZW50OjpjYW5Nb25pdG9yTWFpblRocmVhZCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnQ6OnN1cHBvcnRzRnJhbWVJbnN0cnVtZW50YXRpb24p OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50OjpnZXRBbGxvY2F0 ZWRPYmplY3RzKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNsaWVudDo6 ZHVtcFVuY291bnRlZEFsbG9jYXRlZE9iamVjdHMpOiBEZWxldGVkLgorCisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOiBSZW1vdmUgdW51c2VkIGluc3RydW1lbnRh dGlvbi4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZEJlZ2luRnJh bWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlk Q2FuY2VsRnJhbWUpOiBEZWxldGVkLgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250 cm9sbGVyLmg6CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5j cHA6IFJlbW92ZSB0aGUgYmFja2VuZCdzIEJlZ2luRnJhbWUgZW51bQorICAgICAgICB2YWx1ZSwg YnV0IGtlZXAgaXQgaW4gdGhlIHByb3RvY29sIGZvciB3aGVuIGl0IGlzIHJlaW1wbGVtZW50ZWQu IFJlbW92ZQorICAgICAgICBtYW5hZ2VtZW50IG9mIHRoZSBjdXJyZW50IGZyYW1lIHJlY29yZCwg YW5kIHNpbXBsaWZ5IHNvbWUgY29kZS4KKyAgICAgICAgKFdlYkNvcmU6OnRvUHJvdG9jb2wpOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6YWRkUmVjb3JkVG9UaW1l bGluZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDb21w bGV0ZUN1cnJlbnRSZWNvcmQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVB Z2VudDo6cHVzaEN1cnJlbnRSZWNvcmQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6Y2xlYXJSZWNvcmRTdGFjayk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JUaW1lbGluZUFnZW50OjpjYW5Nb25pdG9yTWFpblRocmVhZCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpzdXBwb3J0c0ZyYW1lSW5zdHJ1bWVu dGF0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OmRpZEJlZ2luRnJhbWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6ZGlkQ2FuY2VsRnJhbWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6aW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5lKTogRGVs ZXRlZC4gVW5kbyB0ZWxlc2NvcGluZy4KKyAgICAgICAgKFdlYkNvcmU6OnVzZWRIZWFwU2l6ZSk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojpjb21t aXRGcmFtZVJlY29yZCk6IERlbGV0ZWQuCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclRp bWVsaW5lQWdlbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6 OlRpbWVsaW5lUmVjb3JkRW50cnk6OlRpbWVsaW5lUmVjb3JkRW50cnkpOgorICAgICAgICAqIGlu c3BlY3Rvci9wcm90b2NvbC9UaW1lbGluZS5qc29uOgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0NvbXBvc2l0aW5nQ29vcmRpbmF0b3IuY3BwOiBSZW1v dmUKKyAgICAgICAgaW5zdHJ1bWVudGF0aW9uIGhvb2sgZm9yIGJlZ2luRnJhbWUuIFRoaXMgaXMg dGhlIG9ubHkgYmFja2VuZCB0aGF0IGltcGxlbWVudHMgaXQuCisgICAgICAgIChXZWJDb3JlOjpD b21wb3NpdGluZ0Nvb3JkaW5hdG9yOjpzeW5jRGlzcGxheVN0YXRlKToKKworICAgICAgICAqIHRl c3RpbmcvSW50ZXJuYWxzLmNwcDogUmVtb3ZlIGNydWZ0eSB0ZXN0IG1ldGhvZHMgdGhhdCBhcmVu J3QgdXNlZC4KKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6ZW1pdEluc3BlY3RvckRpZEJl Z2luRnJhbWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjplbWl0SW5z cGVjdG9yRGlkQ2FuY2VsRnJhbWUpOiBEZWxldGVkLgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJu YWxzLmg6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuaWRsOgorCiAyMDE0LTA0LTAzICBC cmlhbiBKLiBCdXJnICA8YnVyZ0Bjcy53YXNoaW5ndG9uLmVkdT4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBob29rIHVwIHByb2JlIHNhbXBsZXMgdG8gVGltZWxpbmVBZ2VudCdzIHJlY29yZHMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5leHAuaW4KaW5kZXggOWZhMjgxYmVjMDViMjAxM2U3NmZmMDM2OWYzOGQxZjJi OWU2Y2NkZS4uYzNkNzUzMDE4YWVhYzBlYjQ0ZjI0Mzc2NmY1MGIwMDIxMTcxOThjOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4KQEAgLTMwMjEsOCArMzAyMSw2IEBAIF9fWk43V2ViQ29yZTVDb2xvckMx RVJLTjNXVEY2U3RyaW5nRQogI2lmIEVOQUJMRShJTlNQRUNUT1IpCiBfX1pON1dlYkNvcmUxNFNj aGVtZVJlZ2lzdHJ5MjdzaG91bGRUcmVhdFVSTFNjaGVtZUFzTG9jYWxFUktOM1dURjZTdHJpbmdF CiBfX1pON1dlYkNvcmUxNUluc3BlY3RvckNsaWVudDMxZG9EaXNwYXRjaE1lc3NhZ2VPbkZyb250 ZW5kUGFnZUVQTlNfNFBhZ2VFUktOM1dURjZTdHJpbmdFCi1fX1pON1dlYkNvcmUxOUluc3BlY3Rv ckNvbnRyb2xsZXIxM2RpZEJlZ2luRnJhbWVFdgotX19aTjdXZWJDb3JlMTlJbnNwZWN0b3JDb250 cm9sbGVyMTRkaWRDYW5jZWxGcmFtZUV2CiBfX1pON1dlYkNvcmUxOUluc3BlY3RvckNvbnRyb2xs ZXIxNWNvbm5lY3RGcm9udGVuZEVQTjlJbnNwZWN0b3IyNEluc3BlY3RvckZyb250ZW5kQ2hhbm5l bEUKIF9fWk43V2ViQ29yZTE5SW5zcGVjdG9yQ29udHJvbGxlcjE4ZGlzY29ubmVjdEZyb250ZW5k RU45SW5zcGVjdG9yMjVJbnNwZWN0b3JEaXNjb25uZWN0UmVhc29uRQogX19aTjdXZWJDb3JlMTlJ bnNwZWN0b3JDb250cm9sbGVyMThzZXRQcm9maWxlckVuYWJsZWRFYgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNsaWVudC5oCmluZGV4IDYzNmYwOTZhMjJiZGMxZjAzMjViZDdh YjE0ZTQxMzlhZTFkMWFiYjQuLmFkNTIzNWY4NjRlNDAxYjlmNjgwOGNmZjc5YTc3ZTQ5MTg5Yzlj MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDbGllbnQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2xpZW50LmgKQEAgLTYz LDcgKzYzLDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjbGVhckJyb3dzZXJDYWNoZSgp IHsgfQogICAgIHZpcnR1YWwgYm9vbCBjYW5DbGVhckJyb3dzZXJDb29raWVzKCkgeyByZXR1cm4g ZmFsc2U7IH0KICAgICB2aXJ0dWFsIHZvaWQgY2xlYXJCcm93c2VyQ29va2llcygpIHsgfQotICAg IHZpcnR1YWwgYm9vbCBjYW5Nb25pdG9yTWFpblRocmVhZCgpIHsgcmV0dXJuIGZhbHNlOyB9CiAK ICAgICB2aXJ0dWFsIGJvb2wgb3ZlcnJpZGVzU2hvd1BhaW50UmVjdHMoKSB7IHJldHVybiBmYWxz ZTsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRTaG93UGFpbnRSZWN0cyhib29sKSB7IH0KQEAgLTc3 LDEzICs3Niw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgY2FuQ29udGludW91c2x5UGFp bnQoKSB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRDb250aW51b3VzUGFp bnRpbmdFbmFibGVkKGJvb2wpIHsgfQogCi0gICAgdmlydHVhbCBib29sIHN1cHBvcnRzRnJhbWVJ bnN0cnVtZW50YXRpb24oKSB7IHJldHVybiBmYWxzZTsgfQotCiAgICAgdmlydHVhbCB2b2lkIGRp ZFNldFNlYXJjaGluZ0Zvck5vZGUoYm9vbCkgeyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgZ2V0QWxs b2NhdGVkT2JqZWN0cyhIYXNoU2V0PGNvbnN0IHZvaWQqPiYpIHsgfQotICAgIHZpcnR1YWwgdm9p ZCBkdW1wVW5jb3VudGVkQWxsb2NhdGVkT2JqZWN0cyhjb25zdCBIYXNoTWFwPGNvbnN0IHZvaWQq LCBzaXplX3Q+JikgeyB9Ci0KICAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlSmF2YVNjcmlwdERpYWxv Zyhib29sLCBjb25zdCBTdHJpbmcqKSB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgc3RhdGljIGJv b2wgZG9EaXNwYXRjaE1lc3NhZ2VPbkZyb250ZW5kUGFnZShQYWdlKiBmcm9udGVuZFBhZ2UsIGNv bnN0IFN0cmluZyYgbWVzc2FnZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggNDJiNGNkNjgwM2VkMDNjNzM2MWQxYjJmN2VhY2Rj YTJiYjg1OGJmMy4uYzdiOTMzNTIyOTM1MzE2OTc1NDYyM2NmNDQ1Mjk1ZTU2MmE3OTZmZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApA QCAtNDAxLDE4ICs0MDEsNiBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnNldFJlc291cmNl c0RhdGFTaXplTGltaXRzRnJvbUludGVybmFscyhpbnQgbWF4aW11bVJlcwogICAgIG1fcmVzb3Vy Y2VBZ2VudC0+c2V0UmVzb3VyY2VzRGF0YVNpemVMaW1pdHNGcm9tSW50ZXJuYWxzKG1heGltdW1S ZXNvdXJjZXNDb250ZW50U2l6ZSwgbWF4aW11bVNpbmdsZVJlc291cmNlQ29udGVudFNpemUpOwog fQogCi12b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZEJlZ2luRnJhbWUoKQotewotICAgIGlm IChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gbV9pbnN0cnVtZW50aW5n QWdlbnRzLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCkpCi0gICAgICAgIHRpbWVsaW5lQWdlbnQt PmRpZEJlZ2luRnJhbWUoKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRDYW5j ZWxGcmFtZSgpCi17Ci0gICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdl bnQgPSBtX2luc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkKLSAg ICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkQ2FuY2VsRnJhbWUoKTsKLX0KLQogdm9pZCBJbnNwZWN0 b3JDb250cm9sbGVyOjp3aWxsQ29tcG9zaXRlKCkKIHsKICAgICBpZiAoSW5zcGVjdG9yVGltZWxp bmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IG1faW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9y VGltZWxpbmVBZ2VudCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmgKaW5kZXggY2NlZTljNzI0NjFlN2Y3ZmU1MmRlOWMyNTYwNDgxOTcxMGYxOGZk MS4uZjM2ZGExNGIzYjBiZDgyNDFlYjI0ODFhZGNjY2ZiYjVhYjEwZjhiMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC0xMjYsOCArMTI2 LDYgQEAgcHVibGljOgogICAgIEluc3BlY3RvckNsaWVudCogaW5zcGVjdG9yQ2xpZW50KCkgY29u c3QgeyByZXR1cm4gbV9pbnNwZWN0b3JDbGllbnQ7IH0KICAgICBJbnNwZWN0b3JQYWdlQWdlbnQq IHBhZ2VBZ2VudCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZUFnZW50OyB9CiAKLSAgICB2b2lkIGRp ZEJlZ2luRnJhbWUoKTsKLSAgICB2b2lkIGRpZENhbmNlbEZyYW1lKCk7CiAgICAgdm9pZCB3aWxs Q29tcG9zaXRlKCk7CiAgICAgdm9pZCBkaWRDb21wb3NpdGUoKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCmluZGV4IDY4OTY0 OTE4ZjNmNTMwNDM3ODE4MTIwOTY4YWVmZWM3NmU4YTA0OTIuLmMzMDJlNmIxM2VjZmMyMDQ1ZDI4 NDdhN2Q4NjA2OTJmMTJhN2FkNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKQEAgLTExNiwyNiArMTE2LDYgQEAgdm9pZCBJ bnNwZWN0b3JUaW1lbGluZUFnZW50OjpzdG9wKEVycm9yU3RyaW5nKikKICAgICBtX2VuYWJsZWQg PSBmYWxzZTsKIH0KIAotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpjYW5Nb25pdG9yTWFp blRocmVhZChFcnJvclN0cmluZyosIGJvb2wqIHJlc3VsdCkKLXsKLSAgICAqcmVzdWx0ID0gbV9j bGllbnQgJiYgbV9jbGllbnQtPmNhbk1vbml0b3JNYWluVGhyZWFkKCk7Ci19Ci0KLXZvaWQgSW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6c3VwcG9ydHNGcmFtZUluc3RydW1lbnRhdGlvbihFcnJvclN0 cmluZyosIGJvb2wqIHJlc3VsdCkKLXsKLSAgICAqcmVzdWx0ID0gbV9jbGllbnQgJiYgbV9jbGll bnQtPnN1cHBvcnRzRnJhbWVJbnN0cnVtZW50YXRpb24oKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpkaWRCZWdpbkZyYW1lKCkKLXsKLSAgICBtX3BlbmRpbmdGcmFtZVJlY29y ZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZCh0aW1lc3RhbXAo KSwgMCk7Ci19Ci0KLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ2FuY2VsRnJhbWUo KQotewotICAgIG1fcGVuZGluZ0ZyYW1lUmVjb3JkLmNsZWFyKCk7Ci19Ci0KIHZvaWQgSW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6d2lsbENhbGxGdW5jdGlvbihjb25zdCBTdHJpbmcmIHNjcmlwdE5h bWUsIGludCBzY3JpcHRMaW5lLCBGcmFtZSogZnJhbWUpCiB7CiAgICAgcHVzaEN1cnJlbnRSZWNv cmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVGdW5jdGlvbkNhbGxEYXRhKHNjcmlwdE5h bWUsIHNjcmlwdExpbmUpLCBUaW1lbGluZVJlY29yZFR5cGU6OkZ1bmN0aW9uQ2FsbCwgdHJ1ZSwg ZnJhbWUpOwpAQCAtNDcwLDE5ICs0NTAsMTEgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50 OjpicmVha3BvaW50QWN0aW9uUHJvYmUoSlNDOjpFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEkKICAg ICBhcHBlbmRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVQcm9iZVNhbXBsZURh dGEoYWN0aW9uLCBoaXRDb3VudCksIFRpbWVsaW5lUmVjb3JkVHlwZTo6UHJvYmVTYW1wbGUsIGZh bHNlLCBmcmFtZSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6YWRkUmVjb3Jk VG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVjb3JkLCBUaW1lbGluZVJl Y29yZFR5cGUgdHlwZSkKLXsKLSAgICBjb21taXRGcmFtZVJlY29yZCgpOwotICAgIGlubmVyQWRk UmVjb3JkVG9UaW1lbGluZShyZWNvcmQsIHR5cGUpOwotfQotCiBzdGF0aWMgSW5zcGVjdG9yOjpU eXBlQnVpbGRlcjo6VGltZWxpbmU6OkV2ZW50VHlwZTo6RW51bSB0b1Byb3RvY29sKFRpbWVsaW5l UmVjb3JkVHlwZSB0eXBlKQogewogICAgIHN3aXRjaCAodHlwZSkgewogICAgIGNhc2UgVGltZWxp bmVSZWNvcmRUeXBlOjpFdmVudERpc3BhdGNoOgogICAgICAgICByZXR1cm4gSW5zcGVjdG9yOjpU eXBlQnVpbGRlcjo6VGltZWxpbmU6OkV2ZW50VHlwZTo6RXZlbnREaXNwYXRjaDsKLSAgICBjYXNl IFRpbWVsaW5lUmVjb3JkVHlwZTo6QmVnaW5GcmFtZToKLSAgICAgICAgcmV0dXJuIEluc3BlY3Rv cjo6VHlwZUJ1aWxkZXI6OlRpbWVsaW5lOjpFdmVudFR5cGU6OkJlZ2luRnJhbWU7CiAgICAgY2Fz ZSBUaW1lbGluZVJlY29yZFR5cGU6OlNjaGVkdWxlU3R5bGVSZWNhbGN1bGF0aW9uOgogICAgICAg ICByZXR1cm4gSW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6VGltZWxpbmU6OkV2ZW50VHlwZTo6U2No ZWR1bGVTdHlsZVJlY2FsY3VsYXRpb247CiAgICAgY2FzZSBUaW1lbGluZVJlY29yZFR5cGU6OlJl Y2FsY3VsYXRlU3R5bGVzOgpAQCAtNTY2LDcgKzUzOCw3IEBAIHN0YXRpYyBJbnNwZWN0b3I6OlR5 cGVCdWlsZGVyOjpUaW1lbGluZTo6RXZlbnRUeXBlOjpFbnVtIHRvUHJvdG9jb2woVGltZWxpbmVS ZWNvCiAgICAgcmV0dXJuIEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlRpbWVsaW5lOjpFdmVudFR5 cGU6OlRpbWVTdGFtcDsKIH0KIAotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojppbm5lckFk ZFJlY29yZFRvVGltZWxpbmUoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHBycFJlY29yZCwg VGltZWxpbmVSZWNvcmRUeXBlIHR5cGUpCit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmFk ZFJlY29yZFRvVGltZWxpbmUoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHBycFJlY29yZCwg VGltZWxpbmVSZWNvcmRUeXBlIHR5cGUpCiB7CiAgICAgcHJwUmVjb3JkLT5zZXRTdHJpbmcoInR5 cGUiLCBJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpnZXRXZWJFbnVtQ29uc3RhbnRWYWx1ZSh0b1By b3RvY29sKHR5cGUpKSk7CiAKQEAgLTU4MCwxMSArNTUyLDYgQEAgdm9pZCBJbnNwZWN0b3JUaW1l bGluZUFnZW50Ojppbm5lckFkZFJlY29yZFRvVGltZWxpbmUoUGFzc1JlZlB0cjxJbnNwZWN0b3JP YmplY3QKICAgICB9CiB9CiAKLXN0YXRpYyBzaXplX3QgdXNlZEhlYXBTaXplKCkKLXsKLSAgICBy ZXR1cm4gSlNET01XaW5kb3c6OmNvbW1vblZNKCkuaGVhcC5zaXplKCk7Ci19Ci0KIHZvaWQgSW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6c2V0RnJhbWVJZGVudGlmaWVyKEluc3BlY3Rvck9iamVjdCog cmVjb3JkLCBGcmFtZSogZnJhbWUpCiB7CiAgICAgaWYgKCFmcmFtZSB8fCAhbV9wYWdlQWdlbnQp CkBAIC02MDYsOSArNTczLDYgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDb21w bGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRUeXBlIHR5cGUpCiAgICAgICAgIGVudHJ5 LnJlY29yZC0+c2V0T2JqZWN0KCJkYXRhIiwgZW50cnkuZGF0YSk7CiAgICAgICAgIGVudHJ5LnJl Y29yZC0+c2V0QXJyYXkoImNoaWxkcmVuIiwgZW50cnkuY2hpbGRyZW4pOwogICAgICAgICBlbnRy eS5yZWNvcmQtPnNldE51bWJlcigiZW5kVGltZSIsIHRpbWVzdGFtcCgpKTsKLSAgICAgICAgc2l6 ZV90IHVzZWRIZWFwU2l6ZURlbHRhID0gdXNlZEhlYXBTaXplKCkgLSBlbnRyeS51c2VkSGVhcFNp emVBdFN0YXJ0OwotICAgICAgICBpZiAodXNlZEhlYXBTaXplRGVsdGEpCi0gICAgICAgICAgICBl bnRyeS5yZWNvcmQtPnNldE51bWJlcigidXNlZEhlYXBTaXplRGVsdGEiLCB1c2VkSGVhcFNpemVE ZWx0YSk7CiAgICAgICAgIGFkZFJlY29yZFRvVGltZWxpbmUoZW50cnkucmVjb3JkLCB0eXBlKTsK ICAgICB9CiB9CkBAIC02NDMsMjQgKzYwNywxMyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OnNlbmRFdmVudChQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZXZlbnQpCiAKIHZvaWQg SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cHVzaEN1cnJlbnRSZWNvcmQoUGFzc1JlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IGRhdGEsIFRpbWVsaW5lUmVjb3JkVHlwZSB0eXBlLCBib29sIGNhcHR1cmVD YWxsU3RhY2ssIEZyYW1lKiBmcmFtZSkKIHsKLSAgICBjb21taXRGcmFtZVJlY29yZCgpOwogICAg IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6 Y3JlYXRlR2VuZXJpY1JlY29yZCh0aW1lc3RhbXAoKSwgY2FwdHVyZUNhbGxTdGFjayA/IG1fbWF4 Q2FsbFN0YWNrRGVwdGggOiAwKTsKICAgICBzZXRGcmFtZUlkZW50aWZpZXIocmVjb3JkLmdldCgp LCBmcmFtZSk7Ci0gICAgbV9yZWNvcmRTdGFjay5hcHBlbmQoVGltZWxpbmVSZWNvcmRFbnRyeShy ZWNvcmQucmVsZWFzZSgpLCBkYXRhLCBJbnNwZWN0b3JBcnJheTo6Y3JlYXRlKCksIHR5cGUsIHVz ZWRIZWFwU2l6ZSgpKSk7Ci19Ci0KLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6Y29tbWl0 RnJhbWVSZWNvcmQoKQotewotICAgIGlmICghbV9wZW5kaW5nRnJhbWVSZWNvcmQpCi0gICAgICAg IHJldHVybjsKLSAgICAKLSAgICBtX3BlbmRpbmdGcmFtZVJlY29yZC0+c2V0T2JqZWN0KCJkYXRh IiwgSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKSk7Ci0gICAgaW5uZXJBZGRSZWNvcmRUb1RpbWVs aW5lKG1fcGVuZGluZ0ZyYW1lUmVjb3JkLnJlbGVhc2UoKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpC ZWdpbkZyYW1lKTsKKyAgICBtX3JlY29yZFN0YWNrLmFwcGVuZChUaW1lbGluZVJlY29yZEVudHJ5 KHJlY29yZC5yZWxlYXNlKCksIGRhdGEsIEluc3BlY3RvckFycmF5OjpjcmVhdGUoKSwgdHlwZSkp OwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmNsZWFyUmVjb3JkU3RhY2soKQog ewotICAgIG1fcGVuZGluZ0ZyYW1lUmVjb3JkLmNsZWFyKCk7CiAgICAgbV9yZWNvcmRTdGFjay5j bGVhcigpOwogICAgIG1faWQrKzsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCmluZGV4IDgzMTc2Y2U3MTYxMzdhNWVkYmYxOGIyNTQz MGYxZGViZGYwNWIxOTguLmNmZDlhZWY1YWJkNjY2ZTBhNzIzMzI1ZTc1NjIzNTI5YTlmZjQxMDEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFn ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdl bnQuaApAQCAtNjIsNyArNjIsNiBAQCB0eXBlZGVmIFN0cmluZyBFcnJvclN0cmluZzsKIAogZW51 bSBjbGFzcyBUaW1lbGluZVJlY29yZFR5cGUgewogICAgIEV2ZW50RGlzcGF0Y2gsCi0gICAgQmVn aW5GcmFtZSwKICAgICBTY2hlZHVsZVN0eWxlUmVjYWxjdWxhdGlvbiwKICAgICBSZWNhbGN1bGF0 ZVN0eWxlcywKICAgICBJbnZhbGlkYXRlTGF5b3V0LApAQCAtMTM4LDggKzEzNyw2IEBAIHB1Ymxp YzoKIAogICAgIHZpcnR1YWwgdm9pZCBzdGFydChFcnJvclN0cmluZyosIGNvbnN0IGludCogbWF4 Q2FsbFN0YWNrRGVwdGgpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBzdG9wKEVycm9yU3Ry aW5nKikgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCB2b2lkIGNhbk1vbml0b3JNYWluVGhyZWFkKEVy cm9yU3RyaW5nKiwgYm9vbCopIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCBzdXBwb3J0c0Zy YW1lSW5zdHJ1bWVudGF0aW9uKEVycm9yU3RyaW5nKiwgYm9vbCopIG92ZXJyaWRlOwogCiAgICAg aW50IGlkKCkgY29uc3QgeyByZXR1cm4gbV9pZDsgfQogCkBAIC0xNTIsOSArMTQ5LDYgQEAgcHVi bGljOgogICAgIHZvaWQgd2lsbERpc3BhdGNoRXZlbnQoY29uc3QgRXZlbnQmLCBGcmFtZSopOwog ICAgIHZvaWQgZGlkRGlzcGF0Y2hFdmVudCgpOwogCi0gICAgdm9pZCBkaWRCZWdpbkZyYW1lKCk7 Ci0gICAgdm9pZCBkaWRDYW5jZWxGcmFtZSgpOwotCiAgICAgdm9pZCBkaWRJbnZhbGlkYXRlTGF5 b3V0KEZyYW1lKik7CiAgICAgdm9pZCB3aWxsTGF5b3V0KEZyYW1lKik7CiAgICAgdm9pZCBkaWRM YXlvdXQoUmVuZGVyT2JqZWN0Kik7CkBAIC0yMzAsMTUgKzIyNCwxNCBAQCBwcml2YXRlOgogICAg IGZyaWVuZCBjbGFzcyBUaW1lbGluZVJlY29yZFN0YWNrOwogCiAgICAgc3RydWN0IFRpbWVsaW5l UmVjb3JkRW50cnkgewotICAgICAgICBUaW1lbGluZVJlY29yZEVudHJ5KFBhc3NSZWZQdHI8SW5z cGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCwgUGFzc1JlZlB0cjxJbnNwZWN0b3I6Oklu c3BlY3Rvck9iamVjdD4gZGF0YSwgUGFzc1JlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3RvckFycmF5 PiBjaGlsZHJlbiwgVGltZWxpbmVSZWNvcmRUeXBlIHR5cGUsIHNpemVfdCB1c2VkSGVhcFNpemVB dFN0YXJ0KQotICAgICAgICAgICAgOiByZWNvcmQocmVjb3JkKSwgZGF0YShkYXRhKSwgY2hpbGRy ZW4oY2hpbGRyZW4pLCB0eXBlKHR5cGUpLCB1c2VkSGVhcFNpemVBdFN0YXJ0KHVzZWRIZWFwU2l6 ZUF0U3RhcnQpCisgICAgICAgIFRpbWVsaW5lUmVjb3JkRW50cnkoUGFzc1JlZlB0cjxJbnNwZWN0 b3I6Okluc3BlY3Rvck9iamVjdD4gcmVjb3JkLCBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVj dG9yT2JqZWN0PiBkYXRhLCBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yQXJyYXk+IGNo aWxkcmVuLCBUaW1lbGluZVJlY29yZFR5cGUgdHlwZSkKKyAgICAgICAgICAgIDogcmVjb3JkKHJl Y29yZCksIGRhdGEoZGF0YSksIGNoaWxkcmVuKGNoaWxkcmVuKSwgdHlwZSh0eXBlKQogICAgICAg ICB7CiAgICAgICAgIH0KICAgICAgICAgUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0 PiByZWNvcmQ7CiAgICAgICAgIFJlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gZGF0 YTsKICAgICAgICAgUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yQXJyYXk+IGNoaWxkcmVuOwog ICAgICAgICBUaW1lbGluZVJlY29yZFR5cGUgdHlwZTsKLSAgICAgICAgc2l6ZV90IHVzZWRIZWFw U2l6ZUF0U3RhcnQ7CiAgICAgfTsKIAogICAgIHZvaWQgc2VuZEV2ZW50KFBhc3NSZWZQdHI8SW5z cGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+KTsKQEAgLTI0OSwxMSArMjQyLDcgQEAgcHJpdmF0ZToK IAogICAgIHZvaWQgZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkVHlwZSk7 CiAKLSAgICB2b2lkIHNldEhlYXBTaXplU3RhdGlzdGljcyhJbnNwZWN0b3I6Okluc3BlY3Rvck9i amVjdCogcmVjb3JkKTsKLSAgICB2b2lkIGNvbW1pdEZyYW1lUmVjb3JkKCk7Ci0KICAgICB2b2lk IGFkZFJlY29yZFRvVGltZWxpbmUoUGFzc1JlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVj dD4sIFRpbWVsaW5lUmVjb3JkVHlwZSk7Ci0gICAgdm9pZCBpbm5lckFkZFJlY29yZFRvVGltZWxp bmUoUGFzc1JlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4sIFRpbWVsaW5lUmVjb3Jk VHlwZSk7CiAgICAgdm9pZCBjbGVhclJlY29yZFN0YWNrKCk7CiAKICAgICB2b2lkIGxvY2FsVG9Q YWdlUXVhZChjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBMYXlvdXRSZWN0JiwgRmxvYXRRdWFk Kik7CkBAIC0yNzIsNyArMjYxLDYgQEAgcHJpdmF0ZToKIAogICAgIGludCBtX2lkOwogICAgIGlu dCBtX21heENhbGxTdGFja0RlcHRoOwotICAgIFJlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rvck9i amVjdD4gbV9wZW5kaW5nRnJhbWVSZWNvcmQ7CiAgICAgSW5zcGVjdG9yVHlwZSBtX2luc3BlY3Rv clR5cGU7CiAgICAgSW5zcGVjdG9yQ2xpZW50KiBtX2NsaWVudDsKICAgICBXZWFrUHRyRmFjdG9y eTxJbnNwZWN0b3JUaW1lbGluZUFnZW50PiBtX3dlYWtGYWN0b3J5OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1RpbWVsaW5lLmpzb24gYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvVGltZWxpbmUuanNvbgppbmRleCAyMTMxNDIxMzdiYzQ0 YWNhNGI2YjkzNzJhNTY4NDM0NTViNWE2NjBmLi42NzJhNTA2OGY2NTA3ZjUzNjcwYmRlNGEwYmQ1 M2M3ODYyOTIyY2U4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvcHJvdG9j b2wvVGltZWxpbmUuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvcHJvdG9jb2wv VGltZWxpbmUuanNvbgpAQCAtMTMsMTAgKzEzLDggQEAKICAgICAgICAgICAgICJ0eXBlIjogIm9i amVjdCIsCiAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKICAgICAgICAgICAgICAgICB7ICJu YW1lIjogInR5cGUiLCAiJHJlZiI6ICJFdmVudFR5cGUiLCAiZGVzY3JpcHRpb24iOiAiRXZlbnQg dHlwZS4iIH0sCi0gICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0aHJlYWQiLCAidHlwZSI6ICJz dHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiSWYgcHJlc2VudCwgaWRl bnRpZmllcyB0aGUgdGhyZWFkIHRoYXQgcHJvZHVjZWQgdGhlIGV2ZW50LiIgfSwKICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogImRhdGEiLCAidHlwZSI6ICJvYmplY3QiLCAiZGVzY3JpcHRpb24i OiAiRXZlbnQgZGF0YS4iIH0sCi0gICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjaGlsZHJlbiIs ICJ0eXBlIjogImFycmF5IiwgIm9wdGlvbmFsIjogdHJ1ZSwgIml0ZW1zIjogeyAiJHJlZiI6ICJU aW1lbGluZUV2ZW50IiB9LCAiZGVzY3JpcHRpb24iOiAiTmVzdGVkIHJlY29yZHMuIiB9LAotICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAidXNlZEhlYXBTaXplIiwgInR5cGUiOiAiaW50ZWdlciIs ICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJDdXJyZW50IHNpemUgb2YgSlMgaGVh cC4iIH0KKyAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNoaWxkcmVuIiwgInR5cGUiOiAiYXJy YXkiLCAib3B0aW9uYWwiOiB0cnVlLCAiaXRlbXMiOiB7ICIkcmVmIjogIlRpbWVsaW5lRXZlbnQi IH0sICJkZXNjcmlwdGlvbiI6ICJOZXN0ZWQgcmVjb3Jkcy4iIH0KICAgICAgICAgICAgIF0sCiAg ICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiVGltZWxpbmUgcmVjb3JkIGNvbnRhaW5zIGluZm9y bWF0aW9uIGFib3V0IHRoZSByZWNvcmRlZCBhY3Rpdml0eS4iCiAgICAgICAgIH0KQEAgLTMyLDIw ICszMCw2IEBACiAgICAgICAgIHsKICAgICAgICAgICAgICJuYW1lIjogInN0b3AiLAogICAgICAg ICAgICAgImRlc2NyaXB0aW9uIjogIlN0b3BzIGNhcHR1cmluZyBpbnN0cnVtZW50YXRpb24gZXZl bnRzLiIKLSAgICAgICAgfSwKLSAgICAgICAgewotICAgICAgICAgICAgIm5hbWUiOiAic3VwcG9y dHNGcmFtZUluc3RydW1lbnRhdGlvbiIsCi0gICAgICAgICAgICAicmV0dXJucyI6IFsKLSAgICAg ICAgICAgICAgICB7ICJuYW1lIjogInJlc3VsdCIsICJ0eXBlIjogImJvb2xlYW4iLCAiZGVzY3Jp cHRpb24iOiAiVHJ1ZSBpZiB0aW1lbGluZSBzdXBwb3J0cyBmcmFtZSBpbnN0cnVtZW50YXRpb24u IiB9Ci0gICAgICAgICAgICBdLAotICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlRlbGxzIHdo ZXRoZXIgdGltZWxpbmUgYWdlbnQgc3VwcG9ydHMgZnJhbWUgaW5zdHJ1bWVudGF0aW9uLiIKLSAg ICAgICAgfSwKLSAgICAgICAgewotICAgICAgICAgICAgIm5hbWUiOiAiY2FuTW9uaXRvck1haW5U aHJlYWQiLAotICAgICAgICAgICAgInJldHVybnMiOiBbCi0gICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJyZXN1bHQiLCAidHlwZSI6ICJib29sZWFuIiwgImRlc2NyaXB0aW9uIjogIlRydWUgaWYg dGltZWxpbmUgc3VwcG9ydHMgbWFpbiB0aHJlYWQgQ1BVIHV0aWxpemF0aW9uIGluc3RydW1lbnRh dGlvbi4iIH0KLSAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiVGVs bHMgd2hldGhlciB0aW1lbGluZSBhZ2VudCBzdXBwb3J0cyBtYWluIHRocmVhZCBDUFUgdXRpbGl6 YXRpb24gaW5zdHJ1bWVudGF0aW9uLiIKICAgICAgICAgfQogICAgIF0sCiAgICAgImV2ZW50cyI6 IFsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9j b29yZGluYXRlZC9Db21wb3NpdGluZ0Nvb3JkaW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db21wb3NpdGluZ0Nvb3JkaW5hdG9y LmNwcAppbmRleCA5Y2I5ZTk3ZGVmNjBhNTA2ZmRlNzgwNGIwZjgzMzNkMzM0NWZlNjY3Li5jYzk3 NzA0ODI4NzE0ZDk5MTBlNDk0YTQ2YzYyYjBkMGQ2ZjdjZDE3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29tcG9zaXRpbmdD b29yZGluYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL2Nvb3JkaW5hdGVkL0NvbXBvc2l0aW5nQ29vcmRpbmF0b3IuY3BwCkBAIC0xMjUsMTAgKzEy NSw2IEBAIGJvb2wgQ29tcG9zaXRpbmdDb29yZGluYXRvcjo6Zmx1c2hQZW5kaW5nTGF5ZXJDaGFu Z2VzKCkKIAogdm9pZCBDb21wb3NpdGluZ0Nvb3JkaW5hdG9yOjpzeW5jRGlzcGxheVN0YXRlKCkK IHsKLSNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIG1fcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxl cigpLmRpZEJlZ2luRnJhbWUoKTsKLSNlbmRpZgotCiAjaWYgRU5BQkxFKFJFUVVFU1RfQU5JTUFU SU9OX0ZSQU1FKSAmJiAhVVNFKFJFUVVFU1RfQU5JTUFUSU9OX0ZSQU1FX1RJTUVSKSAmJiAhVVNF KFJFUVVFU1RfQU5JTUFUSU9OX0ZSQU1FX0RJU1BMQVlfTU9OSVRPUikKICAgICAvLyBNYWtlIHN1 cmUgdGhhdCBhbnkgcHJldmlvdXNseSByZWdpc3RlcmVkIGFuaW1hdGlvbiBjYWxsYmFja3MgYXJl IGJlaW5nIGV4ZWN1dGVkIGJlZm9yZSB3ZSBmbHVzaCB0aGUgbGF5ZXJzLgogICAgIG1fbGFzdEFu aW1hdGlvblNlcnZpY2VUaW1lID0gV1RGOjptb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAppbmRleCA5ZjQyMjZmOGRjNzBmNjRhYjQz NmY1NTEzMmNkZmQ0MDkzNTRlOWRhLi44ZTMxMzdkMTliN2FlNDdkYzllZDk2OTI3YWZiNzc4NDQw Y2UxM2NhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCkBAIC0xMTY0LDIwICsx MTY0LDYgQEAgUGFzc1JlZlB0cjxOb2RlTGlzdD4gSW50ZXJuYWxzOjpub2Rlc0Zyb21SZWN0KERv Y3VtZW50KiBkb2N1bWVudCwgaW50IGNlbnRlclgsIGkKICAgICByZXR1cm4gU3RhdGljTm9kZUxp c3Q6OmFkb3B0KG1hdGNoZXMpOwogfQogCi12b2lkIEludGVybmFsczo6ZW1pdEluc3BlY3RvckRp ZEJlZ2luRnJhbWUoKQotewotI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgY29udGV4dERvY3Vt ZW50KCktPmZyYW1lKCktPnBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLmRpZEJlZ2luRnJh bWUoKTsKLSNlbmRpZgotfQotCi12b2lkIEludGVybmFsczo6ZW1pdEluc3BlY3RvckRpZENhbmNl bEZyYW1lKCkKLXsKLSNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIGNvbnRleHREb2N1bWVudCgp LT5mcmFtZSgpLT5wYWdlKCktPmluc3BlY3RvckNvbnRyb2xsZXIoKS5kaWRDYW5jZWxGcmFtZSgp OwotI2VuZGlmCi19Ci0KIGNsYXNzIEdldENhbGxlckNvZGVCbG9ja0Z1bmN0b3IgewogcHVibGlj OgogICAgIEdldENhbGxlckNvZGVCbG9ja0Z1bmN0b3IoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJu YWxzLmgKaW5kZXggN2Q0ZTk5ODYyNzI3ZjllMDFiNjMyMzAwZThlNTg3ZmNlZGQ1YTQ2YS4uODU4 NDBhNjMyZjNhYjIwNmIwMWY5M2UxM2YwYmZkYjQxZGU4NTcyMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5n L0ludGVybmFscy5oCkBAIC0xNjYsOSArMTY2LDYgQEAgcHVibGljOgogICAgIFBhc3NSZWZQdHI8 Tm9kZUxpc3Q+IG5vZGVzRnJvbVJlY3QoRG9jdW1lbnQqLCBpbnQgeCwgaW50IHksIHVuc2lnbmVk IHRvcFBhZGRpbmcsIHVuc2lnbmVkIHJpZ2h0UGFkZGluZywKICAgICAgICAgdW5zaWduZWQgYm90 dG9tUGFkZGluZywgdW5zaWduZWQgbGVmdFBhZGRpbmcsIGJvb2wgaWdub3JlQ2xpcHBpbmcsIGJv b2wgYWxsb3dTaGFkb3dDb250ZW50LCBib29sIGFsbG93Q2hpbGRGcmFtZUNvbnRlbnQsIEV4Y2Vw dGlvbkNvZGUmKSBjb25zdDsKIAotICAgIHZvaWQgZW1pdEluc3BlY3RvckRpZEJlZ2luRnJhbWUo KTsKLSAgICB2b2lkIGVtaXRJbnNwZWN0b3JEaWRDYW5jZWxGcmFtZSgpOwotCiAgICAgU3RyaW5n IHBhcnNlck1ldGFEYXRhKERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlID0gRGVwcmVjYXRlZDo6U2Ny aXB0VmFsdWUoKSk7CiAKICAgICBOb2RlKiBmaW5kRWRpdGluZ0RlbGV0ZUJ1dHRvbigpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsIGIvU291cmNlL1dl YkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCmluZGV4IGNmNjU1NjQ0MGExNmYzMWM5NGU4OWM3 MDI0MGY3Yzg3ZWVlNWFmOGUuLmFhMGQ3ZGM4ZmY5YmFmZGVhMTU0OTMzZTU0YzcyZmRjNjE2M2E0 ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbAorKysg Yi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKQEAgLTEyNCw5ICsxMjQsNiBA QAogICAgICAgICB1bnNpZ25lZCBsb25nIHRvcFBhZGRpbmcsIHVuc2lnbmVkIGxvbmcgcmlnaHRQ YWRkaW5nLCB1bnNpZ25lZCBsb25nIGJvdHRvbVBhZGRpbmcsIHVuc2lnbmVkIGxvbmcgbGVmdFBh ZGRpbmcsCiAgICAgICAgIGJvb2xlYW4gaWdub3JlQ2xpcHBpbmcsIGJvb2xlYW4gYWxsb3dTaGFk b3dDb250ZW50LCBib29sZWFuIGFsbG93Q2hpbGRGcmFtZUNvbnRlbnQpOwogCi0gICAgdm9pZCBl bWl0SW5zcGVjdG9yRGlkQmVnaW5GcmFtZSgpOwotICAgIHZvaWQgZW1pdEluc3BlY3RvckRpZENh bmNlbEZyYW1lKCk7Ci0KICAgICAvLyBDYWxsaW5nIHBhcnNlck1ldGFEYXRhKCkgd2l0aCBubyBh cmd1bWVudHMgZ2V0cyB0aGUgbWV0YWRhdGEgZm9yIHRoZSBzY3JpcHQgb2YgdGhlIGN1cnJlbnQg c2NvcGUuCiAgICAgRE9NU3RyaW5nIHBhcnNlck1ldGFEYXRhKG9wdGlvbmFsIGFueSBmdW5jKTsK IAo= 228679 2014-04-05 12:33:07 -0700 2014-04-05 17:07:08 -0700 the patch, now with less didComposite bug-131184-20140405123246.patch text/plain 27402 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2ODI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2I0ZDk1YTE4MTVhZGQy MmU3ZTFhZTA4MTU3MWZlYWIzNzk1ZjhlMy4uYmM5ZmU1NDY5YTc2YjNhYWFkZWIwODY5ZmU3YjBh ZDE0Zjk0ZWJiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU5IEBACisyMDE0LTA0LTA1ICBCcmlh biBKLiBCdXJnICA8YnVyZ0Bjcy53YXNoaW5ndG9uLmVkdT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiByZW1vdmUgdW51c2VkIG1ldHJpY3MgYW5kIGNvbW1hbmRzIGZyb20gdGhlIFRpbWVsaW5l IGFnZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzExODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIHBhdGNoIHJlbW92ZXMgc2V2ZXJhbCBpbnN0cnVtZW50YXRpb24gaG9va3MgdGhhdCBhcmUg bm90IGJlaW5nCisgICAgICAgIHVzZWQgYnkgdGhlIGZyb250ZW5kIGluIGFueSB3YXkuIE1vc3Qg b2YgdGhlbSBhcmUgbm90IGhvb2tlZCB1cCB0bworICAgICAgICBwcm9kdWNlIGFueSBkYXRhLCBz byB0aGV5IGp1c3QgY2x1dHRlciB1cCBJbnNwZWN0b3JDbGllbnQgYW5kIHRoZSBhZ2VudC4KKwor ICAgICAgICAqIFdlYkNvcmUuZXhwLmluOiBSZW1vdmUgZGlkQmVnaW5GcmFtZS9kaWRDYW5jZWxG cmFtZS4KKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ2xpZW50Lmg6IFJlbW92ZSBjbGll bnQgbWV0aG9kcyB0aGF0IGFyZSBuZXZlciBvdmVycmlkZGVuLgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQ2xpZW50OjpjYW5Nb25pdG9yTWFpblRocmVhZCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnQ6OnN1cHBvcnRzRnJhbWVJbnN0cnVtZW50YXRpb24p OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50OjpnZXRBbGxvY2F0 ZWRPYmplY3RzKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNsaWVudDo6 ZHVtcFVuY291bnRlZEFsbG9jYXRlZE9iamVjdHMpOiBEZWxldGVkLgorCisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOiBSZW1vdmUgdW51c2VkIGluc3RydW1lbnRh dGlvbi4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZEJlZ2luRnJh bWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlk Q2FuY2VsRnJhbWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJv bGxlcjo6ZGlkQ29tcG9zaXRlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckNvbnRyb2xsZXI6OndpbENvbXBvc2l0ZSk6IERlbGV0ZWQuCisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuaDoKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JU aW1lbGluZUFnZW50LmNwcDogUmVtb3ZlIHRoZSBiYWNrZW5kJ3MgQmVnaW5GcmFtZSBlbnVtCisg ICAgICAgIHZhbHVlLCBidXQga2VlcCBpdCBpbiB0aGUgcHJvdG9jb2wgZm9yIHdoZW4gaXQgaXMg cmVpbXBsZW1lbnRlZC4gUmVtb3ZlCisgICAgICAgIG1hbmFnZW1lbnQgb2YgdGhlIGN1cnJlbnQg ZnJhbWUgcmVjb3JkLCBhbmQgc2ltcGxpZnkgc29tZSBjb2RlLgorICAgICAgICAoV2ViQ29yZTo6 dG9Qcm90b2NvbCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojph ZGRSZWNvcmRUb1RpbWVsaW5lKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpwdXNoQ3VycmVudFJlY29yZCk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpjbGVhclJlY29yZFN0YWNrKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmNhbk1vbml0b3JNYWluVGhyZWFkKTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN1cHBvcnRz RnJhbWVJbnN0cnVtZW50YXRpb24pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6ZGlkQmVnaW5GcmFtZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDYW5jZWxGcmFtZSk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDb21wb3NpdGUpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsQ29t cG9zaXRlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OmlubmVyQWRkUmVjb3JkVG9UaW1lbGluZSk6IERlbGV0ZWQuIFVuZG8gdGVsZXNjb3Bpbmcu CisgICAgICAgIChXZWJDb3JlOjp1c2VkSGVhcFNpemUpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6Y29tbWl0RnJhbWVSZWNvcmQpOiBEZWxldGVk LgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50Lmg6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpUaW1lbGluZVJlY29yZEVudHJ5OjpU aW1lbGluZVJlY29yZEVudHJ5KToKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvdG9jb2wvVGltZWxp bmUuanNvbjoKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRl ZC9Db21wb3NpdGluZ0Nvb3JkaW5hdG9yLmNwcDogUmVtb3ZlCisgICAgICAgIGluc3RydW1lbnRh dGlvbiBob29rIGZvciBiZWdpbkZyYW1lLiBUaGlzIGlzIHRoZSBvbmx5IGJhY2tlbmQgdGhhdCBp bXBsZW1lbnRzIGl0LgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9zaXRpbmdDb29yZGluYXRvcjo6 c3luY0Rpc3BsYXlTdGF0ZSk6CisKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6IFJl bW92ZSBjcnVmdHkgdGVzdCBtZXRob2RzIHRoYXQgYXJlbid0IHVzZWQuCisgICAgICAgIChXZWJD b3JlOjpJbnRlcm5hbHM6OmVtaXRJbnNwZWN0b3JEaWRCZWdpbkZyYW1lKTogRGVsZXRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6ZW1pdEluc3BlY3RvckRpZENhbmNlbEZyYW1lKTog RGVsZXRlZC4KKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5oOgorICAgICAgICAqIHRlc3Rp bmcvSW50ZXJuYWxzLmlkbDoKKwogMjAxNC0wNC0wMyAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mu d2FzaGluZ3Rvbi5lZHU+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogaG9vayB1cCBwcm9iZSBz YW1wbGVzIHRvIFRpbWVsaW5lQWdlbnQncyByZWNvcmRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpp bmRleCAyYjczZGQwZDVlODliYzdlMjE1Zjk0ZjFiZGU5ZDE5MTZjMWE0YTc1Li5hOTBjMWJkMjU5 YThjMGJkYTBjY2Q0YTE2ZTBlZDAxODk0ZThlNTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxMiBAQAorMjAxNC0wNC0wNSAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2Fz aGluZ3Rvbi5lZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIHVudXNlZCBtZXRy aWNzIGFuZCBjb21tYW5kcyBmcm9tIHRoZSBUaW1lbGluZSBhZ2VudAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxMTg0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3RvY29s L0xlZ2FjeS83LjAvSW5zcGVjdG9yV2ViQmFja2VuZENvbW1hbmRzLmpzOgorCiAyMDE0LTA0LTAz ICBCcmlhbiBKLiBCdXJnICA8YnVyZ0Bjcy53YXNoaW5ndG9uLmVkdT4KIAogICAgICAgICBXZWIg SW5zcGVjdG9yOiBob29rIHVwIHByb2JlIHNhbXBsZXMgdG8gVGltZWxpbmVBZ2VudCdzIHJlY29y ZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKaW5kZXggZGNmZWMxNDI5ZWRjZjA4Njc5YjBjNThlM2U1ZTk0NTViN2Y1M2M5ZS4u ODI2OTY0NmFlYTljN2E2NTQzNDlmZGU3NzY2YjEzMDI5MzI2NzhhMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAxNC0wNC0wNSAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIHVudXNlZCBtZXRyaWNzIGFu ZCBjb21tYW5kcyBmcm9tIHRoZSBUaW1lbGluZSBhZ2VudAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxMTg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJLaXQudmN4cHJvai9XZWJLaXRFeHBvcnRH ZW5lcmF0b3IvV2ViS2l0RXhwb3J0cy5kZWYuaW46IFJlbW92ZSBzeW1ib2xzLgorCiAyMDE0LTA0 LTA0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQgYnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCA5ZmEyODFiZWMwNWIyMDEz ZTc2ZmYwMzY5ZjM4ZDFmMmI5ZTZjY2RlLi5jM2Q3NTMwMThhZWFjMGViNDRmMjQzNzY2ZjUwYjAw MjExNzE5OGM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysg Yi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtMzAyMSw4ICszMDIxLDYgQEAgX19a TjdXZWJDb3JlNUNvbG9yQzFFUktOM1dURjZTdHJpbmdFCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikK IF9fWk43V2ViQ29yZTE0U2NoZW1lUmVnaXN0cnkyN3Nob3VsZFRyZWF0VVJMU2NoZW1lQXNMb2Nh bEVSS04zV1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTE1SW5zcGVjdG9yQ2xpZW50MzFkb0Rpc3Bh dGNoTWVzc2FnZU9uRnJvbnRlbmRQYWdlRVBOU180UGFnZUVSS04zV1RGNlN0cmluZ0UKLV9fWk43 V2ViQ29yZTE5SW5zcGVjdG9yQ29udHJvbGxlcjEzZGlkQmVnaW5GcmFtZUV2Ci1fX1pON1dlYkNv cmUxOUluc3BlY3RvckNvbnRyb2xsZXIxNGRpZENhbmNlbEZyYW1lRXYKIF9fWk43V2ViQ29yZTE5 SW5zcGVjdG9yQ29udHJvbGxlcjE1Y29ubmVjdEZyb250ZW5kRVBOOUluc3BlY3RvcjI0SW5zcGVj dG9yRnJvbnRlbmRDaGFubmVsRQogX19aTjdXZWJDb3JlMTlJbnNwZWN0b3JDb250cm9sbGVyMThk aXNjb25uZWN0RnJvbnRlbmRFTjlJbnNwZWN0b3IyNUluc3BlY3RvckRpc2Nvbm5lY3RSZWFzb25F CiBfX1pON1dlYkNvcmUxOUluc3BlY3RvckNvbnRyb2xsZXIxOHNldFByb2ZpbGVyRW5hYmxlZEVi CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2xpZW50Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2xpZW50LmgKaW5kZXggNjM2ZjA5 NmEyMmJkYzFmMDMyNWJkN2FiMTRlNDEzOWFlMWQxYWJiNC4uYWQ1MjM1Zjg2NGU0MDFiOWY2ODA4 Y2ZmNzlhNzdlNDkxODljOWMyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JDbGllbnQuaApAQCAtNjMsNyArNjMsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGNs ZWFyQnJvd3NlckNhY2hlKCkgeyB9CiAgICAgdmlydHVhbCBib29sIGNhbkNsZWFyQnJvd3NlckNv b2tpZXMoKSB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgdm9pZCBjbGVhckJyb3dzZXJD b29raWVzKCkgeyB9Ci0gICAgdmlydHVhbCBib29sIGNhbk1vbml0b3JNYWluVGhyZWFkKCkgeyBy ZXR1cm4gZmFsc2U7IH0KIAogICAgIHZpcnR1YWwgYm9vbCBvdmVycmlkZXNTaG93UGFpbnRSZWN0 cygpIHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCB2b2lkIHNldFNob3dQYWludFJlY3Rz KGJvb2wpIHsgfQpAQCAtNzcsMTMgKzc2LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBj YW5Db250aW51b3VzbHlQYWludCgpIHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCB2b2lk IHNldENvbnRpbnVvdXNQYWludGluZ0VuYWJsZWQoYm9vbCkgeyB9CiAKLSAgICB2aXJ0dWFsIGJv b2wgc3VwcG9ydHNGcmFtZUluc3RydW1lbnRhdGlvbigpIHsgcmV0dXJuIGZhbHNlOyB9Ci0KICAg ICB2aXJ0dWFsIHZvaWQgZGlkU2V0U2VhcmNoaW5nRm9yTm9kZShib29sKSB7IH0KIAotICAgIHZp cnR1YWwgdm9pZCBnZXRBbGxvY2F0ZWRPYmplY3RzKEhhc2hTZXQ8Y29uc3Qgdm9pZCo+JikgeyB9 Ci0gICAgdmlydHVhbCB2b2lkIGR1bXBVbmNvdW50ZWRBbGxvY2F0ZWRPYmplY3RzKGNvbnN0IEhh c2hNYXA8Y29uc3Qgdm9pZCosIHNpemVfdD4mKSB7IH0KLQogICAgIHZpcnR1YWwgYm9vbCBoYW5k bGVKYXZhU2NyaXB0RGlhbG9nKGJvb2wsIGNvbnN0IFN0cmluZyopIHsgcmV0dXJuIGZhbHNlOyB9 CiAKICAgICBzdGF0aWMgYm9vbCBkb0Rpc3BhdGNoTWVzc2FnZU9uRnJvbnRlbmRQYWdlKFBhZ2Uq IGZyb250ZW5kUGFnZSwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCA0MmI0Y2Q2ODAzZWQw M2M3MzYxZDFiMmY3ZWFjZGNhMmJiODU4YmYzLi4wYTZmYTI2OWM5MDEzNGVmYmY3YWUxYTdkODkw ODdhMjJhNTU2ZmI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuY3BwCkBAIC00MDEsMzAgKzQwMSw2IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJv bGxlcjo6c2V0UmVzb3VyY2VzRGF0YVNpemVMaW1pdHNGcm9tSW50ZXJuYWxzKGludCBtYXhpbXVt UmVzCiAgICAgbV9yZXNvdXJjZUFnZW50LT5zZXRSZXNvdXJjZXNEYXRhU2l6ZUxpbWl0c0Zyb21J bnRlcm5hbHMobWF4aW11bVJlc291cmNlc0NvbnRlbnRTaXplLCBtYXhpbXVtU2luZ2xlUmVzb3Vy Y2VDb250ZW50U2l6ZSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkQmVnaW5G cmFtZSgpCi17Ci0gICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQg PSBtX2luc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkKLSAgICAg ICAgdGltZWxpbmVBZ2VudC0+ZGlkQmVnaW5GcmFtZSgpOwotfQotCi12b2lkIEluc3BlY3RvckNv bnRyb2xsZXI6OmRpZENhbmNlbEZyYW1lKCkKLXsKLSAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVB Z2VudCogdGltZWxpbmVBZ2VudCA9IG1faW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yVGlt ZWxpbmVBZ2VudCgpKQotICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRDYW5jZWxGcmFtZSgpOwot fQotCi12b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OndpbGxDb21wb3NpdGUoKQotewotICAgIGlm IChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gbV9pbnN0cnVtZW50aW5n QWdlbnRzLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCkpCi0gICAgICAgIHRpbWVsaW5lQWdlbnQt PndpbGxDb21wb3NpdGUoKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRDb21w b3NpdGUoKQotewotICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50 ID0gbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCkpCi0gICAg ICAgIHRpbWVsaW5lQWdlbnQtPmRpZENvbXBvc2l0ZSgpOwotfQotCiBib29sIEluc3BlY3RvckNv bnRyb2xsZXI6OmRldmVsb3BlckV4dHJhc0VuYWJsZWQoKSBjb25zdAogewogICAgIHJldHVybiBt X3BhZ2Uuc2V0dGluZ3MoKS5kZXZlbG9wZXJFeHRyYXNFbmFibGVkKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAppbmRleCBjY2VlOWM3MjQ2MWU3 ZjdmZTUyZGU5YzI1NjA0ODE5NzEwZjE4ZmQxLi41Yzk5NDQ3MTc4NjIwZDU3ZTI2YmEwNTY3Yzhm YTg3MDFlMzZkNjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmgKQEAgLTEyNiwxMSArMTI2LDYgQEAgcHVibGljOgogICAgIEluc3BlY3RvckNs aWVudCogaW5zcGVjdG9yQ2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9pbnNwZWN0b3JDbGllbnQ7 IH0KICAgICBJbnNwZWN0b3JQYWdlQWdlbnQqIHBhZ2VBZ2VudCgpIGNvbnN0IHsgcmV0dXJuIG1f cGFnZUFnZW50OyB9CiAKLSAgICB2b2lkIGRpZEJlZ2luRnJhbWUoKTsKLSAgICB2b2lkIGRpZENh bmNlbEZyYW1lKCk7Ci0gICAgdm9pZCB3aWxsQ29tcG9zaXRlKCk7Ci0gICAgdm9pZCBkaWRDb21w b3NpdGUoKTsKLQogICAgIHZpcnR1YWwgYm9vbCBkZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkgY29u c3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBib29sIGNhbkFjY2Vzc0luc3BlY3RlZFNjcmlwdFN0 YXRlKEpTQzo6RXhlY1N0YXRlKikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBJbnNwZWN0 b3I6Okluc3BlY3RvckZ1bmN0aW9uQ2FsbEhhbmRsZXIgZnVuY3Rpb25DYWxsSGFuZGxlcigpIGNv bnN0IG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvckluc3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckluc3RydW1lbnRhdGlvbi5oCmluZGV4IDUxMGQ2OGNhMDk2ZDVmMTQ3ZTI1OTY3ODFjN2I0Y2Rh ZGE0ZDA2YjAuLmI0Mzc2ZTkxZDNjZGE3MmFjYzgzOGY3ODQ4ZmFhNTM2MzdjZDUyZDEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24u aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u LmgKQEAgLTE2NSw4ICsxNjUsNiBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgZGlkU2Nyb2xs TGF5ZXIoRnJhbWUqKTsKICAgICBzdGF0aWMgdm9pZCB3aWxsUGFpbnQoUmVuZGVyT2JqZWN0Kik7 CiAgICAgc3RhdGljIHZvaWQgZGlkUGFpbnQoUmVuZGVyT2JqZWN0KiwgR3JhcGhpY3NDb250ZXh0 KiwgY29uc3QgTGF5b3V0UmVjdCYpOwotICAgIHN0YXRpYyB2b2lkIHdpbGxDb21wb3NpdGUoUGFn ZSopOwotICAgIHN0YXRpYyB2b2lkIGRpZENvbXBvc2l0ZShQYWdlKik7CiAgICAgc3RhdGljIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsUmVjYWxjdWxhdGVTdHlsZShEb2N1bWVu dCopOwogICAgIHN0YXRpYyB2b2lkIGRpZFJlY2FsY3VsYXRlU3R5bGUoY29uc3QgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uQ29va2llJik7CiAgICAgc3RhdGljIHZvaWQgZGlkU2NoZWR1bGVTdHls ZVJlY2FsY3VsYXRpb24oRG9jdW1lbnQqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAppbmRleCA2ODk2NDkxOGYzZjUzMDQzNzgx ODEyMDk2OGFlZmVjNzZlOGEwNDkyLi45MGQ2OWRhYWZhZmQ4YTA0NGEyOWE2MDk4ZmJkM2ZkMThh ZTFjODAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRp bWVsaW5lQWdlbnQuY3BwCkBAIC0xMTYsMjYgKzExNiw2IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6c3RvcChFcnJvclN0cmluZyopCiAgICAgbV9lbmFibGVkID0gZmFsc2U7CiB9CiAK LXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6Y2FuTW9uaXRvck1haW5UaHJlYWQoRXJyb3JT dHJpbmcqLCBib29sKiByZXN1bHQpCi17Ci0gICAgKnJlc3VsdCA9IG1fY2xpZW50ICYmIG1fY2xp ZW50LT5jYW5Nb25pdG9yTWFpblRocmVhZCgpOwotfQotCi12b2lkIEluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OnN1cHBvcnRzRnJhbWVJbnN0cnVtZW50YXRpb24oRXJyb3JTdHJpbmcqLCBib29sKiBy ZXN1bHQpCi17Ci0gICAgKnJlc3VsdCA9IG1fY2xpZW50ICYmIG1fY2xpZW50LT5zdXBwb3J0c0Zy YW1lSW5zdHJ1bWVudGF0aW9uKCk7Ci19Ci0KLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6 ZGlkQmVnaW5GcmFtZSgpCi17Ci0gICAgbV9wZW5kaW5nRnJhbWVSZWNvcmQgPSBUaW1lbGluZVJl Y29yZEZhY3Rvcnk6OmNyZWF0ZUdlbmVyaWNSZWNvcmQodGltZXN0YW1wKCksIDApOwotfQotCi12 b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENhbmNlbEZyYW1lKCkKLXsKLSAgICBtX3Bl bmRpbmdGcmFtZVJlY29yZC5jbGVhcigpOwotfQotCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OndpbGxDYWxsRnVuY3Rpb24oY29uc3QgU3RyaW5nJiBzY3JpcHROYW1lLCBpbnQgc2NyaXB0 TGluZSwgRnJhbWUqIGZyYW1lKQogewogICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlRnVuY3Rpb25DYWxsRGF0YShzY3JpcHROYW1lLCBzY3JpcHRMaW5l KSwgVGltZWxpbmVSZWNvcmRUeXBlOjpGdW5jdGlvbkNhbGwsIHRydWUsIGZyYW1lKTsKQEAgLTI1 MywxNiArMjMzLDYgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRTY3JvbGwoKQog ICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZFR5cGU6OlNjcm9sbExh eWVyKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsQ29tcG9zaXRlKCkK LXsKLSAgICBwdXNoQ3VycmVudFJlY29yZChJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpLCBUaW1l bGluZVJlY29yZFR5cGU6OkNvbXBvc2l0ZUxheWVycywgZmFsc2UsIG51bGxwdHIpOwotfQotCi12 b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENvbXBvc2l0ZSgpCi17Ci0gICAgZGlkQ29t cGxldGVDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkVHlwZTo6Q29tcG9zaXRlTGF5ZXJzKTsK LX0KLQogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsV3JpdGVIVE1MKHVuc2lnbmVk IHN0YXJ0TGluZSwgRnJhbWUqIGZyYW1lKQogewogICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVs aW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUGFyc2VIVE1MRGF0YShzdGFydExpbmUpLCBUaW1lbGlu ZVJlY29yZFR5cGU6OlBhcnNlSFRNTCwgdHJ1ZSwgZnJhbWUpOwpAQCAtNDcwLDE5ICs0NDAsMTEg QEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpicmVha3BvaW50QWN0aW9uUHJvYmUoSlND OjpFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEkKICAgICBhcHBlbmRSZWNvcmQoVGltZWxpbmVSZWNv cmRGYWN0b3J5OjpjcmVhdGVQcm9iZVNhbXBsZURhdGEoYWN0aW9uLCBoaXRDb3VudCksIFRpbWVs aW5lUmVjb3JkVHlwZTo6UHJvYmVTYW1wbGUsIGZhbHNlLCBmcmFtZSk7CiB9CiAKLXZvaWQgSW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6YWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3Bl Y3Rvck9iamVjdD4gcmVjb3JkLCBUaW1lbGluZVJlY29yZFR5cGUgdHlwZSkKLXsKLSAgICBjb21t aXRGcmFtZVJlY29yZCgpOwotICAgIGlubmVyQWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQsIHR5 cGUpOwotfQotCiBzdGF0aWMgSW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6VGltZWxpbmU6OkV2ZW50 VHlwZTo6RW51bSB0b1Byb3RvY29sKFRpbWVsaW5lUmVjb3JkVHlwZSB0eXBlKQogewogICAgIHN3 aXRjaCAodHlwZSkgewogICAgIGNhc2UgVGltZWxpbmVSZWNvcmRUeXBlOjpFdmVudERpc3BhdGNo OgogICAgICAgICByZXR1cm4gSW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6VGltZWxpbmU6OkV2ZW50 VHlwZTo6RXZlbnREaXNwYXRjaDsKLSAgICBjYXNlIFRpbWVsaW5lUmVjb3JkVHlwZTo6QmVnaW5G cmFtZToKLSAgICAgICAgcmV0dXJuIEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlRpbWVsaW5lOjpF dmVudFR5cGU6OkJlZ2luRnJhbWU7CiAgICAgY2FzZSBUaW1lbGluZVJlY29yZFR5cGU6OlNjaGVk dWxlU3R5bGVSZWNhbGN1bGF0aW9uOgogICAgICAgICByZXR1cm4gSW5zcGVjdG9yOjpUeXBlQnVp bGRlcjo6VGltZWxpbmU6OkV2ZW50VHlwZTo6U2NoZWR1bGVTdHlsZVJlY2FsY3VsYXRpb247CiAg ICAgY2FzZSBUaW1lbGluZVJlY29yZFR5cGU6OlJlY2FsY3VsYXRlU3R5bGVzOgpAQCAtNDk3LDgg KzQ1OSw2IEBAIHN0YXRpYyBJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpUaW1lbGluZTo6RXZlbnRU eXBlOjpFbnVtIHRvUHJvdG9jb2woVGltZWxpbmVSZWNvCiAgICAgICAgIHJldHVybiBJbnNwZWN0 b3I6OlR5cGVCdWlsZGVyOjpUaW1lbGluZTo6RXZlbnRUeXBlOjpTY3JvbGxMYXllcjsKICAgICBj YXNlIFRpbWVsaW5lUmVjb3JkVHlwZTo6UmVzaXplSW1hZ2U6CiAgICAgICAgIHJldHVybiBJbnNw ZWN0b3I6OlR5cGVCdWlsZGVyOjpUaW1lbGluZTo6RXZlbnRUeXBlOjpSZXNpemVJbWFnZTsKLSAg ICBjYXNlIFRpbWVsaW5lUmVjb3JkVHlwZTo6Q29tcG9zaXRlTGF5ZXJzOgotICAgICAgICByZXR1 cm4gSW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6VGltZWxpbmU6OkV2ZW50VHlwZTo6Q29tcG9zaXRl TGF5ZXJzOwogCiAgICAgY2FzZSBUaW1lbGluZVJlY29yZFR5cGU6OlBhcnNlSFRNTDoKICAgICAg ICAgcmV0dXJuIEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlRpbWVsaW5lOjpFdmVudFR5cGU6OlBh cnNlSFRNTDsKQEAgLTU2Niw3ICs1MjYsNyBAQCBzdGF0aWMgSW5zcGVjdG9yOjpUeXBlQnVpbGRl cjo6VGltZWxpbmU6OkV2ZW50VHlwZTo6RW51bSB0b1Byb3RvY29sKFRpbWVsaW5lUmVjbwogICAg IHJldHVybiBJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpUaW1lbGluZTo6RXZlbnRUeXBlOjpUaW1l U3RhbXA7CiB9CiAKLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6aW5uZXJBZGRSZWNvcmRU b1RpbWVsaW5lKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBwcnBSZWNvcmQsIFRpbWVsaW5l UmVjb3JkVHlwZSB0eXBlKQordm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjphZGRSZWNvcmRU b1RpbWVsaW5lKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBwcnBSZWNvcmQsIFRpbWVsaW5l UmVjb3JkVHlwZSB0eXBlKQogewogICAgIHBycFJlY29yZC0+c2V0U3RyaW5nKCJ0eXBlIiwgSW5z cGVjdG9yOjpUeXBlQnVpbGRlcjo6Z2V0V2ViRW51bUNvbnN0YW50VmFsdWUodG9Qcm90b2NvbCh0 eXBlKSkpOwogCkBAIC01ODAsMTEgKzU0MCw2IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6aW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5lKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0CiAg ICAgfQogfQogCi1zdGF0aWMgc2l6ZV90IHVzZWRIZWFwU2l6ZSgpCi17Ci0gICAgcmV0dXJuIEpT RE9NV2luZG93Ojpjb21tb25WTSgpLmhlYXAuc2l6ZSgpOwotfQotCiB2b2lkIEluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OnNldEZyYW1lSWRlbnRpZmllcihJbnNwZWN0b3JPYmplY3QqIHJlY29yZCwg RnJhbWUqIGZyYW1lKQogewogICAgIGlmICghZnJhbWUgfHwgIW1fcGFnZUFnZW50KQpAQCAtNjA2 LDkgKzU2MSw2IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ29tcGxldGVDdXJy ZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkVHlwZSB0eXBlKQogICAgICAgICBlbnRyeS5yZWNvcmQt PnNldE9iamVjdCgiZGF0YSIsIGVudHJ5LmRhdGEpOwogICAgICAgICBlbnRyeS5yZWNvcmQtPnNl dEFycmF5KCJjaGlsZHJlbiIsIGVudHJ5LmNoaWxkcmVuKTsKICAgICAgICAgZW50cnkucmVjb3Jk LT5zZXROdW1iZXIoImVuZFRpbWUiLCB0aW1lc3RhbXAoKSk7Ci0gICAgICAgIHNpemVfdCB1c2Vk SGVhcFNpemVEZWx0YSA9IHVzZWRIZWFwU2l6ZSgpIC0gZW50cnkudXNlZEhlYXBTaXplQXRTdGFy dDsKLSAgICAgICAgaWYgKHVzZWRIZWFwU2l6ZURlbHRhKQotICAgICAgICAgICAgZW50cnkucmVj b3JkLT5zZXROdW1iZXIoInVzZWRIZWFwU2l6ZURlbHRhIiwgdXNlZEhlYXBTaXplRGVsdGEpOwog ICAgICAgICBhZGRSZWNvcmRUb1RpbWVsaW5lKGVudHJ5LnJlY29yZCwgdHlwZSk7CiAgICAgfQog fQpAQCAtNjQzLDI0ICs1OTUsMTMgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpzZW5k RXZlbnQoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGV2ZW50KQogCiB2b2lkIEluc3BlY3Rv clRpbWVsaW5lQWdlbnQ6OnB1c2hDdXJyZW50UmVjb3JkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2Jq ZWN0PiBkYXRhLCBUaW1lbGluZVJlY29yZFR5cGUgdHlwZSwgYm9vbCBjYXB0dXJlQ2FsbFN0YWNr LCBGcmFtZSogZnJhbWUpCiB7Ci0gICAgY29tbWl0RnJhbWVSZWNvcmQoKTsKICAgICBSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdl bmVyaWNSZWNvcmQodGltZXN0YW1wKCksIGNhcHR1cmVDYWxsU3RhY2sgPyBtX21heENhbGxTdGFj a0RlcHRoIDogMCk7CiAgICAgc2V0RnJhbWVJZGVudGlmaWVyKHJlY29yZC5nZXQoKSwgZnJhbWUp OwotICAgIG1fcmVjb3JkU3RhY2suYXBwZW5kKFRpbWVsaW5lUmVjb3JkRW50cnkocmVjb3JkLnJl bGVhc2UoKSwgZGF0YSwgSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgpLCB0eXBlLCB1c2VkSGVhcFNp emUoKSkpOwotfQotCi12b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmNvbW1pdEZyYW1lUmVj b3JkKCkKLXsKLSAgICBpZiAoIW1fcGVuZGluZ0ZyYW1lUmVjb3JkKQotICAgICAgICByZXR1cm47 Ci0gICAgCi0gICAgbV9wZW5kaW5nRnJhbWVSZWNvcmQtPnNldE9iamVjdCgiZGF0YSIsIEluc3Bl Y3Rvck9iamVjdDo6Y3JlYXRlKCkpOwotICAgIGlubmVyQWRkUmVjb3JkVG9UaW1lbGluZShtX3Bl bmRpbmdGcmFtZVJlY29yZC5yZWxlYXNlKCksIFRpbWVsaW5lUmVjb3JkVHlwZTo6QmVnaW5GcmFt ZSk7CisgICAgbV9yZWNvcmRTdGFjay5hcHBlbmQoVGltZWxpbmVSZWNvcmRFbnRyeShyZWNvcmQu cmVsZWFzZSgpLCBkYXRhLCBJbnNwZWN0b3JBcnJheTo6Y3JlYXRlKCksIHR5cGUpKTsKIH0KIAog dm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpjbGVhclJlY29yZFN0YWNrKCkKIHsKLSAgICBt X3BlbmRpbmdGcmFtZVJlY29yZC5jbGVhcigpOwogICAgIG1fcmVjb3JkU3RhY2suY2xlYXIoKTsK ICAgICBtX2lkKys7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yVGltZWxpbmVBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clRpbWVsaW5lQWdlbnQuaAppbmRleCA4MzE3NmNlNzE2MTM3YTVlZGJmMThiMjU0MzBmMWRlYmRm MDViMTk4Li4yNWViNmVmZGVhZjZjZTJkNzY1ZjEzYWZkMWVhMDhiZTU1ZWZjZjg1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKQEAg LTYyLDcgKzYyLDYgQEAgdHlwZWRlZiBTdHJpbmcgRXJyb3JTdHJpbmc7CiAKIGVudW0gY2xhc3Mg VGltZWxpbmVSZWNvcmRUeXBlIHsKICAgICBFdmVudERpc3BhdGNoLAotICAgIEJlZ2luRnJhbWUs CiAgICAgU2NoZWR1bGVTdHlsZVJlY2FsY3VsYXRpb24sCiAgICAgUmVjYWxjdWxhdGVTdHlsZXMs CiAgICAgSW52YWxpZGF0ZUxheW91dCwKQEAgLTcwLDcgKzY5LDYgQEAgZW51bSBjbGFzcyBUaW1l bGluZVJlY29yZFR5cGUgewogICAgIFBhaW50LAogICAgIFNjcm9sbExheWVyLAogICAgIFJlc2l6 ZUltYWdlLAotICAgIENvbXBvc2l0ZUxheWVycywKIAogICAgIFBhcnNlSFRNTCwKIApAQCAtMTM4 LDggKzEzNiw2IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBzdGFydChFcnJvclN0cmlu ZyosIGNvbnN0IGludCogbWF4Q2FsbFN0YWNrRGVwdGgpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwg dm9pZCBzdG9wKEVycm9yU3RyaW5nKikgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCB2b2lkIGNhbk1v bml0b3JNYWluVGhyZWFkKEVycm9yU3RyaW5nKiwgYm9vbCopIG92ZXJyaWRlOwotICAgIHZpcnR1 YWwgdm9pZCBzdXBwb3J0c0ZyYW1lSW5zdHJ1bWVudGF0aW9uKEVycm9yU3RyaW5nKiwgYm9vbCop IG92ZXJyaWRlOwogCiAgICAgaW50IGlkKCkgY29uc3QgeyByZXR1cm4gbV9pZDsgfQogCkBAIC0x NTIsOSArMTQ4LDYgQEAgcHVibGljOgogICAgIHZvaWQgd2lsbERpc3BhdGNoRXZlbnQoY29uc3Qg RXZlbnQmLCBGcmFtZSopOwogICAgIHZvaWQgZGlkRGlzcGF0Y2hFdmVudCgpOwogCi0gICAgdm9p ZCBkaWRCZWdpbkZyYW1lKCk7Ci0gICAgdm9pZCBkaWRDYW5jZWxGcmFtZSgpOwotCiAgICAgdm9p ZCBkaWRJbnZhbGlkYXRlTGF5b3V0KEZyYW1lKik7CiAgICAgdm9pZCB3aWxsTGF5b3V0KEZyYW1l Kik7CiAgICAgdm9pZCBkaWRMYXlvdXQoUmVuZGVyT2JqZWN0Kik7CkBAIC0xNjksOSArMTYyLDYg QEAgcHVibGljOgogICAgIHZvaWQgd2lsbFNjcm9sbChGcmFtZSopOwogICAgIHZvaWQgZGlkU2Ny b2xsKCk7CiAKLSAgICB2b2lkIHdpbGxDb21wb3NpdGUoKTsKLSAgICB2b2lkIGRpZENvbXBvc2l0 ZSgpOwotCiAgICAgdm9pZCB3aWxsV3JpdGVIVE1MKHVuc2lnbmVkIHN0YXJ0TGluZSwgRnJhbWUq KTsKICAgICB2b2lkIGRpZFdyaXRlSFRNTCh1bnNpZ25lZCBlbmRMaW5lKTsKIApAQCAtMjMwLDE1 ICsyMjAsMTQgQEAgcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgVGltZWxpbmVSZWNvcmRTdGFj azsKIAogICAgIHN0cnVjdCBUaW1lbGluZVJlY29yZEVudHJ5IHsKLSAgICAgICAgVGltZWxpbmVS ZWNvcmRFbnRyeShQYXNzUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQs IFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGRhdGEsIFBhc3NSZWZQdHI8 SW5zcGVjdG9yOjpJbnNwZWN0b3JBcnJheT4gY2hpbGRyZW4sIFRpbWVsaW5lUmVjb3JkVHlwZSB0 eXBlLCBzaXplX3QgdXNlZEhlYXBTaXplQXRTdGFydCkKLSAgICAgICAgICAgIDogcmVjb3JkKHJl Y29yZCksIGRhdGEoZGF0YSksIGNoaWxkcmVuKGNoaWxkcmVuKSwgdHlwZSh0eXBlKSwgdXNlZEhl YXBTaXplQXRTdGFydCh1c2VkSGVhcFNpemVBdFN0YXJ0KQorICAgICAgICBUaW1lbGluZVJlY29y ZEVudHJ5KFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCwgUGFz c1JlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gZGF0YSwgUGFzc1JlZlB0cjxJbnNw ZWN0b3I6Okluc3BlY3RvckFycmF5PiBjaGlsZHJlbiwgVGltZWxpbmVSZWNvcmRUeXBlIHR5cGUp CisgICAgICAgICAgICA6IHJlY29yZChyZWNvcmQpLCBkYXRhKGRhdGEpLCBjaGlsZHJlbihjaGls ZHJlbiksIHR5cGUodHlwZSkKICAgICAgICAgewogICAgICAgICB9CiAgICAgICAgIFJlZlB0cjxJ bnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gcmVjb3JkOwogICAgICAgICBSZWZQdHI8SW5zcGVj dG9yOjpJbnNwZWN0b3JPYmplY3Q+IGRhdGE7CiAgICAgICAgIFJlZlB0cjxJbnNwZWN0b3I6Oklu c3BlY3RvckFycmF5PiBjaGlsZHJlbjsKICAgICAgICAgVGltZWxpbmVSZWNvcmRUeXBlIHR5cGU7 Ci0gICAgICAgIHNpemVfdCB1c2VkSGVhcFNpemVBdFN0YXJ0OwogICAgIH07CiAKICAgICB2b2lk IHNlbmRFdmVudChQYXNzUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0Pik7CkBAIC0y NDksMTEgKzIzOCw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGRpZENvbXBsZXRlQ3VycmVudFJl Y29yZChUaW1lbGluZVJlY29yZFR5cGUpOwogCi0gICAgdm9pZCBzZXRIZWFwU2l6ZVN0YXRpc3Rp Y3MoSW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3QqIHJlY29yZCk7Ci0gICAgdm9pZCBjb21taXRG cmFtZVJlY29yZCgpOwotCiAgICAgdm9pZCBhZGRSZWNvcmRUb1RpbWVsaW5lKFBhc3NSZWZQdHI8 SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+LCBUaW1lbGluZVJlY29yZFR5cGUpOwotICAgIHZv aWQgaW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5lKFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0 b3JPYmplY3Q+LCBUaW1lbGluZVJlY29yZFR5cGUpOwogICAgIHZvaWQgY2xlYXJSZWNvcmRTdGFj aygpOwogCiAgICAgdm9pZCBsb2NhbFRvUGFnZVF1YWQoY29uc3QgUmVuZGVyT2JqZWN0JiwgY29u c3QgTGF5b3V0UmVjdCYsIEZsb2F0UXVhZCopOwpAQCAtMjcyLDcgKzI1Nyw2IEBAIHByaXZhdGU6 CiAKICAgICBpbnQgbV9pZDsKICAgICBpbnQgbV9tYXhDYWxsU3RhY2tEZXB0aDsKLSAgICBSZWZQ dHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IG1fcGVuZGluZ0ZyYW1lUmVjb3JkOwogICAg IEluc3BlY3RvclR5cGUgbV9pbnNwZWN0b3JUeXBlOwogICAgIEluc3BlY3RvckNsaWVudCogbV9j bGllbnQ7CiAgICAgV2Vha1B0ckZhY3Rvcnk8SW5zcGVjdG9yVGltZWxpbmVBZ2VudD4gbV93ZWFr RmFjdG9yeTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9U aW1lbGluZS5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1RpbWVsaW5l Lmpzb24KaW5kZXggMjEzMTQyMTM3YmM0NGFjYTRiNmI5MzcyYTU2ODQzNDU1YjVhNjYwZi4uNjcy YTUwNjhmNjUwN2Y1MzY3MGJkZTRhMGJkNTNjNzg2MjkyMmNlOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1RpbWVsaW5lLmpzb24KKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1RpbWVsaW5lLmpzb24KQEAgLTEzLDEwICsxMyw4IEBA CiAgICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgInByb3BlcnRpZXMi OiBbCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0eXBlIiwgIiRyZWYiOiAiRXZlbnRUeXBl IiwgImRlc2NyaXB0aW9uIjogIkV2ZW50IHR5cGUuIiB9LAotICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAidGhyZWFkIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2Ny aXB0aW9uIjogIklmIHByZXNlbnQsIGlkZW50aWZpZXMgdGhlIHRocmVhZCB0aGF0IHByb2R1Y2Vk IHRoZSBldmVudC4iIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJkYXRhIiwgInR5cGUi OiAib2JqZWN0IiwgImRlc2NyaXB0aW9uIjogIkV2ZW50IGRhdGEuIiB9LAotICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiY2hpbGRyZW4iLCAidHlwZSI6ICJhcnJheSIsICJvcHRpb25hbCI6IHRy dWUsICJpdGVtcyI6IHsgIiRyZWYiOiAiVGltZWxpbmVFdmVudCIgfSwgImRlc2NyaXB0aW9uIjog Ik5lc3RlZCByZWNvcmRzLiIgfSwKLSAgICAgICAgICAgICAgICB7ICJuYW1lIjogInVzZWRIZWFw U2l6ZSIsICJ0eXBlIjogImludGVnZXIiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24i OiAiQ3VycmVudCBzaXplIG9mIEpTIGhlYXAuIiB9CisgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJjaGlsZHJlbiIsICJ0eXBlIjogImFycmF5IiwgIm9wdGlvbmFsIjogdHJ1ZSwgIml0ZW1zIjog eyAiJHJlZiI6ICJUaW1lbGluZUV2ZW50IiB9LCAiZGVzY3JpcHRpb24iOiAiTmVzdGVkIHJlY29y ZHMuIiB9CiAgICAgICAgICAgICBdLAogICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlRpbWVs aW5lIHJlY29yZCBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dCB0aGUgcmVjb3JkZWQgYWN0aXZp dHkuIgogICAgICAgICB9CkBAIC0zMiwyMCArMzAsNiBAQAogICAgICAgICB7CiAgICAgICAgICAg ICAibmFtZSI6ICJzdG9wIiwKICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJTdG9wcyBjYXB0 dXJpbmcgaW5zdHJ1bWVudGF0aW9uIGV2ZW50cy4iCi0gICAgICAgIH0sCi0gICAgICAgIHsKLSAg ICAgICAgICAgICJuYW1lIjogInN1cHBvcnRzRnJhbWVJbnN0cnVtZW50YXRpb24iLAotICAgICAg ICAgICAgInJldHVybnMiOiBbCi0gICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXN1bHQiLCAi dHlwZSI6ICJib29sZWFuIiwgImRlc2NyaXB0aW9uIjogIlRydWUgaWYgdGltZWxpbmUgc3VwcG9y dHMgZnJhbWUgaW5zdHJ1bWVudGF0aW9uLiIgfQotICAgICAgICAgICAgXSwKLSAgICAgICAgICAg ICJkZXNjcmlwdGlvbiI6ICJUZWxscyB3aGV0aGVyIHRpbWVsaW5lIGFnZW50IHN1cHBvcnRzIGZy YW1lIGluc3RydW1lbnRhdGlvbi4iCi0gICAgICAgIH0sCi0gICAgICAgIHsKLSAgICAgICAgICAg ICJuYW1lIjogImNhbk1vbml0b3JNYWluVGhyZWFkIiwKLSAgICAgICAgICAgICJyZXR1cm5zIjog WwotICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVzdWx0IiwgInR5cGUiOiAiYm9vbGVhbiIs ICJkZXNjcmlwdGlvbiI6ICJUcnVlIGlmIHRpbWVsaW5lIHN1cHBvcnRzIG1haW4gdGhyZWFkIENQ VSB1dGlsaXphdGlvbiBpbnN0cnVtZW50YXRpb24uIiB9Ci0gICAgICAgICAgICBdLAotICAgICAg ICAgICAgImRlc2NyaXB0aW9uIjogIlRlbGxzIHdoZXRoZXIgdGltZWxpbmUgYWdlbnQgc3VwcG9y dHMgbWFpbiB0aHJlYWQgQ1BVIHV0aWxpemF0aW9uIGluc3RydW1lbnRhdGlvbi4iCiAgICAgICAg IH0KICAgICBdLAogICAgICJldmVudHMiOiBbCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29tcG9zaXRpbmdDb29yZGluYXRv ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0 ZWQvQ29tcG9zaXRpbmdDb29yZGluYXRvci5jcHAKaW5kZXggOWNiOWU5N2RlZjYwYTUwNmZkZTc4 MDRiMGY4MzMzZDMzNDVmZTY2Ny4uY2M5NzcwNDgyODcxNGQ5OTEwZTQ5NGE0NmM2MmIwZDBkNmY3 Y2QxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L2Nvb3JkaW5hdGVkL0NvbXBvc2l0aW5nQ29vcmRpbmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db21wb3NpdGluZ0Nvb3Jk aW5hdG9yLmNwcApAQCAtMTI1LDEwICsxMjUsNiBAQCBib29sIENvbXBvc2l0aW5nQ29vcmRpbmF0 b3I6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcygpCiAKIHZvaWQgQ29tcG9zaXRpbmdDb29yZGlu YXRvcjo6c3luY0Rpc3BsYXlTdGF0ZSgpCiB7Ci0jaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBt X3BhZ2UtPmluc3BlY3RvckNvbnRyb2xsZXIoKS5kaWRCZWdpbkZyYW1lKCk7Ci0jZW5kaWYKLQog I2lmIEVOQUJMRShSRVFVRVNUX0FOSU1BVElPTl9GUkFNRSkgJiYgIVVTRShSRVFVRVNUX0FOSU1B VElPTl9GUkFNRV9USU1FUikgJiYgIVVTRShSRVFVRVNUX0FOSU1BVElPTl9GUkFNRV9ESVNQTEFZ X01PTklUT1IpCiAgICAgLy8gTWFrZSBzdXJlIHRoYXQgYW55IHByZXZpb3VzbHkgcmVnaXN0ZXJl ZCBhbmltYXRpb24gY2FsbGJhY2tzIGFyZSBiZWluZyBleGVjdXRlZCBiZWZvcmUgd2UgZmx1c2gg dGhlIGxheWVycy4KICAgICBtX2xhc3RBbmltYXRpb25TZXJ2aWNlVGltZSA9IFdURjo6bW9ub3Rv bmljYWxseUluY3JlYXNpbmdUaW1lKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0 aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAK aW5kZXggOWY0MjI2ZjhkYzcwZjY0YWI0MzZmNTUxMzJjZGZkNDA5MzU0ZTlkYS4uOGUzMTM3ZDE5 YjdhZTQ3ZGM5ZWQ5NjkyN2FmYjc3ODQ0MGNlMTNjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50 ZXJuYWxzLmNwcApAQCAtMTE2NCwyMCArMTE2NCw2IEBAIFBhc3NSZWZQdHI8Tm9kZUxpc3Q+IElu dGVybmFsczo6bm9kZXNGcm9tUmVjdChEb2N1bWVudCogZG9jdW1lbnQsIGludCBjZW50ZXJYLCBp CiAgICAgcmV0dXJuIFN0YXRpY05vZGVMaXN0OjphZG9wdChtYXRjaGVzKTsKIH0KIAotdm9pZCBJ bnRlcm5hbHM6OmVtaXRJbnNwZWN0b3JEaWRCZWdpbkZyYW1lKCkKLXsKLSNpZiBFTkFCTEUoSU5T UEVDVE9SKQotICAgIGNvbnRleHREb2N1bWVudCgpLT5mcmFtZSgpLT5wYWdlKCktPmluc3BlY3Rv ckNvbnRyb2xsZXIoKS5kaWRCZWdpbkZyYW1lKCk7Ci0jZW5kaWYKLX0KLQotdm9pZCBJbnRlcm5h bHM6OmVtaXRJbnNwZWN0b3JEaWRDYW5jZWxGcmFtZSgpCi17Ci0jaWYgRU5BQkxFKElOU1BFQ1RP UikKLSAgICBjb250ZXh0RG9jdW1lbnQoKS0+ZnJhbWUoKS0+cGFnZSgpLT5pbnNwZWN0b3JDb250 cm9sbGVyKCkuZGlkQ2FuY2VsRnJhbWUoKTsKLSNlbmRpZgotfQotCiBjbGFzcyBHZXRDYWxsZXJD b2RlQmxvY2tGdW5jdG9yIHsKIHB1YmxpYzoKICAgICBHZXRDYWxsZXJDb2RlQmxvY2tGdW5jdG9y KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmggYi9Tb3Vy Y2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCmluZGV4IDdkNGU5OTg2MjcyN2Y5ZTAxYjYz MjMwMGU4ZTU4N2ZjZWRkNWE0NmEuLjg1ODQwYTYzMmYzYWIyMDZiMDFmOTNlMTNmMGJmZGI0MWRl ODU3MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKKysr IGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaApAQCAtMTY2LDkgKzE2Niw2IEBA IHB1YmxpYzoKICAgICBQYXNzUmVmUHRyPE5vZGVMaXN0PiBub2Rlc0Zyb21SZWN0KERvY3VtZW50 KiwgaW50IHgsIGludCB5LCB1bnNpZ25lZCB0b3BQYWRkaW5nLCB1bnNpZ25lZCByaWdodFBhZGRp bmcsCiAgICAgICAgIHVuc2lnbmVkIGJvdHRvbVBhZGRpbmcsIHVuc2lnbmVkIGxlZnRQYWRkaW5n LCBib29sIGlnbm9yZUNsaXBwaW5nLCBib29sIGFsbG93U2hhZG93Q29udGVudCwgYm9vbCBhbGxv d0NoaWxkRnJhbWVDb250ZW50LCBFeGNlcHRpb25Db2RlJikgY29uc3Q7CiAKLSAgICB2b2lkIGVt aXRJbnNwZWN0b3JEaWRCZWdpbkZyYW1lKCk7Ci0gICAgdm9pZCBlbWl0SW5zcGVjdG9yRGlkQ2Fu Y2VsRnJhbWUoKTsKLQogICAgIFN0cmluZyBwYXJzZXJNZXRhRGF0YShEZXByZWNhdGVkOjpTY3Jp cHRWYWx1ZSA9IERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlKCkpOwogCiAgICAgTm9kZSogZmluZEVk aXRpbmdEZWxldGVCdXR0b24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv SW50ZXJuYWxzLmlkbCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbAppbmRl eCBjZjY1NTY0NDBhMTZmMzFjOTRlODljNzAyNDBmN2M4N2VlZTVhZjhlLi5hYTBkN2RjOGZmOWJh ZmRlYTE1NDkzM2U1NGM3MmZkYzYxNjNhNGQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90 ZXN0aW5nL0ludGVybmFscy5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5h bHMuaWRsCkBAIC0xMjQsOSArMTI0LDYgQEAKICAgICAgICAgdW5zaWduZWQgbG9uZyB0b3BQYWRk aW5nLCB1bnNpZ25lZCBsb25nIHJpZ2h0UGFkZGluZywgdW5zaWduZWQgbG9uZyBib3R0b21QYWRk aW5nLCB1bnNpZ25lZCBsb25nIGxlZnRQYWRkaW5nLAogICAgICAgICBib29sZWFuIGlnbm9yZUNs aXBwaW5nLCBib29sZWFuIGFsbG93U2hhZG93Q29udGVudCwgYm9vbGVhbiBhbGxvd0NoaWxkRnJh bWVDb250ZW50KTsKIAotICAgIHZvaWQgZW1pdEluc3BlY3RvckRpZEJlZ2luRnJhbWUoKTsKLSAg ICB2b2lkIGVtaXRJbnNwZWN0b3JEaWRDYW5jZWxGcmFtZSgpOwotCiAgICAgLy8gQ2FsbGluZyBw YXJzZXJNZXRhRGF0YSgpIHdpdGggbm8gYXJndW1lbnRzIGdldHMgdGhlIG1ldGFkYXRhIGZvciB0 aGUgc2NyaXB0IG9mIHRoZSBjdXJyZW50IHNjb3BlLgogICAgIERPTVN0cmluZyBwYXJzZXJNZXRh RGF0YShvcHRpb25hbCBhbnkgZnVuYyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS83LjAvSW5zcGVjdG9yV2ViQmFja2Vu ZENvbW1hbmRzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9j b2wvTGVnYWN5LzcuMC9JbnNwZWN0b3JXZWJCYWNrZW5kQ29tbWFuZHMuanMKaW5kZXggZTczY2I4 YzRmZGUyMzRhMDFlMjUxMDY5M2UwYjJmNGI3NTVlOGRjMS4uOTJmZWNlYzJmMTI5NTBjZmRhNzBm ZmIzOTQzZTNlMjllYTI1ZmI4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzcuMC9JbnNwZWN0b3JXZWJCYWNrZW5kQ29tbWFu ZHMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wv TGVnYWN5LzcuMC9JbnNwZWN0b3JXZWJCYWNrZW5kQ29tbWFuZHMuanMKQEAgLTIzNCw4ICsyMzQs NiBAQCBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgiVGltZWxpbmUuRXZlbnRUeXBlIiwg e0V2ZW50RGlzcGF0Y2g6ICJFdmVudERpc3BhdAogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2 ZW50KCJUaW1lbGluZS5ldmVudFJlY29yZGVkIiwgWyJyZWNvcmQiXSk7CiBJbnNwZWN0b3JCYWNr ZW5kLnJlZ2lzdGVyQ29tbWFuZCgiVGltZWxpbmUuc3RhcnQiLCBbeyJuYW1lIjogIm1heENhbGxT dGFja0RlcHRoIiwgInR5cGUiOiAibnVtYmVyIiwgIm9wdGlvbmFsIjogdHJ1ZX0sIHsibmFtZSI6 ICJpbmNsdWRlRG9tQ291bnRlcnMiLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1 ZX0sIHsibmFtZSI6ICJpbmNsdWRlTmF0aXZlTWVtb3J5U3RhdGlzdGljcyIsICJ0eXBlIjogImJv b2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlfV0sIFtdKTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0 ZXJDb21tYW5kKCJUaW1lbGluZS5zdG9wIiwgW10sIFtdKTsKLUluc3BlY3RvckJhY2tlbmQucmVn aXN0ZXJDb21tYW5kKCJUaW1lbGluZS5zdXBwb3J0c0ZyYW1lSW5zdHJ1bWVudGF0aW9uIiwgW10s IFsicmVzdWx0Il0pOwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbW1hbmQoIlRpbWVsaW5l LmNhbk1vbml0b3JNYWluVGhyZWFkIiwgW10sIFsicmVzdWx0Il0pOwogCiAvLyBEZWJ1Z2dlci4K IEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJEZWJ1Z2dlckRpc3BhdGNoZXIgPSBJbnNwZWN0b3JC YWNrZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlci5iaW5kKEluc3BlY3RvckJhY2tlbmQsICJE ZWJ1Z2dlciIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJLaXQudmN4cHJvai9XZWJL aXRFeHBvcnRHZW5lcmF0b3IvV2ViS2l0RXhwb3J0cy5kZWYuaW4gYi9Tb3VyY2UvV2ViS2l0L1dl YktpdC52Y3hwcm9qL1dlYktpdEV4cG9ydEdlbmVyYXRvci9XZWJLaXRFeHBvcnRzLmRlZi5pbgpp bmRleCBkM2NhNjY4MDAwMTY0MDhkNTVlZDY0MjBmMWEwZjFhOWNjMmIxZWViLi5mODE3ODViYjE3 NTNmODZlNWE2ZDhkNDA2MjA3ZTRiMDIzOGNmZmJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYktpdC52Y3hwcm9qL1dlYktpdEV4cG9ydEdlbmVyYXRvci9XZWJLaXRFeHBvcnRzLmRlZi5p bgorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdEV4cG9ydEdlbmVyYXRv ci9XZWJLaXRFeHBvcnRzLmRlZi5pbgpAQCAtMTI0LDEwICsxMjQsNiBAQCBFWFBPUlRTCiAgICAg ICAgIHN5bWJvbFdpdGhQb2ludGVyKD9hZGRUZXh0TWF0Y2hNYXJrZXJARG9jdW1lbnRNYXJrZXJD b250cm9sbGVyQFdlYkNvcmVAQFFBRVhQQlZSYW5nZUAyQF9OQFosID9hZGRUZXh0TWF0Y2hNYXJr ZXJARG9jdW1lbnRNYXJrZXJDb250cm9sbGVyQFdlYkNvcmVAQFFFQUFYUEVCVlJhbmdlQDJAX05A WikKICAgICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP2Jyb2FkY2FzdEBUaHJlYWRDb25kaXRpb25A V1RGQEBRQUVYWFosID9icm9hZGNhc3RAVGhyZWFkQ29uZGl0aW9uQFdURkBAUUVBQVhYWikKICAg ICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP2NhbGxPbk1haW5UaHJlYWRAV1RGQEBZQVhQNkFYUEFY QFowQFosID9jYWxsT25NYWluVGhyZWFkQFdURkBAWUFYUDZBWFBFQVhAWjBAWikKLSNpZiBFTkFC TEUoSU5TUEVDVE9SKQotICAgICAgICBzeW1ib2xXaXRoUG9pbnRlcig/ZGlkQmVnaW5GcmFtZUBJ bnNwZWN0b3JDb250cm9sbGVyQFdlYkNvcmVAQFFBRVhYWiwgP2RpZEJlZ2luRnJhbWVASW5zcGVj dG9yQ29udHJvbGxlckBXZWJDb3JlQEBRRUFBWFhaKQotICAgICAgICBzeW1ib2xXaXRoUG9pbnRl cig/ZGlkQ2FuY2VsRnJhbWVASW5zcGVjdG9yQ29udHJvbGxlckBXZWJDb3JlQEBRQUVYWFosID9k aWRDYW5jZWxGcmFtZUBJbnNwZWN0b3JDb250cm9sbGVyQFdlYkNvcmVAQFFFQUFYWFopCi0jZW5k aWYKICAgICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP2NvdW50ZXJWYWx1ZUZvckVsZW1lbnRAV2Vi Q29yZUBAWUE/QVZTdHJpbmdAV1RGQEBQQVZFbGVtZW50QDFAQFosID9jb3VudGVyVmFsdWVGb3JF bGVtZW50QFdlYkNvcmVAQFlBP0FWU3RyaW5nQFdURkBAUEVBVkVsZW1lbnRAMUBAWikKICAgICAg ICAgc3ltYm9sV2l0aFBvaW50ZXIoP2NyZWF0ZVRocmVhZEBXVEZAQFlBSVA2QVBBWFBBWEBaMFBC REBaLCA/Y3JlYXRlVGhyZWFkQFdURkBAWUFJUDZBUEVBWFBFQVhAWjBQRUJEQFopCiAgICAgICAg IHN5bWJvbFdpdGhQb2ludGVyKD9jcmVhdGVUaHJlYWRAV1RGQEBZQUlQNkFYUEFYQFowUEJEQFos ID9jcmVhdGVUaHJlYWRAV1RGQEBZQUlQNkFYUEVBWEBaMFBFQkRAWikK 228687 2014-04-05 17:07:14 -0700 2014-04-29 14:33:20 -0700 the patch, with old protocols fixed bug-131184-20140405170654.patch text/plain 46347 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2ODI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2I0ZDk1YTE4MTVhZGQy MmU3ZTFhZTA4MTU3MWZlYWIzNzk1ZjhlMy4uYmM5ZmU1NDY5YTc2YjNhYWFkZWIwODY5ZmU3YjBh ZDE0Zjk0ZWJiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU5IEBACisyMDE0LTA0LTA1ICBCcmlh biBKLiBCdXJnICA8YnVyZ0Bjcy53YXNoaW5ndG9uLmVkdT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiByZW1vdmUgdW51c2VkIG1ldHJpY3MgYW5kIGNvbW1hbmRzIGZyb20gdGhlIFRpbWVsaW5l IGFnZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzExODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIHBhdGNoIHJlbW92ZXMgc2V2ZXJhbCBpbnN0cnVtZW50YXRpb24gaG9va3MgdGhhdCBhcmUg bm90IGJlaW5nCisgICAgICAgIHVzZWQgYnkgdGhlIGZyb250ZW5kIGluIGFueSB3YXkuIE1vc3Qg b2YgdGhlbSBhcmUgbm90IGhvb2tlZCB1cCB0bworICAgICAgICBwcm9kdWNlIGFueSBkYXRhLCBz byB0aGV5IGp1c3QgY2x1dHRlciB1cCBJbnNwZWN0b3JDbGllbnQgYW5kIHRoZSBhZ2VudC4KKwor ICAgICAgICAqIFdlYkNvcmUuZXhwLmluOiBSZW1vdmUgZGlkQmVnaW5GcmFtZS9kaWRDYW5jZWxG cmFtZS4KKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ2xpZW50Lmg6IFJlbW92ZSBjbGll bnQgbWV0aG9kcyB0aGF0IGFyZSBuZXZlciBvdmVycmlkZGVuLgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQ2xpZW50OjpjYW5Nb25pdG9yTWFpblRocmVhZCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnQ6OnN1cHBvcnRzRnJhbWVJbnN0cnVtZW50YXRpb24p OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50OjpnZXRBbGxvY2F0 ZWRPYmplY3RzKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNsaWVudDo6 ZHVtcFVuY291bnRlZEFsbG9jYXRlZE9iamVjdHMpOiBEZWxldGVkLgorCisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOiBSZW1vdmUgdW51c2VkIGluc3RydW1lbnRh dGlvbi4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZEJlZ2luRnJh bWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlk Q2FuY2VsRnJhbWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJv bGxlcjo6ZGlkQ29tcG9zaXRlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckNvbnRyb2xsZXI6OndpbENvbXBvc2l0ZSk6IERlbGV0ZWQuCisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuaDoKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JU aW1lbGluZUFnZW50LmNwcDogUmVtb3ZlIHRoZSBiYWNrZW5kJ3MgQmVnaW5GcmFtZSBlbnVtCisg ICAgICAgIHZhbHVlLCBidXQga2VlcCBpdCBpbiB0aGUgcHJvdG9jb2wgZm9yIHdoZW4gaXQgaXMg cmVpbXBsZW1lbnRlZC4gUmVtb3ZlCisgICAgICAgIG1hbmFnZW1lbnQgb2YgdGhlIGN1cnJlbnQg ZnJhbWUgcmVjb3JkLCBhbmQgc2ltcGxpZnkgc29tZSBjb2RlLgorICAgICAgICAoV2ViQ29yZTo6 dG9Qcm90b2NvbCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojph ZGRSZWNvcmRUb1RpbWVsaW5lKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpwdXNoQ3VycmVudFJlY29yZCk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpjbGVhclJlY29yZFN0YWNrKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmNhbk1vbml0b3JNYWluVGhyZWFkKTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN1cHBvcnRz RnJhbWVJbnN0cnVtZW50YXRpb24pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6ZGlkQmVnaW5GcmFtZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDYW5jZWxGcmFtZSk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDb21wb3NpdGUpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsQ29t cG9zaXRlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OmlubmVyQWRkUmVjb3JkVG9UaW1lbGluZSk6IERlbGV0ZWQuIFVuZG8gdGVsZXNjb3Bpbmcu CisgICAgICAgIChXZWJDb3JlOjp1c2VkSGVhcFNpemUpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6Y29tbWl0RnJhbWVSZWNvcmQpOiBEZWxldGVk LgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50Lmg6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpUaW1lbGluZVJlY29yZEVudHJ5OjpU aW1lbGluZVJlY29yZEVudHJ5KToKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvdG9jb2wvVGltZWxp bmUuanNvbjoKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRl ZC9Db21wb3NpdGluZ0Nvb3JkaW5hdG9yLmNwcDogUmVtb3ZlCisgICAgICAgIGluc3RydW1lbnRh dGlvbiBob29rIGZvciBiZWdpbkZyYW1lLiBUaGlzIGlzIHRoZSBvbmx5IGJhY2tlbmQgdGhhdCBp bXBsZW1lbnRzIGl0LgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9zaXRpbmdDb29yZGluYXRvcjo6 c3luY0Rpc3BsYXlTdGF0ZSk6CisKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6IFJl bW92ZSBjcnVmdHkgdGVzdCBtZXRob2RzIHRoYXQgYXJlbid0IHVzZWQuCisgICAgICAgIChXZWJD b3JlOjpJbnRlcm5hbHM6OmVtaXRJbnNwZWN0b3JEaWRCZWdpbkZyYW1lKTogRGVsZXRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6ZW1pdEluc3BlY3RvckRpZENhbmNlbEZyYW1lKTog RGVsZXRlZC4KKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5oOgorICAgICAgICAqIHRlc3Rp bmcvSW50ZXJuYWxzLmlkbDoKKwogMjAxNC0wNC0wMyAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mu d2FzaGluZ3Rvbi5lZHU+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogaG9vayB1cCBwcm9iZSBz YW1wbGVzIHRvIFRpbWVsaW5lQWdlbnQncyByZWNvcmRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpp bmRleCAyYjczZGQwZDVlODliYzdlMjE1Zjk0ZjFiZGU5ZDE5MTZjMWE0YTc1Li4yM2ZjN2U3ZTAx YWVlOTc4MTIxM2UxZjMwZGJmMWVhOWZlOWUyNTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOSBAQAorMjAxNC0wNC0wNSAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2Fz aGluZ3Rvbi5lZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIHVudXNlZCBtZXRy aWNzIGFuZCBjb21tYW5kcyBmcm9tIHRoZSBUaW1lbGluZSBhZ2VudAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxMTg0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHRoZSBNZW1vcnkgZG9tYWlu IGZyb20gb2xkIHByb3RvY29sIHZlcnNpb25zLiBSZW1vdmUgZW51bSB2YWx1ZXMKKyAgICAgICAg QmVnaW5GcmFtZSBhbmQgQ29tcG9zaXRlTGF5ZXJzLiBSZW1vdmUgYXJndW1lbnRzIHRvIFRpbWVs aW5lLnN0YXJ0LgorICAgICAgICBSZW1vdmUgbWlzY2VsbGFuZW91cyBUaW1lbGluZSBjb21tYW5k cyB0aGF0IG5vIGxvbmdlciBleGlzdCBhbmQgd2VyZSBuZXZlciB1c2VkLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvNi4wL0luc3BlY3RvcldlYkJhY2tlbmRDb21t YW5kcy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS83LjAvSW5z cGVjdG9yV2ViQmFja2VuZENvbW1hbmRzLmpzOgorICAgICAgICAqIFZlcnNpb25zL0luc3BlY3Rv ci1pT1MtNi4wLmpzb246CisgICAgICAgICogVmVyc2lvbnMvSW5zcGVjdG9yLWlPUy03LjAuanNv bjoKKwogMjAxNC0wNC0wMyAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5lZHU+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogaG9vayB1cCBwcm9iZSBzYW1wbGVzIHRvIFRpbWVs aW5lQWdlbnQncyByZWNvcmRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRjZmVjMTQyOWVkY2YwODY3OWIwYzU4ZTNl NWU5NDU1YjdmNTNjOWUuLjgyNjk2NDZhZWE5YzdhNjU0MzQ5ZmRlNzc2NmIxMzAyOTMyNjc4YTMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTQtMDQtMDUgIEJyaWFuIEouIEJ1cmcgIDxi dXJnQGNzLndhc2hpbmd0b24uZWR1PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSB1 bnVzZWQgbWV0cmljcyBhbmQgY29tbWFuZHMgZnJvbSB0aGUgVGltZWxpbmUgYWdlbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTE4NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0LnZjeHBy b2ovV2ViS2l0RXhwb3J0R2VuZXJhdG9yL1dlYktpdEV4cG9ydHMuZGVmLmluOiBSZW1vdmUgc3lt Ym9scy4KKwogMjAxNC0wNC0wNCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXgg OWZhMjgxYmVjMDViMjAxM2U3NmZmMDM2OWYzOGQxZjJiOWU2Y2NkZS4uYzNkNzUzMDE4YWVhYzBl YjQ0ZjI0Mzc2NmY1MGIwMDIxMTcxOThjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTMwMjEs OCArMzAyMSw2IEBAIF9fWk43V2ViQ29yZTVDb2xvckMxRVJLTjNXVEY2U3RyaW5nRQogI2lmIEVO QUJMRShJTlNQRUNUT1IpCiBfX1pON1dlYkNvcmUxNFNjaGVtZVJlZ2lzdHJ5MjdzaG91bGRUcmVh dFVSTFNjaGVtZUFzTG9jYWxFUktOM1dURjZTdHJpbmdFCiBfX1pON1dlYkNvcmUxNUluc3BlY3Rv ckNsaWVudDMxZG9EaXNwYXRjaE1lc3NhZ2VPbkZyb250ZW5kUGFnZUVQTlNfNFBhZ2VFUktOM1dU RjZTdHJpbmdFCi1fX1pON1dlYkNvcmUxOUluc3BlY3RvckNvbnRyb2xsZXIxM2RpZEJlZ2luRnJh bWVFdgotX19aTjdXZWJDb3JlMTlJbnNwZWN0b3JDb250cm9sbGVyMTRkaWRDYW5jZWxGcmFtZUV2 CiBfX1pON1dlYkNvcmUxOUluc3BlY3RvckNvbnRyb2xsZXIxNWNvbm5lY3RGcm9udGVuZEVQTjlJ bnNwZWN0b3IyNEluc3BlY3RvckZyb250ZW5kQ2hhbm5lbEUKIF9fWk43V2ViQ29yZTE5SW5zcGVj dG9yQ29udHJvbGxlcjE4ZGlzY29ubmVjdEZyb250ZW5kRU45SW5zcGVjdG9yMjVJbnNwZWN0b3JE aXNjb25uZWN0UmVhc29uRQogX19aTjdXZWJDb3JlMTlJbnNwZWN0b3JDb250cm9sbGVyMThzZXRQ cm9maWxlckVuYWJsZWRFYgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNsaWVu dC5oCmluZGV4IDYzNmYwOTZhMjJiZGMxZjAzMjViZDdhYjE0ZTQxMzlhZTFkMWFiYjQuLmFkNTIz NWY4NjRlNDAxYjlmNjgwOGNmZjc5YTc3ZTQ5MTg5YzljMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ2xpZW50LmgKQEAgLTYzLDcgKzYzLDYgQEAgcHVibGljOgogICAg IHZpcnR1YWwgdm9pZCBjbGVhckJyb3dzZXJDYWNoZSgpIHsgfQogICAgIHZpcnR1YWwgYm9vbCBj YW5DbGVhckJyb3dzZXJDb29raWVzKCkgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIHZv aWQgY2xlYXJCcm93c2VyQ29va2llcygpIHsgfQotICAgIHZpcnR1YWwgYm9vbCBjYW5Nb25pdG9y TWFpblRocmVhZCgpIHsgcmV0dXJuIGZhbHNlOyB9CiAKICAgICB2aXJ0dWFsIGJvb2wgb3ZlcnJp ZGVzU2hvd1BhaW50UmVjdHMoKSB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgdm9pZCBz ZXRTaG93UGFpbnRSZWN0cyhib29sKSB7IH0KQEAgLTc3LDEzICs3Niw4IEBAIHB1YmxpYzoKICAg ICB2aXJ0dWFsIGJvb2wgY2FuQ29udGludW91c2x5UGFpbnQoKSB7IHJldHVybiBmYWxzZTsgfQog ICAgIHZpcnR1YWwgdm9pZCBzZXRDb250aW51b3VzUGFpbnRpbmdFbmFibGVkKGJvb2wpIHsgfQog Ci0gICAgdmlydHVhbCBib29sIHN1cHBvcnRzRnJhbWVJbnN0cnVtZW50YXRpb24oKSB7IHJldHVy biBmYWxzZTsgfQotCiAgICAgdmlydHVhbCB2b2lkIGRpZFNldFNlYXJjaGluZ0Zvck5vZGUoYm9v bCkgeyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgZ2V0QWxsb2NhdGVkT2JqZWN0cyhIYXNoU2V0PGNv bnN0IHZvaWQqPiYpIHsgfQotICAgIHZpcnR1YWwgdm9pZCBkdW1wVW5jb3VudGVkQWxsb2NhdGVk T2JqZWN0cyhjb25zdCBIYXNoTWFwPGNvbnN0IHZvaWQqLCBzaXplX3Q+JikgeyB9Ci0KICAgICB2 aXJ0dWFsIGJvb2wgaGFuZGxlSmF2YVNjcmlwdERpYWxvZyhib29sLCBjb25zdCBTdHJpbmcqKSB7 IHJldHVybiBmYWxzZTsgfQogCiAgICAgc3RhdGljIGJvb2wgZG9EaXNwYXRjaE1lc3NhZ2VPbkZy b250ZW5kUGFnZShQYWdlKiBmcm9udGVuZFBhZ2UsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5k ZXggNDJiNGNkNjgwM2VkMDNjNzM2MWQxYjJmN2VhY2RjYTJiYjg1OGJmMy4uMGE2ZmEyNjljOTAx MzRlZmJmN2FlMWE3ZDg5MDg3YTIyYTU1NmZiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtNDAxLDMwICs0MDEsNiBAQCB2b2lk IEluc3BlY3RvckNvbnRyb2xsZXI6OnNldFJlc291cmNlc0RhdGFTaXplTGltaXRzRnJvbUludGVy bmFscyhpbnQgbWF4aW11bVJlcwogICAgIG1fcmVzb3VyY2VBZ2VudC0+c2V0UmVzb3VyY2VzRGF0 YVNpemVMaW1pdHNGcm9tSW50ZXJuYWxzKG1heGltdW1SZXNvdXJjZXNDb250ZW50U2l6ZSwgbWF4 aW11bVNpbmdsZVJlc291cmNlQ29udGVudFNpemUpOwogfQogCi12b2lkIEluc3BlY3RvckNvbnRy b2xsZXI6OmRpZEJlZ2luRnJhbWUoKQotewotICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50 KiB0aW1lbGluZUFnZW50ID0gbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JUaW1lbGlu ZUFnZW50KCkpCi0gICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZEJlZ2luRnJhbWUoKTsKLX0KLQot dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRDYW5jZWxGcmFtZSgpCi17Ci0gICAgaWYgKElu c3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBtX2luc3RydW1lbnRpbmdBZ2Vu dHMtPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkKLSAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlk Q2FuY2VsRnJhbWUoKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjp3aWxsQ29tcG9z aXRlKCkKLXsKLSAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9 IG1faW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpKQotICAgICAg ICB0aW1lbGluZUFnZW50LT53aWxsQ29tcG9zaXRlKCk7Ci19Ci0KLXZvaWQgSW5zcGVjdG9yQ29u dHJvbGxlcjo6ZGlkQ29tcG9zaXRlKCkKLXsKLSAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dCogdGltZWxpbmVBZ2VudCA9IG1faW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yVGltZWxp bmVBZ2VudCgpKQotICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRDb21wb3NpdGUoKTsKLX0KLQog Ym9vbCBJbnNwZWN0b3JDb250cm9sbGVyOjpkZXZlbG9wZXJFeHRyYXNFbmFibGVkKCkgY29uc3QK IHsKICAgICByZXR1cm4gbV9wYWdlLnNldHRpbmdzKCkuZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xs ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKaW5k ZXggY2NlZTljNzI0NjFlN2Y3ZmU1MmRlOWMyNTYwNDgxOTcxMGYxOGZkMS4uNWM5OTQ0NzE3ODYy MGQ1N2UyNmJhMDU2N2M4ZmE4NzAxZTM2ZDYzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC0xMjYsMTEgKzEyNiw2IEBAIHB1YmxpYzoK ICAgICBJbnNwZWN0b3JDbGllbnQqIGluc3BlY3RvckNsaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1f aW5zcGVjdG9yQ2xpZW50OyB9CiAgICAgSW5zcGVjdG9yUGFnZUFnZW50KiBwYWdlQWdlbnQoKSBj b25zdCB7IHJldHVybiBtX3BhZ2VBZ2VudDsgfQogCi0gICAgdm9pZCBkaWRCZWdpbkZyYW1lKCk7 Ci0gICAgdm9pZCBkaWRDYW5jZWxGcmFtZSgpOwotICAgIHZvaWQgd2lsbENvbXBvc2l0ZSgpOwot ICAgIHZvaWQgZGlkQ29tcG9zaXRlKCk7Ci0KICAgICB2aXJ0dWFsIGJvb2wgZGV2ZWxvcGVyRXh0 cmFzRW5hYmxlZCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBjYW5BY2Nlc3NJ bnNwZWN0ZWRTY3JpcHRTdGF0ZShKU0M6OkV4ZWNTdGF0ZSopIGNvbnN0IG92ZXJyaWRlOwogICAg IHZpcnR1YWwgSW5zcGVjdG9yOjpJbnNwZWN0b3JGdW5jdGlvbkNhbGxIYW5kbGVyIGZ1bmN0aW9u Q2FsbEhhbmRsZXIoKSBjb25zdCBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAppbmRleCA1MTBkNjhjYTA5NmQ1ZjE0 N2UyNTk2NzgxYzdiNGNkYWRhNGQwNmIwLi5iNDM3NmU5MWQzY2RhNzJhY2M4MzhmNzg0OGZhYTUz NjM3Y2Q1MmQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckluc3RydW1lbnRhdGlvbi5oCkBAIC0xNjUsOCArMTY1LDYgQEAgcHVibGljOgogICAgIHN0YXRp YyB2b2lkIGRpZFNjcm9sbExheWVyKEZyYW1lKik7CiAgICAgc3RhdGljIHZvaWQgd2lsbFBhaW50 KFJlbmRlck9iamVjdCopOwogICAgIHN0YXRpYyB2b2lkIGRpZFBhaW50KFJlbmRlck9iamVjdCos IEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IExheW91dFJlY3QmKTsKLSAgICBzdGF0aWMgdm9pZCB3 aWxsQ29tcG9zaXRlKFBhZ2UqKTsKLSAgICBzdGF0aWMgdm9pZCBkaWRDb21wb3NpdGUoUGFnZSop OwogICAgIHN0YXRpYyBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgd2lsbFJlY2FsY3Vs YXRlU3R5bGUoRG9jdW1lbnQqKTsKICAgICBzdGF0aWMgdm9pZCBkaWRSZWNhbGN1bGF0ZVN0eWxl KGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYpOwogICAgIHN0YXRpYyB2b2lk IGRpZFNjaGVkdWxlU3R5bGVSZWNhbGN1bGF0aW9uKERvY3VtZW50Kik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKaW5kZXggNjg5 NjQ5MThmM2Y1MzA0Mzc4MTgxMjA5NjhhZWZlYzc2ZThhMDQ5Mi4uOTBkNjlkYWFmYWZkOGEwNDRh MjlhNjA5OGZiZDNmZDE4YWUxYzgwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcApAQCAtMTE2LDI2ICsxMTYsNiBAQCB2b2lk IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN0b3AoRXJyb3JTdHJpbmcqKQogICAgIG1fZW5hYmxl ZCA9IGZhbHNlOwogfQogCi12b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmNhbk1vbml0b3JN YWluVGhyZWFkKEVycm9yU3RyaW5nKiwgYm9vbCogcmVzdWx0KQotewotICAgICpyZXN1bHQgPSBt X2NsaWVudCAmJiBtX2NsaWVudC0+Y2FuTW9uaXRvck1haW5UaHJlYWQoKTsKLX0KLQotdm9pZCBJ bnNwZWN0b3JUaW1lbGluZUFnZW50OjpzdXBwb3J0c0ZyYW1lSW5zdHJ1bWVudGF0aW9uKEVycm9y U3RyaW5nKiwgYm9vbCogcmVzdWx0KQotewotICAgICpyZXN1bHQgPSBtX2NsaWVudCAmJiBtX2Ns aWVudC0+c3VwcG9ydHNGcmFtZUluc3RydW1lbnRhdGlvbigpOwotfQotCi12b2lkIEluc3BlY3Rv clRpbWVsaW5lQWdlbnQ6OmRpZEJlZ2luRnJhbWUoKQotewotICAgIG1fcGVuZGluZ0ZyYW1lUmVj b3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKHRpbWVzdGFt cCgpLCAwKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDYW5jZWxGcmFt ZSgpCi17Ci0gICAgbV9wZW5kaW5nRnJhbWVSZWNvcmQuY2xlYXIoKTsKLX0KLQogdm9pZCBJbnNw ZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsQ2FsbEZ1bmN0aW9uKGNvbnN0IFN0cmluZyYgc2NyaXB0 TmFtZSwgaW50IHNjcmlwdExpbmUsIEZyYW1lKiBmcmFtZSkKIHsKICAgICBwdXNoQ3VycmVudFJl Y29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUZ1bmN0aW9uQ2FsbERhdGEoc2NyaXB0 TmFtZSwgc2NyaXB0TGluZSksIFRpbWVsaW5lUmVjb3JkVHlwZTo6RnVuY3Rpb25DYWxsLCB0cnVl LCBmcmFtZSk7CkBAIC0yNTMsMTYgKzIzMyw2IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6ZGlkU2Nyb2xsKCkKICAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNv cmRUeXBlOjpTY3JvbGxMYXllcik7CiB9CiAKLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6 d2lsbENvbXBvc2l0ZSgpCi17Ci0gICAgcHVzaEN1cnJlbnRSZWNvcmQoSW5zcGVjdG9yT2JqZWN0 OjpjcmVhdGUoKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpDb21wb3NpdGVMYXllcnMsIGZhbHNlLCBu dWxscHRyKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDb21wb3NpdGUo KQotewotICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZFR5cGU6OkNv bXBvc2l0ZUxheWVycyk7Ci19Ci0KIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbFdy aXRlSFRNTCh1bnNpZ25lZCBzdGFydExpbmUsIEZyYW1lKiBmcmFtZSkKIHsKICAgICBwdXNoQ3Vy cmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVBhcnNlSFRNTERhdGEoc3Rh cnRMaW5lKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpQYXJzZUhUTUwsIHRydWUsIGZyYW1lKTsKQEAg LTQ3MCwxOSArNDQwLDExIEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6YnJlYWtwb2lu dEFjdGlvblByb2JlKEpTQzo6RXhlY1N0YXRlKiBleGVjLCBjb25zdCBJCiAgICAgYXBwZW5kUmVj b3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUHJvYmVTYW1wbGVEYXRhKGFjdGlvbiwg aGl0Q291bnQpLCBUaW1lbGluZVJlY29yZFR5cGU6OlByb2JlU2FtcGxlLCBmYWxzZSwgZnJhbWUp OwogfQogCi12b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmFkZFJlY29yZFRvVGltZWxpbmUo UGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCwgVGltZWxpbmVSZWNvcmRUeXBlIHR5 cGUpCi17Ci0gICAgY29tbWl0RnJhbWVSZWNvcmQoKTsKLSAgICBpbm5lckFkZFJlY29yZFRvVGlt ZWxpbmUocmVjb3JkLCB0eXBlKTsKLX0KLQogc3RhdGljIEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6 OlRpbWVsaW5lOjpFdmVudFR5cGU6OkVudW0gdG9Qcm90b2NvbChUaW1lbGluZVJlY29yZFR5cGUg dHlwZSkKIHsKICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICBjYXNlIFRpbWVsaW5lUmVjb3JkVHlw ZTo6RXZlbnREaXNwYXRjaDoKICAgICAgICAgcmV0dXJuIEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6 OlRpbWVsaW5lOjpFdmVudFR5cGU6OkV2ZW50RGlzcGF0Y2g7Ci0gICAgY2FzZSBUaW1lbGluZVJl Y29yZFR5cGU6OkJlZ2luRnJhbWU6Ci0gICAgICAgIHJldHVybiBJbnNwZWN0b3I6OlR5cGVCdWls ZGVyOjpUaW1lbGluZTo6RXZlbnRUeXBlOjpCZWdpbkZyYW1lOwogICAgIGNhc2UgVGltZWxpbmVS ZWNvcmRUeXBlOjpTY2hlZHVsZVN0eWxlUmVjYWxjdWxhdGlvbjoKICAgICAgICAgcmV0dXJuIElu c3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlRpbWVsaW5lOjpFdmVudFR5cGU6OlNjaGVkdWxlU3R5bGVS ZWNhbGN1bGF0aW9uOwogICAgIGNhc2UgVGltZWxpbmVSZWNvcmRUeXBlOjpSZWNhbGN1bGF0ZVN0 eWxlczoKQEAgLTQ5Nyw4ICs0NTksNiBAQCBzdGF0aWMgSW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6 VGltZWxpbmU6OkV2ZW50VHlwZTo6RW51bSB0b1Byb3RvY29sKFRpbWVsaW5lUmVjbwogICAgICAg ICByZXR1cm4gSW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6VGltZWxpbmU6OkV2ZW50VHlwZTo6U2Ny b2xsTGF5ZXI7CiAgICAgY2FzZSBUaW1lbGluZVJlY29yZFR5cGU6OlJlc2l6ZUltYWdlOgogICAg ICAgICByZXR1cm4gSW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6VGltZWxpbmU6OkV2ZW50VHlwZTo6 UmVzaXplSW1hZ2U7Ci0gICAgY2FzZSBUaW1lbGluZVJlY29yZFR5cGU6OkNvbXBvc2l0ZUxheWVy czoKLSAgICAgICAgcmV0dXJuIEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlRpbWVsaW5lOjpFdmVu dFR5cGU6OkNvbXBvc2l0ZUxheWVyczsKIAogICAgIGNhc2UgVGltZWxpbmVSZWNvcmRUeXBlOjpQ YXJzZUhUTUw6CiAgICAgICAgIHJldHVybiBJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpUaW1lbGlu ZTo6RXZlbnRUeXBlOjpQYXJzZUhUTUw7CkBAIC01NjYsNyArNTI2LDcgQEAgc3RhdGljIEluc3Bl Y3Rvcjo6VHlwZUJ1aWxkZXI6OlRpbWVsaW5lOjpFdmVudFR5cGU6OkVudW0gdG9Qcm90b2NvbChU aW1lbGluZVJlY28KICAgICByZXR1cm4gSW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6VGltZWxpbmU6 OkV2ZW50VHlwZTo6VGltZVN0YW1wOwogfQogCi12b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6 OmlubmVyQWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcHJw UmVjb3JkLCBUaW1lbGluZVJlY29yZFR5cGUgdHlwZSkKK3ZvaWQgSW5zcGVjdG9yVGltZWxpbmVB Z2VudDo6YWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcHJw UmVjb3JkLCBUaW1lbGluZVJlY29yZFR5cGUgdHlwZSkKIHsKICAgICBwcnBSZWNvcmQtPnNldFN0 cmluZygidHlwZSIsIEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OmdldFdlYkVudW1Db25zdGFudFZh bHVlKHRvUHJvdG9jb2wodHlwZSkpKTsKIApAQCAtNTgwLDExICs1NDAsNiBAQCB2b2lkIEluc3Bl Y3RvclRpbWVsaW5lQWdlbnQ6OmlubmVyQWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPElu c3BlY3Rvck9iamVjdAogICAgIH0KIH0KIAotc3RhdGljIHNpemVfdCB1c2VkSGVhcFNpemUoKQot ewotICAgIHJldHVybiBKU0RPTVdpbmRvdzo6Y29tbW9uVk0oKS5oZWFwLnNpemUoKTsKLX0KLQog dm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpzZXRGcmFtZUlkZW50aWZpZXIoSW5zcGVjdG9y T2JqZWN0KiByZWNvcmQsIEZyYW1lKiBmcmFtZSkKIHsKICAgICBpZiAoIWZyYW1lIHx8ICFtX3Bh Z2VBZ2VudCkKQEAgLTYwNiw5ICs1NjEsNiBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6 OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZFR5cGUgdHlwZSkKICAgICAg ICAgZW50cnkucmVjb3JkLT5zZXRPYmplY3QoImRhdGEiLCBlbnRyeS5kYXRhKTsKICAgICAgICAg ZW50cnkucmVjb3JkLT5zZXRBcnJheSgiY2hpbGRyZW4iLCBlbnRyeS5jaGlsZHJlbik7CiAgICAg ICAgIGVudHJ5LnJlY29yZC0+c2V0TnVtYmVyKCJlbmRUaW1lIiwgdGltZXN0YW1wKCkpOwotICAg ICAgICBzaXplX3QgdXNlZEhlYXBTaXplRGVsdGEgPSB1c2VkSGVhcFNpemUoKSAtIGVudHJ5LnVz ZWRIZWFwU2l6ZUF0U3RhcnQ7Ci0gICAgICAgIGlmICh1c2VkSGVhcFNpemVEZWx0YSkKLSAgICAg ICAgICAgIGVudHJ5LnJlY29yZC0+c2V0TnVtYmVyKCJ1c2VkSGVhcFNpemVEZWx0YSIsIHVzZWRI ZWFwU2l6ZURlbHRhKTsKICAgICAgICAgYWRkUmVjb3JkVG9UaW1lbGluZShlbnRyeS5yZWNvcmQs IHR5cGUpOwogICAgIH0KIH0KQEAgLTY0MywyNCArNTk1LDEzIEBAIHZvaWQgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6c2VuZEV2ZW50KFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBldmVudCkK IAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpwdXNoQ3VycmVudFJlY29yZChQYXNzUmVm UHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YSwgVGltZWxpbmVSZWNvcmRUeXBlIHR5cGUsIGJvb2wg Y2FwdHVyZUNhbGxTdGFjaywgRnJhbWUqIGZyYW1lKQogewotICAgIGNvbW1pdEZyYW1lUmVjb3Jk KCk7CiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVjb3JkID0gVGltZWxpbmVSZWNvcmRG YWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKHRpbWVzdGFtcCgpLCBjYXB0dXJlQ2FsbFN0YWNr ID8gbV9tYXhDYWxsU3RhY2tEZXB0aCA6IDApOwogICAgIHNldEZyYW1lSWRlbnRpZmllcihyZWNv cmQuZ2V0KCksIGZyYW1lKTsKLSAgICBtX3JlY29yZFN0YWNrLmFwcGVuZChUaW1lbGluZVJlY29y ZEVudHJ5KHJlY29yZC5yZWxlYXNlKCksIGRhdGEsIEluc3BlY3RvckFycmF5OjpjcmVhdGUoKSwg dHlwZSwgdXNlZEhlYXBTaXplKCkpKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50 Ojpjb21taXRGcmFtZVJlY29yZCgpCi17Ci0gICAgaWYgKCFtX3BlbmRpbmdGcmFtZVJlY29yZCkK LSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIG1fcGVuZGluZ0ZyYW1lUmVjb3JkLT5zZXRPYmpl Y3QoImRhdGEiLCBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpKTsKLSAgICBpbm5lckFkZFJlY29y ZFRvVGltZWxpbmUobV9wZW5kaW5nRnJhbWVSZWNvcmQucmVsZWFzZSgpLCBUaW1lbGluZVJlY29y ZFR5cGU6OkJlZ2luRnJhbWUpOworICAgIG1fcmVjb3JkU3RhY2suYXBwZW5kKFRpbWVsaW5lUmVj b3JkRW50cnkocmVjb3JkLnJlbGVhc2UoKSwgZGF0YSwgSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgp LCB0eXBlKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6Y2xlYXJSZWNvcmRT dGFjaygpCiB7Ci0gICAgbV9wZW5kaW5nRnJhbWVSZWNvcmQuY2xlYXIoKTsKICAgICBtX3JlY29y ZFN0YWNrLmNsZWFyKCk7CiAgICAgbV9pZCsrOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKaW5kZXggODMxNzZjZTcxNjEzN2E1ZWRi ZjE4YjI1NDMwZjFkZWJkZjA1YjE5OC4uMjVlYjZlZmRlYWY2Y2UyZDc2NWYxM2FmZDFlYTA4YmU1 NWVmY2Y4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRp bWVsaW5lQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudC5oCkBAIC02Miw3ICs2Miw2IEBAIHR5cGVkZWYgU3RyaW5nIEVycm9yU3RyaW5n OwogCiBlbnVtIGNsYXNzIFRpbWVsaW5lUmVjb3JkVHlwZSB7CiAgICAgRXZlbnREaXNwYXRjaCwK LSAgICBCZWdpbkZyYW1lLAogICAgIFNjaGVkdWxlU3R5bGVSZWNhbGN1bGF0aW9uLAogICAgIFJl Y2FsY3VsYXRlU3R5bGVzLAogICAgIEludmFsaWRhdGVMYXlvdXQsCkBAIC03MCw3ICs2OSw2IEBA IGVudW0gY2xhc3MgVGltZWxpbmVSZWNvcmRUeXBlIHsKICAgICBQYWludCwKICAgICBTY3JvbGxM YXllciwKICAgICBSZXNpemVJbWFnZSwKLSAgICBDb21wb3NpdGVMYXllcnMsCiAKICAgICBQYXJz ZUhUTUwsCiAKQEAgLTEzOCw4ICsxMzYsNiBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQg c3RhcnQoRXJyb3JTdHJpbmcqLCBjb25zdCBpbnQqIG1heENhbGxTdGFja0RlcHRoKSBvdmVycmlk ZTsKICAgICB2aXJ0dWFsIHZvaWQgc3RvcChFcnJvclN0cmluZyopIG92ZXJyaWRlOwotICAgIHZp cnR1YWwgdm9pZCBjYW5Nb25pdG9yTWFpblRocmVhZChFcnJvclN0cmluZyosIGJvb2wqKSBvdmVy cmlkZTsKLSAgICB2aXJ0dWFsIHZvaWQgc3VwcG9ydHNGcmFtZUluc3RydW1lbnRhdGlvbihFcnJv clN0cmluZyosIGJvb2wqKSBvdmVycmlkZTsKIAogICAgIGludCBpZCgpIGNvbnN0IHsgcmV0dXJu IG1faWQ7IH0KIApAQCAtMTUyLDkgKzE0OCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHdpbGxEaXNw YXRjaEV2ZW50KGNvbnN0IEV2ZW50JiwgRnJhbWUqKTsKICAgICB2b2lkIGRpZERpc3BhdGNoRXZl bnQoKTsKIAotICAgIHZvaWQgZGlkQmVnaW5GcmFtZSgpOwotICAgIHZvaWQgZGlkQ2FuY2VsRnJh bWUoKTsKLQogICAgIHZvaWQgZGlkSW52YWxpZGF0ZUxheW91dChGcmFtZSopOwogICAgIHZvaWQg d2lsbExheW91dChGcmFtZSopOwogICAgIHZvaWQgZGlkTGF5b3V0KFJlbmRlck9iamVjdCopOwpA QCAtMTY5LDkgKzE2Miw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHdpbGxTY3JvbGwoRnJhbWUqKTsK ICAgICB2b2lkIGRpZFNjcm9sbCgpOwogCi0gICAgdm9pZCB3aWxsQ29tcG9zaXRlKCk7Ci0gICAg dm9pZCBkaWRDb21wb3NpdGUoKTsKLQogICAgIHZvaWQgd2lsbFdyaXRlSFRNTCh1bnNpZ25lZCBz dGFydExpbmUsIEZyYW1lKik7CiAgICAgdm9pZCBkaWRXcml0ZUhUTUwodW5zaWduZWQgZW5kTGlu ZSk7CiAKQEAgLTIzMCwxNSArMjIwLDE0IEBAIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIFRp bWVsaW5lUmVjb3JkU3RhY2s7CiAKICAgICBzdHJ1Y3QgVGltZWxpbmVSZWNvcmRFbnRyeSB7Ci0g ICAgICAgIFRpbWVsaW5lUmVjb3JkRW50cnkoUGFzc1JlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rv ck9iamVjdD4gcmVjb3JkLCBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBk YXRhLCBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yQXJyYXk+IGNoaWxkcmVuLCBUaW1l bGluZVJlY29yZFR5cGUgdHlwZSwgc2l6ZV90IHVzZWRIZWFwU2l6ZUF0U3RhcnQpCi0gICAgICAg ICAgICA6IHJlY29yZChyZWNvcmQpLCBkYXRhKGRhdGEpLCBjaGlsZHJlbihjaGlsZHJlbiksIHR5 cGUodHlwZSksIHVzZWRIZWFwU2l6ZUF0U3RhcnQodXNlZEhlYXBTaXplQXRTdGFydCkKKyAgICAg ICAgVGltZWxpbmVSZWNvcmRFbnRyeShQYXNzUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2Jq ZWN0PiByZWNvcmQsIFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGRhdGEs IFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JBcnJheT4gY2hpbGRyZW4sIFRpbWVsaW5l UmVjb3JkVHlwZSB0eXBlKQorICAgICAgICAgICAgOiByZWNvcmQocmVjb3JkKSwgZGF0YShkYXRh KSwgY2hpbGRyZW4oY2hpbGRyZW4pLCB0eXBlKHR5cGUpCiAgICAgICAgIHsKICAgICAgICAgfQog ICAgICAgICBSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IHJlY29yZDsKICAgICAg ICAgUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBkYXRhOwogICAgICAgICBSZWZQ dHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JBcnJheT4gY2hpbGRyZW47CiAgICAgICAgIFRpbWVsaW5l UmVjb3JkVHlwZSB0eXBlOwotICAgICAgICBzaXplX3QgdXNlZEhlYXBTaXplQXRTdGFydDsKICAg ICB9OwogCiAgICAgdm9pZCBzZW5kRXZlbnQoUGFzc1JlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rv ck9iamVjdD4pOwpAQCAtMjQ5LDExICsyMzgsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBkaWRD b21wbGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRUeXBlKTsKIAotICAgIHZvaWQgc2V0 SGVhcFNpemVTdGF0aXN0aWNzKEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0KiByZWNvcmQpOwot ICAgIHZvaWQgY29tbWl0RnJhbWVSZWNvcmQoKTsKLQogICAgIHZvaWQgYWRkUmVjb3JkVG9UaW1l bGluZShQYXNzUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiwgVGltZWxpbmVSZWNv cmRUeXBlKTsKLSAgICB2b2lkIGlubmVyQWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPElu c3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiwgVGltZWxpbmVSZWNvcmRUeXBlKTsKICAgICB2b2lk IGNsZWFyUmVjb3JkU3RhY2soKTsKIAogICAgIHZvaWQgbG9jYWxUb1BhZ2VRdWFkKGNvbnN0IFJl bmRlck9iamVjdCYsIGNvbnN0IExheW91dFJlY3QmLCBGbG9hdFF1YWQqKTsKQEAgLTI3Miw3ICsy NTcsNiBAQCBwcml2YXRlOgogCiAgICAgaW50IG1faWQ7CiAgICAgaW50IG1fbWF4Q2FsbFN0YWNr RGVwdGg7Ci0gICAgUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBtX3BlbmRpbmdG cmFtZVJlY29yZDsKICAgICBJbnNwZWN0b3JUeXBlIG1faW5zcGVjdG9yVHlwZTsKICAgICBJbnNw ZWN0b3JDbGllbnQqIG1fY2xpZW50OwogICAgIFdlYWtQdHJGYWN0b3J5PEluc3BlY3RvclRpbWVs aW5lQWdlbnQ+IG1fd2Vha0ZhY3Rvcnk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvcHJvdG9jb2wvVGltZWxpbmUuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9w cm90b2NvbC9UaW1lbGluZS5qc29uCmluZGV4IDIxMzE0MjEzN2JjNDRhY2E0YjZiOTM3MmE1Njg0 MzQ1NWI1YTY2MGYuLmM5ZWYyYmIxOTdhZGE1OGE1ZDczODVhZTBiYjBjYmFiZWM5YTZmNGMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9UaW1lbGluZS5qc29u CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9UaW1lbGluZS5qc29uCkBA IC01LDcgKzUsNyBAQAogICAgICAgICB7CiAgICAgICAgICAgICAiaWQiOiAiRXZlbnRUeXBlIiwK ICAgICAgICAgICAgICJ0eXBlIjogInN0cmluZyIsCi0gICAgICAgICAgICAiZW51bSI6IFsiRXZl bnREaXNwYXRjaCIsICJCZWdpbkZyYW1lIiwgIlNjaGVkdWxlU3R5bGVSZWNhbGN1bGF0aW9uIiwg IlJlY2FsY3VsYXRlU3R5bGVzIiwgIkludmFsaWRhdGVMYXlvdXQiLCAiTGF5b3V0IiwgIlBhaW50 IiwgIlNjcm9sbExheWVyIiwgIlJlc2l6ZUltYWdlIiwgIkNvbXBvc2l0ZUxheWVycyIsICJQYXJz ZUhUTUwiLCAiVGltZXJJbnN0YWxsIiwgIlRpbWVyUmVtb3ZlIiwgIlRpbWVyRmlyZSIsICJFdmFs dWF0ZVNjcmlwdCIsICJNYXJrTG9hZCIsICJNYXJrRE9NQ29udGVudCIsICJUaW1lU3RhbXAiLCAi VGltZSIsICJUaW1lRW5kIiwgIlNjaGVkdWxlUmVzb3VyY2VSZXF1ZXN0IiwgIlJlc291cmNlU2Vu ZFJlcXVlc3QiLCAiUmVzb3VyY2VSZWNlaXZlUmVzcG9uc2UiLCAiUmVzb3VyY2VSZWNlaXZlZERh dGEiLCAiUmVzb3VyY2VGaW5pc2giLCAiWEhSUmVhZHlTdGF0ZUNoYW5nZSIsICJYSFJMb2FkIiwg IkZ1bmN0aW9uQ2FsbCIsICJQcm9iZVNhbXBsZSIsICJHQ0V2ZW50IiwgIlJlcXVlc3RBbmltYXRp b25GcmFtZSIsICJDYW5jZWxBbmltYXRpb25GcmFtZSIsICJGaXJlQW5pbWF0aW9uRnJhbWUiLCAi V2ViU29ja2V0Q3JlYXRlIiwgIldlYlNvY2tldFNlbmRIYW5kc2hha2VSZXF1ZXN0IiwgIldlYlNv Y2tldFJlY2VpdmVIYW5kc2hha2VSZXNwb25zZSIsICJXZWJTb2NrZXREZXN0cm95Il0sCisgICAg ICAgICAgICAiZW51bSI6IFsiRXZlbnREaXNwYXRjaCIsICJTY2hlZHVsZVN0eWxlUmVjYWxjdWxh dGlvbiIsICJSZWNhbGN1bGF0ZVN0eWxlcyIsICJJbnZhbGlkYXRlTGF5b3V0IiwgIkxheW91dCIs ICJQYWludCIsICJTY3JvbGxMYXllciIsICJSZXNpemVJbWFnZSIsICJQYXJzZUhUTUwiLCAiVGlt ZXJJbnN0YWxsIiwgIlRpbWVyUmVtb3ZlIiwgIlRpbWVyRmlyZSIsICJFdmFsdWF0ZVNjcmlwdCIs ICJNYXJrTG9hZCIsICJNYXJrRE9NQ29udGVudCIsICJUaW1lU3RhbXAiLCAiVGltZSIsICJUaW1l RW5kIiwgIlNjaGVkdWxlUmVzb3VyY2VSZXF1ZXN0IiwgIlJlc291cmNlU2VuZFJlcXVlc3QiLCAi UmVzb3VyY2VSZWNlaXZlUmVzcG9uc2UiLCAiUmVzb3VyY2VSZWNlaXZlZERhdGEiLCAiUmVzb3Vy Y2VGaW5pc2giLCAiWEhSUmVhZHlTdGF0ZUNoYW5nZSIsICJYSFJMb2FkIiwgIkZ1bmN0aW9uQ2Fs bCIsICJQcm9iZVNhbXBsZSIsICJHQ0V2ZW50IiwgIlJlcXVlc3RBbmltYXRpb25GcmFtZSIsICJD YW5jZWxBbmltYXRpb25GcmFtZSIsICJGaXJlQW5pbWF0aW9uRnJhbWUiLCAiV2ViU29ja2V0Q3Jl YXRlIiwgIldlYlNvY2tldFNlbmRIYW5kc2hha2VSZXF1ZXN0IiwgIldlYlNvY2tldFJlY2VpdmVI YW5kc2hha2VSZXNwb25zZSIsICJXZWJTb2NrZXREZXN0cm95Il0sCiAgICAgICAgICAgICAiZGVz Y3JpcHRpb24iOiAiVGltZWxpbmUgcmVjb3JkIHR5cGUuIgogICAgICAgICB9LAogICAgICAgICB7 CkBAIC0xMywxMCArMTMsOCBAQAogICAgICAgICAgICAgInR5cGUiOiAib2JqZWN0IiwKICAgICAg ICAgICAgICJwcm9wZXJ0aWVzIjogWwogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIs ICIkcmVmIjogIkV2ZW50VHlwZSIsICJkZXNjcmlwdGlvbiI6ICJFdmVudCB0eXBlLiIgfSwKLSAg ICAgICAgICAgICAgICB7ICJuYW1lIjogInRocmVhZCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRp b25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJJZiBwcmVzZW50LCBpZGVudGlmaWVzIHRoZSB0 aHJlYWQgdGhhdCBwcm9kdWNlZCB0aGUgZXZlbnQuIiB9LAogICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAiZGF0YSIsICJ0eXBlIjogIm9iamVjdCIsICJkZXNjcmlwdGlvbiI6ICJFdmVudCBkYXRh LiIgfSwKLSAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNoaWxkcmVuIiwgInR5cGUiOiAiYXJy YXkiLCAib3B0aW9uYWwiOiB0cnVlLCAiaXRlbXMiOiB7ICIkcmVmIjogIlRpbWVsaW5lRXZlbnQi IH0sICJkZXNjcmlwdGlvbiI6ICJOZXN0ZWQgcmVjb3Jkcy4iIH0sCi0gICAgICAgICAgICAgICAg eyAibmFtZSI6ICJ1c2VkSGVhcFNpemUiLCAidHlwZSI6ICJpbnRlZ2VyIiwgIm9wdGlvbmFsIjog dHJ1ZSwgImRlc2NyaXB0aW9uIjogIkN1cnJlbnQgc2l6ZSBvZiBKUyBoZWFwLiIgfQorICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiY2hpbGRyZW4iLCAidHlwZSI6ICJhcnJheSIsICJvcHRpb25h bCI6IHRydWUsICJpdGVtcyI6IHsgIiRyZWYiOiAiVGltZWxpbmVFdmVudCIgfSwgImRlc2NyaXB0 aW9uIjogIk5lc3RlZCByZWNvcmRzLiIgfQogICAgICAgICAgICAgXSwKICAgICAgICAgICAgICJk ZXNjcmlwdGlvbiI6ICJUaW1lbGluZSByZWNvcmQgY29udGFpbnMgaW5mb3JtYXRpb24gYWJvdXQg dGhlIHJlY29yZGVkIGFjdGl2aXR5LiIKICAgICAgICAgfQpAQCAtMzIsMjAgKzMwLDYgQEAKICAg ICAgICAgewogICAgICAgICAgICAgIm5hbWUiOiAic3RvcCIsCiAgICAgICAgICAgICAiZGVzY3Jp cHRpb24iOiAiU3RvcHMgY2FwdHVyaW5nIGluc3RydW1lbnRhdGlvbiBldmVudHMuIgotICAgICAg ICB9LAotICAgICAgICB7Ci0gICAgICAgICAgICAibmFtZSI6ICJzdXBwb3J0c0ZyYW1lSW5zdHJ1 bWVudGF0aW9uIiwKLSAgICAgICAgICAgICJyZXR1cm5zIjogWwotICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAicmVzdWx0IiwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNjcmlwdGlvbiI6ICJUcnVl IGlmIHRpbWVsaW5lIHN1cHBvcnRzIGZyYW1lIGluc3RydW1lbnRhdGlvbi4iIH0KLSAgICAgICAg ICAgIF0sCi0gICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiVGVsbHMgd2hldGhlciB0aW1lbGlu ZSBhZ2VudCBzdXBwb3J0cyBmcmFtZSBpbnN0cnVtZW50YXRpb24uIgotICAgICAgICB9LAotICAg ICAgICB7Ci0gICAgICAgICAgICAibmFtZSI6ICJjYW5Nb25pdG9yTWFpblRocmVhZCIsCi0gICAg ICAgICAgICAicmV0dXJucyI6IFsKLSAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJlc3VsdCIs ICJ0eXBlIjogImJvb2xlYW4iLCAiZGVzY3JpcHRpb24iOiAiVHJ1ZSBpZiB0aW1lbGluZSBzdXBw b3J0cyBtYWluIHRocmVhZCBDUFUgdXRpbGl6YXRpb24gaW5zdHJ1bWVudGF0aW9uLiIgfQotICAg ICAgICAgICAgXSwKLSAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJUZWxscyB3aGV0aGVyIHRp bWVsaW5lIGFnZW50IHN1cHBvcnRzIG1haW4gdGhyZWFkIENQVSB1dGlsaXphdGlvbiBpbnN0cnVt ZW50YXRpb24uIgogICAgICAgICB9CiAgICAgXSwKICAgICAiZXZlbnRzIjogWwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nv bXBvc2l0aW5nQ29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0NvbXBvc2l0aW5nQ29vcmRpbmF0b3IuY3BwCmluZGV4IDlj YjllOTdkZWY2MGE1MDZmZGU3ODA0YjBmODMzM2QzMzQ1ZmU2NjcuLmNjOTc3MDQ4Mjg3MTRkOTkx MGU0OTRhNDZjNjJiMGQwZDZmN2NkMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db21wb3NpdGluZ0Nvb3JkaW5hdG9yLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0 ZWQvQ29tcG9zaXRpbmdDb29yZGluYXRvci5jcHAKQEAgLTEyNSwxMCArMTI1LDYgQEAgYm9vbCBD b21wb3NpdGluZ0Nvb3JkaW5hdG9yOjpmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMoKQogCiB2b2lk IENvbXBvc2l0aW5nQ29vcmRpbmF0b3I6OnN5bmNEaXNwbGF5U3RhdGUoKQogewotI2lmIEVOQUJM RShJTlNQRUNUT1IpCi0gICAgbV9wYWdlLT5pbnNwZWN0b3JDb250cm9sbGVyKCkuZGlkQmVnaW5G cmFtZSgpOwotI2VuZGlmCi0KICNpZiBFTkFCTEUoUkVRVUVTVF9BTklNQVRJT05fRlJBTUUpICYm ICFVU0UoUkVRVUVTVF9BTklNQVRJT05fRlJBTUVfVElNRVIpICYmICFVU0UoUkVRVUVTVF9BTklN QVRJT05fRlJBTUVfRElTUExBWV9NT05JVE9SKQogICAgIC8vIE1ha2Ugc3VyZSB0aGF0IGFueSBw cmV2aW91c2x5IHJlZ2lzdGVyZWQgYW5pbWF0aW9uIGNhbGxiYWNrcyBhcmUgYmVpbmcgZXhlY3V0 ZWQgYmVmb3JlIHdlIGZsdXNoIHRoZSBsYXllcnMuCiAgICAgbV9sYXN0QW5pbWF0aW9uU2Vydmlj ZVRpbWUgPSBXVEY6Om1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIvU291cmNlL1dlYkNvcmUvdGVz dGluZy9JbnRlcm5hbHMuY3BwCmluZGV4IDlmNDIyNmY4ZGM3MGY2NGFiNDM2ZjU1MTMyY2RmZDQw OTM1NGU5ZGEuLjhlMzEzN2QxOWI3YWU0N2RjOWVkOTY5MjdhZmI3Nzg0NDBjZTEzY2EgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTExNjQsMjAgKzExNjQsNiBAQCBQYXNz UmVmUHRyPE5vZGVMaXN0PiBJbnRlcm5hbHM6Om5vZGVzRnJvbVJlY3QoRG9jdW1lbnQqIGRvY3Vt ZW50LCBpbnQgY2VudGVyWCwgaQogICAgIHJldHVybiBTdGF0aWNOb2RlTGlzdDo6YWRvcHQobWF0 Y2hlcyk7CiB9CiAKLXZvaWQgSW50ZXJuYWxzOjplbWl0SW5zcGVjdG9yRGlkQmVnaW5GcmFtZSgp Ci17Ci0jaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBjb250ZXh0RG9jdW1lbnQoKS0+ZnJhbWUo KS0+cGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCkuZGlkQmVnaW5GcmFtZSgpOwotI2VuZGlm Ci19Ci0KLXZvaWQgSW50ZXJuYWxzOjplbWl0SW5zcGVjdG9yRGlkQ2FuY2VsRnJhbWUoKQotewot I2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgY29udGV4dERvY3VtZW50KCktPmZyYW1lKCktPnBh Z2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLmRpZENhbmNlbEZyYW1lKCk7Ci0jZW5kaWYKLX0K LQogY2xhc3MgR2V0Q2FsbGVyQ29kZUJsb2NrRnVuY3RvciB7CiBwdWJsaWM6CiAgICAgR2V0Q2Fs bGVyQ29kZUJsb2NrRnVuY3RvcigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5n L0ludGVybmFscy5oIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAppbmRleCA3 ZDRlOTk4NjI3MjdmOWUwMWI2MzIzMDBlOGU1ODdmY2VkZDVhNDZhLi44NTg0MGE2MzJmM2FiMjA2 YjAxZjkzZTEzZjBiZmRiNDFkZTg1NzIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0 aW5nL0ludGVybmFscy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgK QEAgLTE2Niw5ICsxNjYsNiBAQCBwdWJsaWM6CiAgICAgUGFzc1JlZlB0cjxOb2RlTGlzdD4gbm9k ZXNGcm9tUmVjdChEb2N1bWVudCosIGludCB4LCBpbnQgeSwgdW5zaWduZWQgdG9wUGFkZGluZywg dW5zaWduZWQgcmlnaHRQYWRkaW5nLAogICAgICAgICB1bnNpZ25lZCBib3R0b21QYWRkaW5nLCB1 bnNpZ25lZCBsZWZ0UGFkZGluZywgYm9vbCBpZ25vcmVDbGlwcGluZywgYm9vbCBhbGxvd1NoYWRv d0NvbnRlbnQsIGJvb2wgYWxsb3dDaGlsZEZyYW1lQ29udGVudCwgRXhjZXB0aW9uQ29kZSYpIGNv bnN0OwogCi0gICAgdm9pZCBlbWl0SW5zcGVjdG9yRGlkQmVnaW5GcmFtZSgpOwotICAgIHZvaWQg ZW1pdEluc3BlY3RvckRpZENhbmNlbEZyYW1lKCk7Ci0KICAgICBTdHJpbmcgcGFyc2VyTWV0YURh dGEoRGVwcmVjYXRlZDo6U2NyaXB0VmFsdWUgPSBEZXByZWNhdGVkOjpTY3JpcHRWYWx1ZSgpKTsK IAogICAgIE5vZGUqIGZpbmRFZGl0aW5nRGVsZXRlQnV0dG9uKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5n L0ludGVybmFscy5pZGwKaW5kZXggY2Y2NTU2NDQwYTE2ZjMxYzk0ZTg5YzcwMjQwZjdjODdlZWU1 YWY4ZS4uYWEwZDdkYzhmZjliYWZkZWExNTQ5MzNlNTRjNzJmZGM2MTYzYTRkMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCisrKyBiL1NvdXJjZS9XZWJD b3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbApAQCAtMTI0LDkgKzEyNCw2IEBACiAgICAgICAgIHVu c2lnbmVkIGxvbmcgdG9wUGFkZGluZywgdW5zaWduZWQgbG9uZyByaWdodFBhZGRpbmcsIHVuc2ln bmVkIGxvbmcgYm90dG9tUGFkZGluZywgdW5zaWduZWQgbG9uZyBsZWZ0UGFkZGluZywKICAgICAg ICAgYm9vbGVhbiBpZ25vcmVDbGlwcGluZywgYm9vbGVhbiBhbGxvd1NoYWRvd0NvbnRlbnQsIGJv b2xlYW4gYWxsb3dDaGlsZEZyYW1lQ29udGVudCk7CiAKLSAgICB2b2lkIGVtaXRJbnNwZWN0b3JE aWRCZWdpbkZyYW1lKCk7Ci0gICAgdm9pZCBlbWl0SW5zcGVjdG9yRGlkQ2FuY2VsRnJhbWUoKTsK LQogICAgIC8vIENhbGxpbmcgcGFyc2VyTWV0YURhdGEoKSB3aXRoIG5vIGFyZ3VtZW50cyBnZXRz IHRoZSBtZXRhZGF0YSBmb3IgdGhlIHNjcmlwdCBvZiB0aGUgY3VycmVudCBzY29wZS4KICAgICBE T01TdHJpbmcgcGFyc2VyTWV0YURhdGEob3B0aW9uYWwgYW55IGZ1bmMpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9MZWdhY3kvNi4w L0luc3BlY3RvcldlYkJhY2tlbmRDb21tYW5kcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS82LjAvSW5zcGVjdG9yV2ViQmFja2VuZENvbW1h bmRzLmpzCmluZGV4IDA4N2ZlZWJjYzliNDUxYmRiNzVmOWU0ZjI0YWZmMGU2NDY0ZjcxZWMuLjc1 MzkwZTZmYTI1OGNkM2EwMjMwNzJjMGJhNGI0NmY4ZDYzMjZlMGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS82LjAvSW5zcGVj dG9yV2ViQmFja2VuZENvbW1hbmRzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS82LjAvSW5zcGVjdG9yV2ViQmFja2VuZENvbW1hbmRz LmpzCkBAIC0xNSwxMCArMTUsNiBAQCBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoIklu c3BlY3Rvci5kaWREZXN0cm95V29ya2VyIiwgWyJpZCJdKTsKIEluc3BlY3RvckJhY2tlbmQucmVn aXN0ZXJDb21tYW5kKCJJbnNwZWN0b3IuZW5hYmxlIiwgW10sIFtdKTsKIEluc3BlY3RvckJhY2tl bmQucmVnaXN0ZXJDb21tYW5kKCJJbnNwZWN0b3IuZGlzYWJsZSIsIFtdLCBbXSk7CiAKLS8vIE1l bW9yeS4KLUluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJNZW1vcnlEaXNwYXRjaGVyID0gSW5zcGVj dG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIuYmluZChJbnNwZWN0b3JCYWNrZW5k LCAiTWVtb3J5Iik7Ci1JbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFuZCgiTWVtb3J5Lmdl dERPTU5vZGVDb3VudCIsIFtdLCBbImRvbUdyb3VwcyIsICJzdHJpbmdzIl0pOwotCiAvLyBQYWdl LgogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlclBhZ2VEaXNwYXRjaGVyID0gSW5zcGVjdG9yQmFj a2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIuYmluZChJbnNwZWN0b3JCYWNrZW5kLCAiUGFn ZSIpOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIlBhZ2UuUmVzb3VyY2VUeXBlIiwg e0RvY3VtZW50OiAiRG9jdW1lbnQiLCBTdHlsZXNoZWV0OiAiU3R5bGVzaGVldCIsIEltYWdlOiAi SW1hZ2UiLCBGb250OiAiRm9udCIsIFNjcmlwdDogIlNjcmlwdCIsIFhIUjogIlhIUiIsIFdlYlNv Y2tldDogIldlYlNvY2tldCIsIE90aGVyOiAiT3RoZXIifSk7CkBAIC0xOTQsMTEgKzE5MCwxMCBA QCBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFuZCgiQ1NTLnN0b3BTZWxlY3RvclByb2Zp bGVyIiwgW10sIFsicHJvZmlsZSJdKTsKIAogLy8gVGltZWxpbmUuCiBJbnNwZWN0b3JCYWNrZW5k LnJlZ2lzdGVyVGltZWxpbmVEaXNwYXRjaGVyID0gSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRv bWFpbkRpc3BhdGNoZXIuYmluZChJbnNwZWN0b3JCYWNrZW5kLCAiVGltZWxpbmUiKTsKLUluc3Bl Y3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJUaW1lbGluZS5FdmVudFR5cGUiLCB7RXZlbnREaXNw YXRjaDogIkV2ZW50RGlzcGF0Y2giLCBMYXlvdXQ6ICJMYXlvdXQiLCBSZWNhbGN1bGF0ZVN0eWxl czogIlJlY2FsY3VsYXRlU3R5bGVzIiwgUGFpbnQ6ICJQYWludCIsIEJlZ2luRnJhbWU6ICJCZWdp bkZyYW1lIiwgUGFyc2VIVE1MOiAiUGFyc2VIVE1MIiwgVGltZXJJbnN0YWxsOiAiVGltZXJJbnN0 YWxsIiwgVGltZXJSZW1vdmU6ICJUaW1lclJlbW92ZSIsIFRpbWVyRmlyZTogIlRpbWVyRmlyZSIs IEV2YWx1YXRlU2NyaXB0OiAiRXZhbHVhdGVTY3JpcHQiLCBNYXJrTG9hZDogIk1hcmtMb2FkIiwg TWFya0RPTUNvbnRlbnQ6ICJNYXJrRE9NQ29udGVudCIsIFRpbWVTdGFtcDogIlRpbWVTdGFtcCIs IFNjaGVkdWxlUmVzb3VyY2VSZXF1ZXN0OiAiU2NoZWR1bGVSZXNvdXJjZVJlcXVlc3QiLCBSZXNv dXJjZVNlbmRSZXF1ZXN0OiAiUmVzb3VyY2VTZW5kUmVxdWVzdCIsIFJlc291cmNlUmVjZWl2ZVJl c3BvbnNlOiAiUmVzb3VyY2VSZWNlaXZlUmVzcG9uc2UiLCBSZXNvdXJjZVJlY2VpdmVkRGF0YTog IlJlc291cmNlUmVjZWl2ZWREYXRhIiwgUmVzb3VyY2VGaW5pc2g6ICJSZXNvdXJjZUZpbmlzaCIs IFhIUlJlYWR5U3RhdGVDaGFuZ2U6ICJYSFJSZWFkeVN0YXRlQ2hhbmdlIiwgWEhSTG9hZDogIlhI UkxvYWQiLCBGdW5jdGlvbkNhbGw6ICJGdW5jdGlvbkNhbGwiLCBHQ0V2ZW50OiAiR0NFdmVudCIs IFJlcXVlc3RBbmltYXRpb25GcmFtZTogIlJlcXVlc3RBbmltYXRpb25GcmFtZSIsIENhbmNlbEFu aW1hdGlvbkZyYW1lOiAiQ2FuY2VsQW5pbWF0aW9uRnJhbWUiLCBGaXJlQW5pbWF0aW9uRnJhbWU6 ICJGaXJlQW5pbWF0aW9uRnJhbWUifSk7CitJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRW51bSgi VGltZWxpbmUuRXZlbnRUeXBlIiwge0V2ZW50RGlzcGF0Y2g6ICJFdmVudERpc3BhdGNoIiwgTGF5 b3V0OiAiTGF5b3V0IiwgUmVjYWxjdWxhdGVTdHlsZXM6ICJSZWNhbGN1bGF0ZVN0eWxlcyIsIFBh aW50OiAiUGFpbnQiLCBQYXJzZUhUTUw6ICJQYXJzZUhUTUwiLCBUaW1lckluc3RhbGw6ICJUaW1l ckluc3RhbGwiLCBUaW1lclJlbW92ZTogIlRpbWVyUmVtb3ZlIiwgVGltZXJGaXJlOiAiVGltZXJG aXJlIiwgRXZhbHVhdGVTY3JpcHQ6ICJFdmFsdWF0ZVNjcmlwdCIsIE1hcmtMb2FkOiAiTWFya0xv YWQiLCBNYXJrRE9NQ29udGVudDogIk1hcmtET01Db250ZW50IiwgVGltZVN0YW1wOiAiVGltZVN0 YW1wIiwgU2NoZWR1bGVSZXNvdXJjZVJlcXVlc3Q6ICJTY2hlZHVsZVJlc291cmNlUmVxdWVzdCIs IFJlc291cmNlU2VuZFJlcXVlc3Q6ICJSZXNvdXJjZVNlbmRSZXF1ZXN0IiwgUmVzb3VyY2VSZWNl aXZlUmVzcG9uc2U6ICJSZXNvdXJjZVJlY2VpdmVSZXNwb25zZSIsIFJlc291cmNlUmVjZWl2ZWRE YXRhOiAiUmVzb3VyY2VSZWNlaXZlZERhdGEiLCBSZXNvdXJjZUZpbmlzaDogIlJlc291cmNlRmlu aXNoIiwgWEhSUmVhZHlTdGF0ZUNoYW5nZTogIlhIUlJlYWR5U3RhdGVDaGFuZ2UiLCBYSFJMb2Fk OiAiWEhSTG9hZCIsIEZ1bmN0aW9uQ2FsbDogIkZ1bmN0aW9uQ2FsbCIsIEdDRXZlbnQ6ICJHQ0V2 ZW50IiwgUmVxdWVzdEFuaW1hdGlvbkZyYW1lOiAiUmVxdWVzdEFuaW1hdGlvbkZyYW1lIiwgQ2Fu Y2VsQW5pbWF0aW9uRnJhbWU6ICJDYW5jZWxBbmltYXRpb25GcmFtZSIsIEZpcmVBbmltYXRpb25G cmFtZTogIkZpcmVBbmltYXRpb25GcmFtZSJ9KTsKIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJF dmVudCgiVGltZWxpbmUuZXZlbnRSZWNvcmRlZCIsIFsicmVjb3JkIl0pOwogSW5zcGVjdG9yQmFj a2VuZC5yZWdpc3RlckNvbW1hbmQoIlRpbWVsaW5lLnN0YXJ0IiwgW3sibmFtZSI6ICJtYXhDYWxs U3RhY2tEZXB0aCIsICJ0eXBlIjogIm51bWJlciIsICJvcHRpb25hbCI6IHRydWV9XSwgW10pOwog SW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbW1hbmQoIlRpbWVsaW5lLnN0b3AiLCBbXSwgW10p OwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbW1hbmQoIlRpbWVsaW5lLnNldEluY2x1ZGVN ZW1vcnlEZXRhaWxzIiwgW3sibmFtZSI6ICJlbmFibGVkIiwgInR5cGUiOiAiYm9vbGVhbiIsICJv cHRpb25hbCI6IGZhbHNlfV0sIFtdKTsKIAogLy8gRGVidWdnZXIuCiBJbnNwZWN0b3JCYWNrZW5k LnJlZ2lzdGVyRGVidWdnZXJEaXNwYXRjaGVyID0gSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRv bWFpbkRpc3BhdGNoZXIuYmluZChJbnNwZWN0b3JCYWNrZW5kLCAiRGVidWdnZXIiKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2Fj eS83LjAvSW5zcGVjdG9yV2ViQmFja2VuZENvbW1hbmRzLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzcuMC9JbnNwZWN0b3JXZWJCYWNrZW5k Q29tbWFuZHMuanMKaW5kZXggZTczY2I4YzRmZGUyMzRhMDFlMjUxMDY5M2UwYjJmNGI3NTVlOGRj MS4uOTNiNDQ3OWQ3ZGM2MDc4MzE1NDc5NzMyOTYzYWJmNWRkMGQzMDVkNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzcuMC9J bnNwZWN0b3JXZWJCYWNrZW5kQ29tbWFuZHMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzcuMC9JbnNwZWN0b3JXZWJCYWNrZW5kQ29t bWFuZHMuanMKQEAgLTE1LDEwICsxNSw2IEBAIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVu dCgiSW5zcGVjdG9yLnRhcmdldENyYXNoZWQiLCBbXSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lz dGVyQ29tbWFuZCgiSW5zcGVjdG9yLmVuYWJsZSIsIFtdLCBbXSk7CiBJbnNwZWN0b3JCYWNrZW5k LnJlZ2lzdGVyQ29tbWFuZCgiSW5zcGVjdG9yLmRpc2FibGUiLCBbXSwgW10pOwogCi0vLyBNZW1v cnkuCi1JbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyTWVtb3J5RGlzcGF0Y2hlciA9IEluc3BlY3Rv ckJhY2tlbmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyLmJpbmQoSW5zcGVjdG9yQmFja2VuZCwg Ik1lbW9yeSIpOwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbW1hbmQoIk1lbW9yeS5nZXRE T01Db3VudGVycyIsIFtdLCBbImRvY3VtZW50cyIsICJub2RlcyIsICJqc0V2ZW50TGlzdGVuZXJz Il0pOwotCiAvLyBQYWdlLgogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlclBhZ2VEaXNwYXRjaGVy ID0gSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIuYmluZChJbnNwZWN0 b3JCYWNrZW5kLCAiUGFnZSIpOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIlBhZ2Uu UmVzb3VyY2VUeXBlIiwge0RvY3VtZW50OiAiRG9jdW1lbnQiLCBTdHlsZXNoZWV0OiAiU3R5bGVz aGVldCIsIEltYWdlOiAiSW1hZ2UiLCBGb250OiAiRm9udCIsIFNjcmlwdDogIlNjcmlwdCIsIFhI UjogIlhIUiIsIFdlYlNvY2tldDogIldlYlNvY2tldCIsIE90aGVyOiAiT3RoZXIifSk7CkBAIC0y MzAsMTIgKzIyNiwxMCBAQCBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFuZCgiQ1NTLmdl dE5hbWVkRmxvd0NvbGxlY3Rpb24iLCBbeyJuYW1lIjogImRvY3VtZQogCiAvLyBUaW1lbGluZS4K IEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJUaW1lbGluZURpc3BhdGNoZXIgPSBJbnNwZWN0b3JC YWNrZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlci5iaW5kKEluc3BlY3RvckJhY2tlbmQsICJU aW1lbGluZSIpOwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckVudW0oIlRpbWVsaW5lLkV2ZW50 VHlwZSIsIHtFdmVudERpc3BhdGNoOiAiRXZlbnREaXNwYXRjaCIsIEJlZ2luRnJhbWU6ICJCZWdp bkZyYW1lIiwgU2NoZWR1bGVTdHlsZVJlY2FsY3VsYXRpb246ICJTY2hlZHVsZVN0eWxlUmVjYWxj dWxhdGlvbiIsIFJlY2FsY3VsYXRlU3R5bGVzOiAiUmVjYWxjdWxhdGVTdHlsZXMiLCBJbnZhbGlk YXRlTGF5b3V0OiAiSW52YWxpZGF0ZUxheW91dCIsIExheW91dDogIkxheW91dCIsIFBhaW50OiAi UGFpbnQiLCBTY3JvbGxMYXllcjogIlNjcm9sbExheWVyIiwgUmVzaXplSW1hZ2U6ICJSZXNpemVJ bWFnZSIsIENvbXBvc2l0ZUxheWVyczogIkNvbXBvc2l0ZUxheWVycyIsIFBhcnNlSFRNTDogIlBh cnNlSFRNTCIsIFRpbWVySW5zdGFsbDogIlRpbWVySW5zdGFsbCIsIFRpbWVyUmVtb3ZlOiAiVGlt ZXJSZW1vdmUiLCBUaW1lckZpcmU6ICJUaW1lckZpcmUiLCBFdmFsdWF0ZVNjcmlwdDogIkV2YWx1 YXRlU2NyaXB0IiwgTWFya0xvYWQ6ICJNYXJrTG9hZCIsIE1hcmtET01Db250ZW50OiAiTWFya0RP TUNvbnRlbnQiLCBUaW1lU3RhbXA6ICJUaW1lU3RhbXAiLCBUaW1lOiAiVGltZSIsIFRpbWVFbmQ6 ICJUaW1lRW5kIiwgU2NoZWR1bGVSZXNvdXJjZVJlcXVlc3Q6ICJTY2hlZHVsZVJlc291cmNlUmVx dWVzdCIsIFJlc291cmNlU2VuZFJlcXVlc3Q6ICJSZXNvdXJjZVNlbmRSZXF1ZXN0IiwgUmVzb3Vy Y2VSZWNlaXZlUmVzcG9uc2U6ICJSZXNvdXJjZVJlY2VpdmVSZXNwb25zZSIsIFJlc291cmNlUmVj ZWl2ZWREYXRhOiAiUmVzb3VyY2VSZWNlaXZlZERhdGEiLCBSZXNvdXJjZUZpbmlzaDogIlJlc291 cmNlRmluaXNoIiwgWEhSUmVhZHlTdGF0ZUNoYW5nZTogIlhIUlJlYWR5U3RhdGVDaGFuZ2UiLCBY SFJMb2FkOiAiWEhSTG9hZCIsIEZ1bmN0aW9uQ2FsbDogIkZ1bmN0aW9uQ2FsbCIsIEdDRXZlbnQ6 ICJHQ0V2ZW50IiwgUmVxdWVzdEFuaW1hdGlvbkZyYW1lOiAiUmVxdWVzdEFuaW1hdGlvbkZyYW1l IiwgQ2FuY2VsQW5pbWF0aW9uRnJhbWU6ICJDYW5jZWxBbmltYXRpb25GcmFtZSIsIEZpcmVBbmlt YXRpb25GcmFtZTogIkZpcmVBbmltYXRpb25GcmFtZSIsIFdlYlNvY2tldENyZWF0ZTogIldlYlNv Y2tldENyZWF0ZSIsIFdlYlNvY2tldFNlbmRIYW5kc2hha2VSZXF1ZXN0OiAiV2ViU29ja2V0U2Vu ZEhhbmRzaGFrZVJlcXVlc3QiLCBXZWJTb2NrZXRSZWNlaXZlSGFuZHNoYWtlUmVzcG9uc2U6ICJX ZWJTb2NrZXRSZWNlaXZlSGFuZHNoYWtlUmVzcG9uc2UiLCBXZWJTb2NrZXREZXN0cm95OiAiV2Vi U29ja2V0RGVzdHJveSJ9KTsKK0luc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFbnVtKCJUaW1lbGlu ZS5FdmVudFR5cGUiLCB7RXZlbnREaXNwYXRjaDogIkV2ZW50RGlzcGF0Y2giLCBTY2hlZHVsZVN0 eWxlUmVjYWxjdWxhdGlvbjogIlNjaGVkdWxlU3R5bGVSZWNhbGN1bGF0aW9uIiwgUmVjYWxjdWxh dGVTdHlsZXM6ICJSZWNhbGN1bGF0ZVN0eWxlcyIsIEludmFsaWRhdGVMYXlvdXQ6ICJJbnZhbGlk YXRlTGF5b3V0IiwgTGF5b3V0OiAiTGF5b3V0IiwgUGFpbnQ6ICJQYWludCIsIFNjcm9sbExheWVy OiAiU2Nyb2xsTGF5ZXIiLCBSZXNpemVJbWFnZTogIlJlc2l6ZUltYWdlIiwgUGFyc2VIVE1MOiAi UGFyc2VIVE1MIiwgVGltZXJJbnN0YWxsOiAiVGltZXJJbnN0YWxsIiwgVGltZXJSZW1vdmU6ICJU aW1lclJlbW92ZSIsIFRpbWVyRmlyZTogIlRpbWVyRmlyZSIsIEV2YWx1YXRlU2NyaXB0OiAiRXZh bHVhdGVTY3JpcHQiLCBNYXJrTG9hZDogIk1hcmtMb2FkIiwgTWFya0RPTUNvbnRlbnQ6ICJNYXJr RE9NQ29udGVudCIsIFRpbWVTdGFtcDogIlRpbWVTdGFtcCIsIFRpbWU6ICJUaW1lIiwgVGltZUVu ZDogIlRpbWVFbmQiLCBTY2hlZHVsZVJlc291cmNlUmVxdWVzdDogIlNjaGVkdWxlUmVzb3VyY2VS ZXF1ZXN0IiwgUmVzb3VyY2VTZW5kUmVxdWVzdDogIlJlc291cmNlU2VuZFJlcXVlc3QiLCBSZXNv dXJjZVJlY2VpdmVSZXNwb25zZTogIlJlc291cmNlUmVjZWl2ZVJlc3BvbnNlIiwgUmVzb3VyY2VS ZWNlaXZlZERhdGE6ICJSZXNvdXJjZVJlY2VpdmVkRGF0YSIsIFJlc291cmNlRmluaXNoOiAiUmVz b3VyY2VGaW5pc2giLCBYSFJSZWFkeVN0YXRlQ2hhbmdlOiAiWEhSUmVhZHlTdGF0ZUNoYW5nZSIs IFhIUkxvYWQ6ICJYSFJMb2FkIiwgRnVuY3Rpb25DYWxsOiAiRnVuY3Rpb25DYWxsIiwgR0NFdmVu dDogIkdDRXZlbnQiLCBSZXF1ZXN0QW5pbWF0aW9uRnJhbWU6ICJSZXF1ZXN0QW5pbWF0aW9uRnJh bWUiLCBDYW5jZWxBbmltYXRpb25GcmFtZTogIkNhbmNlbEFuaW1hdGlvbkZyYW1lIiwgRmlyZUFu aW1hdGlvbkZyYW1lOiAiRmlyZUFuaW1hdGlvbkZyYW1lIiwgV2ViU29ja2V0Q3JlYXRlOiAiV2Vi U29ja2V0Q3JlYXRlIiwgV2ViU29ja2V0U2VuZEhhbmRzaGFrZVJlcXVlc3Q6ICJXZWJTb2NrZXRT ZW5kSGFuZHNoYWtlUmVxdWVzdCIsIFdlYlNvY2tldFJlY2VpdmVIYW5kc2hha2VSZXNwb25zZTog IldlYlNvY2tldFJlY2VpdmVIYW5kc2hha2VSZXNwb25zZSIsIFdlYlNvY2tldERlc3Ryb3k6ICJX ZWJTb2NrZXREZXN0cm95In0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2ZW50KCJUaW1l bGluZS5ldmVudFJlY29yZGVkIiwgWyJyZWNvcmQiXSk7Ci1JbnNwZWN0b3JCYWNrZW5kLnJlZ2lz dGVyQ29tbWFuZCgiVGltZWxpbmUuc3RhcnQiLCBbeyJuYW1lIjogIm1heENhbGxTdGFja0RlcHRo IiwgInR5cGUiOiAibnVtYmVyIiwgIm9wdGlvbmFsIjogdHJ1ZX0sIHsibmFtZSI6ICJpbmNsdWRl RG9tQ291bnRlcnMiLCAidHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZX0sIHsibmFt ZSI6ICJpbmNsdWRlTmF0aXZlTWVtb3J5U3RhdGlzdGljcyIsICJ0eXBlIjogImJvb2xlYW4iLCAi b3B0aW9uYWwiOiB0cnVlfV0sIFtdKTsKK0luc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJDb21tYW5k KCJUaW1lbGluZS5zdGFydCIsIFt7Im5hbWUiOiAibWF4Q2FsbFN0YWNrRGVwdGgiLCAidHlwZSI6 ICJudW1iZXIiLCAib3B0aW9uYWwiOiB0cnVlfV0sIFtdKTsKIEluc3BlY3RvckJhY2tlbmQucmVn aXN0ZXJDb21tYW5kKCJUaW1lbGluZS5zdG9wIiwgW10sIFtdKTsKLUluc3BlY3RvckJhY2tlbmQu cmVnaXN0ZXJDb21tYW5kKCJUaW1lbGluZS5zdXBwb3J0c0ZyYW1lSW5zdHJ1bWVudGF0aW9uIiwg W10sIFsicmVzdWx0Il0pOwotSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbW1hbmQoIlRpbWVs aW5lLmNhbk1vbml0b3JNYWluVGhyZWFkIiwgW10sIFsicmVzdWx0Il0pOwogCiAvLyBEZWJ1Z2dl ci4KIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJEZWJ1Z2dlckRpc3BhdGNoZXIgPSBJbnNwZWN0 b3JCYWNrZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlci5iaW5kKEluc3BlY3RvckJhY2tlbmQs ICJEZWJ1Z2dlciIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1ZlcnNpb25z L0luc3BlY3Rvci1pT1MtNi4wLmpzb24gYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVmVyc2lvbnMv SW5zcGVjdG9yLWlPUy02LjAuanNvbgppbmRleCAxZjY1ZGUwMWViMGE0NTE2MjBlZDkwMDM0YTY5 NDc3NzJmOTY0NGQ0Li4wZDUwNjFlYWQwY2E3YzM2YjI0MDRhNjczZjQwYmRkNTliN2Y0YzIzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVmVyc2lvbnMvSW5zcGVjdG9yLWlPUy02 LjAuanNvbgorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVmVyc2lvbnMvSW5zcGVjdG9yLWlP Uy02LjAuanNvbgpAQCAtNDYsNjAgKzQ2LDYgQEAKICAgICAgICAgXQogICAgIH0sCiAgICAgewot ICAgICAgICAiZG9tYWluIjogIk1lbW9yeSIsCi0gICAgICAgICJoaWRkZW4iOiB0cnVlLAotICAg ICAgICAidHlwZXMiOiBbCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgImlkIjogIk5v ZGVDb3VudCIsCi0gICAgICAgICAgICAgICAgInR5cGUiOiAib2JqZWN0IiwKLSAgICAgICAgICAg ICAgICAicHJvcGVydGllcyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJub2Rl TmFtZSIsICJ0eXBlIjogInN0cmluZyIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJjb3VudCIsICJ0eXBlIjogImludGVnZXIiIH0KLSAgICAgICAgICAgICAgICBdLAotICAgICAg ICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJOdW1iZXIgb2Ygbm9kZXMgd2l0aCBnaXZlbiBuYW1l LiIKLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgImlkIjog Ikxpc3RlbmVyQ291bnQiLAotICAgICAgICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCi0gICAg ICAgICAgICAgICAgInByb3BlcnRpZXMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAidHlwZSIsICJ0eXBlIjogInN0cmluZyIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJjb3VudCIsICJ0eXBlIjogImludGVnZXIiIH0KLSAgICAgICAgICAgICAgICBdLAotICAg ICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJOdW1iZXIgb2YgSlMgZXZlbnQgbGlzdGVuZXJz IGJ5IGV2ZW50IHR5cGUuIgotICAgICAgICAgICAgfSwKLSAgICAgICAgICAgIHsKLSAgICAgICAg ICAgICAgICAiaWQiOiAiU3RyaW5nU3RhdGlzdGljcyIsCi0gICAgICAgICAgICAgICAgInR5cGUi OiAib2JqZWN0IiwKLSAgICAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKLSAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJkb20iLCAidHlwZSI6ICJpbnRlZ2VyIiB9LAotICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogImpzIiwgInR5cGUiOiAiaW50ZWdlciIgfSwKLSAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJzaGFyZWQiLCAidHlwZSI6ICJpbnRlZ2VyIiB9Ci0gICAg ICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiQ2hhcmFjdGVy IGRhdGEgc3RhdGlzdGljcyBmb3IgdGhlIHBhZ2UuIgotICAgICAgICAgICAgfSwKLSAgICAgICAg ICAgIHsKLSAgICAgICAgICAgICAgICAiaWQiOiAiRE9NR3JvdXAiLAotICAgICAgICAgICAgICAg ICJ0eXBlIjogIm9iamVjdCIsCi0gICAgICAgICAgICAgICAgInByb3BlcnRpZXMiOiBbCi0gICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2l6ZSIsICJ0eXBlIjogImludGVnZXIiIH0sCi0g ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGl0bGUiLCAidHlwZSI6ICJzdHJpbmciIH0s Ci0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZG9jdW1lbnRVUkkiLCAidHlwZSI6ICJz dHJpbmciLCAib3B0aW9uYWwiOiB0cnVlIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAibm9kZUNvdW50IiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIk5vZGVD b3VudCIgfX0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibGlzdGVuZXJDb3VudCIs ICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJMaXN0ZW5lckNvdW50IiB9fQot ICAgICAgICAgICAgICAgIF0KLSAgICAgICAgICAgIH0KLSAgICAgICAgXSwKLSAgICAgICAgImNv bW1hbmRzIjogWwotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogImdldERP TU5vZGVDb3VudCIsCi0gICAgICAgICAgICAgICAgInJldHVybnMiOiBbCi0gICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiZG9tR3JvdXBzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7 ICIkcmVmIjogIkRPTUdyb3VwIiB9fSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJz dHJpbmdzIiwgIiRyZWYiOiAiU3RyaW5nU3RhdGlzdGljcyIgfQotICAgICAgICAgICAgICAgIF0K LSAgICAgICAgICAgIH0KLSAgICAgICAgXQotICAgIH0sCi0gICAgewogICAgICAgICAiZG9tYWlu IjogIlBhZ2UiLAogICAgICAgICAiZGVzY3JpcHRpb24iOiAiQWN0aW9ucyBhbmQgZXZlbnRzIHJl bGF0ZWQgdG8gdGhlIGluc3BlY3RlZCBwYWdlIGJlbG9uZyB0byB0aGUgcGFnZSBkb21haW4uIiwK ICAgICAgICAgInR5cGVzIjogWwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Zl cnNpb25zL0luc3BlY3Rvci1pT1MtNy4wLmpzb24gYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVmVy c2lvbnMvSW5zcGVjdG9yLWlPUy03LjAuanNvbgppbmRleCA4NDY3MjA2MDI3NjQ3ZmY4N2UwYTA2 YWFmODY4ODE4YTMyM2I5NGY2Li44ZjY5MGRlZTc3MTNlMTM2NTNmMTljYTRhMTBmMzBkNDBiNDhh ZmYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVmVyc2lvbnMvSW5zcGVjdG9y LWlPUy03LjAuanNvbgorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVmVyc2lvbnMvSW5zcGVj dG9yLWlPUy03LjAuanNvbgpAQCAtNDIsMzAgKzQyLDYgQEAKICAgICAgICAgXQogICAgIH0sCiAg ICAgewotICAgICAgICAiZG9tYWluIjogIk1lbW9yeSIsCi0gICAgICAgICJ0eXBlcyI6IFsKLSAg ICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAiaWQiOiAiTWVtb3J5QmxvY2siLAotICAgICAg ICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCi0gICAgICAgICAgICAgICAgInByb3BlcnRpZXMi OiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2l6ZSIsICJ0eXBlIjogIm51bWJl ciIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJTaXplIG9mIHRoZSBibG9jayBp biBieXRlcyBpZiBhdmFpbGFibGUiIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi bmFtZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJVbmlxdWUgbmFtZSB1c2Vk IHRvIGlkZW50aWZ5IHRoZSBjb21wb25lbnQgdGhhdCBhbGxvY2F0ZWQgdGhpcyBibG9jayIgfSwK LSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjaGlsZHJlbiIsICJ0eXBlIjogImFycmF5 IiwgIm9wdGlvbmFsIjogdHJ1ZSwgIml0ZW1zIjogeyAiJHJlZiI6ICJNZW1vcnlCbG9jayIgfX0K LSAgICAgICAgICAgICAgICBdCi0gICAgICAgICAgICB9Ci0gICAgICAgIF0sCi0gICAgICAgICJj b21tYW5kcyI6IFsKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJnZXRE T01Db3VudGVycyIsCi0gICAgICAgICAgICAgICAgInJldHVybnMiOiBbCi0gICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAiZG9jdW1lbnRzIiwgInR5cGUiOiAiaW50ZWdlciIgfSwKLSAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJub2RlcyIsICJ0eXBlIjogImludGVnZXIiIH0sCi0g ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAianNFdmVudExpc3RlbmVycyIsICJ0eXBlIjog ImludGVnZXIiIH0KLSAgICAgICAgICAgICAgICBdCi0gICAgICAgICAgICB9Ci0gICAgICAgIF0K LSAgICB9LAotICAgIHsKICAgICAgICAgImRvbWFpbiI6ICJQYWdlIiwKICAgICAgICAgImRlc2Ny aXB0aW9uIjogIkFjdGlvbnMgYW5kIGV2ZW50cyByZWxhdGVkIHRvIHRoZSBpbnNwZWN0ZWQgcGFn ZSBiZWxvbmcgdG8gdGhlIHBhZ2UgZG9tYWluLiIsCiAgICAgICAgICJ0eXBlcyI6IFsKQEAgLTIy MjMsMTkgKzIxOTksOSBAQAogICAgICAgICAiZGVzY3JpcHRpb24iOiAiVGltZWxpbmUgcHJvdmlk ZXMgaXRzIGNsaWVudHMgd2l0aCBpbnN0cnVtZW50YXRpb24gcmVjb3JkcyB0aGF0IGFyZSBnZW5l cmF0ZWQgZHVyaW5nIHRoZSBwYWdlIHJ1bnRpbWUuIFRpbWVsaW5lIGluc3RydW1lbnRhdGlvbiBj YW4gYmUgc3RhcnRlZCBhbmQgc3RvcHBlZCB1c2luZyBjb3JyZXNwb25kaW5nIGNvbW1hbmRzLiBX aGlsZSB0aW1lbGluZSBpcyBzdGFydGVkLCBpdCBpcyBnZW5lcmF0aW5nIHRpbWVsaW5lIGV2ZW50 IHJlY29yZHMuIiwKICAgICAgICAgInR5cGVzIjogWwogICAgICAgICAgICAgewotICAgICAgICAg ICAgICAgICJpZCI6ICJET01Db3VudGVycyIsCi0gICAgICAgICAgICAgICAgInR5cGUiOiAib2Jq ZWN0IiwKLSAgICAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKLSAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJkb2N1bWVudHMiLCAidHlwZSI6ICJpbnRlZ2VyIiB9LAotICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogIm5vZGVzIiwgInR5cGUiOiAiaW50ZWdlciIgfSwKLSAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJqc0V2ZW50TGlzdGVuZXJzIiwgInR5cGUiOiAiaW50 ZWdlciIgfQotICAgICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAgICAgImRlc2NyaXB0aW9u IjogIkN1cnJlbnQgdmFsdWVzIG9mIERPTSBjb3VudGVycy4iCi0gICAgICAgICAgICB9LAotICAg ICAgICAgICAgewogICAgICAgICAgICAgICAgICJpZCI6ICJFdmVudFR5cGUiLAogICAgICAgICAg ICAgICAgICJ0eXBlIjogInN0cmluZyIsCi0gICAgICAgICAgICAgICAgImVudW0iOiBbIkV2ZW50 RGlzcGF0Y2giLCAiQmVnaW5GcmFtZSIsICJTY2hlZHVsZVN0eWxlUmVjYWxjdWxhdGlvbiIsICJS ZWNhbGN1bGF0ZVN0eWxlcyIsICJJbnZhbGlkYXRlTGF5b3V0IiwgIkxheW91dCIsICJQYWludCIs ICJTY3JvbGxMYXllciIsICJSZXNpemVJbWFnZSIsICJDb21wb3NpdGVMYXllcnMiLCAiUGFyc2VI VE1MIiwgIlRpbWVySW5zdGFsbCIsICJUaW1lclJlbW92ZSIsICJUaW1lckZpcmUiLCAiRXZhbHVh dGVTY3JpcHQiLCAiTWFya0xvYWQiLCAiTWFya0RPTUNvbnRlbnQiLCAiVGltZVN0YW1wIiwgIlRp bWUiLCAiVGltZUVuZCIsICJTY2hlZHVsZVJlc291cmNlUmVxdWVzdCIsICJSZXNvdXJjZVNlbmRS ZXF1ZXN0IiwgIlJlc291cmNlUmVjZWl2ZVJlc3BvbnNlIiwgIlJlc291cmNlUmVjZWl2ZWREYXRh IiwgIlJlc291cmNlRmluaXNoIiwgIlhIUlJlYWR5U3RhdGVDaGFuZ2UiLCAiWEhSTG9hZCIsICJG dW5jdGlvbkNhbGwiLCAiR0NFdmVudCIsICJSZXF1ZXN0QW5pbWF0aW9uRnJhbWUiLCAiQ2FuY2Vs QW5pbWF0aW9uRnJhbWUiLCAiRmlyZUFuaW1hdGlvbkZyYW1lIiwgIldlYlNvY2tldENyZWF0ZSIs ICJXZWJTb2NrZXRTZW5kSGFuZHNoYWtlUmVxdWVzdCIsICJXZWJTb2NrZXRSZWNlaXZlSGFuZHNo YWtlUmVzcG9uc2UiLCAiV2ViU29ja2V0RGVzdHJveSJdLAorICAgICAgICAgICAgICAgICJlbnVt IjogWyJFdmVudERpc3BhdGNoIiwgIlNjaGVkdWxlU3R5bGVSZWNhbGN1bGF0aW9uIiwgIlJlY2Fs Y3VsYXRlU3R5bGVzIiwgIkludmFsaWRhdGVMYXlvdXQiLCAiTGF5b3V0IiwgIlBhaW50IiwgIlNj cm9sbExheWVyIiwgIlJlc2l6ZUltYWdlIiwgIlBhcnNlSFRNTCIsICJUaW1lckluc3RhbGwiLCAi VGltZXJSZW1vdmUiLCAiVGltZXJGaXJlIiwgIkV2YWx1YXRlU2NyaXB0IiwgIk1hcmtMb2FkIiwg Ik1hcmtET01Db250ZW50IiwgIlRpbWVTdGFtcCIsICJUaW1lIiwgIlRpbWVFbmQiLCAiU2NoZWR1 bGVSZXNvdXJjZVJlcXVlc3QiLCAiUmVzb3VyY2VTZW5kUmVxdWVzdCIsICJSZXNvdXJjZVJlY2Vp dmVSZXNwb25zZSIsICJSZXNvdXJjZVJlY2VpdmVkRGF0YSIsICJSZXNvdXJjZUZpbmlzaCIsICJY SFJSZWFkeVN0YXRlQ2hhbmdlIiwgIlhIUkxvYWQiLCAiRnVuY3Rpb25DYWxsIiwgIkdDRXZlbnQi LCAiUmVxdWVzdEFuaW1hdGlvbkZyYW1lIiwgIkNhbmNlbEFuaW1hdGlvbkZyYW1lIiwgIkZpcmVB bmltYXRpb25GcmFtZSIsICJXZWJTb2NrZXRDcmVhdGUiLCAiV2ViU29ja2V0U2VuZEhhbmRzaGFr ZVJlcXVlc3QiLCAiV2ViU29ja2V0UmVjZWl2ZUhhbmRzaGFrZVJlc3BvbnNlIiwgIldlYlNvY2tl dERlc3Ryb3kiXSwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiVGltZWxpbmUgcmVj b3JkIHR5cGUuIgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKQEAgLTIyNDMsMTIgKzIy MDksOCBAQAogICAgICAgICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCiAgICAgICAgICAgICAg ICAgInByb3BlcnRpZXMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIs ICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJFdmVudCB0eXBlLiIgfSwKLSAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0aHJlYWQiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0 aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiSWYgcHJlc2VudCwgaWRlbnRpZmllcyB0aGUg dGhyZWFkIHRoYXQgcHJvZHVjZWQgdGhlIGV2ZW50LiIgfSwKICAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJkYXRhIiwgInR5cGUiOiAib2JqZWN0IiwgImRlc2NyaXB0aW9uIjogIkV2ZW50 IGRhdGEuIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNoaWxkcmVuIiwgInR5 cGUiOiAiYXJyYXkiLCAib3B0aW9uYWwiOiB0cnVlLCAiaXRlbXMiOiB7ICIkcmVmIjogIlRpbWVs aW5lRXZlbnQiIH0sICJkZXNjcmlwdGlvbiI6ICJOZXN0ZWQgcmVjb3Jkcy4iIH0sCi0gICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAiY291bnRlcnMiLCAiJHJlZiI6ICJET01Db3VudGVycyIs ICJvcHRpb25hbCI6IHRydWUsICAiZGVzY3JpcHRpb24iOiAiQ3VycmVudCB2YWx1ZXMgb2YgRE9N IGNvdW50ZXJzLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ1c2VkSGVhcFNp emUiLCAidHlwZSI6ICJpbnRlZ2VyIiwgIm9wdGlvbmFsIjogdHJ1ZSwgICJkZXNjcmlwdGlvbiI6 ICJDdXJyZW50IHNpemUgb2YgSlMgaGVhcC4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAibmF0aXZlSGVhcFN0YXRpc3RpY3MiLCAidHlwZSI6ICJvYmplY3QiLCAib3B0aW9uYWwi OiB0cnVlLCAgImRlc2NyaXB0aW9uIjogIk5hdGl2ZSBoZWFwIHN0YXRpc3RpY3MuIiB9CisgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY2hpbGRyZW4iLCAidHlwZSI6ICJhcnJheSIsICJv cHRpb25hbCI6IHRydWUsICJpdGVtcyI6IHsgIiRyZWYiOiAiVGltZWxpbmVFdmVudCIgfSwgImRl c2NyaXB0aW9uIjogIk5lc3RlZCByZWNvcmRzLiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAg ICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlRpbWVsaW5lIHJlY29yZCBjb250YWlucyBpbmZv cm1hdGlvbiBhYm91dCB0aGUgcmVjb3JkZWQgYWN0aXZpdHkuIgogICAgICAgICAgICAgfQpAQCAt MjI1NywyOSArMjIxOSwxMyBAQAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1l IjogInN0YXJ0IiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJtYXhDYWxsU3RhY2tEZXB0aCIsICJvcHRpb25hbCI6IHRydWUs ICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiU2FtcGxlcyBKYXZhU2NyaXB0IHN0 YWNrIHRyYWNlcyB1cCB0byA8Y29kZT5tYXhDYWxsU3RhY2tEZXB0aDwvY29kZT4sIGRlZmF1bHRz IHRvIDUuIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImluY2x1ZGVEb21Db3Vu dGVycyIsICJvcHRpb25hbCI6IHRydWUsICJ0eXBlIjogImJvb2xlYW4iLCAgImRlc2NyaXB0aW9u IjogIldoZXRoZXIgRE9NIGNvdW50ZXJzIGRhdGEgc2hvdWxkIGJlIGluY2x1ZGVkIGludG8gdGlt ZWxpbmUgZXZlbnRzLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpbmNsdWRl TmF0aXZlTWVtb3J5U3RhdGlzdGljcyIsICJvcHRpb25hbCI6IHRydWUsICJ0eXBlIjogImJvb2xl YW4iLCAgImRlc2NyaXB0aW9uIjogIldoZXRoZXIgbmF0aXZlIG1lbW9yeSB1c2FnZSBzdGF0aXN0 aWNzIHNob3VsZCBiZSByZXBvcnRlZCBhcyBwYXJ0IG9mIHRpbWVsaW5lIGV2ZW50cy4iIH0KKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJtYXhDYWxsU3RhY2tEZXB0aCIsICJvcHRpb25h bCI6IHRydWUsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiU2FtcGxlcyBKYXZh U2NyaXB0IHN0YWNrIHRyYWNlcyB1cCB0byA8Y29kZT5tYXhDYWxsU3RhY2tEZXB0aDwvY29kZT4s IGRlZmF1bHRzIHRvIDUuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAi ZGVzY3JpcHRpb24iOiAiU3RhcnRzIGNhcHR1cmluZyBpbnN0cnVtZW50YXRpb24gZXZlbnRzLiIK ICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAi c3RvcCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlN0b3BzIGNhcHR1cmluZyBp bnN0cnVtZW50YXRpb24gZXZlbnRzLiIKLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICB7Ci0g ICAgICAgICAgICAgICAgIm5hbWUiOiAic3VwcG9ydHNGcmFtZUluc3RydW1lbnRhdGlvbiIsCi0g ICAgICAgICAgICAgICAgInJldHVybnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAicmVzdWx0IiwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNjcmlwdGlvbiI6ICJUcnVlIGlmIHRp bWVsaW5lIHN1cHBvcnRzIGZyYW1lIGluc3RydW1lbnRhdGlvbi4iIH0KLSAgICAgICAgICAgICAg ICBdLAotICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJUZWxscyB3aGV0aGVyIHRpbWVs aW5lIGFnZW50IHN1cHBvcnRzIGZyYW1lIGluc3RydW1lbnRhdGlvbi4iCi0gICAgICAgICAgICB9 LAotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogImNhbk1vbml0b3JNYWlu VGhyZWFkIiwKLSAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKLSAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJyZXN1bHQiLCAidHlwZSI6ICJib29sZWFuIiwgImRlc2NyaXB0aW9uIjog IlRydWUgaWYgdGltZWxpbmUgc3VwcG9ydHMgbWFpbiB0aHJlYWQgQ1BVIHV0aWxpemF0aW9uIGlu c3RydW1lbnRhdGlvbi4iIH0KLSAgICAgICAgICAgICAgICBdLAotICAgICAgICAgICAgICAgICJk ZXNjcmlwdGlvbiI6ICJUZWxscyB3aGV0aGVyIHRpbWVsaW5lIGFnZW50IHN1cHBvcnRzIG1haW4g dGhyZWFkIENQVSB1dGlsaXphdGlvbiBpbnN0cnVtZW50YXRpb24uIgogICAgICAgICAgICAgfQog ICAgICAgICBdLAogICAgICAgICAiZXZlbnRzIjogWwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9XZWJLaXQudmN4cHJvai9XZWJLaXRFeHBvcnRHZW5lcmF0b3IvV2ViS2l0RXhwb3J0cy5kZWYu aW4gYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdEV4cG9ydEdlbmVyYXRvci9X ZWJLaXRFeHBvcnRzLmRlZi5pbgppbmRleCBkM2NhNjY4MDAwMTY0MDhkNTVlZDY0MjBmMWEwZjFh OWNjMmIxZWViLi5mODE3ODViYjE3NTNmODZlNWE2ZDhkNDA2MjA3ZTRiMDIzOGNmZmJiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdEV4cG9ydEdlbmVyYXRv ci9XZWJLaXRFeHBvcnRzLmRlZi5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9q L1dlYktpdEV4cG9ydEdlbmVyYXRvci9XZWJLaXRFeHBvcnRzLmRlZi5pbgpAQCAtMTI0LDEwICsx MjQsNiBAQCBFWFBPUlRTCiAgICAgICAgIHN5bWJvbFdpdGhQb2ludGVyKD9hZGRUZXh0TWF0Y2hN YXJrZXJARG9jdW1lbnRNYXJrZXJDb250cm9sbGVyQFdlYkNvcmVAQFFBRVhQQlZSYW5nZUAyQF9O QFosID9hZGRUZXh0TWF0Y2hNYXJrZXJARG9jdW1lbnRNYXJrZXJDb250cm9sbGVyQFdlYkNvcmVA QFFFQUFYUEVCVlJhbmdlQDJAX05AWikKICAgICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP2Jyb2Fk Y2FzdEBUaHJlYWRDb25kaXRpb25AV1RGQEBRQUVYWFosID9icm9hZGNhc3RAVGhyZWFkQ29uZGl0 aW9uQFdURkBAUUVBQVhYWikKICAgICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP2NhbGxPbk1haW5U aHJlYWRAV1RGQEBZQVhQNkFYUEFYQFowQFosID9jYWxsT25NYWluVGhyZWFkQFdURkBAWUFYUDZB WFBFQVhAWjBAWikKLSNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgICAgICBzeW1ib2xXaXRoUG9p bnRlcig/ZGlkQmVnaW5GcmFtZUBJbnNwZWN0b3JDb250cm9sbGVyQFdlYkNvcmVAQFFBRVhYWiwg P2RpZEJlZ2luRnJhbWVASW5zcGVjdG9yQ29udHJvbGxlckBXZWJDb3JlQEBRRUFBWFhaKQotICAg ICAgICBzeW1ib2xXaXRoUG9pbnRlcig/ZGlkQ2FuY2VsRnJhbWVASW5zcGVjdG9yQ29udHJvbGxl ckBXZWJDb3JlQEBRQUVYWFosID9kaWRDYW5jZWxGcmFtZUBJbnNwZWN0b3JDb250cm9sbGVyQFdl YkNvcmVAQFFFQUFYWFopCi0jZW5kaWYKICAgICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP2NvdW50 ZXJWYWx1ZUZvckVsZW1lbnRAV2ViQ29yZUBAWUE/QVZTdHJpbmdAV1RGQEBQQVZFbGVtZW50QDFA QFosID9jb3VudGVyVmFsdWVGb3JFbGVtZW50QFdlYkNvcmVAQFlBP0FWU3RyaW5nQFdURkBAUEVB VkVsZW1lbnRAMUBAWikKICAgICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP2NyZWF0ZVRocmVhZEBX VEZAQFlBSVA2QVBBWFBBWEBaMFBCREBaLCA/Y3JlYXRlVGhyZWFkQFdURkBAWUFJUDZBUEVBWFBF QVhAWjBQRUJEQFopCiAgICAgICAgIHN5bWJvbFdpdGhQb2ludGVyKD9jcmVhdGVUaHJlYWRAV1RG QEBZQUlQNkFYUEFYQFowUEJEQFosID9jcmVhdGVUaHJlYWRAV1RGQEBZQUlQNkFYUEVBWEBaMFBF QkRAWikK