57299 2011-03-28 22:28:40 -0700 Web Inspector: document Timeline domain, make timeline event types of type string. 2011-03-29 06:21:32 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned abarth apavlov buildbot bweinstein dglazkov eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit-ews webkit.review.bot yurys oldest_to_newest 375005 0 pfeldman 2011-03-28 22:28:40 -0700 Patch to follow. 375013 1 87262 pfeldman 2011-03-28 22:39:08 -0700 Created attachment 87262 Patch 375016 2 webkit.review.bot 2011-03-28 22:42:53 -0700 Attachment 87262 did not build on chromium: Build output: http://queues.webkit.org/results/8281066 375018 3 webkit-ews 2011-03-28 22:43:51 -0700 Attachment 87262 did not build on qt: Build output: http://queues.webkit.org/results/8280068 375024 4 buildbot 2011-03-28 23:02:00 -0700 Attachment 87262 did not build on win: Build output: http://queues.webkit.org/results/8285071 375032 5 87264 pfeldman 2011-03-28 23:08:16 -0700 Created attachment 87264 [PATCH] Patch that compiles. 375184 6 87264 yurys 2011-03-29 04:21:44 -0700 Comment on attachment 87264 [PATCH] Patch that compiles. View in context: https://bugs.webkit.org/attachment.cgi?id=87264&action=review > Source/WebCore/inspector/InspectorTimelineAgent.cpp:54 > +static const char EventDispatch[] = "EventDispatch"; Could we sort them alphabetically. > Source/WebCore/inspector/front-end/TimelineAgent.js:37 > + EventDispatch: "EventDispatch", We should enumerated these constants in the .json scheme. This deserves its own change, please file a bug and put a FIXME here. 375230 7 pfeldman 2011-03-29 06:05:42 -0700 Committed r82239: <http://trac.webkit.org/changeset/82239> 375248 8 webkit.review.bot 2011-03-29 06:21:32 -0700 http://trac.webkit.org/changeset/82239 might have broken Qt Linux Release minimal 87262 2011-03-28 22:39:08 -0700 2011-03-28 23:08:09 -0700 Patch bug-57299-20110329093906.patch text/plain 32257 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODIxMzMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5ZjFhOWJiNTc4ZGExZWYxMWUyOGMy NWQwN2NhNzhmZWU2OWEzNjhmLi5iMzI2MjMxOTJkMTc0ODM3ZWU5ZTM5MzlkNDA1MWM3ZDBiZTlh NWFkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDMtMjggIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZG9jdW1lbnQgVGltZWxpbmUgZG9tYWluLCBt YWtlIHRpbWVsaW5lIGV2ZW50IHR5cGVzIG9mIHR5cGUgc3RyaW5nLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcyOTkKKworICAgICAgICAqIGluc3Bl Y3Rvci90aW1lbGluZS90aW1lbGluZS10ZXN0LmpzOgorICAgICAgICAoaW5pdGlhbGl6ZV9UaW1l bGluZS5JbnNwZWN0b3JUZXN0LnN0YXJ0VGltZWxpbmUpOgorCiAyMDExLTAzLTI4ICBKZXNzaWUg QmVybGluICA8amJlcmxpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkg QWRhbSBSb2Jlbi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90 aW1lbGluZS10ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5l LXRlc3QuanMKaW5kZXggMzE5NTRiNDVlMjlhN2YyZTIyMDM1NmM0Zjk4OTNlOTgwYTc0ZmZlZi4u ZGI1ZjNhNWQyYTQzZTMwMjFkOTg5MTE5NjgwZTA5Mzc5YTJmMDk1NiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLXRlc3QuanMKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLXRlc3QuanMKQEAgLTI1LDcgKzI1LDcg QEAgSW5zcGVjdG9yVGVzdC5zdGFydFRpbWVsaW5lID0gZnVuY3Rpb24oY2FsbGJhY2spCiAgICAg ICAgIGZvciAodmFyIGkgPSAwOyByZWNvcmQuY2hpbGRyZW4gJiYgaSA8IHJlY29yZC5jaGlsZHJl bi5sZW5ndGg7ICsraSkKICAgICAgICAgICAgIGFkZFJlY29yZChyZWNvcmQuY2hpbGRyZW5baV0p OwogICAgIH0KLSAgICBJbnNwZWN0b3JUZXN0LmFkZFNuaWZmZXIoV2ViSW5zcGVjdG9yLlRpbWVs aW5lRGlzcGF0Y2hlci5wcm90b3R5cGUsICJhZGRSZWNvcmRUb1RpbWVsaW5lIiwgYWRkUmVjb3Jk LCB0cnVlKTsKKyAgICBJbnNwZWN0b3JUZXN0LmFkZFNuaWZmZXIoV2ViSW5zcGVjdG9yLlRpbWVs aW5lRGlzcGF0Y2hlci5wcm90b3R5cGUsICJldmVudFJlY29yZGVkIiwgYWRkUmVjb3JkLCB0cnVl KTsKIH07CiAKIEluc3BlY3RvclRlc3Quc3RvcFRpbWVsaW5lID0gZnVuY3Rpb24oY2FsbGJhY2sp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggMWVlNDVmZTcwNjE2NjAwOTRjN2Y5MzBhYzAzOWQ2Y2E0ZWJhMmVlNC4u NzlmNDAwZTM2YzA5OTkxNDEwZDllMmZlNTNlZjg1NTkwM2UwOGU4MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDYxIEBACisyMDExLTAzLTI4ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdlYiBJbnNwZWN0b3I6IGRvY3VtZW50IFRpbWVsaW5lIGRvbWFpbiwgbWFrZSB0aW1lbGluZSBl dmVudCB0eXBlcyBvZiB0eXBlIHN0cmluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU3Mjk5CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y Lmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cHVzaEdDRXZlbnRSZWNv cmRzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN0YXJ0KToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN0b3ApOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbENhbGxGdW5jdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDYWxsRnVuY3Rpb24p OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbERpc3BhdGNo RXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkRGlz cGF0Y2hFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3 aWxsTGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRp ZExheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxs UmVjYWxjdWxhdGVTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFn ZW50OjpkaWRSZWNhbGN1bGF0ZVN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OndpbGxQYWludCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1l bGluZUFnZW50OjpkaWRQYWludCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGlu ZUFnZW50Ojp3aWxsV3JpdGVIVE1MKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVs aW5lQWdlbnQ6OmRpZFdyaXRlSFRNTCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1l bGluZUFnZW50OjpkaWRJbnN0YWxsVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6ZGlkUmVtb3ZlVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6d2lsbEZpcmVUaW1lcik6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpkaWRGaXJlVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbENoYW5nZVhIUlJlYWR5U3RhdGUpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ2hhbmdlWEhSUmVhZHlTdGF0ZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsTG9hZFhIUik6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRMb2FkWEhSKToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxFdmFsdWF0ZVNj cmlwdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRFdmFs dWF0ZVNjcmlwdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojpk aWRTY2hlZHVsZVJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JU aW1lbGluZUFnZW50Ojp3aWxsU2VuZFJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsUmVjZWl2ZVJlc291cmNlRGF0YSk6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRSZWNlaXZlUmVzb3VyY2VE YXRhKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxSZWNl aXZlUmVzb3VyY2VSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpkaWRSZWNlaXZlUmVzb3VyY2VSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRGaW5pc2hMb2FkaW5nUmVzb3VyY2UpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTWFya1RpbWVsaW5lKToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZE1hcmtET01Db250ZW50 RXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTWFy a0xvYWRFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojph ZGRSZWNvcmRUb1RpbWVsaW5lKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpwdXNoQ3VycmVudFJlY29yZCk6CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv clRpbWVsaW5lQWdlbnQ6OlRpbWVsaW5lUmVjb3JkRW50cnk6OlRpbWVsaW5lUmVjb3JkRW50cnkp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5qczoKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuZ2V0IF9yZWNvcmRTdHlsZXMpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9jcmVhdGVFdmVudERp dmlkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9p bm5lckFkZFJlY29yZFRvVGltZWxpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l RGlzcGF0Y2hlci5wcm90b3R5cGUuc3RhcnRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVEaXNwYXRjaGVyLnByb3RvdHlwZS5zdG9wcGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UaW1lbGluZURpc3BhdGNoZXIucHJvdG90eXBlLmV2ZW50UmVjb3JkZWQpOgorCiAyMDExLTAz LTI4ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByODIwOTkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yLmpzb24KaW5kZXggZGIzYWYyZTAyYWZlOGNjNmU2NjM2MjhhZWY5YTE2MjA5MzJl OTUwMi4uOWQ2NTQ3NjRjMzEwYmMxZGNkMzBlODIyMzVhMDdkNTQyYjE3MDVjNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMTAyNCwyNyArMTAyNCw0NCBAQAog ICAgIH0sCiAgICAgewogICAgICAgICAiZG9tYWluIjogIlRpbWVsaW5lIiwKLSAgICAgICAgInR5 cGVzIjogW10sCisgICAgICAgICJkZXNjcmlwdGlvbiI6ICJUaW1lbGluZSBwcm92aWRlcyBpdHMg Y2xpZW50cyB3aXRoIGluc3RydW1lbnRhdGlvbiByZWNvcmRzIHRoYXQgYXJlIGdlbmVyYXRlZCBk dXJpbmcgdGhlIHBhZ2UgcnVudGltZS4gVGltZWxpbmUgaW5zdHJ1bWVudGF0aW9uIGNhbiBiZSBz dGFydGVkIGFuZCBzdG9wcGVkIHVzaW5nIGNvcnJlc3BvbmRpbmcgY29tbWFuZHMuIFdoaWxlIHRp bWVsaW5lIGlzIHN0YXJ0ZWQsIGl0IGlzIGdlbmVyYXRpbmcgdGltZWxpbmUgZXZlbnQgcmVjb3Jk cy4iCisgICAgICAgICJ0eXBlcyI6IFsKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAi aWQiOiAiVGltZWxpbmVSZWNvcmQiLAorICAgICAgICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIs CisgICAgICAgICAgICAgICAgInByb3BlcnRpZXMiOiB7CisgICAgICAgICAgICAgICAgICAgICJ0 eXBlIjogeyAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiRXZlbnQgdHlwZS4iIH0s CisgICAgICAgICAgICAgICAgICAgICJkYXRhIjogeyAidHlwZSI6ICJvYmplY3QiLCAiZGVzY3Jp cHRpb24iOiAiRXZlbnQgZGF0YS4iIH0sCisgICAgICAgICAgICAgICAgICAgICJjaGlsZHJlbiI6 IHsgInR5cGUiOiAiYXJyYXkiLCAib3B0aW9uYWwiIDogdHJ1ZSwgIml0ZW1zIjogeyAiJHJlZiI6 ICJUaW1lbGluZVJlY29yZCIgfSwgImRlc2NyaXB0aW9uIjogIk5lc3RlZCByZWNvcmRzLiIgfQor ICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlRpbWVs aW5lIHJlY29yZCBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dCB0aGUgcmVjb3JkZWQgYWN0aXZp dHkuIgorICAgICAgICAgICAgfQorICAgICAgICBdLAogICAgICAgICAiY29tbWFuZHMiOiBbCiAg ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAic3RhcnQiCisgICAgICAgICAg ICAgICAgIm5hbWUiOiAic3RhcnQiLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJT dGFydHMgY2FwdHVyaW5nIGluc3RydW1lbnRhdGlvbiBldmVudHMuIgogICAgICAgICAgICAgfSwK ICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJzdG9wIgorICAgICAgICAg ICAgICAgICJuYW1lIjogInN0b3AiLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJT dG9wcyBjYXB0dXJpbmcgaW5zdHJ1bWVudGF0aW9uIGV2ZW50cy4iCiAgICAgICAgICAgICB9CiAg ICAgICAgIF0sCiAgICAgICAgICJldmVudHMiOiBbCiAgICAgICAgICAgICB7Ci0gICAgICAgICAg ICAgICAgIm5hbWUiOiAidGltZWxpbmVQcm9maWxlcldhc1N0YXJ0ZWQiCisgICAgICAgICAgICAg ICAgIm5hbWUiOiAic3RhcnRlZCIsCisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZp cmVkIHdoZW4gdGltZWxpbmUgaGFzIGJlZW4gc3RhcnRlZC4iCiAgICAgICAgICAgICB9LAogICAg ICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogInRpbWVsaW5lUHJvZmlsZXJXYXNT dG9wcGVkIgorICAgICAgICAgICAgICAgICJuYW1lIjogInN0b3BwZWQiLAorICAgICAgICAgICAg ICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVuIHRpbWVsaW5lIGhhcyBiZWVuIHN0b3BwZWQu IgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6 ICJhZGRSZWNvcmRUb1RpbWVsaW5lIiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJldmVudFJl Y29yZGVkIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJyZWNvcmQiLCAiJHJlZiI6ICJUaW1lbGluZVJlY29yZCIgfQotICAg ICAgICAgICAgICAgIF0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZWNvcmQiLCAi JHJlZiI6ICJUaW1lbGluZVJlY29yZCIsICJkZXNjcmlwdGlvbiI6ICJUaW1lbGluZSByZWNvcmQg ZGF0YS4iIH0KKyAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlv biI6ICJGaXJlZCBmb3IgZXZlcnkgaW5zdHJ1bWVudGF0aW9uIGV2ZW50IHdoaWxlIHRpbWVsaW5l IGlzIHN0YXJ0ZWQuIgogICAgICAgICAgICAgfQogICAgICAgICBdCiAgICAgfSwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAppbmRl eCBkNDVhNTA3NTFjMzgyMWNkNTAyZjBmMjNmYTYyZDZlOGZlMTUxMmY4Li44OWI0NTIyOTAyM2Ez NTJjYzZhOTExOWU4YWE4Zjg3OTE1ZTY3NDU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCkBAIC01MCw2ICs1MCwzMCBAQCBu YW1lc3BhY2UgVGltZWxpbmVBZ2VudFN0YXRlIHsKIHN0YXRpYyBjb25zdCBjaGFyIHRpbWVsaW5l QWdlbnRFbmFibGVkW10gPSAidGltZWxpbmVBZ2VudEVuYWJsZWQiOwogfQogCituYW1lc3BhY2Ug VGltZWxpbmVSZWNvcmRUeXBlIHsKK3N0YXRpYyBjb25zdCBjaGFyIEV2ZW50RGlzcGF0Y2hbXSA9 ICJFdmVudERpc3BhdGNoIjsKK3N0YXRpYyBjb25zdCBjaGFyIExheW91dFtdID0gIkxheW91dCI7 CitzdGF0aWMgY29uc3QgY2hhciBSZWNhbGN1bGF0ZVN0eWxlc1tdID0gIlJlY2FsY3VsYXRlU3R5 bGVzIjsKK3N0YXRpYyBjb25zdCBjaGFyIFBhaW50W10gPSAiUGFpbnQiOworc3RhdGljIGNvbnN0 IGNoYXIgUGFyc2VIVE1MW10gPSAiUGFyc2VIVE1MIjsKK3N0YXRpYyBjb25zdCBjaGFyIFRpbWVy SW5zdGFsbFtdID0gIlRpbWVySW5zdGFsbCI7CitzdGF0aWMgY29uc3QgY2hhciBUaW1lclJlbW92 ZVtdID0gIlRpbWVyUmVtb3ZlIjsKK3N0YXRpYyBjb25zdCBjaGFyIFRpbWVyRmlyZVtdID0gIlRp bWVyRmlyZSI7CitzdGF0aWMgY29uc3QgY2hhciBYSFJSZWFkeVN0YXRlQ2hhbmdlW10gPSAiWEhS UmVhZHlTdGF0ZUNoYW5nZSI7CitzdGF0aWMgY29uc3QgY2hhciBYSFJMb2FkW10gPSAiWEhSTG9h ZCI7CitzdGF0aWMgY29uc3QgY2hhciBFdmFsdWF0ZVNjcmlwdFtdID0gIkV2YWx1YXRlU2NyaXB0 IjsKK3N0YXRpYyBjb25zdCBjaGFyIE1hcmtbXSA9ICJNYXJrIjsKK3N0YXRpYyBjb25zdCBjaGFy IFJlc291cmNlU2VuZFJlcXVlc3RbXSA9ICJSZXNvdXJjZVNlbmRSZXF1ZXN0IjsKK3N0YXRpYyBj b25zdCBjaGFyIFJlc291cmNlUmVjZWl2ZVJlc3BvbnNlW10gPSAiUmVzb3VyY2VSZWNlaXZlUmVz cG9uc2UiOworc3RhdGljIGNvbnN0IGNoYXIgUmVzb3VyY2VGaW5pc2hbXSA9ICJSZXNvdXJjZUZp bmlzaCI7CitzdGF0aWMgY29uc3QgY2hhciBGdW5jdGlvbkNhbGxbXSA9ICJGdW5jdGlvbkNhbGwi Oworc3RhdGljIGNvbnN0IGNoYXIgUmVjZWl2ZVJlc291cmNlRGF0YVtdID0gIlJlY2VpdmVSZXNv dXJjZURhdGEiOworc3RhdGljIGNvbnN0IGNoYXIgR0NFdmVudFtdID0gIkdDRXZlbnQiOworc3Rh dGljIGNvbnN0IGNoYXIgTWFya0RPTUNvbnRlbnRbXSA9ICJNYXJrRE9NQ29udGVudCI7CitzdGF0 aWMgY29uc3QgY2hhciBNYXJrTG9hZFtdID0gIk1hcmtMb2FkIjsKK3N0YXRpYyBjb25zdCBjaGFy IFNjaGVkdWxlUmVzb3VyY2VSZXF1ZXN0W10gPSAiU2NoZWR1bGVSZXNvdXJjZVJlcXVlc3QiOwor fQorCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnB1c2hHQ0V2ZW50UmVjb3JkcygpCiB7 CiAgICAgaWYgKCFtX2djRXZlbnRzLnNpemUoKSkKQEAgLTYxLDcgKzg1LDcgQEAgdm9pZCBJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpwdXNoR0NFdmVudFJlY29yZHMoKQogICAgICAgICBSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdl bmVyaWNSZWNvcmQoaS0+c3RhcnRUaW1lKTsKICAgICAgICAgcmVjb3JkLT5zZXRPYmplY3QoImRh dGEiLCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdDRXZlbnREYXRhKGktPmNvbGxlY3Rl ZEJ5dGVzKSk7CiAgICAgICAgIHJlY29yZC0+c2V0TnVtYmVyKCJlbmRUaW1lIiwgaS0+ZW5kVGlt ZSk7Ci0gICAgICAgIGFkZFJlY29yZFRvVGltZWxpbmUocmVjb3JkLnJlbGVhc2UoKSwgR0NFdmVu dFRpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAgICAgIGFkZFJlY29yZFRvVGltZWxpbmUocmVjb3Jk LnJlbGVhc2UoKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpHQ0V2ZW50KTsKICAgICB9CiB9CiAKQEAg LTEwMSw3ICsxMjUsNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN0YXJ0KEVycm9y U3RyaW5nKikKICAgICAgICAgcmV0dXJuOwogICAgIG1faW5zdHJ1bWVudGluZ0FnZW50cy0+c2V0 SW5zcGVjdG9yVGltZWxpbmVBZ2VudCh0aGlzKTsKICAgICBTY3JpcHRHQ0V2ZW50OjphZGRFdmVu dExpc3RlbmVyKHRoaXMpOwotICAgIG1fZnJvbnRlbmQtPnRpbWVsaW5lUHJvZmlsZXJXYXNTdGFy dGVkKCk7CisgICAgbV9mcm9udGVuZC0+c3RhcnRlZCgpOwogICAgIG1fc3RhdGUtPnNldEJvb2xl YW4oVGltZWxpbmVBZ2VudFN0YXRlOjp0aW1lbGluZUFnZW50RW5hYmxlZCwgdHJ1ZSk7CiB9CiAK QEAgLTExMSw3ICsxMzUsNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN0b3AoRXJy b3JTdHJpbmcqKQogICAgICAgICByZXR1cm47CiAgICAgbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5z ZXRJbnNwZWN0b3JUaW1lbGluZUFnZW50KDApOwogICAgIGlmIChtX2Zyb250ZW5kKQotICAgICAg ICBtX2Zyb250ZW5kLT50aW1lbGluZVByb2ZpbGVyV2FzU3RvcHBlZCgpOworICAgICAgICBtX2Zy b250ZW5kLT5zdG9wcGVkKCk7CiAgICAgU2NyaXB0R0NFdmVudDo6cmVtb3ZlRXZlbnRMaXN0ZW5l cih0aGlzKTsKIAogICAgIGNsZWFyUmVjb3JkU3RhY2soKTsKQEAgLTEyNyw1OCArMTUxLDU4IEBA IGJvb2wgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6c3RhcnRlZCgpIGNvbnN0CiAKIHZvaWQgSW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbENhbGxGdW5jdGlvbihjb25zdCBTdHJpbmcmIHNjcmlw dE5hbWUsIGludCBzY3JpcHRMaW5lKQogewotICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5l UmVjb3JkRmFjdG9yeTo6Y3JlYXRlRnVuY3Rpb25DYWxsRGF0YShzY3JpcHROYW1lLCBzY3JpcHRM aW5lKSwgRnVuY3Rpb25DYWxsVGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBwdXNoQ3VycmVudFJl Y29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUZ1bmN0aW9uQ2FsbERhdGEoc2NyaXB0 TmFtZSwgc2NyaXB0TGluZSksIFRpbWVsaW5lUmVjb3JkVHlwZTo6RnVuY3Rpb25DYWxsKTsKIH0K IAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDYWxsRnVuY3Rpb24oKQogewotICAg IGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChGdW5jdGlvbkNhbGxUaW1lbGluZVJlY29yZFR5cGUp OworICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZFR5cGU6OkZ1bmN0 aW9uQ2FsbCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbERpc3BhdGNo RXZlbnQoY29uc3QgRXZlbnQmIGV2ZW50KQogewogICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVs aW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRXZlbnREaXNwYXRjaERhdGEoZXZlbnQpLAotICAgICAg ICBFdmVudERpc3BhdGNoVGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICAgICAgVGltZWxpbmVSZWNv cmRUeXBlOjpFdmVudERpc3BhdGNoKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50 OjpkaWREaXNwYXRjaEV2ZW50KCkKIHsKLSAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoRXZl bnREaXNwYXRjaFRpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAgZGlkQ29tcGxldGVDdXJyZW50UmVj b3JkKFRpbWVsaW5lUmVjb3JkVHlwZTo6RXZlbnREaXNwYXRjaCk7CiB9CiAKIHZvaWQgSW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6d2lsbExheW91dCgpCiB7Ci0gICAgcHVzaEN1cnJlbnRSZWNvcmQo SW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKSwgTGF5b3V0VGltZWxpbmVSZWNvcmRUeXBlKTsKKyAg ICBwdXNoQ3VycmVudFJlY29yZChJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpLCBUaW1lbGluZVJl Y29yZFR5cGU6OkxheW91dCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlk TGF5b3V0KCkKIHsKLSAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoTGF5b3V0VGltZWxpbmVS ZWNvcmRUeXBlKTsKKyAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRU eXBlOjpMYXlvdXQpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxSZWNh bGN1bGF0ZVN0eWxlKCkKIHsKLSAgICBwdXNoQ3VycmVudFJlY29yZChJbnNwZWN0b3JPYmplY3Q6 OmNyZWF0ZSgpLCBSZWNhbGN1bGF0ZVN0eWxlc1RpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAgcHVz aEN1cnJlbnRSZWNvcmQoSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKSwgVGltZWxpbmVSZWNvcmRU eXBlOjpSZWNhbGN1bGF0ZVN0eWxlcyk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6ZGlkUmVjYWxjdWxhdGVTdHlsZSgpCiB7Ci0gICAgZGlkQ29tcGxldGVDdXJyZW50UmVjb3Jk KFJlY2FsY3VsYXRlU3R5bGVzVGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBkaWRDb21wbGV0ZUN1 cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRUeXBlOjpSZWNhbGN1bGF0ZVN0eWxlcyk7CiB9CiAK IHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbFBhaW50KGNvbnN0IEludFJlY3QmIHJl Y3QpCiB7Ci0gICAgcHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVh dGVQYWludERhdGEocmVjdCksIFBhaW50VGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBwdXNoQ3Vy cmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVBhaW50RGF0YShyZWN0KSwg VGltZWxpbmVSZWNvcmRUeXBlOjpQYWludCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVB Z2VudDo6ZGlkUGFpbnQoKQogewotICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChQYWludFRp bWVsaW5lUmVjb3JkVHlwZSk7CisgICAgZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKFRpbWVsaW5l UmVjb3JkVHlwZTo6UGFpbnQpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6Ondp bGxXcml0ZUhUTUwodW5zaWduZWQgaW50IGxlbmd0aCwgdW5zaWduZWQgaW50IHN0YXJ0TGluZSkK IHsKLSAgICBwdXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVBh cnNlSFRNTERhdGEobGVuZ3RoLCBzdGFydExpbmUpLCBQYXJzZUhUTUxUaW1lbGluZVJlY29yZFR5 cGUpOworICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRl UGFyc2VIVE1MRGF0YShsZW5ndGgsIHN0YXJ0TGluZSksIFRpbWVsaW5lUmVjb3JkVHlwZTo6UGFy c2VIVE1MKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRXcml0ZUhUTUwo dW5zaWduZWQgaW50IGVuZExpbmUpCkBAIC0xODYsNyArMjEwLDcgQEAgdm9pZCBJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpkaWRXcml0ZUhUTUwodW5zaWduZWQgaW50IGVuZExpbmUpCiAgICAgaWYg KCFtX3JlY29yZFN0YWNrLmlzRW1wdHkoKSkgewogICAgICAgICBUaW1lbGluZVJlY29yZEVudHJ5 IGVudHJ5ID0gbV9yZWNvcmRTdGFjay5sYXN0KCk7CiAgICAgICAgIGVudHJ5LmRhdGEtPnNldE51 bWJlcigiZW5kTGluZSIsIGVuZExpbmUpOwotICAgICAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNv cmQoUGFyc2VIVE1MVGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICAgICAgZGlkQ29tcGxldGVDdXJy ZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkVHlwZTo6UGFyc2VIVE1MKTsKICAgICB9CiB9CiAKQEAg LTE5NSw3ICsyMTksNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZEluc3RhbGxU aW1lcihpbnQgdGltZXJJZCwgaW50IHRpbWVvdXQsIGJvb2wgc2luZwogICAgIHB1c2hHQ0V2ZW50 UmVjb3JkcygpOwogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCA9IFRpbWVsaW5l UmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChXVEY6OmN1cnJlbnRUaW1lTVMoKSk7 CiAgICAgcmVjb3JkLT5zZXRPYmplY3QoImRhdGEiLCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNy ZWF0ZVRpbWVySW5zdGFsbERhdGEodGltZXJJZCwgdGltZW91dCwgc2luZ2xlU2hvdCkpOwotICAg IGFkZFJlY29yZFRvVGltZWxpbmUocmVjb3JkLnJlbGVhc2UoKSwgVGltZXJJbnN0YWxsVGltZWxp bmVSZWNvcmRUeXBlKTsKKyAgICBhZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29yZC5yZWxlYXNlKCks IFRpbWVsaW5lUmVjb3JkVHlwZTo6VGltZXJJbnN0YWxsKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpkaWRSZW1vdmVUaW1lcihpbnQgdGltZXJJZCkKQEAgLTIwMyw0NyArMjI3 LDQ3IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkUmVtb3ZlVGltZXIoaW50IHRp bWVySWQpCiAgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgUmVmUHRyPEluc3BlY3Rvck9i amVjdD4gcmVjb3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3Jk KFdURjo6Y3VycmVudFRpbWVNUygpKTsKICAgICByZWNvcmQtPnNldE9iamVjdCgiZGF0YSIsIFRp bWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1RpbWVyRGF0YSh0aW1lcklkKSk7Ci0g ICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQucmVsZWFzZSgpLCBUaW1lclJlbW92ZVRpbWVs aW5lUmVjb3JkVHlwZSk7CisgICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQucmVsZWFzZSgp LCBUaW1lbGluZVJlY29yZFR5cGU6OlRpbWVyUmVtb3ZlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JU aW1lbGluZUFnZW50Ojp3aWxsRmlyZVRpbWVyKGludCB0aW1lcklkKQogewotICAgIHB1c2hDdXJy ZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1RpbWVyRGF0YSh0 aW1lcklkKSwgVGltZXJGaXJlVGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBwdXNoQ3VycmVudFJl Y29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdlbmVyaWNUaW1lckRhdGEodGltZXJJ ZCksIFRpbWVsaW5lUmVjb3JkVHlwZTo6VGltZXJGaXJlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpkaWRGaXJlVGltZXIoKQogewotICAgIGRpZENvbXBsZXRlQ3VycmVudFJl Y29yZChUaW1lckZpcmVUaW1lbGluZVJlY29yZFR5cGUpOworICAgIGRpZENvbXBsZXRlQ3VycmVu dFJlY29yZChUaW1lbGluZVJlY29yZFR5cGU6OlRpbWVyRmlyZSk7CiB9CiAKIHZvaWQgSW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6d2lsbENoYW5nZVhIUlJlYWR5U3RhdGUoY29uc3QgU3RyaW5nJiB1 cmwsIGludCByZWFkeVN0YXRlKQogewotICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlWEhSUmVhZHlTdGF0ZUNoYW5nZURhdGEodXJsLCByZWFkeVN0YXRl KSwgWEhSUmVhZHlTdGF0ZUNoYW5nZVJlY29yZFR5cGUpOworICAgIHB1c2hDdXJyZW50UmVjb3Jk KFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlWEhSUmVhZHlTdGF0ZUNoYW5nZURhdGEodXJs LCByZWFkeVN0YXRlKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpYSFJSZWFkeVN0YXRlQ2hhbmdlKTsK IH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDaGFuZ2VYSFJSZWFkeVN0YXRl KCkKIHsKLSAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoWEhSUmVhZHlTdGF0ZUNoYW5nZVJl Y29yZFR5cGUpOworICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZFR5 cGU6OlhIUlJlYWR5U3RhdGVDaGFuZ2UpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OndpbGxMb2FkWEhSKGNvbnN0IFN0cmluZyYgdXJsKSAKIHsKLSAgICBwdXNoQ3VycmVudFJl Y29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhIUkxvYWREYXRhKHVybCksIFhIUkxv YWRSZWNvcmRUeXBlKTsKKyAgICBwdXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rv cnk6OmNyZWF0ZVhIUkxvYWREYXRhKHVybCksIFRpbWVsaW5lUmVjb3JkVHlwZTo6WEhSTG9hZCk7 CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTG9hZFhIUigpCiB7Ci0gICAg ZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKFhIUkxvYWRSZWNvcmRUeXBlKTsKKyAgICBkaWRDb21w bGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRUeXBlOjpYSFJMb2FkKTsKIH0KIAogdm9p ZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsRXZhbHVhdGVTY3JpcHQoY29uc3QgU3RyaW5n JiB1cmwsIGludCBsaW5lTnVtYmVyKQogewotICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5l UmVjb3JkRmFjdG9yeTo6Y3JlYXRlRXZhbHVhdGVTY3JpcHREYXRhKHVybCwgbGluZU51bWJlciks IEV2YWx1YXRlU2NyaXB0VGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBwdXNoQ3VycmVudFJlY29y ZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2YWx1YXRlU2NyaXB0RGF0YSh1cmwsIGxp bmVOdW1iZXIpLCBUaW1lbGluZVJlY29yZFR5cGU6OkV2YWx1YXRlU2NyaXB0KTsKIH0KICAgICAK IHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkRXZhbHVhdGVTY3JpcHQoKQogewotICAg IGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChFdmFsdWF0ZVNjcmlwdFRpbWVsaW5lUmVjb3JkVHlw ZSk7CisgICAgZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkVHlwZTo6RXZh bHVhdGVTY3JpcHQpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZFNjaGVk dWxlUmVzb3VyY2VSZXF1ZXN0KGNvbnN0IFN0cmluZyYgdXJsKQpAQCAtMjUxLDggKzI3NSw4IEBA IHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkU2NoZWR1bGVSZXNvdXJjZVJlcXVlc3Qo Y29uc3QgU3RyaW5nJiB1cmwpCiAgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgUmVmUHRy PEluc3BlY3Rvck9iamVjdD4gcmVjb3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVH ZW5lcmljUmVjb3JkKFdURjo6Y3VycmVudFRpbWVNUygpKTsKICAgICByZWNvcmQtPnNldE9iamVj dCgiZGF0YSIsIFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlU2NoZWR1bGVSZXNvdXJjZVJl cXVlc3REYXRhKHVybCkpOwotICAgIHJlY29yZC0+c2V0TnVtYmVyKCJ0eXBlIiwgU2NoZWR1bGVS ZXNvdXJjZVJlcXVlc3RUaW1lbGluZVJlY29yZFR5cGUpOwotICAgIGFkZFJlY29yZFRvVGltZWxp bmUocmVjb3JkLnJlbGVhc2UoKSwgU2NoZWR1bGVSZXNvdXJjZVJlcXVlc3RUaW1lbGluZVJlY29y ZFR5cGUpOworICAgIHJlY29yZC0+c2V0TnVtYmVyKCJ0eXBlIiwgVGltZWxpbmVSZWNvcmRUeXBl OjpTY2hlZHVsZVJlc291cmNlUmVxdWVzdCk7CisgICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNv cmQucmVsZWFzZSgpLCBUaW1lbGluZVJlY29yZFR5cGU6OlNjaGVkdWxlUmVzb3VyY2VSZXF1ZXN0 KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsU2VuZFJlc291cmNlUmVx dWVzdCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVx dWVzdCkKQEAgLTI2MCwyOSArMjg0LDI5IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6 d2lsbFNlbmRSZXNvdXJjZVJlcXVlc3QodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjCiAgICAg cHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVjb3Jk ID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKFdURjo6Y3VycmVu dFRpbWVNUygpKTsKICAgICByZWNvcmQtPnNldE9iamVjdCgiZGF0YSIsIFRpbWVsaW5lUmVjb3Jk RmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VTZW5kUmVxdWVzdERhdGEoaWRlbnRpZmllciwgcmVxdWVz dCkpOwotICAgIHJlY29yZC0+c2V0TnVtYmVyKCJ0eXBlIiwgUmVzb3VyY2VTZW5kUmVxdWVzdFRp bWVsaW5lUmVjb3JkVHlwZSk7CisgICAgcmVjb3JkLT5zZXROdW1iZXIoInR5cGUiLCBUaW1lbGlu ZVJlY29yZFR5cGU6OlJlc291cmNlU2VuZFJlcXVlc3QpOwogICAgIHNldEhlYXBTaXplU3RhdGlz dGljKHJlY29yZC5nZXQoKSk7Ci0gICAgbV9mcm9udGVuZC0+YWRkUmVjb3JkVG9UaW1lbGluZShy ZWNvcmQucmVsZWFzZSgpKTsKKyAgICBtX2Zyb250ZW5kLT5ldmVudFJlY29yZGVkKHJlY29yZC5y ZWxlYXNlKCkpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxSZWNlaXZl UmVzb3VyY2VEYXRhKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcikKIHsKLSAgICBwdXNoQ3VycmVu dFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlY2VpdmVSZXNvdXJjZURhdGEo aWRlbnRpZmllciksIFJlY2VpdmVSZXNvdXJjZURhdGFUaW1lbGluZVJlY29yZFR5cGUpOworICAg IHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVjZWl2ZVJl c291cmNlRGF0YShpZGVudGlmaWVyKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpSZWNlaXZlUmVzb3Vy Y2VEYXRhKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRSZWNlaXZlUmVz b3VyY2VEYXRhKCkKIHsKLSAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoUmVjZWl2ZVJlc291 cmNlRGF0YVRpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAgZGlkQ29tcGxldGVDdXJyZW50UmVjb3Jk KFRpbWVsaW5lUmVjb3JkVHlwZTo6UmVjZWl2ZVJlc291cmNlRGF0YSk7CiB9CiAgICAgCiB2b2lk IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxSZWNlaXZlUmVzb3VyY2VSZXNwb25zZSh1bnNp Z25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQog ewotICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVz b3VyY2VSZWNlaXZlUmVzcG9uc2VEYXRhKGlkZW50aWZpZXIsIHJlc3BvbnNlKSwgUmVzb3VyY2VS ZWNlaXZlUmVzcG9uc2VUaW1lbGluZVJlY29yZFR5cGUpOworICAgIHB1c2hDdXJyZW50UmVjb3Jk KFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VSZWNlaXZlUmVzcG9uc2VEYXRh KGlkZW50aWZpZXIsIHJlc3BvbnNlKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpSZXNvdXJjZVJlY2Vp dmVSZXNwb25zZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkUmVjZWl2 ZVJlc291cmNlUmVzcG9uc2UoKQogewotICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChSZXNv dXJjZVJlY2VpdmVSZXNwb25zZVRpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAgZGlkQ29tcGxldGVD dXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkVHlwZTo6UmVzb3VyY2VSZWNlaXZlUmVzcG9uc2Up OwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZEZpbmlzaExvYWRpbmdSZXNv dXJjZSh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGJvb2wgZGlkRmFpbCwgZG91YmxlIGZpbmlz aFRpbWUpCkBAIC0yOTEsOSArMzE1LDkgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojpk aWRGaW5pc2hMb2FkaW5nUmVzb3VyY2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLAogICAgIC8v IFNvbWV0aW1lcyBuZXR3b3JrIHN0YWNrIGNhbiBwcm92aWRlIGZvciB1cyBleGFjdCBmaW5pc2gg bG9hZGluZyB0aW1lLiBJbiB0aGUgb3RoZXIgY2FzZSB3ZSB3aWxsIHVzZSBjdXJyZW50VGltZS4K ICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rv cnk6OmNyZWF0ZUdlbmVyaWNSZWNvcmQoV1RGOjpjdXJyZW50VGltZU1TKCkpOwogICAgIHJlY29y ZC0+c2V0T2JqZWN0KCJkYXRhIiwgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJj ZUZpbmlzaERhdGEoaWRlbnRpZmllciwgZGlkRmFpbCwgZmluaXNoVGltZSAqIDEwMDApKTsKLSAg ICByZWNvcmQtPnNldE51bWJlcigidHlwZSIsIFJlc291cmNlRmluaXNoVGltZWxpbmVSZWNvcmRU eXBlKTsKKyAgICByZWNvcmQtPnNldE51bWJlcigidHlwZSIsIFRpbWVsaW5lUmVjb3JkVHlwZTo6 UmVzb3VyY2VGaW5pc2gpOwogICAgIHNldEhlYXBTaXplU3RhdGlzdGljKHJlY29yZC5nZXQoKSk7 Ci0gICAgbV9mcm9udGVuZC0+YWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQucmVsZWFzZSgpKTsK KyAgICBtX2Zyb250ZW5kLT5ldmVudFJlY29yZGVkKHJlY29yZC5yZWxlYXNlKCkpOwogfQogCiB2 b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZE1hcmtUaW1lbGluZShjb25zdCBTdHJpbmcm IG1lc3NhZ2UpCkBAIC0zMDEsMjEgKzMyNSwyMSBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OmRpZE1hcmtUaW1lbGluZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCiAgICAgcHVzaEdDRXZl bnRSZWNvcmRzKCk7CiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVjb3JkID0gVGltZWxp bmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKFdURjo6Y3VycmVudFRpbWVNUygp KTsKICAgICByZWNvcmQtPnNldE9iamVjdCgiZGF0YSIsIFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6 Y3JlYXRlTWFya1RpbWVsaW5lRGF0YShtZXNzYWdlKSk7Ci0gICAgYWRkUmVjb3JkVG9UaW1lbGlu ZShyZWNvcmQucmVsZWFzZSgpLCBNYXJrVGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBhZGRSZWNv cmRUb1RpbWVsaW5lKHJlY29yZC5yZWxlYXNlKCksIFRpbWVsaW5lUmVjb3JkVHlwZTo6TWFya1Rp bWVsaW5lKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRNYXJrRE9NQ29u dGVudEV2ZW50KCkKIHsKICAgICBwdXNoR0NFdmVudFJlY29yZHMoKTsKICAgICBSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdlbmVy aWNSZWNvcmQoV1RGOjpjdXJyZW50VGltZU1TKCkpOwotICAgIGFkZFJlY29yZFRvVGltZWxpbmUo cmVjb3JkLnJlbGVhc2UoKSwgTWFya0RPTUNvbnRlbnRFdmVudFR5cGUpOworICAgIGFkZFJlY29y ZFRvVGltZWxpbmUocmVjb3JkLnJlbGVhc2UoKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpNYXJrRE9N Q29udGVudCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTWFya0xvYWRF dmVudCgpCiB7CiAgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgUmVmUHRyPEluc3BlY3Rv ck9iamVjdD4gcmVjb3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVj b3JkKFdURjo6Y3VycmVudFRpbWVNUygpKTsKLSAgICBhZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29y ZC5yZWxlYXNlKCksIE1hcmtMb2FkRXZlbnRUeXBlKTsKKyAgICBhZGRSZWNvcmRUb1RpbWVsaW5l KHJlY29yZC5yZWxlYXNlKCksIFRpbWVsaW5lUmVjb3JkVHlwZTo6TWFya0xvYWQpOwogfQogCiB2 b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENvbW1pdExvYWQoKQpAQCAtMzIzLDEzICsz NDcsMTMgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDb21taXRMb2FkKCkKICAg ICBjbGVhclJlY29yZFN0YWNrKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6 YWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcHJwUmVjb3Jk LCBUaW1lbGluZVJlY29yZFR5cGUgdHlwZSkKK3ZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6 YWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcHJwUmVjb3Jk LCBjb25zdCBTdHJpbmcmIHR5cGUpCiB7CiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVj b3JkKHBycFJlY29yZCk7Ci0gICAgcmVjb3JkLT5zZXROdW1iZXIoInR5cGUiLCB0eXBlKTsKKyAg ICByZWNvcmQtPnNldFN0cmluZygidHlwZSIsIHR5cGUpOwogICAgIHNldEhlYXBTaXplU3RhdGlz dGljKHJlY29yZC5nZXQoKSk7CiAgICAgaWYgKG1fcmVjb3JkU3RhY2suaXNFbXB0eSgpKQotICAg ICAgICBtX2Zyb250ZW5kLT5hZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29yZC5yZWxlYXNlKCkpOwor ICAgICAgICBtX2Zyb250ZW5kLT5ldmVudFJlY29yZGVkKHJlY29yZC5yZWxlYXNlKCkpOwogICAg IGVsc2UgewogICAgICAgICBUaW1lbGluZVJlY29yZEVudHJ5IHBhcmVudCA9IG1fcmVjb3JkU3Rh Y2subGFzdCgpOwogICAgICAgICBwYXJlbnQuY2hpbGRyZW4tPnB1c2hPYmplY3QocmVjb3JkLnJl bGVhc2UoKSk7CkBAIC0zNDYsNyArMzcwLDcgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50 OjpzZXRIZWFwU2l6ZVN0YXRpc3RpYyhJbnNwZWN0b3JPYmplY3QqIHJlY29yZCkKICAgICByZWNv cmQtPnNldE51bWJlcigidG90YWxIZWFwU2l6ZSIsIHRvdGFsSGVhcFNpemUpOwogfQogCi12b2lk IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZChUaW1lbGlu ZVJlY29yZFR5cGUgdHlwZSkKK3ZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ29tcGxl dGVDdXJyZW50UmVjb3JkKGNvbnN0IFN0cmluZyYgdHlwZSkKIHsKICAgICAvLyBBbiBlbXB0eSBz dGFjayBjb3VsZCBtZXJlbHkgbWVhbiB0aGF0IHRoZSB0aW1lbGluZSBhZ2VudCB3YXMgdHVybmVk IG9uIGluIHRoZSBtaWRkbGUgb2YKICAgICAvLyBhbiBldmVudC4gIERvbid0IHRyZWF0IGFzIGFu IGVycm9yLgpAQCAtMzcwLDcgKzM5NCw3IEBAIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6Okluc3Bl Y3RvclRpbWVsaW5lQWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluCiB7CiB9 CiAKLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cHVzaEN1cnJlbnRSZWNvcmQoUGFzc1Jl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGRhdGEsIFRpbWVsaW5lUmVjb3JkVHlwZSB0eXBlKQordm9p ZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpwdXNoQ3VycmVudFJlY29yZChQYXNzUmVmUHRyPElu c3BlY3Rvck9iamVjdD4gZGF0YSwgY29uc3QgU3RyaW5nJiB0eXBlKQogewogICAgIHB1c2hHQ0V2 ZW50UmVjb3JkcygpOwogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCA9IFRpbWVs aW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChXVEY6OmN1cnJlbnRUaW1lTVMo KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxp bmVBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdl bnQuaAppbmRleCBjNGMwZjNiZjk4OGRmNzIzNGRmZTdlODcyMzMzZjM2YjU5OWI2N2Q5Li5hYjNh MDhmYzViNTZmYTk4MzU0NzkxMTJiYzI3ZGQxM2JmYTIwYjBjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKQEAgLTUxLDMwICs1MSwy OSBAQCBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlOwogCiB0eXBlZGVmIFN0cmluZyBFcnJvclN0cmlu ZzsKIAotLy8gTXVzdCBiZSBrZXB0IGluIHN5bmMgd2l0aCBUaW1lbGluZUFnZW50LmpzCi1lbnVt IFRpbWVsaW5lUmVjb3JkVHlwZSB7Ci0gICAgRXZlbnREaXNwYXRjaFRpbWVsaW5lUmVjb3JkVHlw ZSA9IDAsCi0gICAgTGF5b3V0VGltZWxpbmVSZWNvcmRUeXBlID0gMSwKLSAgICBSZWNhbGN1bGF0 ZVN0eWxlc1RpbWVsaW5lUmVjb3JkVHlwZSA9IDIsCi0gICAgUGFpbnRUaW1lbGluZVJlY29yZFR5 cGUgPSAzLAotICAgIFBhcnNlSFRNTFRpbWVsaW5lUmVjb3JkVHlwZSA9IDQsCi0gICAgVGltZXJJ bnN0YWxsVGltZWxpbmVSZWNvcmRUeXBlID0gNSwKLSAgICBUaW1lclJlbW92ZVRpbWVsaW5lUmVj b3JkVHlwZSA9IDYsCi0gICAgVGltZXJGaXJlVGltZWxpbmVSZWNvcmRUeXBlID0gNywKLSAgICBY SFJSZWFkeVN0YXRlQ2hhbmdlUmVjb3JkVHlwZSA9IDgsCi0gICAgWEhSTG9hZFJlY29yZFR5cGUg PSA5LAotICAgIEV2YWx1YXRlU2NyaXB0VGltZWxpbmVSZWNvcmRUeXBlID0gMTAsCi0gICAgTWFy a1RpbWVsaW5lUmVjb3JkVHlwZSA9IDExLAotICAgIFJlc291cmNlU2VuZFJlcXVlc3RUaW1lbGlu ZVJlY29yZFR5cGUgPSAxMiwKLSAgICBSZXNvdXJjZVJlY2VpdmVSZXNwb25zZVRpbWVsaW5lUmVj b3JkVHlwZSA9IDEzLAotICAgIFJlc291cmNlRmluaXNoVGltZWxpbmVSZWNvcmRUeXBlID0gMTQs Ci0gICAgRnVuY3Rpb25DYWxsVGltZWxpbmVSZWNvcmRUeXBlID0gMTUsCi0gICAgUmVjZWl2ZVJl c291cmNlRGF0YVRpbWVsaW5lUmVjb3JkVHlwZSA9IDE2LAotICAgIEdDRXZlbnRUaW1lbGluZVJl Y29yZFR5cGUgPSAxNywKLSAgICBNYXJrRE9NQ29udGVudEV2ZW50VHlwZSA9IDE4LAotICAgIE1h cmtMb2FkRXZlbnRUeXBlID0gMTksCi0gICAgU2NoZWR1bGVSZXNvdXJjZVJlcXVlc3RUaW1lbGlu ZVJlY29yZFR5cGUgPSAyMAotfTsKK25hbWVzcGFjZSBUaW1lbGluZVJlY29yZFR5cGUgeworc3Rh dGljIGNvbnN0IGNoYXIgRXZlbnREaXNwYXRjaFtdOworc3RhdGljIGNvbnN0IGNoYXIgTGF5b3V0 W107CitzdGF0aWMgY29uc3QgY2hhciBSZWNhbGN1bGF0ZVN0eWxlc1tdOworc3RhdGljIGNvbnN0 IGNoYXIgUGFpbnRbXTsKK3N0YXRpYyBjb25zdCBjaGFyIFBhcnNlSFRNTFtdOworc3RhdGljIGNv bnN0IGNoYXIgVGltZXJJbnN0YWxsW107CitzdGF0aWMgY29uc3QgY2hhciBUaW1lclJlbW92ZVtd Oworc3RhdGljIGNvbnN0IGNoYXIgVGltZXJGaXJlW107CitzdGF0aWMgY29uc3QgY2hhciBYSFJS ZWFkeVN0YXRlQ2hhbmdlW107CitzdGF0aWMgY29uc3QgY2hhciBYSFJMb2FkW107CitzdGF0aWMg Y29uc3QgY2hhciBFdmFsdWF0ZVNjcmlwdFtdOworc3RhdGljIGNvbnN0IGNoYXIgTWFya1RpbWVs aW5lW107CitzdGF0aWMgY29uc3QgY2hhciBSZXNvdXJjZVNlbmRSZXF1ZXN0W107CitzdGF0aWMg Y29uc3QgY2hhciBSZXNvdXJjZVJlY2VpdmVSZXNwb25zZVtdOworc3RhdGljIGNvbnN0IGNoYXIg UmVzb3VyY2VGaW5pc2hbXTsKK3N0YXRpYyBjb25zdCBjaGFyIEZ1bmN0aW9uQ2FsbFtdOworc3Rh dGljIGNvbnN0IGNoYXIgUmVjZWl2ZVJlc291cmNlRGF0YVtdOworc3RhdGljIGNvbnN0IGNoYXIg R0NFdmVudFtdOworc3RhdGljIGNvbnN0IGNoYXIgTWFya0RPTUNvbnRlbnRbXTsKK3N0YXRpYyBj b25zdCBjaGFyIE1hcmtMb2FkW107CitzdGF0aWMgY29uc3QgY2hhciBTY2hlZHVsZVJlc291cmNl UmVxdWVzdFtdOworfQogCiBjbGFzcyBJbnNwZWN0b3JUaW1lbGluZUFnZW50IDogU2NyaXB0R0NF dmVudExpc3RlbmVyIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShJbnNwZWN0b3JUaW1lbGlu ZUFnZW50KTsKQEAgLTE0OCwyNCArMTQ3LDI0IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBz dHJ1Y3QgVGltZWxpbmVSZWNvcmRFbnRyeSB7Ci0gICAgICAgIFRpbWVsaW5lUmVjb3JkRW50cnko UGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCwgUGFzc1JlZlB0cjxJbnNwZWN0b3JP YmplY3Q+IGRhdGEsIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGNoaWxkcmVuLCBUaW1lbGlu ZVJlY29yZFR5cGUgdHlwZSkKKyAgICAgICAgVGltZWxpbmVSZWNvcmRFbnRyeShQYXNzUmVmUHRy PEluc3BlY3Rvck9iamVjdD4gcmVjb3JkLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0 YSwgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gY2hpbGRyZW4sIGNvbnN0IFN0cmluZyYgdHlw ZSkKICAgICAgICAgICAgIDogcmVjb3JkKHJlY29yZCksIGRhdGEoZGF0YSksIGNoaWxkcmVuKGNo aWxkcmVuKSwgdHlwZSh0eXBlKQogICAgICAgICB7CiAgICAgICAgIH0KICAgICAgICAgUmVmUHRy PEluc3BlY3Rvck9iamVjdD4gcmVjb3JkOwogICAgICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0 PiBkYXRhOwogICAgICAgICBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGNoaWxkcmVuOwotICAgICAg ICBUaW1lbGluZVJlY29yZFR5cGUgdHlwZTsKKyAgICAgICAgU3RyaW5nIHR5cGU7CiAgICAgfTsK ICAgICAgICAgCiAgICAgSW5zcGVjdG9yVGltZWxpbmVBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRz KiwgSW5zcGVjdG9yU3RhdGUqKTsKIAotICAgIHZvaWQgcHVzaEN1cnJlbnRSZWNvcmQoUGFzc1Jl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+LCBUaW1lbGluZVJlY29yZFR5cGUpOworICAgIHZvaWQgcHVz aEN1cnJlbnRSZWNvcmQoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+LCBjb25zdCBTdHJpbmcm IHR5cGUpOwogICAgIHZvaWQgc2V0SGVhcFNpemVTdGF0aXN0aWMoSW5zcGVjdG9yT2JqZWN0KiBy ZWNvcmQpOwogICAgICAgICAKLSAgICB2b2lkIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChUaW1l bGluZVJlY29yZFR5cGUpOworICAgIHZvaWQgZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKGNvbnN0 IFN0cmluZyYgdHlwZSk7CiAKLSAgICB2b2lkIGFkZFJlY29yZFRvVGltZWxpbmUoUGFzc1JlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+LCBUaW1lbGluZVJlY29yZFR5cGUpOworICAgIHZvaWQgYWRkUmVj b3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4sIGNvbnN0IFN0cmluZyYg dHlwZSk7CiAKICAgICB2b2lkIHB1c2hHQ0V2ZW50UmVjb3JkcygpOwogICAgIHZvaWQgY2xlYXJS ZWNvcmRTdGFjaygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9UaW1lbGluZUFnZW50LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9UaW1lbGluZUFnZW50LmpzCmluZGV4IDk3YjhlNDIxZTc5NTRiNzdkMWNlZDc3ZDY3NDM3NmVl NWI2M2MxYmUuLmYzZDA1NGY1ZjY5MWYyM2I4MjczMTk1YjQ5ODBmZmZiYTcwNjQ3ZTYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQu anMKQEAgLTM0LDI1ICszNCwyNSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudCA9IGZ1bmN0 aW9uKCkgewogCiAvLyBNdXN0IGJlIGtlcHQgaW4gc3luYyB3aXRoIFRpbWVsaW5lSXRlbS5oCiBX ZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlID0gewotICAgIEV2ZW50RGlzcGF0 Y2ggOiAwLAotICAgIExheW91dCA6IDEsCi0gICAgUmVjYWxjdWxhdGVTdHlsZXMgOiAyLAotICAg IFBhaW50IDogMywKLSAgICBQYXJzZUhUTUwgOiA0LAotICAgIFRpbWVySW5zdGFsbCA6IDUsCi0g ICAgVGltZXJSZW1vdmUgOiA2LAotICAgIFRpbWVyRmlyZSA6IDcsCi0gICAgWEhSUmVhZHlTdGF0 ZUNoYW5nZSA6IDgsCi0gICAgWEhSTG9hZCA6IDksCi0gICAgRXZhbHVhdGVTY3JpcHQgOiAxMCwK LSAgICBNYXJrVGltZWxpbmUgOiAxMSwKLSAgICBSZXNvdXJjZVNlbmRSZXF1ZXN0IDogMTIsCi0g ICAgUmVzb3VyY2VSZWNlaXZlUmVzcG9uc2UgOiAxMywKLSAgICBSZXNvdXJjZUZpbmlzaCA6IDE0 LAotICAgIEZ1bmN0aW9uQ2FsbCA6IDE1LAotICAgIFJlc291cmNlUmVjZWl2ZURhdGE6IDE2LAot ICAgIEdDRXZlbnQgOiAxNywKLSAgICBNYXJrRE9NQ29udGVudEV2ZW50VHlwZSA6IDE4LAotICAg IE1hcmtMb2FkRXZlbnRUeXBlIDogMTksCi0gICAgU2NoZWR1bGVSZXNvdXJjZVJlcXVlc3QgOiAy MAorICAgIEV2ZW50RGlzcGF0Y2g6ICJFdmVudERpc3BhdGNoIiwKKyAgICBMYXlvdXQ6ICJMYXlv dXQiLAorICAgIFJlY2FsY3VsYXRlU3R5bGVzOiAiUmVjYWxjdWxhdGVTdHlsZXMiLAorICAgIFBh aW50OiAiUGFpbnQiLAorICAgIFBhcnNlSFRNTDogIlBhcnNlSFRNTCIsCisgICAgVGltZXJJbnN0 YWxsOiAiVGltZXJJbnN0YWxsIiwKKyAgICBUaW1lclJlbW92ZTogIlRpbWVyUmVtb3ZlIiwKKyAg ICBUaW1lckZpcmU6ICJUaW1lckZpcmUiLAorICAgIFhIUlJlYWR5U3RhdGVDaGFuZ2U6ICJYSFJS ZWFkeVN0YXRlQ2hhbmdlIiwKKyAgICBYSFJMb2FkOiAiWEhSTG9hZCIsCisgICAgRXZhbHVhdGVT Y3JpcHQ6ICJFdmFsdWF0ZVNjcmlwdCIsCisgICAgTWFya1RpbWVsaW5lOiAiTWFya1RpbWVsaW5l IiwKKyAgICBSZXNvdXJjZVNlbmRSZXF1ZXN0OiAiUmVzb3VyY2VTZW5kUmVxdWVzdCIsCisgICAg UmVzb3VyY2VSZWNlaXZlUmVzcG9uc2U6ICJSZXNvdXJjZVJlY2VpdmVSZXNwb25zZSIsCisgICAg UmVzb3VyY2VGaW5pc2g6ICJSZXNvdXJjZUZpbmlzaCIsCisgICAgRnVuY3Rpb25DYWxsOiAiRnVu Y3Rpb25DYWxsIiwKKyAgICBSZXNvdXJjZVJlY2VpdmVEYXRhOiAiUmVzb3VyY2VSZWNlaXZlRGF0 YSIsCisgICAgR0NFdmVudDogIkdDRXZlbnQiLAorICAgIE1hcmtET01Db250ZW50OiAiTWFya0RP TUNvbnRlbnQiLAorICAgIE1hcmtMb2FkOiAiTWFya0xvYWQiLAorICAgIFNjaGVkdWxlUmVzb3Vy Y2VSZXF1ZXN0OiAiU2NoZWR1bGVSZXNvdXJjZVJlcXVlc3QiCiB9OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCmluZGV4IGFmYTZl YzA2MmI4MWQ2YmNkMDZmYWNlZWIzN2Y0M2M3MzgwMGJkODAuLjFhMmY0ZjNhNTY1NDE2N2M0MWFi ZDY2NjA0ZDFmNGQ5ZGI5ZWE1OGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTE5MCw4ICsxOTAsOCBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZWNvcmRTdHls ZXNbcmVjb3JkVHlwZXMuRnVuY3Rpb25DYWxsXSA9IHsgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiRnVuY3Rpb24gQ2FsbCIpLCBjYXRlZ29yeTogdGhpcy5jYXRlZ29yaWVzLnNjcmlwdGlu ZyB9OwogICAgICAgICAgICAgcmVjb3JkU3R5bGVzW3JlY29yZFR5cGVzLlJlc291cmNlUmVjZWl2 ZURhdGFdID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZWNlaXZlIERhdGEiKSwg Y2F0ZWdvcnk6IHRoaXMuY2F0ZWdvcmllcy5sb2FkaW5nIH07CiAgICAgICAgICAgICByZWNvcmRT dHlsZXNbcmVjb3JkVHlwZXMuR0NFdmVudF0gPSB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIkdDIEV2ZW50IiksIGNhdGVnb3J5OiB0aGlzLmNhdGVnb3JpZXMuc2NyaXB0aW5nIH07Ci0g ICAgICAgICAgICByZWNvcmRTdHlsZXNbcmVjb3JkVHlwZXMuTWFya0RPTUNvbnRlbnRFdmVudFR5 cGVdID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJET01Db250ZW50IGV2ZW50Iiks IGNhdGVnb3J5OiB0aGlzLmNhdGVnb3JpZXMuc2NyaXB0aW5nIH07Ci0gICAgICAgICAgICByZWNv cmRTdHlsZXNbcmVjb3JkVHlwZXMuTWFya0xvYWRFdmVudFR5cGVdID0geyB0aXRsZTogV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJMb2FkIGV2ZW50IiksIGNhdGVnb3J5OiB0aGlzLmNhdGVnb3JpZXMu c2NyaXB0aW5nIH07CisgICAgICAgICAgICByZWNvcmRTdHlsZXNbcmVjb3JkVHlwZXMuTWFya0RP TUNvbnRlbnRdID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJET01Db250ZW50IGV2 ZW50IiksIGNhdGVnb3J5OiB0aGlzLmNhdGVnb3JpZXMuc2NyaXB0aW5nIH07CisgICAgICAgICAg ICByZWNvcmRTdHlsZXNbcmVjb3JkVHlwZXMuTWFya0xvYWRdID0geyB0aXRsZTogV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJMb2FkIGV2ZW50IiksIGNhdGVnb3J5OiB0aGlzLmNhdGVnb3JpZXMuc2Ny aXB0aW5nIH07CiAgICAgICAgICAgICByZWNvcmRTdHlsZXNbcmVjb3JkVHlwZXMuU2NoZWR1bGVS ZXNvdXJjZVJlcXVlc3RdID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTY2hlZHVs ZSBSZXF1ZXN0IiksIGNhdGVnb3J5OiB0aGlzLmNhdGVnb3JpZXMubG9hZGluZyB9OwogICAgICAg ICAgICAgdGhpcy5fcmVjb3JkU3R5bGVzQXJyYXkgPSByZWNvcmRTdHlsZXM7CiAgICAgICAgIH0K QEAgLTI1MCw5ICsyNTAsOSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIGV2ZW50RGl2aWRlclBhZGRpbmcuY2xhc3NOYW1lID0gInJlc291cmNlcy1l dmVudC1kaXZpZGVyLXBhZGRpbmciOwogICAgICAgICBldmVudERpdmlkZXJQYWRkaW5nLnRpdGxl ID0gcmVjb3JkLnRpdGxlOwogCi0gICAgICAgIGlmIChyZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlw ZXMuTWFya0RPTUNvbnRlbnRFdmVudFR5cGUpCisgICAgICAgIGlmIChyZWNvcmQudHlwZSA9PT0g cmVjb3JkVHlwZXMuTWFya0RPTUNvbnRlbnQpCiAgICAgICAgICAgICBldmVudERpdmlkZXIuY2xh c3NOYW1lICs9ICIgcmVzb3VyY2VzLWJsdWUtZGl2aWRlciI7Ci0gICAgICAgIGVsc2UgaWYgKHJl Y29yZC50eXBlID09PSByZWNvcmRUeXBlcy5NYXJrTG9hZEV2ZW50VHlwZSkKKyAgICAgICAgZWxz ZSBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLk1hcmtMb2FkKQogICAgICAgICAgICAg ZXZlbnREaXZpZGVyLmNsYXNzTmFtZSArPSAiIHJlc291cmNlcy1yZWQtZGl2aWRlciI7CiAgICAg ICAgIGVsc2UgaWYgKHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5NYXJrVGltZWxpbmUpIHsK ICAgICAgICAgICAgIGV2ZW50RGl2aWRlci5jbGFzc05hbWUgKz0gIiByZXNvdXJjZXMtb3Jhbmdl LWRpdmlkZXIiOwpAQCAtMzM4LDcgKzMzOCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVs LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBjb25uZWN0ZWRUb09sZFJlY29yZCA9 IGZhbHNlOwogICAgICAgICB2YXIgcmVjb3JkVHlwZXMgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVB Z2VudC5SZWNvcmRUeXBlOwotICAgICAgICBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVz Lk1hcmtET01Db250ZW50RXZlbnRUeXBlIHx8IHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5N YXJrTG9hZEV2ZW50VHlwZSkKKyAgICAgICAgaWYgKHJlY29yZC50eXBlID09PSByZWNvcmRUeXBl cy5NYXJrRE9NQ29udGVudCB8fCByZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuTWFya0xvYWQp CiAgICAgICAgICAgICBwYXJlbnRSZWNvcmQgPSBudWxsOyAvLyBObyBiYXIgZW50cnkgZm9yIGxv YWQgZXZlbnRzLgogICAgICAgICBlbHNlIGlmIChwYXJlbnRSZWNvcmQgPT09IHRoaXMuX3Jvb3RS ZWNvcmQpIHsKICAgICAgICAgICAgIHZhciBuZXdQYXJlbnRSZWNvcmQgPSB0aGlzLl9maW5kUGFy ZW50UmVjb3JkKHJlY29yZCk7CkBAIC0zNjAsNyArMzYwLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBmb3JtYXR0ZWRSZWNvcmQgPSBu ZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuRm9ybWF0dGVkUmVjb3JkKHJlY29yZCwgcGFy ZW50UmVjb3JkLCB0aGlzKTsKIAotICAgICAgICBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29yZFR5 cGVzLk1hcmtET01Db250ZW50RXZlbnRUeXBlIHx8IHJlY29yZC50eXBlID09PSByZWNvcmRUeXBl cy5NYXJrTG9hZEV2ZW50VHlwZSkgeworICAgICAgICBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29y ZFR5cGVzLk1hcmtET01Db250ZW50IHx8IHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5NYXJr TG9hZCkgewogICAgICAgICAgICAgdGhpcy5fbWFya1RpbWVsaW5lUmVjb3Jkcy5wdXNoKGZvcm1h dHRlZFJlY29yZCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTY1NywxNyAr NjU3LDE3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZURpc3BhdGNoZXIgPSBmdW5jdGlvbih0aW1l bGluZVBhbmVsKQogfQogCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVEaXNwYXRjaGVyLnByb3RvdHlw ZSA9IHsKLSAgICB0aW1lbGluZVByb2ZpbGVyV2FzU3RhcnRlZDogZnVuY3Rpb24oKQorICAgIHN0 YXJ0ZWQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lUGFuZWwuX3Rp bWVsaW5lUHJvZmlsZXJXYXNTdGFydGVkKCk7CiAgICAgfSwKIAotICAgIHRpbWVsaW5lUHJvZmls ZXJXYXNTdG9wcGVkOiBmdW5jdGlvbigpCisgICAgc3RvcHBlZDogZnVuY3Rpb24oKQogICAgIHsK ICAgICAgICAgdGhpcy5fdGltZWxpbmVQYW5lbC5fdGltZWxpbmVQcm9maWxlcldhc1N0b3BwZWQo KTsKICAgICB9LAogCi0gICAgYWRkUmVjb3JkVG9UaW1lbGluZTogZnVuY3Rpb24ocmVjb3JkKQor ICAgIGV2ZW50UmVjb3JkZWQ6IGZ1bmN0aW9uKHJlY29yZCkKICAgICB7CiAgICAgICAgIHRoaXMu X3RpbWVsaW5lUGFuZWwuX2FkZFJlY29yZFRvVGltZWxpbmUocmVjb3JkKTsKICAgICB9Cg== 87264 2011-03-28 23:08:16 -0700 2011-03-29 04:21:44 -0700 [PATCH] Patch that compiles. bug-57299-20110329100813.patch text/plain 31491 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODIxMzMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5ZjFhOWJiNTc4ZGExZWYxMWUyOGMy NWQwN2NhNzhmZWU2OWEzNjhmLi5iMzI2MjMxOTJkMTc0ODM3ZWU5ZTM5MzlkNDA1MWM3ZDBiZTlh NWFkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDMtMjggIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZG9jdW1lbnQgVGltZWxpbmUgZG9tYWluLCBt YWtlIHRpbWVsaW5lIGV2ZW50IHR5cGVzIG9mIHR5cGUgc3RyaW5nLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcyOTkKKworICAgICAgICAqIGluc3Bl Y3Rvci90aW1lbGluZS90aW1lbGluZS10ZXN0LmpzOgorICAgICAgICAoaW5pdGlhbGl6ZV9UaW1l bGluZS5JbnNwZWN0b3JUZXN0LnN0YXJ0VGltZWxpbmUpOgorCiAyMDExLTAzLTI4ICBKZXNzaWUg QmVybGluICA8amJlcmxpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkg QWRhbSBSb2Jlbi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90 aW1lbGluZS10ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5l LXRlc3QuanMKaW5kZXggMzE5NTRiNDVlMjlhN2YyZTIyMDM1NmM0Zjk4OTNlOTgwYTc0ZmZlZi4u ZGI1ZjNhNWQyYTQzZTMwMjFkOTg5MTE5NjgwZTA5Mzc5YTJmMDk1NiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLXRlc3QuanMKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLXRlc3QuanMKQEAgLTI1LDcgKzI1LDcg QEAgSW5zcGVjdG9yVGVzdC5zdGFydFRpbWVsaW5lID0gZnVuY3Rpb24oY2FsbGJhY2spCiAgICAg ICAgIGZvciAodmFyIGkgPSAwOyByZWNvcmQuY2hpbGRyZW4gJiYgaSA8IHJlY29yZC5jaGlsZHJl bi5sZW5ndGg7ICsraSkKICAgICAgICAgICAgIGFkZFJlY29yZChyZWNvcmQuY2hpbGRyZW5baV0p OwogICAgIH0KLSAgICBJbnNwZWN0b3JUZXN0LmFkZFNuaWZmZXIoV2ViSW5zcGVjdG9yLlRpbWVs aW5lRGlzcGF0Y2hlci5wcm90b3R5cGUsICJhZGRSZWNvcmRUb1RpbWVsaW5lIiwgYWRkUmVjb3Jk LCB0cnVlKTsKKyAgICBJbnNwZWN0b3JUZXN0LmFkZFNuaWZmZXIoV2ViSW5zcGVjdG9yLlRpbWVs aW5lRGlzcGF0Y2hlci5wcm90b3R5cGUsICJldmVudFJlY29yZGVkIiwgYWRkUmVjb3JkLCB0cnVl KTsKIH07CiAKIEluc3BlY3RvclRlc3Quc3RvcFRpbWVsaW5lID0gZnVuY3Rpb24oY2FsbGJhY2sp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggMWVlNDVmZTcwNjE2NjAwOTRjN2Y5MzBhYzAzOWQ2Y2E0ZWJhMmVlNC4u NzlmNDAwZTM2YzA5OTkxNDEwZDllMmZlNTNlZjg1NTkwM2UwOGU4MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDYxIEBACisyMDExLTAzLTI4ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdlYiBJbnNwZWN0b3I6IGRvY3VtZW50IFRpbWVsaW5lIGRvbWFpbiwgbWFrZSB0aW1lbGluZSBl dmVudCB0eXBlcyBvZiB0eXBlIHN0cmluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU3Mjk5CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y Lmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cHVzaEdDRXZlbnRSZWNv cmRzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN0YXJ0KToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN0b3ApOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbENhbGxGdW5jdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDYWxsRnVuY3Rpb24p OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbERpc3BhdGNo RXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkRGlz cGF0Y2hFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3 aWxsTGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRp ZExheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxs UmVjYWxjdWxhdGVTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFn ZW50OjpkaWRSZWNhbGN1bGF0ZVN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OndpbGxQYWludCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1l bGluZUFnZW50OjpkaWRQYWludCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGlu ZUFnZW50Ojp3aWxsV3JpdGVIVE1MKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVs aW5lQWdlbnQ6OmRpZFdyaXRlSFRNTCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1l bGluZUFnZW50OjpkaWRJbnN0YWxsVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6ZGlkUmVtb3ZlVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6d2lsbEZpcmVUaW1lcik6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpkaWRGaXJlVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbENoYW5nZVhIUlJlYWR5U3RhdGUpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ2hhbmdlWEhSUmVhZHlTdGF0ZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsTG9hZFhIUik6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRMb2FkWEhSKToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxFdmFsdWF0ZVNj cmlwdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRFdmFs dWF0ZVNjcmlwdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojpk aWRTY2hlZHVsZVJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JU aW1lbGluZUFnZW50Ojp3aWxsU2VuZFJlc291cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsUmVjZWl2ZVJlc291cmNlRGF0YSk6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRSZWNlaXZlUmVzb3VyY2VE YXRhKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxSZWNl aXZlUmVzb3VyY2VSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpkaWRSZWNlaXZlUmVzb3VyY2VSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRGaW5pc2hMb2FkaW5nUmVzb3VyY2UpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTWFya1RpbWVsaW5lKToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZE1hcmtET01Db250ZW50 RXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTWFy a0xvYWRFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojph ZGRSZWNvcmRUb1RpbWVsaW5lKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpwdXNoQ3VycmVudFJlY29yZCk6CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv clRpbWVsaW5lQWdlbnQ6OlRpbWVsaW5lUmVjb3JkRW50cnk6OlRpbWVsaW5lUmVjb3JkRW50cnkp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5qczoKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuZ2V0IF9yZWNvcmRTdHlsZXMpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9jcmVhdGVFdmVudERp dmlkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9p bm5lckFkZFJlY29yZFRvVGltZWxpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l RGlzcGF0Y2hlci5wcm90b3R5cGUuc3RhcnRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVEaXNwYXRjaGVyLnByb3RvdHlwZS5zdG9wcGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UaW1lbGluZURpc3BhdGNoZXIucHJvdG90eXBlLmV2ZW50UmVjb3JkZWQpOgorCiAyMDExLTAz LTI4ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByODIwOTkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yLmpzb24KaW5kZXggZGIzYWYyZTAyYWZlOGNjNmU2NjM2MjhhZWY5YTE2MjA5MzJl OTUwMi4uY2VmZGFiZDM3ZTBmZjMxMjQ4MWY1YmU1MzJiMWRmNTliNjVlY2U3MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMTAyNCwyNyArMTAyNCw0NCBAQAog ICAgIH0sCiAgICAgewogICAgICAgICAiZG9tYWluIjogIlRpbWVsaW5lIiwKLSAgICAgICAgInR5 cGVzIjogW10sCisgICAgICAgICJkZXNjcmlwdGlvbiI6ICJUaW1lbGluZSBwcm92aWRlcyBpdHMg Y2xpZW50cyB3aXRoIGluc3RydW1lbnRhdGlvbiByZWNvcmRzIHRoYXQgYXJlIGdlbmVyYXRlZCBk dXJpbmcgdGhlIHBhZ2UgcnVudGltZS4gVGltZWxpbmUgaW5zdHJ1bWVudGF0aW9uIGNhbiBiZSBz dGFydGVkIGFuZCBzdG9wcGVkIHVzaW5nIGNvcnJlc3BvbmRpbmcgY29tbWFuZHMuIFdoaWxlIHRp bWVsaW5lIGlzIHN0YXJ0ZWQsIGl0IGlzIGdlbmVyYXRpbmcgdGltZWxpbmUgZXZlbnQgcmVjb3Jk cy4iLAorICAgICAgICAidHlwZXMiOiBbCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg ImlkIjogIlRpbWVsaW5lUmVjb3JkIiwKKyAgICAgICAgICAgICAgICAidHlwZSI6ICJvYmplY3Qi LAorICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogeworICAgICAgICAgICAgICAgICAgICAi dHlwZSI6IHsgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkV2ZW50IHR5cGUuIiB9 LAorICAgICAgICAgICAgICAgICAgICAiZGF0YSI6IHsgInR5cGUiOiAib2JqZWN0IiwgImRlc2Ny aXB0aW9uIjogIkV2ZW50IGRhdGEuIiB9LAorICAgICAgICAgICAgICAgICAgICAiY2hpbGRyZW4i OiB7ICJ0eXBlIjogImFycmF5IiwgIm9wdGlvbmFsIiA6IHRydWUsICJpdGVtcyI6IHsgIiRyZWYi OiAiVGltZWxpbmVSZWNvcmQiIH0sICJkZXNjcmlwdGlvbiI6ICJOZXN0ZWQgcmVjb3Jkcy4iIH0K KyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJUaW1l bGluZSByZWNvcmQgY29udGFpbnMgaW5mb3JtYXRpb24gYWJvdXQgdGhlIHJlY29yZGVkIGFjdGl2 aXR5LiIKKyAgICAgICAgICAgIH0KKyAgICAgICAgXSwKICAgICAgICAgImNvbW1hbmRzIjogWwog ICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogInN0YXJ0IgorICAgICAgICAg ICAgICAgICJuYW1lIjogInN0YXJ0IiwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAi U3RhcnRzIGNhcHR1cmluZyBpbnN0cnVtZW50YXRpb24gZXZlbnRzLiIKICAgICAgICAgICAgIH0s CiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUiOiAic3RvcCIKKyAgICAgICAg ICAgICAgICAibmFtZSI6ICJzdG9wIiwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAi U3RvcHMgY2FwdHVyaW5nIGluc3RydW1lbnRhdGlvbiBldmVudHMuIgogICAgICAgICAgICAgfQog ICAgICAgICBdLAogICAgICAgICAiZXZlbnRzIjogWwogICAgICAgICAgICAgewotICAgICAgICAg ICAgICAgICJuYW1lIjogInRpbWVsaW5lUHJvZmlsZXJXYXNTdGFydGVkIgorICAgICAgICAgICAg ICAgICJuYW1lIjogInN0YXJ0ZWQiLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJG aXJlZCB3aGVuIHRpbWVsaW5lIGhhcyBiZWVuIHN0YXJ0ZWQuIgogICAgICAgICAgICAgfSwKICAg ICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJ0aW1lbGluZVByb2ZpbGVyV2Fz U3RvcHBlZCIKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJzdG9wcGVkIiwKKyAgICAgICAgICAg ICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiB0aW1lbGluZSBoYXMgYmVlbiBzdG9wcGVk LiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgIm5hbWUi OiAiYWRkUmVjb3JkVG9UaW1lbGluZSIsCisgICAgICAgICAgICAgICAgIm5hbWUiOiAiZXZlbnRS ZWNvcmRlZCIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAg ICAgICAgIHsgIm5hbWUiOiAicmVjb3JkIiwgIiRyZWYiOiAiVGltZWxpbmVSZWNvcmQiIH0KLSAg ICAgICAgICAgICAgICBdCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVjb3JkIiwg IiRyZWYiOiAiVGltZWxpbmVSZWNvcmQiLCAiZGVzY3JpcHRpb24iOiAiVGltZWxpbmUgcmVjb3Jk IGRhdGEuIiB9CisgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRp b24iOiAiRmlyZWQgZm9yIGV2ZXJ5IGluc3RydW1lbnRhdGlvbiBldmVudCB3aGlsZSB0aW1lbGlu ZSBpcyBzdGFydGVkLiIKICAgICAgICAgICAgIH0KICAgICAgICAgXQogICAgIH0sCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKaW5k ZXggZDQ1YTUwNzUxYzM4MjFjZDUwMmYwZjIzZmE2MmQ2ZThmZTE1MTJmOC4uNDkzNWIxZDI5NmEx ZjZlNjc0NThlZDY0MWI5Njk5ODMzYjc2OTk1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcApAQCAtNTAsNiArNTAsMzAgQEAg bmFtZXNwYWNlIFRpbWVsaW5lQWdlbnRTdGF0ZSB7CiBzdGF0aWMgY29uc3QgY2hhciB0aW1lbGlu ZUFnZW50RW5hYmxlZFtdID0gInRpbWVsaW5lQWdlbnRFbmFibGVkIjsKIH0KIAorbmFtZXNwYWNl IFRpbWVsaW5lUmVjb3JkVHlwZSB7CitzdGF0aWMgY29uc3QgY2hhciBFdmVudERpc3BhdGNoW10g PSAiRXZlbnREaXNwYXRjaCI7CitzdGF0aWMgY29uc3QgY2hhciBMYXlvdXRbXSA9ICJMYXlvdXQi Oworc3RhdGljIGNvbnN0IGNoYXIgUmVjYWxjdWxhdGVTdHlsZXNbXSA9ICJSZWNhbGN1bGF0ZVN0 eWxlcyI7CitzdGF0aWMgY29uc3QgY2hhciBQYWludFtdID0gIlBhaW50IjsKK3N0YXRpYyBjb25z dCBjaGFyIFBhcnNlSFRNTFtdID0gIlBhcnNlSFRNTCI7CitzdGF0aWMgY29uc3QgY2hhciBUaW1l ckluc3RhbGxbXSA9ICJUaW1lckluc3RhbGwiOworc3RhdGljIGNvbnN0IGNoYXIgVGltZXJSZW1v dmVbXSA9ICJUaW1lclJlbW92ZSI7CitzdGF0aWMgY29uc3QgY2hhciBUaW1lckZpcmVbXSA9ICJU aW1lckZpcmUiOworc3RhdGljIGNvbnN0IGNoYXIgWEhSUmVhZHlTdGF0ZUNoYW5nZVtdID0gIlhI UlJlYWR5U3RhdGVDaGFuZ2UiOworc3RhdGljIGNvbnN0IGNoYXIgWEhSTG9hZFtdID0gIlhIUkxv YWQiOworc3RhdGljIGNvbnN0IGNoYXIgRXZhbHVhdGVTY3JpcHRbXSA9ICJFdmFsdWF0ZVNjcmlw dCI7CitzdGF0aWMgY29uc3QgY2hhciBNYXJrVGltZWxpbmVbXSA9ICJNYXJrVGltZWxpbmUiOwor c3RhdGljIGNvbnN0IGNoYXIgUmVzb3VyY2VTZW5kUmVxdWVzdFtdID0gIlJlc291cmNlU2VuZFJl cXVlc3QiOworc3RhdGljIGNvbnN0IGNoYXIgUmVzb3VyY2VSZWNlaXZlUmVzcG9uc2VbXSA9ICJS ZXNvdXJjZVJlY2VpdmVSZXNwb25zZSI7CitzdGF0aWMgY29uc3QgY2hhciBSZXNvdXJjZUZpbmlz aFtdID0gIlJlc291cmNlRmluaXNoIjsKK3N0YXRpYyBjb25zdCBjaGFyIEZ1bmN0aW9uQ2FsbFtd ID0gIkZ1bmN0aW9uQ2FsbCI7CitzdGF0aWMgY29uc3QgY2hhciBSZWNlaXZlUmVzb3VyY2VEYXRh W10gPSAiUmVjZWl2ZVJlc291cmNlRGF0YSI7CitzdGF0aWMgY29uc3QgY2hhciBHQ0V2ZW50W10g PSAiR0NFdmVudCI7CitzdGF0aWMgY29uc3QgY2hhciBNYXJrRE9NQ29udGVudFtdID0gIk1hcmtE T01Db250ZW50IjsKK3N0YXRpYyBjb25zdCBjaGFyIE1hcmtMb2FkW10gPSAiTWFya0xvYWQiOwor c3RhdGljIGNvbnN0IGNoYXIgU2NoZWR1bGVSZXNvdXJjZVJlcXVlc3RbXSA9ICJTY2hlZHVsZVJl c291cmNlUmVxdWVzdCI7Cit9CisKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cHVzaEdD RXZlbnRSZWNvcmRzKCkKIHsKICAgICBpZiAoIW1fZ2NFdmVudHMuc2l6ZSgpKQpAQCAtNjEsNyAr ODUsNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnB1c2hHQ0V2ZW50UmVjb3Jkcygp CiAgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCA9IFRpbWVsaW5lUmVjb3Jk RmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChpLT5zdGFydFRpbWUpOwogICAgICAgICByZWNv cmQtPnNldE9iamVjdCgiZGF0YSIsIFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR0NFdmVu dERhdGEoaS0+Y29sbGVjdGVkQnl0ZXMpKTsKICAgICAgICAgcmVjb3JkLT5zZXROdW1iZXIoImVu ZFRpbWUiLCBpLT5lbmRUaW1lKTsKLSAgICAgICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQu cmVsZWFzZSgpLCBHQ0V2ZW50VGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICAgICAgYWRkUmVjb3Jk VG9UaW1lbGluZShyZWNvcmQucmVsZWFzZSgpLCBUaW1lbGluZVJlY29yZFR5cGU6OkdDRXZlbnQp OwogICAgIH0KIH0KIApAQCAtMTAxLDcgKzEyNSw3IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVB Z2VudDo6c3RhcnQoRXJyb3JTdHJpbmcqKQogICAgICAgICByZXR1cm47CiAgICAgbV9pbnN0cnVt ZW50aW5nQWdlbnRzLT5zZXRJbnNwZWN0b3JUaW1lbGluZUFnZW50KHRoaXMpOwogICAgIFNjcmlw dEdDRXZlbnQ6OmFkZEV2ZW50TGlzdGVuZXIodGhpcyk7Ci0gICAgbV9mcm9udGVuZC0+dGltZWxp bmVQcm9maWxlcldhc1N0YXJ0ZWQoKTsKKyAgICBtX2Zyb250ZW5kLT5zdGFydGVkKCk7CiAgICAg bV9zdGF0ZS0+c2V0Qm9vbGVhbihUaW1lbGluZUFnZW50U3RhdGU6OnRpbWVsaW5lQWdlbnRFbmFi bGVkLCB0cnVlKTsKIH0KIApAQCAtMTExLDcgKzEzNSw3IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6c3RvcChFcnJvclN0cmluZyopCiAgICAgICAgIHJldHVybjsKICAgICBtX2luc3Ry dW1lbnRpbmdBZ2VudHMtPnNldEluc3BlY3RvclRpbWVsaW5lQWdlbnQoMCk7CiAgICAgaWYgKG1f ZnJvbnRlbmQpCi0gICAgICAgIG1fZnJvbnRlbmQtPnRpbWVsaW5lUHJvZmlsZXJXYXNTdG9wcGVk KCk7CisgICAgICAgIG1fZnJvbnRlbmQtPnN0b3BwZWQoKTsKICAgICBTY3JpcHRHQ0V2ZW50Ojpy ZW1vdmVFdmVudExpc3RlbmVyKHRoaXMpOwogCiAgICAgY2xlYXJSZWNvcmRTdGFjaygpOwpAQCAt MTI3LDU4ICsxNTEsNTggQEAgYm9vbCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpzdGFydGVkKCkg Y29uc3QKIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsQ2FsbEZ1bmN0aW9uKGNv bnN0IFN0cmluZyYgc2NyaXB0TmFtZSwgaW50IHNjcmlwdExpbmUpCiB7Ci0gICAgcHVzaEN1cnJl bnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVGdW5jdGlvbkNhbGxEYXRhKHNj cmlwdE5hbWUsIHNjcmlwdExpbmUpLCBGdW5jdGlvbkNhbGxUaW1lbGluZVJlY29yZFR5cGUpOwor ICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRnVuY3Rp b25DYWxsRGF0YShzY3JpcHROYW1lLCBzY3JpcHRMaW5lKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpG dW5jdGlvbkNhbGwpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENhbGxG dW5jdGlvbigpCiB7Ci0gICAgZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKEZ1bmN0aW9uQ2FsbFRp bWVsaW5lUmVjb3JkVHlwZSk7CisgICAgZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKFRpbWVsaW5l UmVjb3JkVHlwZTo6RnVuY3Rpb25DYWxsKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFn ZW50Ojp3aWxsRGlzcGF0Y2hFdmVudChjb25zdCBFdmVudCYgZXZlbnQpCiB7CiAgICAgcHVzaEN1 cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmVudERpc3BhdGNoRGF0 YShldmVudCksCi0gICAgICAgIEV2ZW50RGlzcGF0Y2hUaW1lbGluZVJlY29yZFR5cGUpOworICAg ICAgICBUaW1lbGluZVJlY29yZFR5cGU6OkV2ZW50RGlzcGF0Y2gpOwogfQogCiB2b2lkIEluc3Bl Y3RvclRpbWVsaW5lQWdlbnQ6OmRpZERpc3BhdGNoRXZlbnQoKQogewotICAgIGRpZENvbXBsZXRl Q3VycmVudFJlY29yZChFdmVudERpc3BhdGNoVGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBkaWRD b21wbGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRUeXBlOjpFdmVudERpc3BhdGNoKTsK IH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsTGF5b3V0KCkKIHsKLSAgICBw dXNoQ3VycmVudFJlY29yZChJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpLCBMYXlvdXRUaW1lbGlu ZVJlY29yZFR5cGUpOworICAgIHB1c2hDdXJyZW50UmVjb3JkKEluc3BlY3Rvck9iamVjdDo6Y3Jl YXRlKCksIFRpbWVsaW5lUmVjb3JkVHlwZTo6TGF5b3V0KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpkaWRMYXlvdXQoKQogewotICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29y ZChMYXlvdXRUaW1lbGluZVJlY29yZFR5cGUpOworICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29y ZChUaW1lbGluZVJlY29yZFR5cGU6OkxheW91dCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6d2lsbFJlY2FsY3VsYXRlU3R5bGUoKQogewotICAgIHB1c2hDdXJyZW50UmVjb3Jk KEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCksIFJlY2FsY3VsYXRlU3R5bGVzVGltZWxpbmVSZWNv cmRUeXBlKTsKKyAgICBwdXNoQ3VycmVudFJlY29yZChJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgp LCBUaW1lbGluZVJlY29yZFR5cGU6OlJlY2FsY3VsYXRlU3R5bGVzKTsKIH0KIAogdm9pZCBJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpkaWRSZWNhbGN1bGF0ZVN0eWxlKCkKIHsKLSAgICBkaWRDb21w bGV0ZUN1cnJlbnRSZWNvcmQoUmVjYWxjdWxhdGVTdHlsZXNUaW1lbGluZVJlY29yZFR5cGUpOwor ICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZFR5cGU6OlJlY2FsY3Vs YXRlU3R5bGVzKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsUGFpbnQo Y29uc3QgSW50UmVjdCYgcmVjdCkKIHsKLSAgICBwdXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJl Y29yZEZhY3Rvcnk6OmNyZWF0ZVBhaW50RGF0YShyZWN0KSwgUGFpbnRUaW1lbGluZVJlY29yZFR5 cGUpOworICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRl UGFpbnREYXRhKHJlY3QpLCBUaW1lbGluZVJlY29yZFR5cGU6OlBhaW50KTsKIH0KIAogdm9pZCBJ bnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRQYWludCgpCiB7Ci0gICAgZGlkQ29tcGxldGVDdXJy ZW50UmVjb3JkKFBhaW50VGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBkaWRDb21wbGV0ZUN1cnJl bnRSZWNvcmQoVGltZWxpbmVSZWNvcmRUeXBlOjpQYWludCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6d2lsbFdyaXRlSFRNTCh1bnNpZ25lZCBpbnQgbGVuZ3RoLCB1bnNpZ25l ZCBpbnQgc3RhcnRMaW5lKQogewotICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3Jk RmFjdG9yeTo6Y3JlYXRlUGFyc2VIVE1MRGF0YShsZW5ndGgsIHN0YXJ0TGluZSksIFBhcnNlSFRN TFRpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAgcHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNv cmRGYWN0b3J5OjpjcmVhdGVQYXJzZUhUTUxEYXRhKGxlbmd0aCwgc3RhcnRMaW5lKSwgVGltZWxp bmVSZWNvcmRUeXBlOjpQYXJzZUhUTUwpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OmRpZFdyaXRlSFRNTCh1bnNpZ25lZCBpbnQgZW5kTGluZSkKQEAgLTE4Niw3ICsyMTAsNyBA QCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZFdyaXRlSFRNTCh1bnNpZ25lZCBpbnQg ZW5kTGluZSkKICAgICBpZiAoIW1fcmVjb3JkU3RhY2suaXNFbXB0eSgpKSB7CiAgICAgICAgIFRp bWVsaW5lUmVjb3JkRW50cnkgZW50cnkgPSBtX3JlY29yZFN0YWNrLmxhc3QoKTsKICAgICAgICAg ZW50cnkuZGF0YS0+c2V0TnVtYmVyKCJlbmRMaW5lIiwgZW5kTGluZSk7Ci0gICAgICAgIGRpZENv bXBsZXRlQ3VycmVudFJlY29yZChQYXJzZUhUTUxUaW1lbGluZVJlY29yZFR5cGUpOworICAgICAg ICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRUeXBlOjpQYXJzZUhUTUwp OwogICAgIH0KIH0KIApAQCAtMTk1LDcgKzIxOSw3IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVB Z2VudDo6ZGlkSW5zdGFsbFRpbWVyKGludCB0aW1lcklkLCBpbnQgdGltZW91dCwgYm9vbCBzaW5n CiAgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4g cmVjb3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKFdURjo6 Y3VycmVudFRpbWVNUygpKTsKICAgICByZWNvcmQtPnNldE9iamVjdCgiZGF0YSIsIFRpbWVsaW5l UmVjb3JkRmFjdG9yeTo6Y3JlYXRlVGltZXJJbnN0YWxsRGF0YSh0aW1lcklkLCB0aW1lb3V0LCBz aW5nbGVTaG90KSk7Ci0gICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQucmVsZWFzZSgpLCBU aW1lckluc3RhbGxUaW1lbGluZVJlY29yZFR5cGUpOworICAgIGFkZFJlY29yZFRvVGltZWxpbmUo cmVjb3JkLnJlbGVhc2UoKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpUaW1lckluc3RhbGwpOwogfQog CiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZFJlbW92ZVRpbWVyKGludCB0aW1lcklk KQpAQCAtMjAzLDQ3ICsyMjcsNDcgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRS ZW1vdmVUaW1lcihpbnQgdGltZXJJZCkKICAgICBwdXNoR0NFdmVudFJlY29yZHMoKTsKICAgICBS ZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNy ZWF0ZUdlbmVyaWNSZWNvcmQoV1RGOjpjdXJyZW50VGltZU1TKCkpOwogICAgIHJlY29yZC0+c2V0 T2JqZWN0KCJkYXRhIiwgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljVGltZXJE YXRhKHRpbWVySWQpKTsKLSAgICBhZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29yZC5yZWxlYXNlKCks IFRpbWVyUmVtb3ZlVGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBhZGRSZWNvcmRUb1RpbWVsaW5l KHJlY29yZC5yZWxlYXNlKCksIFRpbWVsaW5lUmVjb3JkVHlwZTo6VGltZXJSZW1vdmUpOwogfQog CiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxGaXJlVGltZXIoaW50IHRpbWVySWQp CiB7Ci0gICAgcHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVH ZW5lcmljVGltZXJEYXRhKHRpbWVySWQpLCBUaW1lckZpcmVUaW1lbGluZVJlY29yZFR5cGUpOwor ICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJp Y1RpbWVyRGF0YSh0aW1lcklkKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpUaW1lckZpcmUpOwogfQog CiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZEZpcmVUaW1lcigpCiB7Ci0gICAgZGlk Q29tcGxldGVDdXJyZW50UmVjb3JkKFRpbWVyRmlyZVRpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAg ZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkVHlwZTo6VGltZXJGaXJlKTsK IH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsQ2hhbmdlWEhSUmVhZHlTdGF0 ZShjb25zdCBTdHJpbmcmIHVybCwgaW50IHJlYWR5U3RhdGUpCiB7Ci0gICAgcHVzaEN1cnJlbnRS ZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVYSFJSZWFkeVN0YXRlQ2hhbmdlRGF0 YSh1cmwsIHJlYWR5U3RhdGUpLCBYSFJSZWFkeVN0YXRlQ2hhbmdlUmVjb3JkVHlwZSk7CisgICAg cHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVYSFJSZWFkeVN0 YXRlQ2hhbmdlRGF0YSh1cmwsIHJlYWR5U3RhdGUpLCBUaW1lbGluZVJlY29yZFR5cGU6OlhIUlJl YWR5U3RhdGVDaGFuZ2UpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENo YW5nZVhIUlJlYWR5U3RhdGUoKQogewotICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChYSFJS ZWFkeVN0YXRlQ2hhbmdlUmVjb3JkVHlwZSk7CisgICAgZGlkQ29tcGxldGVDdXJyZW50UmVjb3Jk KFRpbWVsaW5lUmVjb3JkVHlwZTo6WEhSUmVhZHlTdGF0ZUNoYW5nZSk7CiB9CiAKIHZvaWQgSW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbExvYWRYSFIoY29uc3QgU3RyaW5nJiB1cmwpIAogewot ICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlWEhSTG9h ZERhdGEodXJsKSwgWEhSTG9hZFJlY29yZFR5cGUpOworICAgIHB1c2hDdXJyZW50UmVjb3JkKFRp bWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlWEhSTG9hZERhdGEodXJsKSwgVGltZWxpbmVSZWNv cmRUeXBlOjpYSFJMb2FkKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRM b2FkWEhSKCkKIHsKLSAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoWEhSTG9hZFJlY29yZFR5 cGUpOworICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZFR5cGU6OlhI UkxvYWQpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxFdmFsdWF0ZVNj cmlwdChjb25zdCBTdHJpbmcmIHVybCwgaW50IGxpbmVOdW1iZXIpCiB7Ci0gICAgcHVzaEN1cnJl bnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdERhdGEo dXJsLCBsaW5lTnVtYmVyKSwgRXZhbHVhdGVTY3JpcHRUaW1lbGluZVJlY29yZFR5cGUpOworICAg IHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRXZhbHVhdGVT Y3JpcHREYXRhKHVybCwgbGluZU51bWJlciksIFRpbWVsaW5lUmVjb3JkVHlwZTo6RXZhbHVhdGVT Y3JpcHQpOwogfQogICAgIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRFdmFsdWF0 ZVNjcmlwdCgpCiB7Ci0gICAgZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKEV2YWx1YXRlU2NyaXB0 VGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxp bmVSZWNvcmRUeXBlOjpFdmFsdWF0ZVNjcmlwdCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6ZGlkU2NoZWR1bGVSZXNvdXJjZVJlcXVlc3QoY29uc3QgU3RyaW5nJiB1cmwpCkBA IC0yNTEsOCArMjc1LDggQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRTY2hlZHVs ZVJlc291cmNlUmVxdWVzdChjb25zdCBTdHJpbmcmIHVybCkKICAgICBwdXNoR0NFdmVudFJlY29y ZHMoKTsKICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQgPSBUaW1lbGluZVJlY29y ZEZhY3Rvcnk6OmNyZWF0ZUdlbmVyaWNSZWNvcmQoV1RGOjpjdXJyZW50VGltZU1TKCkpOwogICAg IHJlY29yZC0+c2V0T2JqZWN0KCJkYXRhIiwgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVT Y2hlZHVsZVJlc291cmNlUmVxdWVzdERhdGEodXJsKSk7Ci0gICAgcmVjb3JkLT5zZXROdW1iZXIo InR5cGUiLCBTY2hlZHVsZVJlc291cmNlUmVxdWVzdFRpbWVsaW5lUmVjb3JkVHlwZSk7Ci0gICAg YWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQucmVsZWFzZSgpLCBTY2hlZHVsZVJlc291cmNlUmVx dWVzdFRpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAgcmVjb3JkLT5zZXRTdHJpbmcoInR5cGUiLCBU aW1lbGluZVJlY29yZFR5cGU6OlNjaGVkdWxlUmVzb3VyY2VSZXF1ZXN0KTsKKyAgICBhZGRSZWNv cmRUb1RpbWVsaW5lKHJlY29yZC5yZWxlYXNlKCksIFRpbWVsaW5lUmVjb3JkVHlwZTo6U2NoZWR1 bGVSZXNvdXJjZVJlcXVlc3QpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6Ondp bGxTZW5kUmVzb3VyY2VSZXF1ZXN0KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQpAQCAtMjYwLDI5ICsyODQsMjkgQEAgdm9pZCBJbnNwZWN0 b3JUaW1lbGluZUFnZW50Ojp3aWxsU2VuZFJlc291cmNlUmVxdWVzdCh1bnNpZ25lZCBsb25nIGlk ZW50aWZpZXIsIGMKICAgICBwdXNoR0NFdmVudFJlY29yZHMoKTsKICAgICBSZWZQdHI8SW5zcGVj dG9yT2JqZWN0PiByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdlbmVyaWNS ZWNvcmQoV1RGOjpjdXJyZW50VGltZU1TKCkpOwogICAgIHJlY29yZC0+c2V0T2JqZWN0KCJkYXRh IiwgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZVNlbmRSZXF1ZXN0RGF0YShp ZGVudGlmaWVyLCByZXF1ZXN0KSk7Ci0gICAgcmVjb3JkLT5zZXROdW1iZXIoInR5cGUiLCBSZXNv dXJjZVNlbmRSZXF1ZXN0VGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICByZWNvcmQtPnNldFN0cmlu ZygidHlwZSIsIFRpbWVsaW5lUmVjb3JkVHlwZTo6UmVzb3VyY2VTZW5kUmVxdWVzdCk7CiAgICAg c2V0SGVhcFNpemVTdGF0aXN0aWMocmVjb3JkLmdldCgpKTsKLSAgICBtX2Zyb250ZW5kLT5hZGRS ZWNvcmRUb1RpbWVsaW5lKHJlY29yZC5yZWxlYXNlKCkpOworICAgIG1fZnJvbnRlbmQtPmV2ZW50 UmVjb3JkZWQocmVjb3JkLnJlbGVhc2UoKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVB Z2VudDo6d2lsbFJlY2VpdmVSZXNvdXJjZURhdGEodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKQog ewotICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVj ZWl2ZVJlc291cmNlRGF0YShpZGVudGlmaWVyKSwgUmVjZWl2ZVJlc291cmNlRGF0YVRpbWVsaW5l UmVjb3JkVHlwZSk7CisgICAgcHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5 OjpjcmVhdGVSZWNlaXZlUmVzb3VyY2VEYXRhKGlkZW50aWZpZXIpLCBUaW1lbGluZVJlY29yZFR5 cGU6OlJlY2VpdmVSZXNvdXJjZURhdGEpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OmRpZFJlY2VpdmVSZXNvdXJjZURhdGEoKQogewotICAgIGRpZENvbXBsZXRlQ3VycmVudFJl Y29yZChSZWNlaXZlUmVzb3VyY2VEYXRhVGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBkaWRDb21w bGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRUeXBlOjpSZWNlaXZlUmVzb3VyY2VEYXRh KTsKIH0KICAgICAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbFJlY2VpdmVSZXNv dXJjZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNw b25zZSYgcmVzcG9uc2UpCiB7Ci0gICAgcHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRG YWN0b3J5OjpjcmVhdGVSZXNvdXJjZVJlY2VpdmVSZXNwb25zZURhdGEoaWRlbnRpZmllciwgcmVz cG9uc2UpLCBSZXNvdXJjZVJlY2VpdmVSZXNwb25zZVRpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAg cHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZVJl Y2VpdmVSZXNwb25zZURhdGEoaWRlbnRpZmllciwgcmVzcG9uc2UpLCBUaW1lbGluZVJlY29yZFR5 cGU6OlJlc291cmNlUmVjZWl2ZVJlc3BvbnNlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpkaWRSZWNlaXZlUmVzb3VyY2VSZXNwb25zZSgpCiB7Ci0gICAgZGlkQ29tcGxldGVD dXJyZW50UmVjb3JkKFJlc291cmNlUmVjZWl2ZVJlc3BvbnNlVGltZWxpbmVSZWNvcmRUeXBlKTsK KyAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRUeXBlOjpSZXNvdXJj ZVJlY2VpdmVSZXNwb25zZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlk RmluaXNoTG9hZGluZ1Jlc291cmNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgYm9vbCBkaWRG YWlsLCBkb3VibGUgZmluaXNoVGltZSkKQEAgLTI5MSw5ICszMTUsOSBAQCB2b2lkIEluc3BlY3Rv clRpbWVsaW5lQWdlbnQ6OmRpZEZpbmlzaExvYWRpbmdSZXNvdXJjZSh1bnNpZ25lZCBsb25nIGlk ZW50aWZpZXIsCiAgICAgLy8gU29tZXRpbWVzIG5ldHdvcmsgc3RhY2sgY2FuIHByb3ZpZGUgZm9y IHVzIGV4YWN0IGZpbmlzaCBsb2FkaW5nIHRpbWUuIEluIHRoZSBvdGhlciBjYXNlIHdlIHdpbGwg dXNlIGN1cnJlbnRUaW1lLgogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCA9IFRp bWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChXVEY6OmN1cnJlbnRUaW1l TVMoKSk7CiAgICAgcmVjb3JkLT5zZXRPYmplY3QoImRhdGEiLCBUaW1lbGluZVJlY29yZEZhY3Rv cnk6OmNyZWF0ZVJlc291cmNlRmluaXNoRGF0YShpZGVudGlmaWVyLCBkaWRGYWlsLCBmaW5pc2hU aW1lICogMTAwMCkpOwotICAgIHJlY29yZC0+c2V0TnVtYmVyKCJ0eXBlIiwgUmVzb3VyY2VGaW5p c2hUaW1lbGluZVJlY29yZFR5cGUpOworICAgIHJlY29yZC0+c2V0U3RyaW5nKCJ0eXBlIiwgVGlt ZWxpbmVSZWNvcmRUeXBlOjpSZXNvdXJjZUZpbmlzaCk7CiAgICAgc2V0SGVhcFNpemVTdGF0aXN0 aWMocmVjb3JkLmdldCgpKTsKLSAgICBtX2Zyb250ZW5kLT5hZGRSZWNvcmRUb1RpbWVsaW5lKHJl Y29yZC5yZWxlYXNlKCkpOworICAgIG1fZnJvbnRlbmQtPmV2ZW50UmVjb3JkZWQocmVjb3JkLnJl bGVhc2UoKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTWFya1RpbWVs aW5lKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKQEAgLTMwMSwyMSArMzI1LDIxIEBAIHZvaWQgSW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTWFya1RpbWVsaW5lKGNvbnN0IFN0cmluZyYgbWVzc2Fn ZSkKICAgICBwdXNoR0NFdmVudFJlY29yZHMoKTsKICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0 PiByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdlbmVyaWNSZWNvcmQoV1RG OjpjdXJyZW50VGltZU1TKCkpOwogICAgIHJlY29yZC0+c2V0T2JqZWN0KCJkYXRhIiwgVGltZWxp bmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVNYXJrVGltZWxpbmVEYXRhKG1lc3NhZ2UpKTsKLSAgICBh ZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29yZC5yZWxlYXNlKCksIE1hcmtUaW1lbGluZVJlY29yZFR5 cGUpOworICAgIGFkZFJlY29yZFRvVGltZWxpbmUocmVjb3JkLnJlbGVhc2UoKSwgVGltZWxpbmVS ZWNvcmRUeXBlOjpNYXJrVGltZWxpbmUpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OmRpZE1hcmtET01Db250ZW50RXZlbnQoKQogewogICAgIHB1c2hHQ0V2ZW50UmVjb3Jkcygp OwogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCA9IFRpbWVsaW5lUmVjb3JkRmFj dG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChXVEY6OmN1cnJlbnRUaW1lTVMoKSk7Ci0gICAgYWRk UmVjb3JkVG9UaW1lbGluZShyZWNvcmQucmVsZWFzZSgpLCBNYXJrRE9NQ29udGVudEV2ZW50VHlw ZSk7CisgICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQucmVsZWFzZSgpLCBUaW1lbGluZVJl Y29yZFR5cGU6Ok1hcmtET01Db250ZW50KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFn ZW50OjpkaWRNYXJrTG9hZEV2ZW50KCkKIHsKICAgICBwdXNoR0NFdmVudFJlY29yZHMoKTsKICAg ICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6 OmNyZWF0ZUdlbmVyaWNSZWNvcmQoV1RGOjpjdXJyZW50VGltZU1TKCkpOwotICAgIGFkZFJlY29y ZFRvVGltZWxpbmUocmVjb3JkLnJlbGVhc2UoKSwgTWFya0xvYWRFdmVudFR5cGUpOworICAgIGFk ZFJlY29yZFRvVGltZWxpbmUocmVjb3JkLnJlbGVhc2UoKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpN YXJrTG9hZCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ29tbWl0TG9h ZCgpCkBAIC0zMjMsMTMgKzM0NywxMyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRp ZENvbW1pdExvYWQoKQogICAgIGNsZWFyUmVjb3JkU3RhY2soKTsKIH0KIAotdm9pZCBJbnNwZWN0 b3JUaW1lbGluZUFnZW50OjphZGRSZWNvcmRUb1RpbWVsaW5lKFBhc3NSZWZQdHI8SW5zcGVjdG9y T2JqZWN0PiBwcnBSZWNvcmQsIFRpbWVsaW5lUmVjb3JkVHlwZSB0eXBlKQordm9pZCBJbnNwZWN0 b3JUaW1lbGluZUFnZW50OjphZGRSZWNvcmRUb1RpbWVsaW5lKFBhc3NSZWZQdHI8SW5zcGVjdG9y T2JqZWN0PiBwcnBSZWNvcmQsIGNvbnN0IFN0cmluZyYgdHlwZSkKIHsKICAgICBSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiByZWNvcmQocHJwUmVjb3JkKTsKLSAgICByZWNvcmQtPnNldE51bWJlcigi dHlwZSIsIHR5cGUpOworICAgIHJlY29yZC0+c2V0U3RyaW5nKCJ0eXBlIiwgdHlwZSk7CiAgICAg c2V0SGVhcFNpemVTdGF0aXN0aWMocmVjb3JkLmdldCgpKTsKICAgICBpZiAobV9yZWNvcmRTdGFj ay5pc0VtcHR5KCkpCi0gICAgICAgIG1fZnJvbnRlbmQtPmFkZFJlY29yZFRvVGltZWxpbmUocmVj b3JkLnJlbGVhc2UoKSk7CisgICAgICAgIG1fZnJvbnRlbmQtPmV2ZW50UmVjb3JkZWQocmVjb3Jk LnJlbGVhc2UoKSk7CiAgICAgZWxzZSB7CiAgICAgICAgIFRpbWVsaW5lUmVjb3JkRW50cnkgcGFy ZW50ID0gbV9yZWNvcmRTdGFjay5sYXN0KCk7CiAgICAgICAgIHBhcmVudC5jaGlsZHJlbi0+cHVz aE9iamVjdChyZWNvcmQucmVsZWFzZSgpKTsKQEAgLTM0Niw3ICszNzAsNyBAQCB2b2lkIEluc3Bl Y3RvclRpbWVsaW5lQWdlbnQ6OnNldEhlYXBTaXplU3RhdGlzdGljKEluc3BlY3Rvck9iamVjdCog cmVjb3JkKQogICAgIHJlY29yZC0+c2V0TnVtYmVyKCJ0b3RhbEhlYXBTaXplIiwgdG90YWxIZWFw U2l6ZSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ29tcGxldGVDdXJy ZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkVHlwZSB0eXBlKQordm9pZCBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoY29uc3QgU3RyaW5nJiB0eXBlKQogewog ICAgIC8vIEFuIGVtcHR5IHN0YWNrIGNvdWxkIG1lcmVseSBtZWFuIHRoYXQgdGhlIHRpbWVsaW5l IGFnZW50IHdhcyB0dXJuZWQgb24gaW4gdGhlIG1pZGRsZSBvZgogICAgIC8vIGFuIGV2ZW50LiAg RG9uJ3QgdHJlYXQgYXMgYW4gZXJyb3IuCkBAIC0zNzAsNyArMzk0LDcgQEAgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRzKiBp bnN0cnVtZW50aW4KIHsKIH0KIAotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpwdXNoQ3Vy cmVudFJlY29yZChQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YSwgVGltZWxpbmVSZWNv cmRUeXBlIHR5cGUpCit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnB1c2hDdXJyZW50UmVj b3JkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBkYXRhLCBjb25zdCBTdHJpbmcmIHR5cGUp CiB7CiAgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVj dD4gcmVjb3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKFdU Rjo6Y3VycmVudFRpbWVNUygpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yVGltZWxpbmVBZ2VudC5oCmluZGV4IGM0YzBmM2JmOTg4ZGY3MjM0ZGZlN2U4NzIzMzNm MzZiNTk5YjY3ZDkuLjNkOGU5NzNhN2QwNGY4ZDhhYjFmNWZiNjE3YTkzZWRlNzFmMmFhYzAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQu aApAQCAtNTEsMzEgKzUxLDYgQEAgY2xhc3MgUmVzb3VyY2VSZXNwb25zZTsKIAogdHlwZWRlZiBT dHJpbmcgRXJyb3JTdHJpbmc7CiAKLS8vIE11c3QgYmUga2VwdCBpbiBzeW5jIHdpdGggVGltZWxp bmVBZ2VudC5qcwotZW51bSBUaW1lbGluZVJlY29yZFR5cGUgewotICAgIEV2ZW50RGlzcGF0Y2hU aW1lbGluZVJlY29yZFR5cGUgPSAwLAotICAgIExheW91dFRpbWVsaW5lUmVjb3JkVHlwZSA9IDEs Ci0gICAgUmVjYWxjdWxhdGVTdHlsZXNUaW1lbGluZVJlY29yZFR5cGUgPSAyLAotICAgIFBhaW50 VGltZWxpbmVSZWNvcmRUeXBlID0gMywKLSAgICBQYXJzZUhUTUxUaW1lbGluZVJlY29yZFR5cGUg PSA0LAotICAgIFRpbWVySW5zdGFsbFRpbWVsaW5lUmVjb3JkVHlwZSA9IDUsCi0gICAgVGltZXJS ZW1vdmVUaW1lbGluZVJlY29yZFR5cGUgPSA2LAotICAgIFRpbWVyRmlyZVRpbWVsaW5lUmVjb3Jk VHlwZSA9IDcsCi0gICAgWEhSUmVhZHlTdGF0ZUNoYW5nZVJlY29yZFR5cGUgPSA4LAotICAgIFhI UkxvYWRSZWNvcmRUeXBlID0gOSwKLSAgICBFdmFsdWF0ZVNjcmlwdFRpbWVsaW5lUmVjb3JkVHlw ZSA9IDEwLAotICAgIE1hcmtUaW1lbGluZVJlY29yZFR5cGUgPSAxMSwKLSAgICBSZXNvdXJjZVNl bmRSZXF1ZXN0VGltZWxpbmVSZWNvcmRUeXBlID0gMTIsCi0gICAgUmVzb3VyY2VSZWNlaXZlUmVz cG9uc2VUaW1lbGluZVJlY29yZFR5cGUgPSAxMywKLSAgICBSZXNvdXJjZUZpbmlzaFRpbWVsaW5l UmVjb3JkVHlwZSA9IDE0LAotICAgIEZ1bmN0aW9uQ2FsbFRpbWVsaW5lUmVjb3JkVHlwZSA9IDE1 LAotICAgIFJlY2VpdmVSZXNvdXJjZURhdGFUaW1lbGluZVJlY29yZFR5cGUgPSAxNiwKLSAgICBH Q0V2ZW50VGltZWxpbmVSZWNvcmRUeXBlID0gMTcsCi0gICAgTWFya0RPTUNvbnRlbnRFdmVudFR5 cGUgPSAxOCwKLSAgICBNYXJrTG9hZEV2ZW50VHlwZSA9IDE5LAotICAgIFNjaGVkdWxlUmVzb3Vy Y2VSZXF1ZXN0VGltZWxpbmVSZWNvcmRUeXBlID0gMjAKLX07Ci0KIGNsYXNzIEluc3BlY3RvclRp bWVsaW5lQWdlbnQgOiBTY3JpcHRHQ0V2ZW50TGlzdGVuZXIgewogICAgIFdURl9NQUtFX05PTkNP UFlBQkxFKEluc3BlY3RvclRpbWVsaW5lQWdlbnQpOwogcHVibGljOgpAQCAtMTQ4LDI0ICsxMjMs MjQgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIHN0cnVjdCBUaW1lbGluZVJlY29yZEVudHJ5 IHsKLSAgICAgICAgVGltZWxpbmVSZWNvcmRFbnRyeShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVj dD4gcmVjb3JkLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YSwgUGFzc1JlZlB0cjxJ bnNwZWN0b3JBcnJheT4gY2hpbGRyZW4sIFRpbWVsaW5lUmVjb3JkVHlwZSB0eXBlKQorICAgICAg ICBUaW1lbGluZVJlY29yZEVudHJ5KFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQs IFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBkYXRhLCBQYXNzUmVmUHRyPEluc3BlY3RvckFy cmF5PiBjaGlsZHJlbiwgY29uc3QgU3RyaW5nJiB0eXBlKQogICAgICAgICAgICAgOiByZWNvcmQo cmVjb3JkKSwgZGF0YShkYXRhKSwgY2hpbGRyZW4oY2hpbGRyZW4pLCB0eXBlKHR5cGUpCiAgICAg ICAgIHsKICAgICAgICAgfQogICAgICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQ7 CiAgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGRhdGE7CiAgICAgICAgIFJlZlB0cjxJ bnNwZWN0b3JBcnJheT4gY2hpbGRyZW47Ci0gICAgICAgIFRpbWVsaW5lUmVjb3JkVHlwZSB0eXBl OworICAgICAgICBTdHJpbmcgdHlwZTsKICAgICB9OwogICAgICAgICAKICAgICBJbnNwZWN0b3JU aW1lbGluZUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqLCBJbnNwZWN0b3JTdGF0ZSopOwogCi0g ICAgdm9pZCBwdXNoQ3VycmVudFJlY29yZChQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4sIFRp bWVsaW5lUmVjb3JkVHlwZSk7CisgICAgdm9pZCBwdXNoQ3VycmVudFJlY29yZChQYXNzUmVmUHRy PEluc3BlY3Rvck9iamVjdD4sIGNvbnN0IFN0cmluZyYgdHlwZSk7CiAgICAgdm9pZCBzZXRIZWFw U2l6ZVN0YXRpc3RpYyhJbnNwZWN0b3JPYmplY3QqIHJlY29yZCk7CiAgICAgICAgIAotICAgIHZv aWQgZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAgdm9p ZCBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoY29uc3QgU3RyaW5nJiB0eXBlKTsKIAotICAgIHZv aWQgYWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4sIFRpbWVs aW5lUmVjb3JkVHlwZSk7CisgICAgdm9pZCBhZGRSZWNvcmRUb1RpbWVsaW5lKFBhc3NSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiwgY29uc3QgU3RyaW5nJiB0eXBlKTsKIAogICAgIHZvaWQgcHVzaEdD RXZlbnRSZWNvcmRzKCk7CiAgICAgdm9pZCBjbGVhclJlY29yZFN0YWNrKCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMKaW5kZXgg OTdiOGU0MjFlNzk1NGI3N2QxY2VkNzdkNjc0Mzc2ZWU1YjYzYzFiZS4uZjNkMDU0ZjVmNjkxZjIz YjgyNzMxOTViNDk4MGZmZmJhNzA2NDdlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5qcwpAQCAtMzQsMjUgKzM0LDI1IEBAIFdl Ykluc3BlY3Rvci5UaW1lbGluZUFnZW50ID0gZnVuY3Rpb24oKSB7CiAKIC8vIE11c3QgYmUga2Vw dCBpbiBzeW5jIHdpdGggVGltZWxpbmVJdGVtLmgKIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50 LlJlY29yZFR5cGUgPSB7Ci0gICAgRXZlbnREaXNwYXRjaCA6IDAsCi0gICAgTGF5b3V0IDogMSwK LSAgICBSZWNhbGN1bGF0ZVN0eWxlcyA6IDIsCi0gICAgUGFpbnQgOiAzLAotICAgIFBhcnNlSFRN TCA6IDQsCi0gICAgVGltZXJJbnN0YWxsIDogNSwKLSAgICBUaW1lclJlbW92ZSA6IDYsCi0gICAg VGltZXJGaXJlIDogNywKLSAgICBYSFJSZWFkeVN0YXRlQ2hhbmdlIDogOCwKLSAgICBYSFJMb2Fk IDogOSwKLSAgICBFdmFsdWF0ZVNjcmlwdCA6IDEwLAotICAgIE1hcmtUaW1lbGluZSA6IDExLAot ICAgIFJlc291cmNlU2VuZFJlcXVlc3QgOiAxMiwKLSAgICBSZXNvdXJjZVJlY2VpdmVSZXNwb25z ZSA6IDEzLAotICAgIFJlc291cmNlRmluaXNoIDogMTQsCi0gICAgRnVuY3Rpb25DYWxsIDogMTUs Ci0gICAgUmVzb3VyY2VSZWNlaXZlRGF0YTogMTYsCi0gICAgR0NFdmVudCA6IDE3LAotICAgIE1h cmtET01Db250ZW50RXZlbnRUeXBlIDogMTgsCi0gICAgTWFya0xvYWRFdmVudFR5cGUgOiAxOSwK LSAgICBTY2hlZHVsZVJlc291cmNlUmVxdWVzdCA6IDIwCisgICAgRXZlbnREaXNwYXRjaDogIkV2 ZW50RGlzcGF0Y2giLAorICAgIExheW91dDogIkxheW91dCIsCisgICAgUmVjYWxjdWxhdGVTdHls ZXM6ICJSZWNhbGN1bGF0ZVN0eWxlcyIsCisgICAgUGFpbnQ6ICJQYWludCIsCisgICAgUGFyc2VI VE1MOiAiUGFyc2VIVE1MIiwKKyAgICBUaW1lckluc3RhbGw6ICJUaW1lckluc3RhbGwiLAorICAg IFRpbWVyUmVtb3ZlOiAiVGltZXJSZW1vdmUiLAorICAgIFRpbWVyRmlyZTogIlRpbWVyRmlyZSIs CisgICAgWEhSUmVhZHlTdGF0ZUNoYW5nZTogIlhIUlJlYWR5U3RhdGVDaGFuZ2UiLAorICAgIFhI UkxvYWQ6ICJYSFJMb2FkIiwKKyAgICBFdmFsdWF0ZVNjcmlwdDogIkV2YWx1YXRlU2NyaXB0IiwK KyAgICBNYXJrVGltZWxpbmU6ICJNYXJrVGltZWxpbmUiLAorICAgIFJlc291cmNlU2VuZFJlcXVl c3Q6ICJSZXNvdXJjZVNlbmRSZXF1ZXN0IiwKKyAgICBSZXNvdXJjZVJlY2VpdmVSZXNwb25zZTog IlJlc291cmNlUmVjZWl2ZVJlc3BvbnNlIiwKKyAgICBSZXNvdXJjZUZpbmlzaDogIlJlc291cmNl RmluaXNoIiwKKyAgICBGdW5jdGlvbkNhbGw6ICJGdW5jdGlvbkNhbGwiLAorICAgIFJlc291cmNl UmVjZWl2ZURhdGE6ICJSZXNvdXJjZVJlY2VpdmVEYXRhIiwKKyAgICBHQ0V2ZW50OiAiR0NFdmVu dCIsCisgICAgTWFya0RPTUNvbnRlbnQ6ICJNYXJrRE9NQ29udGVudCIsCisgICAgTWFya0xvYWQ6 ICJNYXJrTG9hZCIsCisgICAgU2NoZWR1bGVSZXNvdXJjZVJlcXVlc3Q6ICJTY2hlZHVsZVJlc291 cmNlUmVxdWVzdCIKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1RpbWVsaW5lUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1RpbWVsaW5lUGFuZWwuanMKaW5kZXggYWZhNmVjMDYyYjgxZDZiY2QwNmZhY2VlYjM3ZjQz YzczODAwYmQ4MC4uMWEyZjRmM2E1NjU0MTY3YzQxYWJkNjY2MDRkMWY0ZDlkYjllYTU4YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVs LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5l bC5qcwpAQCAtMTkwLDggKzE5MCw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIHJlY29yZFN0eWxlc1tyZWNvcmRUeXBlcy5GdW5jdGlvbkNh bGxdID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJGdW5jdGlvbiBDYWxsIiksIGNh dGVnb3J5OiB0aGlzLmNhdGVnb3JpZXMuc2NyaXB0aW5nIH07CiAgICAgICAgICAgICByZWNvcmRT dHlsZXNbcmVjb3JkVHlwZXMuUmVzb3VyY2VSZWNlaXZlRGF0YV0gPSB7IHRpdGxlOiBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIlJlY2VpdmUgRGF0YSIpLCBjYXRlZ29yeTogdGhpcy5jYXRlZ29yaWVz LmxvYWRpbmcgfTsKICAgICAgICAgICAgIHJlY29yZFN0eWxlc1tyZWNvcmRUeXBlcy5HQ0V2ZW50 XSA9IHsgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiR0MgRXZlbnQiKSwgY2F0ZWdvcnk6 IHRoaXMuY2F0ZWdvcmllcy5zY3JpcHRpbmcgfTsKLSAgICAgICAgICAgIHJlY29yZFN0eWxlc1ty ZWNvcmRUeXBlcy5NYXJrRE9NQ29udGVudEV2ZW50VHlwZV0gPSB7IHRpdGxlOiBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkRPTUNvbnRlbnQgZXZlbnQiKSwgY2F0ZWdvcnk6IHRoaXMuY2F0ZWdvcmll cy5zY3JpcHRpbmcgfTsKLSAgICAgICAgICAgIHJlY29yZFN0eWxlc1tyZWNvcmRUeXBlcy5NYXJr TG9hZEV2ZW50VHlwZV0gPSB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvYWQgZXZl bnQiKSwgY2F0ZWdvcnk6IHRoaXMuY2F0ZWdvcmllcy5zY3JpcHRpbmcgfTsKKyAgICAgICAgICAg IHJlY29yZFN0eWxlc1tyZWNvcmRUeXBlcy5NYXJrRE9NQ29udGVudF0gPSB7IHRpdGxlOiBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkRPTUNvbnRlbnQgZXZlbnQiKSwgY2F0ZWdvcnk6IHRoaXMuY2F0 ZWdvcmllcy5zY3JpcHRpbmcgfTsKKyAgICAgICAgICAgIHJlY29yZFN0eWxlc1tyZWNvcmRUeXBl cy5NYXJrTG9hZF0gPSB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvYWQgZXZlbnQi KSwgY2F0ZWdvcnk6IHRoaXMuY2F0ZWdvcmllcy5zY3JpcHRpbmcgfTsKICAgICAgICAgICAgIHJl Y29yZFN0eWxlc1tyZWNvcmRUeXBlcy5TY2hlZHVsZVJlc291cmNlUmVxdWVzdF0gPSB7IHRpdGxl OiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNjaGVkdWxlIFJlcXVlc3QiKSwgY2F0ZWdvcnk6IHRo aXMuY2F0ZWdvcmllcy5sb2FkaW5nIH07CiAgICAgICAgICAgICB0aGlzLl9yZWNvcmRTdHlsZXNB cnJheSA9IHJlY29yZFN0eWxlczsKICAgICAgICAgfQpAQCAtMjUwLDkgKzI1MCw5IEBAIFdlYklu c3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgZXZlbnREaXZpZGVy UGFkZGluZy5jbGFzc05hbWUgPSAicmVzb3VyY2VzLWV2ZW50LWRpdmlkZXItcGFkZGluZyI7CiAg ICAgICAgIGV2ZW50RGl2aWRlclBhZGRpbmcudGl0bGUgPSByZWNvcmQudGl0bGU7CiAKLSAgICAg ICAgaWYgKHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5NYXJrRE9NQ29udGVudEV2ZW50VHlw ZSkKKyAgICAgICAgaWYgKHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5NYXJrRE9NQ29udGVu dCkKICAgICAgICAgICAgIGV2ZW50RGl2aWRlci5jbGFzc05hbWUgKz0gIiByZXNvdXJjZXMtYmx1 ZS1kaXZpZGVyIjsKLSAgICAgICAgZWxzZSBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVz Lk1hcmtMb2FkRXZlbnRUeXBlKQorICAgICAgICBlbHNlIGlmIChyZWNvcmQudHlwZSA9PT0gcmVj b3JkVHlwZXMuTWFya0xvYWQpCiAgICAgICAgICAgICBldmVudERpdmlkZXIuY2xhc3NOYW1lICs9 ICIgcmVzb3VyY2VzLXJlZC1kaXZpZGVyIjsKICAgICAgICAgZWxzZSBpZiAocmVjb3JkLnR5cGUg PT09IHJlY29yZFR5cGVzLk1hcmtUaW1lbGluZSkgewogICAgICAgICAgICAgZXZlbnREaXZpZGVy LmNsYXNzTmFtZSArPSAiIHJlc291cmNlcy1vcmFuZ2UtZGl2aWRlciI7CkBAIC0zMzgsNyArMzM4 LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAg ICAgICAgdmFyIGNvbm5lY3RlZFRvT2xkUmVjb3JkID0gZmFsc2U7CiAgICAgICAgIHZhciByZWNv cmRUeXBlcyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGU7Ci0gICAgICAg IGlmIChyZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuTWFya0RPTUNvbnRlbnRFdmVudFR5cGUg fHwgcmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLk1hcmtMb2FkRXZlbnRUeXBlKQorICAgICAg ICBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLk1hcmtET01Db250ZW50IHx8IHJlY29y ZC50eXBlID09PSByZWNvcmRUeXBlcy5NYXJrTG9hZCkKICAgICAgICAgICAgIHBhcmVudFJlY29y ZCA9IG51bGw7IC8vIE5vIGJhciBlbnRyeSBmb3IgbG9hZCBldmVudHMuCiAgICAgICAgIGVsc2Ug aWYgKHBhcmVudFJlY29yZCA9PT0gdGhpcy5fcm9vdFJlY29yZCkgewogICAgICAgICAgICAgdmFy IG5ld1BhcmVudFJlY29yZCA9IHRoaXMuX2ZpbmRQYXJlbnRSZWNvcmQocmVjb3JkKTsKQEAgLTM2 MCw3ICszNjAsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAK ICAgICAgICAgdmFyIGZvcm1hdHRlZFJlY29yZCA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVQ YW5lbC5Gb3JtYXR0ZWRSZWNvcmQocmVjb3JkLCBwYXJlbnRSZWNvcmQsIHRoaXMpOwogCi0gICAg ICAgIGlmIChyZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuTWFya0RPTUNvbnRlbnRFdmVudFR5 cGUgfHwgcmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLk1hcmtMb2FkRXZlbnRUeXBlKSB7Cisg ICAgICAgIGlmIChyZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuTWFya0RPTUNvbnRlbnQgfHwg cmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLk1hcmtMb2FkKSB7CiAgICAgICAgICAgICB0aGlz Ll9tYXJrVGltZWxpbmVSZWNvcmRzLnB1c2goZm9ybWF0dGVkUmVjb3JkKTsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQpAQCAtNjU3LDE3ICs2NTcsMTcgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lRGlzcGF0Y2hlciA9IGZ1bmN0aW9uKHRpbWVsaW5lUGFuZWwpCiB9CiAKIFdlYkluc3Bl Y3Rvci5UaW1lbGluZURpc3BhdGNoZXIucHJvdG90eXBlID0gewotICAgIHRpbWVsaW5lUHJvZmls ZXJXYXNTdGFydGVkOiBmdW5jdGlvbigpCisgICAgc3RhcnRlZDogZnVuY3Rpb24oKQogICAgIHsK ICAgICAgICAgdGhpcy5fdGltZWxpbmVQYW5lbC5fdGltZWxpbmVQcm9maWxlcldhc1N0YXJ0ZWQo KTsKICAgICB9LAogCi0gICAgdGltZWxpbmVQcm9maWxlcldhc1N0b3BwZWQ6IGZ1bmN0aW9uKCkK KyAgICBzdG9wcGVkOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl90aW1lbGluZVBh bmVsLl90aW1lbGluZVByb2ZpbGVyV2FzU3RvcHBlZCgpOwogICAgIH0sCiAKLSAgICBhZGRSZWNv cmRUb1RpbWVsaW5lOiBmdW5jdGlvbihyZWNvcmQpCisgICAgZXZlbnRSZWNvcmRlZDogZnVuY3Rp b24ocmVjb3JkKQogICAgIHsKICAgICAgICAgdGhpcy5fdGltZWxpbmVQYW5lbC5fYWRkUmVjb3Jk VG9UaW1lbGluZShyZWNvcmQpOwogICAgIH0K