131127 2014-04-02 14:01:09 -0700 Web Inspector: hook up probe samples to TimelineAgent's records 2014-04-04 22:54:16 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 131173 1 burg burg graouts joepeck madonnk timothy webkit-bug-importer oldest_to_newest 996840 0 burg 2014-04-02 14:01:09 -0700 Katie and I are unsure whether to put probes+console messages into its own timeline category, or to fold it into the JavaScript & Events category. Our first step is to prototype the latter to see how it would work. 996842 1 webkit-bug-importer 2014-04-02 14:02:06 -0700 <rdar://problem/16503719> 997242 2 burg 2014-04-03 11:09:57 -0700 Narrowing this bug just to hooking up the backend. Katie will tackle the frontend part. 997410 3 228568 burg 2014-04-03 18:13:46 -0700 Created attachment 228568 the patch 997665 4 228568 timothy 2014-04-04 12:29:07 -0700 Comment on attachment 228568 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=228568&action=review > Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js:275 > + case TimelineAgent.EventType.ProbeSample: > + break; FIXME comment here would be nice. 997834 5 burg 2014-04-04 22:54:16 -0700 Committed r166827: <http://trac.webkit.org/changeset/166827> 228568 2014-04-03 18:13:46 -0700 2014-04-04 12:29:07 -0700 the patch bug-131127-20140403181325.patch text/plain 14184 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NzI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy YjdlOWQ4NWRmOWVjOTQzMTBhNmM3NDIyNWM5MmE2OWI1MTU0YmNiLi44YTMzMTc5MzU0MWUwMDJj NmRlODVlNTgyMGU4ZDAzOWUwZWZlYjg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAxNC0wNC0wMyAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogaG9vayB1cCBwcm9iZSBzYW1wbGVzIHRv IFRpbWVsaW5lQWdlbnQncyByZWNvcmRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzExMjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmg6IEFkZCBh IHByb3BlciBmb3J3YXJkIGRlY2xhcmF0aW9uIGZvciBTY3JpcHRCcmVha3BvaW50QWN0aW9uLgor CiAyMDE0LTA0LTAyICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBB Uk12NyBjb21wYXJlMzIoKSBzaG91bGQgbm90IHVzZSBUU1QgdG8gZG8gQ01QJ3Mgam9iLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IDAwN2QyMjA0Yzg1Y2Y5Mzg2YjlmYWRlNGJmNzkzZWRmZjJhOGY1YjEuLjk4YTk1 ODM4ODgyMDcyZDI1N2M0YmY0MTRiNTJhMWQ0NWQyNGJiZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyNiBAQAorMjAxNC0wNC0wMyAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5l ZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogaG9vayB1cCBwcm9iZSBzYW1wbGVzIHRvIFRp bWVsaW5lQWdlbnQncyByZWNvcmRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzExMjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBIb29rIHVwIHByb2JlIGNhbGxiYWNrcyBmcm9tIFNjcmlwdERlYnVnTGlz dGVuZXIgc28gdGhhdCB0aW1lbGluZSByZWNvcmRzIGFyZQorICAgICAgICBjcmVhdGVkIGZvciBw cm9iZSBzYW1wbGVzLiBUaGUgcmVjb3JkIGluY2x1ZGVzIHRoZSBwcm9iZSBpZGVudGlmaWVyIGFu ZCBoaXQgY291bnQuCisgICAgICAgIFRoZSBhY3R1YWwgcHJvYmUgZXZhbHVhdGlvbiByZXN1bHQg aXMgc2VudCBzZXBhcmF0ZWx5IGJ5IERlYnVnZ2VyQWdlbnQsIGFuZAorICAgICAgICBjYW4gYmUg bG9va2VkIHVwIGluIGZyb250ZW5kIG1vZGVscyB1c2luZyB0aGUgaWRlbnRpZmllciBhbmQgaGl0 IGNvdW50LgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3Bw OiBPbmx5IGxpc3RlbiB0byB0aGUgZGVidWcgc2VydmVyIHdoZW4gcmVjb3JkaW5nLgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6c3RhcnQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6c3RvcCk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JUaW1lbGluZUFnZW50OjpicmVha3BvaW50QWN0aW9uUHJvYmUpOgorICAgICAgICAo V2ViQ29yZTo6dG9Qcm90b2NvbCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclRpbWVs aW5lQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUHJvYmVT YW1wbGVEYXRhKToKKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5Lmg6 CisgICAgICAgICogaW5zcGVjdG9yL3Byb3RvY29sL1RpbWVsaW5lLmpzb246IEFkZCBuZXcgZW51 bSB2YWx1ZS4KKwogMjAxNC0wNC0wMyAgQmVtIEpvbmVzLUJleSAgPGJqb25lc2JlQGFkb2JlLmNv bT4KIAogICAgICAgICBbQ1NTIFNoYXBlc10gQ1JBU0ggd2l0aCBjYWxjKCkgdmFsdWUgYXJncyBp biBpbnNldCByb3VuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXggMWRmOWQwMjE1ZTFiNTNl OGJmODQ2ZGU1OTdkMjc3YjkxZDZkMzAzNC4uMTEyNTViOTFiZWMyZmU1MGMwNTlkYWQzYjliYTA1 M2U4OTE2YjFmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw MTQtMDQtMDMgIEJyaWFuIEouIEJ1cmcgIDxidXJnQGNzLndhc2hpbmd0b24uZWR1PgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IGhvb2sgdXAgcHJvYmUgc2FtcGxlcyB0byBUaW1lbGluZUFnZW50 J3MgcmVjb3JkcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTMxMTI3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qczogU3R1YiBv dXQgYSBjYXNlIGZvciB0aGUgUHJvYmVTYW1wbGUgcmVjb3JkIHR5cGUuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLnByb3RvdHlwZS5ldmVudFJlY29yZGVkLnByb2Nlc3NS ZWNvcmQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUu ZXZlbnRSZWNvcmRlZCk6CisKIDIwMTQtMDQtMDIgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlA YXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBJbnB1dCBkb21haW4gZnJvbSB0aGUgV2ViIElu c3BlY3RvciBwcm90b2NvbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3Bl Y3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmgKaW5kZXggY2IwMTBhYWUzYWQxMTQxNzMxOWRkZjBj NzBmMzJlYThhZTIzMzU5NC4uM2JkYmNkODIzZmI5MTQ4ZmEyYjZmM2NlYjI1MjdmYWU5YTM5ZTJh YSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1 Z0xpc3RlbmVyLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9TY3JpcHRE ZWJ1Z0xpc3RlbmVyLmgKQEAgLTQwLDYgKzQwLDggQEAgY2xhc3MgU2NyaXB0VmFsdWU7CiAKIG5h bWVzcGFjZSBJbnNwZWN0b3IgewogCitzdHJ1Y3QgU2NyaXB0QnJlYWtwb2ludEFjdGlvbjsKKwog Y2xhc3MgU2NyaXB0RGVidWdMaXN0ZW5lciB7CiBwdWJsaWM6CiAgICAgY2xhc3MgU2NyaXB0IHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFn ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50 LmNwcAppbmRleCBhMTg4NjE0YWZlODEzOGM1OTBlMjk5YjFjNjE3NTY2NWMzMGZhZTQ5Li42ODk2 NDkxOGYzZjUzMDQzNzgxODEyMDk2OGFlZmVjNzZlOGEwNDkyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCkBAIC0xLDUgKzEs NiBAQAogLyoKICogQ29weXJpZ2h0IChDKSAyMDEzIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisqIENvcHlyaWdodCAoQykgMjAxNCBVbml2ZXJzaXR5IG9mIFdhc2hpbmd0b24uCiAq CiAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC00NCwxMyArNDUsMTYgQEAKICNpbmNs dWRlICJJbnN0cnVtZW50aW5nQWdlbnRzLmgiCiAjaW5jbHVkZSAiSW50UmVjdC5oIgogI2luY2x1 ZGUgIkpTRE9NV2luZG93LmgiCisjaW5jbHVkZSAiUGFnZVNjcmlwdERlYnVnU2VydmVyLmgiCiAj aW5jbHVkZSAiUmVuZGVyRWxlbWVudC5oIgogI2luY2x1ZGUgIlJlbmRlclZpZXcuaCIKICNpbmNs dWRlICJSZXNvdXJjZVJlcXVlc3QuaCIKICNpbmNsdWRlICJSZXNvdXJjZVJlc3BvbnNlLmgiCiAj aW5jbHVkZSAiU2NyaXB0UHJvZmlsZXIuaCIKKyNpbmNsdWRlICJTY3JpcHRTdGF0ZS5oIgogI2lu Y2x1ZGUgIlRpbWVsaW5lUmVjb3JkRmFjdG9yeS5oIgogI2luY2x1ZGUgPGluc3BlY3Rvci9JZGVu dGlmaWVyc0ZhY3RvcnkuaD4KKyNpbmNsdWRlIDxpbnNwZWN0b3IvU2NyaXB0QnJlYWtwb2ludC5o PgogI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5oPgogCiB1c2luZyBuYW1lc3BhY2UgSW5zcGVj dG9yOwpAQCAtOTQsNiArOTgsNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN0YXJ0 KEVycm9yU3RyaW5nKiwgY29uc3QgaW50KiBtYXhDYWxsU3RhY2tEZXB0aCkKICAgICBtX3RpbWVD b252ZXJ0ZXIucmVzZXQoKTsKIAogICAgIG1faW5zdHJ1bWVudGluZ0FnZW50cy0+c2V0SW5zcGVj dG9yVGltZWxpbmVBZ2VudCh0aGlzKTsKKyAgICBQYWdlU2NyaXB0RGVidWdTZXJ2ZXI6OnNoYXJl ZCgpLmFkZExpc3RlbmVyKHRoaXMsIHBhZ2UoKSk7CiAgICAgbV9lbmFibGVkID0gdHJ1ZTsKIH0K IApAQCAtMTA0LDYgKzEwOSw3IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6c3RvcChF cnJvclN0cmluZyopCiAKICAgICBtX3dlYWtGYWN0b3J5LnJldm9rZUFsbCgpOwogICAgIG1faW5z dHJ1bWVudGluZ0FnZW50cy0+c2V0SW5zcGVjdG9yVGltZWxpbmVBZ2VudChudWxscHRyKTsKKyAg ICBQYWdlU2NyaXB0RGVidWdTZXJ2ZXI6OnNoYXJlZCgpLnJlbW92ZUxpc3RlbmVyKHRoaXMsIHBh Z2UoKSwgdHJ1ZSk7CiAKICAgICBjbGVhclJlY29yZFN0YWNrKCk7CiAKQEAgLTQ1Miw2ICs0NTgs MTggQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWREZXN0cm95V2ViU29ja2V0KHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRnJhbWUKIH0KICNlbmRpZiAvLyBFTkFCTEUoV0VCX1NP Q0tFVFMpCiAKKy8vIFNjcmlwdERlYnVnTGlzdGVuZXIKKwordm9pZCBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpicmVha3BvaW50QWN0aW9uUHJvYmUoSlNDOjpFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0 IEluc3BlY3Rvcjo6U2NyaXB0QnJlYWtwb2ludEFjdGlvbiYgYWN0aW9uLCBpbnQgaGl0Q291bnQs IGNvbnN0IERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlJikKK3sKKyAgICBBU1NFUlQoZXhlYyk7CisK KyAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0ID0gc2NyaXB0RXhlY3V0aW9uQ29u dGV4dEZyb21FeGVjU3RhdGUoZXhlYyk7CisgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gKGNvbnRl eHQgJiYgY29udGV4dC0+aXNEb2N1bWVudCgpKSA/IHRvRG9jdW1lbnQoY29udGV4dCkgOiBudWxs cHRyOworICAgIEZyYW1lKiBmcmFtZSA9IGRvY3VtZW50ID8gZG9jdW1lbnQtPmZyYW1lKCkgOiBu dWxscHRyOworICAgIGFwcGVuZFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVBy b2JlU2FtcGxlRGF0YShhY3Rpb24sIGhpdENvdW50KSwgVGltZWxpbmVSZWNvcmRUeXBlOjpQcm9i ZVNhbXBsZSwgZmFsc2UsIGZyYW1lKTsKK30KKwogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50 OjphZGRSZWNvcmRUb1RpbWVsaW5lKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQs IFRpbWVsaW5lUmVjb3JkVHlwZSB0eXBlKQogewogICAgIGNvbW1pdEZyYW1lUmVjb3JkKCk7CkBA IC01MjUsNiArNTQzLDggQEAgc3RhdGljIEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlRpbWVsaW5l OjpFdmVudFR5cGU6OkVudW0gdG9Qcm90b2NvbChUaW1lbGluZVJlY28KIAogICAgIGNhc2UgVGlt ZWxpbmVSZWNvcmRUeXBlOjpGdW5jdGlvbkNhbGw6CiAgICAgICAgIHJldHVybiBJbnNwZWN0b3I6 OlR5cGVCdWlsZGVyOjpUaW1lbGluZTo6RXZlbnRUeXBlOjpGdW5jdGlvbkNhbGw7CisgICAgY2Fz ZSBUaW1lbGluZVJlY29yZFR5cGU6OlByb2JlU2FtcGxlOgorICAgICAgICByZXR1cm4gSW5zcGVj dG9yOjpUeXBlQnVpbGRlcjo6VGltZWxpbmU6OkV2ZW50VHlwZTo6UHJvYmVTYW1wbGU7CiAKICAg ICBjYXNlIFRpbWVsaW5lUmVjb3JkVHlwZTo6UmVxdWVzdEFuaW1hdGlvbkZyYW1lOgogICAgICAg ICByZXR1cm4gSW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6VGltZWxpbmU6OkV2ZW50VHlwZTo6UmVx dWVzdEFuaW1hdGlvbkZyYW1lOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JUaW1lbGluZUFnZW50LmgKaW5kZXggZjM2YzUwMzMzODAxMzM5NWQ1YzVkZDE2Mzg4ZjUy OGFkMGEwNWUyNy4uODMxNzZjZTcxNjEzN2E1ZWRiZjE4YjI1NDMwZjFkZWJkZjA1YjE5OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5o CkBAIC0xLDUgKzEsNiBAQAogLyoKICogQ29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisqIENvcHlyaWdodCAoQykgMjAxNCBVbml2ZXJzaXR5IG9mIFdh c2hpbmd0b24uCiAqCiAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC0zOCw2ICszOSw3 IEBACiAjaW5jbHVkZSAiSW5zcGVjdG9yV2ViRnJvbnRlbmREaXNwYXRjaGVycy5oIgogI2luY2x1 ZGUgIkxheW91dFJlY3QuaCIKICNpbmNsdWRlIDxpbnNwZWN0b3IvSW5zcGVjdG9yVmFsdWVzLmg+ CisjaW5jbHVkZSA8aW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVuZXIuaD4KICNpbmNsdWRlIDx3 dGYvVmVjdG9yLmg+CiAjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KIApAQCAtOTUsNiArOTcsNyBA QCBlbnVtIGNsYXNzIFRpbWVsaW5lUmVjb3JkVHlwZSB7CiAgICAgWEhSTG9hZCwKIAogICAgIEZ1 bmN0aW9uQ2FsbCwKKyAgICBQcm9iZVNhbXBsZSwKIAogICAgIFJlcXVlc3RBbmltYXRpb25GcmFt ZSwKICAgICBDYW5jZWxBbmltYXRpb25GcmFtZSwKQEAgLTEyMSw3ICsxMjQsOCBAQCBwcml2YXRl OgogCiBjbGFzcyBJbnNwZWN0b3JUaW1lbGluZUFnZW50CiAgICAgOiBwdWJsaWMgSW5zcGVjdG9y QWdlbnRCYXNlCi0gICAgLCBwdWJsaWMgSW5zcGVjdG9yOjpJbnNwZWN0b3JUaW1lbGluZUJhY2tl bmREaXNwYXRjaGVySGFuZGxlciB7CisgICAgLCBwdWJsaWMgSW5zcGVjdG9yOjpJbnNwZWN0b3JU aW1lbGluZUJhY2tlbmREaXNwYXRjaGVySGFuZGxlcgorICAgICwgcHVibGljIEluc3BlY3Rvcjo6 U2NyaXB0RGVidWdMaXN0ZW5lciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoSW5zcGVjdG9y VGltZWxpbmVBZ2VudCk7CiBwdWJsaWM6CiAgICAgZW51bSBJbnNwZWN0b3JUeXBlIHsgUGFnZUlu c3BlY3RvciwgV29ya2VySW5zcGVjdG9yIH07CkBAIC0yMTEsNiArMjE1LDE3IEBAIHB1YmxpYzoK ICAgICB2b2lkIGRpZERlc3Ryb3lXZWJTb2NrZXQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBG cmFtZSopOwogI2VuZGlmCiAKK3Byb3RlY3RlZDoKKyAgICAvLyBTY3JpcHREZWJ1Z0xpc3RlbmVy LiBUaGlzIGlzIG9ubHkgdXNlZCB0byBjcmVhdGUgcmVjb3JkcyBmb3IgcHJvYmUgc2FtcGxlcy4K KyAgICB2aXJ0dWFsIHZvaWQgZGlkUGFyc2VTb3VyY2UoSlNDOjpTb3VyY2VJRCwgY29uc3QgU2Ny aXB0Jikgb3ZlcnJpZGUgeyB9CisgICAgdmlydHVhbCB2b2lkIGZhaWxlZFRvUGFyc2VTb3VyY2Uo Y29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgaW50LCBpbnQsIGNvbnN0IFN0cmluZyYpIG92 ZXJyaWRlIHsgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRQYXVzZShKU0M6OkV4ZWNTdGF0ZSosIGNv bnN0IERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlJiwgY29uc3QgRGVwcmVjYXRlZDo6U2NyaXB0VmFs dWUmKSBvdmVycmlkZSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgZGlkQ29udGludWUoKSBvdmVycmlk ZSB7IH0KKworICAgIHZpcnR1YWwgdm9pZCBicmVha3BvaW50QWN0aW9uTG9nKEpTQzo6RXhlY1N0 YXRlKiwgY29uc3QgU3RyaW5nJikgb3ZlcnJpZGUgeyB9CisgICAgdmlydHVhbCB2b2lkIGJyZWFr cG9pbnRBY3Rpb25Tb3VuZChpbnQpIG92ZXJyaWRlIHsgfQorICAgIHZpcnR1YWwgdm9pZCBicmVh a3BvaW50QWN0aW9uUHJvYmUoSlNDOjpFeGVjU3RhdGUqLCBjb25zdCBJbnNwZWN0b3I6OlNjcmlw dEJyZWFrcG9pbnRBY3Rpb24mLCBpbnQgaGl0Q291bnQsIGNvbnN0IERlcHJlY2F0ZWQ6OlNjcmlw dFZhbHVlJiByZXN1bHQpIG92ZXJyaWRlOworCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBU aW1lbGluZVJlY29yZFN0YWNrOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9U aW1lbGluZVJlY29yZEZhY3RvcnkuY3BwCmluZGV4IDJkNjIyNzY5OWYxNDRiNGQyNmFlZTk1MDUy MWFlM2Y2N2YzMDJhMDQuLmM1NjAwODAwYjBkOGEyMDllYjZmYzRjYjY4YjcyMDE4OGUwZWJjMWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3Rv cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3Rv cnkuY3BwCkBAIC0xLDUgKzEsNiBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE0IFVuaXZlcnNp dHkgb2YgV2FzaGluZ3Rvbi4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAg LTQzLDYgKzQ0LDcgQEAKICNpbmNsdWRlICJSZXNvdXJjZVJlc3BvbnNlLmgiCiAjaW5jbHVkZSAi U2NyaXB0UHJvZmlsZS5oIgogI2luY2x1ZGUgPGluc3BlY3Rvci9JbnNwZWN0b3JWYWx1ZXMuaD4K KyNpbmNsdWRlIDxpbnNwZWN0b3IvU2NyaXB0QnJlYWtwb2ludC5oPgogI2luY2x1ZGUgPGluc3Bl Y3Rvci9TY3JpcHRDYWxsU3RhY2suaD4KICNpbmNsdWRlIDxpbnNwZWN0b3IvU2NyaXB0Q2FsbFN0 YWNrRmFjdG9yeS5oPgogI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5oPgpAQCAtODcsNiArODks MTQgQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6 Y3JlYXRlRnVuY3Rpb25DYWxsRGF0YShjb25zdAogICAgIHJldHVybiBkYXRhLnJlbGVhc2UoKTsK IH0KIAorUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6 Y3JlYXRlUHJvYmVTYW1wbGVEYXRhKGNvbnN0IFNjcmlwdEJyZWFrcG9pbnRBY3Rpb24mIGFjdGlv biwgaW50IGhpdENvdW50KQoreworICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGRhdGEgPSBJ bnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOworICAgIGRhdGEtPnNldE51bWJlcihBU0NJSUxpdGVy YWwoInByb2JlSWQiKSwgYWN0aW9uLmlkZW50aWZpZXIpOworICAgIGRhdGEtPnNldE51bWJlcihB U0NJSUxpdGVyYWwoImhpdENvdW50IiksIGhpdENvdW50KTsKKyAgICByZXR1cm4gZGF0YS5yZWxl YXNlKCk7Cit9CisKIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZUV2ZW50RGlzcGF0Y2hEYXRhKGNvbnN0IEV2ZW50JiBldmVudCkKIHsKICAg ICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBkYXRhID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUo KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZh Y3RvcnkuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3Rvcnku aAppbmRleCBhZTM3NjQ2YmE5M2M5OTgwOGYyYjRjNGYzMTQ1ZjA0NDEyMDg4OTZiLi4yMTA2ZDE4 ZjY1ODNiMjFkYTllY2U1M2MyNzA0NzUyZTQ0ODkyYzJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCkBAIC0xLDUgKzEsNiBAQAogLyoK ICAqIENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICogQ29weXJpZ2h0IChDKSAyMDE0IFVuaXZlcnNpdHkgb2YgV2FzaGluZ3Rvbi4KICAqCiAgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTM2LDYgKzM3LDEwIEBACiAjaW5jbHVkZSA8 d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAorbmFtZXNw YWNlIEluc3BlY3RvciB7CitzdHJ1Y3QgU2NyaXB0QnJlYWtwb2ludEFjdGlvbjsKK30KKwogbmFt ZXNwYWNlIFdlYkNvcmUgewogCiAgICAgY2xhc3MgRXZlbnQ7CkBAIC01Myw2ICs1OCw4IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3I6 Okluc3BlY3Rvck9iamVjdD4gY3JlYXRlRnVuY3Rpb25DYWxsRGF0YShjb25zdCBTdHJpbmcmIHNj cmlwdE5hbWUsIGludCBzY3JpcHRMaW5lKTsKIAorICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJ bnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gY3JlYXRlUHJvYmVTYW1wbGVEYXRhKGNvbnN0IElu c3BlY3Rvcjo6U2NyaXB0QnJlYWtwb2ludEFjdGlvbiYsIGludCBoaXRDb3VudCk7CisKICAgICAg ICAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZUV2 ZW50RGlzcGF0Y2hEYXRhKGNvbnN0IEV2ZW50Jik7CiAKICAgICAgICAgc3RhdGljIFBhc3NSZWZQ dHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZUdlbmVyaWNUaW1lckRhdGEoaW50 IHRpbWVySWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL3Byb3RvY29s L1RpbWVsaW5lLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvVGltZWxp bmUuanNvbgppbmRleCA0NWMyNmMyNzNhZTdlYjVhZDU1Nzg4NTk5YjUzNjMwM2FhZGFjZGU0Li4y MTMxNDIxMzdiYzQ0YWNhNGI2YjkzNzJhNTY4NDM0NTViNWE2NjBmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvVGltZWxpbmUuanNvbgorKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvVGltZWxpbmUuanNvbgpAQCAtNSw3ICs1LDcgQEAK ICAgICAgICAgewogICAgICAgICAgICAgImlkIjogIkV2ZW50VHlwZSIsCiAgICAgICAgICAgICAi dHlwZSI6ICJzdHJpbmciLAotICAgICAgICAgICAgImVudW0iOiBbIkV2ZW50RGlzcGF0Y2giLCAi QmVnaW5GcmFtZSIsICJTY2hlZHVsZVN0eWxlUmVjYWxjdWxhdGlvbiIsICJSZWNhbGN1bGF0ZVN0 eWxlcyIsICJJbnZhbGlkYXRlTGF5b3V0IiwgIkxheW91dCIsICJQYWludCIsICJTY3JvbGxMYXll ciIsICJSZXNpemVJbWFnZSIsICJDb21wb3NpdGVMYXllcnMiLCAiUGFyc2VIVE1MIiwgIlRpbWVy SW5zdGFsbCIsICJUaW1lclJlbW92ZSIsICJUaW1lckZpcmUiLCAiRXZhbHVhdGVTY3JpcHQiLCAi TWFya0xvYWQiLCAiTWFya0RPTUNvbnRlbnQiLCAiVGltZVN0YW1wIiwgIlRpbWUiLCAiVGltZUVu ZCIsICJTY2hlZHVsZVJlc291cmNlUmVxdWVzdCIsICJSZXNvdXJjZVNlbmRSZXF1ZXN0IiwgIlJl c291cmNlUmVjZWl2ZVJlc3BvbnNlIiwgIlJlc291cmNlUmVjZWl2ZWREYXRhIiwgIlJlc291cmNl RmluaXNoIiwgIlhIUlJlYWR5U3RhdGVDaGFuZ2UiLCAiWEhSTG9hZCIsICJGdW5jdGlvbkNhbGwi LCAiR0NFdmVudCIsICJSZXF1ZXN0QW5pbWF0aW9uRnJhbWUiLCAiQ2FuY2VsQW5pbWF0aW9uRnJh bWUiLCAiRmlyZUFuaW1hdGlvbkZyYW1lIiwgIldlYlNvY2tldENyZWF0ZSIsICJXZWJTb2NrZXRT ZW5kSGFuZHNoYWtlUmVxdWVzdCIsICJXZWJTb2NrZXRSZWNlaXZlSGFuZHNoYWtlUmVzcG9uc2Ui LCAiV2ViU29ja2V0RGVzdHJveSJdLAorICAgICAgICAgICAgImVudW0iOiBbIkV2ZW50RGlzcGF0 Y2giLCAiQmVnaW5GcmFtZSIsICJTY2hlZHVsZVN0eWxlUmVjYWxjdWxhdGlvbiIsICJSZWNhbGN1 bGF0ZVN0eWxlcyIsICJJbnZhbGlkYXRlTGF5b3V0IiwgIkxheW91dCIsICJQYWludCIsICJTY3Jv bGxMYXllciIsICJSZXNpemVJbWFnZSIsICJDb21wb3NpdGVMYXllcnMiLCAiUGFyc2VIVE1MIiwg IlRpbWVySW5zdGFsbCIsICJUaW1lclJlbW92ZSIsICJUaW1lckZpcmUiLCAiRXZhbHVhdGVTY3Jp cHQiLCAiTWFya0xvYWQiLCAiTWFya0RPTUNvbnRlbnQiLCAiVGltZVN0YW1wIiwgIlRpbWUiLCAi VGltZUVuZCIsICJTY2hlZHVsZVJlc291cmNlUmVxdWVzdCIsICJSZXNvdXJjZVNlbmRSZXF1ZXN0 IiwgIlJlc291cmNlUmVjZWl2ZVJlc3BvbnNlIiwgIlJlc291cmNlUmVjZWl2ZWREYXRhIiwgIlJl c291cmNlRmluaXNoIiwgIlhIUlJlYWR5U3RhdGVDaGFuZ2UiLCAiWEhSTG9hZCIsICJGdW5jdGlv bkNhbGwiLCAiUHJvYmVTYW1wbGUiLCAiR0NFdmVudCIsICJSZXF1ZXN0QW5pbWF0aW9uRnJhbWUi LCAiQ2FuY2VsQW5pbWF0aW9uRnJhbWUiLCAiRmlyZUFuaW1hdGlvbkZyYW1lIiwgIldlYlNvY2tl dENyZWF0ZSIsICJXZWJTb2NrZXRTZW5kSGFuZHNoYWtlUmVxdWVzdCIsICJXZWJTb2NrZXRSZWNl aXZlSGFuZHNoYWtlUmVzcG9uc2UiLCAiV2ViU29ja2V0RGVzdHJveSJdLAogICAgICAgICAgICAg ImRlc2NyaXB0aW9uIjogIlRpbWVsaW5lIHJlY29yZCB0eXBlLiIKICAgICAgICAgfSwKICAgICAg ICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCmluZGV4IGM4MDk0NDU3YWEw ZGRjOGM0ZmNkMDkyZWIyNzAyZjgwNmQzNWM5YjAuLmRjNTMwNTYzNGM5NjNiMWZkOWI4NDFiYWMz YWM4MTUzMzBjOThkZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKQEAg LTI3MSw2ICsyNzEsOSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLnByb3RvdHlwZSA9 IHsKIAogICAgICAgICAgICAgICAgIGJyZWFrOwogCisgICAgICAgICAgICBjYXNlIFRpbWVsaW5l QWdlbnQuRXZlbnRUeXBlLlByb2JlU2FtcGxlOgorICAgICAgICAgICAgICAgIGJyZWFrOworCiAg ICAgICAgICAgICBjYXNlIFRpbWVsaW5lQWdlbnQuRXZlbnRUeXBlLlRpbWVySW5zdGFsbDoKICAg ICAgICAgICAgICAgICBjb25zb2xlLmFzc2VydChpc05hTihlbmRUaW1lKSk7CiAK