150660 2015-10-28 20:25:32 -0700 Web Inspector: Clean up and audit TimelineRecordFactory records 2015-10-29 10:21:34 -0700 1 1 1 Unclassified WebKit Web Inspector Other All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1137438 0 joepeck 2015-10-28 20:25:32 -0700 * SUMMARY Clean up and audit TimelineRecordFactory records. In the process of cleaning this up I discovered some issues with the frontend not using some data and misusing other data (wrong property name). 1137440 1 264294 joepeck 2015-10-28 20:30:45 -0700 Created attachment 264294 [PATCH] Proposed Fix 1137541 2 264294 bburg 2015-10-29 09:33:52 -0700 Comment on attachment 264294 [PATCH] Proposed Fix r=me 1137551 3 264294 commit-queue 2015-10-29 10:21:31 -0700 Comment on attachment 264294 [PATCH] Proposed Fix Clearing flags on attachment: 264294 Committed r191732: <http://trac.webkit.org/changeset/191732> 1137552 4 commit-queue 2015-10-29 10:21:34 -0700 All reviewed patches have been landed. Closing bug. 264294 2015-10-28 20:30:45 -0700 2015-10-29 10:21:31 -0700 [PATCH] Proposed Fix cleanup1.patch text/plain 21349 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiNjJiNjRjLi5iYTE0M2NkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzkg QEAKIDIwMTUtMTAtMjggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBDbGVhbiB1cCBhbmQgYXVkaXQgVGltZWxpbmVSZWNvcmRG YWN0b3J5IHJlY29yZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1MDY2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIENsZWFudXAgaW5jbHVkZWQgcmVtb3ZpbmcgdW51c2VkIG1ldGhvZHMgYW5kIHBheWxv YWQgZGF0YSB0aGF0IHRoZQorICAgICAgICBmcm9udGVuZCB3YXNuJ3QgbGlrZWx5IHRvIHVzZS4g QWxzbyBhZGRlZCBBU0NJSUxpdGVyYWwgYW5kIHJlbW92ZWQKKyAgICAgICAgdW5uZWNlc3Nhcnkg aW5jbHVkZXMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yTmV0d29ya0FnZW50LmNw cDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcDoKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsTGF5b3V0KToKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9UaW1lbGlu ZVJlY29yZEZhY3RvcnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0 b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlRnVuY3Rpb25DYWxsRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpU aW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUNvbnNvbGVQcm9maWxlRGF0YSk6CisgICAgICAg IChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2ZW50RGlzcGF0Y2hEYXRh KToKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJp Y1RpbWVyRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNy ZWF0ZVRpbWVySW5zdGFsbERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRG YWN0b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6VGlt ZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVUaW1lU3RhbXBEYXRhKToKKyAgICAgICAgKFdlYkNv cmU6OlRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUGFyc2VIVE1MRGF0YSk6CisgICAgICAg IChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUFuaW1hdGlvbkZyYW1lRGF0 YSk6CisgICAgICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVBhaW50 RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmFwcGVuZExh eW91dFJvb3QpOgorICAgICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVh dGVCYWNrZ3JvdW5kUmVjb3JkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlRpbWVsaW5l UmVjb3JkRmFjdG9yeTo6Y3JlYXRlTGF5b3V0RGF0YSk6IERlbGV0ZWQuCisgICAgICAgICogaW5z cGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oOgorICAgICAgICAoV2ViQ29yZTo6VGltZWxp bmVSZWNvcmRGYWN0b3J5OjpUaW1lbGluZVJlY29yZEZhY3RvcnkpOgorCisyMDE1LTEwLTI4ICBK b3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogUmVuYW1lIEluc3BlY3RvclJlc291cmNlQWdlbnQgdG8gSW5zcGVjdG9yTmV0d29ya0Fn ZW50CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTA2 NTQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck5ldHdv cmtBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTmV0d29ya0Fn ZW50LmNwcAppbmRleCA4MWZhZTNiLi40NDRmZWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yTmV0d29ya0FnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yTmV0d29ya0FnZW50LmNwcApAQCAtNjYsNiArNjYsNyBAQAog I2luY2x1ZGUgPGluc3BlY3Rvci9TY3JpcHRDYWxsU3RhY2suaD4KICNpbmNsdWRlIDxpbnNwZWN0 b3IvU2NyaXB0Q2FsbFN0YWNrRmFjdG9yeS5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KKyNp bmNsdWRlIDx3dGYvU3RvcHdhdGNoLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQnVpbGRl ci5oPgogCiB1c2luZyBuYW1lc3BhY2UgSW5zcGVjdG9yOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcAppbmRleCA3N2I1MzkxLi4zZTYzY2FiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcApA QCAtNzIsNiArNzIsNyBAQAogI2luY2x1ZGUgPGluc3BlY3Rvci9JZGVudGlmaWVyc0ZhY3Rvcnku aD4KICNpbmNsdWRlIDxpbnNwZWN0b3IvSW5zcGVjdG9yVmFsdWVzLmg+CiAjaW5jbHVkZSA8d3Rm L0xpc3RIYXNoU2V0Lmg+CisjaW5jbHVkZSA8d3RmL1N0b3B3YXRjaC5oPgogI2luY2x1ZGUgPHd0 Zi90ZXh0L0Jhc2U2NC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KICNp bmNsdWRlIDx5YXJyL1JlZ3VsYXJFeHByZXNzaW9uLmg+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKaW5kZXggYjFlNzFiOC4uMTIz OWUyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVs aW5lQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1l bGluZUFnZW50LmNwcApAQCAtMzUsMjMgKzM1LDE2IEBACiAKICNpbmNsdWRlICJFdmVudC5oIgog I2luY2x1ZGUgIkZyYW1lLmgiCi0jaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiSW5z cGVjdG9yUGFnZUFnZW50LmgiCiAjaW5jbHVkZSAiSW5zdHJ1bWVudGluZ0FnZW50cy5oIgotI2lu Y2x1ZGUgIkludFJlY3QuaCIKICNpbmNsdWRlICJKU0RPTVdpbmRvdy5oIgotI2luY2x1ZGUgIk1h aW5GcmFtZS5oIgogI2luY2x1ZGUgIlBhZ2VTY3JpcHREZWJ1Z1NlcnZlci5oIgotI2luY2x1ZGUg IlJlbmRlckVsZW1lbnQuaCIKICNpbmNsdWRlICJSZW5kZXJWaWV3LmgiCi0jaW5jbHVkZSAiUmVz b3VyY2VSZXF1ZXN0LmgiCi0jaW5jbHVkZSAiUmVzb3VyY2VSZXNwb25zZS5oIgogI2luY2x1ZGUg IlNjcmlwdFN0YXRlLmgiCiAjaW5jbHVkZSAiVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgiCi0jaW5j bHVkZSA8aW5zcGVjdG9yL0lkZW50aWZpZXJzRmFjdG9yeS5oPgogI2luY2x1ZGUgPGluc3BlY3Rv ci9TY3JpcHRCcmVha3BvaW50Lmg+CiAjaW5jbHVkZSA8cHJvZmlsZXIvTGVnYWN5UHJvZmlsZXIu aD4KLSNpbmNsdWRlIDx3dGYvQ3VycmVudFRpbWUuaD4KKyNpbmNsdWRlIDx3dGYvU3RvcHdhdGNo Lmg+CiAKICNpZiBQTEFURk9STShJT1MpCiAjaW5jbHVkZSAiUnVudGltZUFwcGxpY2F0aW9uQ2hl Y2tzSU9TLmgiCkBAIC0zNDAsMjAgKzMzMyw3IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6ZGlkSW52YWxpZGF0ZUxheW91dChGcmFtZSYgZnJhbWUpCiAKIHZvaWQgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6d2lsbExheW91dChGcmFtZSYgZnJhbWUpCiB7Ci0gICAgYXV0byogcm9vdCA9 IGZyYW1lLnZpZXcoKS0+bGF5b3V0Um9vdCgpOwotICAgIGJvb2wgcGFydGlhbExheW91dCA9ICEh cm9vdDsKLQotICAgIGlmICghcGFydGlhbExheW91dCkKLSAgICAgICAgcm9vdCA9IGZyYW1lLmNv bnRlbnRSZW5kZXJlcigpOwotCi0gICAgdW5zaWduZWQgZGlydHlPYmplY3RzID0gMDsKLSAgICB1 bnNpZ25lZCB0b3RhbE9iamVjdHMgPSAwOwotICAgIGZvciAoUmVuZGVyT2JqZWN0KiBvID0gcm9v dDsgbzsgbyA9IG8tPm5leHRJblByZU9yZGVyKHJvb3QpKSB7Ci0gICAgICAgICsrdG90YWxPYmpl Y3RzOwotICAgICAgICBpZiAoby0+bmVlZHNMYXlvdXQoKSkKLSAgICAgICAgICAgICsrZGlydHlP YmplY3RzOwotICAgIH0KLSAgICBwdXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rv cnk6OmNyZWF0ZUxheW91dERhdGEoZGlydHlPYmplY3RzLCB0b3RhbE9iamVjdHMsIHBhcnRpYWxM YXlvdXQpLCBUaW1lbGluZVJlY29yZFR5cGU6OkxheW91dCwgdHJ1ZSwgJmZyYW1lKTsKKyAgICBw dXNoQ3VycmVudFJlY29yZChJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpLCBUaW1lbGluZVJlY29y ZFR5cGU6OkxheW91dCwgdHJ1ZSwgJmZyYW1lKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpkaWRMYXlvdXQoUmVuZGVyT2JqZWN0KiByb290KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKaW5kZXggZDg5YmNmOS4uZDNl NDcyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVs aW5lQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxp bmVBZ2VudC5oCkBAIC0zOSw5ICszOSw3IEBACiAjaW5jbHVkZSA8aW5zcGVjdG9yL0luc3BlY3Rv ckZyb250ZW5kRGlzcGF0Y2hlcnMuaD4KICNpbmNsdWRlIDxpbnNwZWN0b3IvSW5zcGVjdG9yVmFs dWVzLmg+CiAjaW5jbHVkZSA8aW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVuZXIuaD4KLSNpbmNs dWRlIDx3dGYvU3RvcHdhdGNoLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgotI2luY2x1ZGUg PHd0Zi9XZWFrUHRyLmg+CiAKIG5hbWVzcGFjZSBKU0MgewogY2xhc3MgUHJvZmlsZTsKQEAgLTUz LDEzICs1MSw4IEBAIGNsYXNzIEV2ZW50OwogY2xhc3MgRmxvYXRRdWFkOwogY2xhc3MgRnJhbWU7 CiBjbGFzcyBJbnNwZWN0b3JQYWdlQWdlbnQ7Ci1jbGFzcyBJbnRSZWN0OwotY2xhc3MgVVJMOwot Y2xhc3MgUGFnZTsKIGNsYXNzIFBhZ2VTY3JpcHREZWJ1Z1NlcnZlcjsKIGNsYXNzIFJlbmRlck9i amVjdDsKLWNsYXNzIFJlc291cmNlUmVxdWVzdDsKLWNsYXNzIFJlc291cmNlUmVzcG9uc2U7CiBj bGFzcyBSdW5Mb29wT2JzZXJ2ZXI7CiAKIHR5cGVkZWYgU3RyaW5nIEVycm9yU3RyaW5nOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcApp bmRleCBhNjdlZTI2Li5lODgzYjI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcApAQCAtMzQsMTEgKzM0LDcgQEAKIAogI2luY2x1 ZGUgIkV2ZW50LmgiCiAjaW5jbHVkZSAiRmxvYXRRdWFkLmgiCi0jaW5jbHVkZSAiSW50UmVjdC5o IgogI2luY2x1ZGUgIkpTTWFpblRocmVhZEV4ZWNTdGF0ZS5oIgotI2luY2x1ZGUgIkxheW91dFJl Y3QuaCIKLSNpbmNsdWRlICJSZXNvdXJjZVJlcXVlc3QuaCIKLSNpbmNsdWRlICJSZXNvdXJjZVJl c3BvbnNlLmgiCiAjaW5jbHVkZSA8aW5zcGVjdG9yL0luc3BlY3RvclByb3RvY29sT2JqZWN0cy5o PgogI2luY2x1ZGUgPGluc3BlY3Rvci9TY3JpcHRCcmVha3BvaW50Lmg+CiAjaW5jbHVkZSA8aW5z cGVjdG9yL1NjcmlwdENhbGxTdGFjay5oPgpAQCAtNTIsMzYgKzQ4LDI4IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIFJlZjxJbnNwZWN0b3JPYmplY3Q+IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3Jl YXRlR2VuZXJpY1JlY29yZChkb3VibGUgc3RhcnRUaW1lLCBpbnQgbWF4Q2FsbFN0YWNrRGVwdGgp CiB7CiAgICAgUmVmPEluc3BlY3Rvck9iamVjdD4gcmVjb3JkID0gSW5zcGVjdG9yT2JqZWN0Ojpj cmVhdGUoKTsKLSAgICByZWNvcmQtPnNldERvdWJsZSgic3RhcnRUaW1lIiwgc3RhcnRUaW1lKTsK KyAgICByZWNvcmQtPnNldERvdWJsZShBU0NJSUxpdGVyYWwoInN0YXJ0VGltZSIpLCBzdGFydFRp bWUpOwogCiAgICAgaWYgKG1heENhbGxTdGFja0RlcHRoKSB7CiAgICAgICAgIFJlZlB0cjxTY3Jp cHRDYWxsU3RhY2s+IHN0YWNrVHJhY2UgPSBjcmVhdGVTY3JpcHRDYWxsU3RhY2soSlNNYWluVGhy ZWFkRXhlY1N0YXRlOjpjdXJyZW50U3RhdGUoKSwgbWF4Q2FsbFN0YWNrRGVwdGgpOwogICAgICAg ICBpZiAoc3RhY2tUcmFjZSAmJiBzdGFja1RyYWNlLT5zaXplKCkpCi0gICAgICAgICAgICByZWNv cmQtPnNldFZhbHVlKCJzdGFja1RyYWNlIiwgc3RhY2tUcmFjZS0+YnVpbGRJbnNwZWN0b3JBcnJh eSgpKTsKKyAgICAgICAgICAgIHJlY29yZC0+c2V0VmFsdWUoQVNDSUlMaXRlcmFsKCJzdGFja1Ry YWNlIiksIHN0YWNrVHJhY2UtPmJ1aWxkSW5zcGVjdG9yQXJyYXkoKSk7CiAgICAgfQogICAgIHJl dHVybiBXVEY6Om1vdmUocmVjb3JkKTsKIH0KIAotUmVmPEluc3BlY3Rvck9iamVjdD4gVGltZWxp bmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVCYWNrZ3JvdW5kUmVjb3JkKGRvdWJsZSBzdGFydFRpbWUs IGNvbnN0IFN0cmluZyYgdGhyZWFkTmFtZSkKLXsKLSAgICBSZWY8SW5zcGVjdG9yT2JqZWN0PiBy ZWNvcmQgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgIHJlY29yZC0+c2V0RG91Ymxl KCJzdGFydFRpbWUiLCBzdGFydFRpbWUpOwotICAgIHJlY29yZC0+c2V0U3RyaW5nKCJ0aHJlYWQi LCB0aHJlYWROYW1lKTsKLSAgICByZXR1cm4gV1RGOjptb3ZlKHJlY29yZCk7Ci19Ci0KIFJlZjxJ bnNwZWN0b3JPYmplY3Q+IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRnVuY3Rpb25DYWxs RGF0YShjb25zdCBTdHJpbmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5lKQogewogICAgIFJl ZjxJbnNwZWN0b3JPYmplY3Q+IGRhdGEgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAg IGRhdGEtPnNldFN0cmluZygic2NyaXB0TmFtZSIsIHNjcmlwdE5hbWUpOwotICAgIGRhdGEtPnNl dEludGVnZXIoInNjcmlwdExpbmUiLCBzY3JpcHRMaW5lKTsKKyAgICBkYXRhLT5zZXRTdHJpbmco QVNDSUlMaXRlcmFsKCJzY3JpcHROYW1lIiksIHNjcmlwdE5hbWUpOworICAgIGRhdGEtPnNldElu dGVnZXIoQVNDSUlMaXRlcmFsKCJzY3JpcHRMaW5lIiksIHNjcmlwdExpbmUpOwogICAgIHJldHVy biBXVEY6Om1vdmUoZGF0YSk7CiB9CiAKIFJlZjxJbnNwZWN0b3JPYmplY3Q+IFRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlQ29uc29sZVByb2ZpbGVEYXRhKGNvbnN0IFN0cmluZyYgdGl0bGUp CiB7CiAgICAgUmVmPEluc3BlY3Rvck9iamVjdD4gZGF0YSA9IEluc3BlY3Rvck9iamVjdDo6Y3Jl YXRlKCk7Ci0gICAgZGF0YS0+c2V0U3RyaW5nKCJ0aXRsZSIsIHRpdGxlKTsKKyAgICBkYXRhLT5z ZXRTdHJpbmcoQVNDSUlMaXRlcmFsKCJ0aXRsZSIpLCB0aXRsZSk7CiAgICAgcmV0dXJuIFdURjo6 bW92ZShkYXRhKTsKIH0KIApAQCAtOTYsNjEgKzg0LDUyIEBAIFJlZjxJbnNwZWN0b3JPYmplY3Q+ IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUHJvYmVTYW1wbGVEYXRhKGNvbnN0IFNjcmlw dEJyCiBSZWY8SW5zcGVjdG9yT2JqZWN0PiBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2 ZW50RGlzcGF0Y2hEYXRhKGNvbnN0IEV2ZW50JiBldmVudCkKIHsKICAgICBSZWY8SW5zcGVjdG9y T2JqZWN0PiBkYXRhID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKLSAgICBkYXRhLT5zZXRT dHJpbmcoInR5cGUiLCBldmVudC50eXBlKCkuc3RyaW5nKCkpOworICAgIGRhdGEtPnNldFN0cmlu ZyhBU0NJSUxpdGVyYWwoInR5cGUiKSwgZXZlbnQudHlwZSgpLnN0cmluZygpKTsKICAgICByZXR1 cm4gV1RGOjptb3ZlKGRhdGEpOwogfQogCiBSZWY8SW5zcGVjdG9yT2JqZWN0PiBUaW1lbGluZVJl Y29yZEZhY3Rvcnk6OmNyZWF0ZUdlbmVyaWNUaW1lckRhdGEoaW50IHRpbWVySWQpCiB7CiAgICAg UmVmPEluc3BlY3Rvck9iamVjdD4gZGF0YSA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7Ci0g ICAgZGF0YS0+c2V0SW50ZWdlcigidGltZXJJZCIsIHRpbWVySWQpOworICAgIGRhdGEtPnNldElu dGVnZXIoQVNDSUlMaXRlcmFsKCJ0aW1lcklkIiksIHRpbWVySWQpOwogICAgIHJldHVybiBXVEY6 Om1vdmUoZGF0YSk7CiB9CiAKIFJlZjxJbnNwZWN0b3JPYmplY3Q+IFRpbWVsaW5lUmVjb3JkRmFj dG9yeTo6Y3JlYXRlVGltZXJJbnN0YWxsRGF0YShpbnQgdGltZXJJZCwgaW50IHRpbWVvdXQsIGJv b2wgc2luZ2xlU2hvdCkKIHsKICAgICBSZWY8SW5zcGVjdG9yT2JqZWN0PiBkYXRhID0gSW5zcGVj dG9yT2JqZWN0OjpjcmVhdGUoKTsKLSAgICBkYXRhLT5zZXRJbnRlZ2VyKCJ0aW1lcklkIiwgdGlt ZXJJZCk7Ci0gICAgZGF0YS0+c2V0SW50ZWdlcigidGltZW91dCIsIHRpbWVvdXQpOwotICAgIGRh dGEtPnNldEJvb2xlYW4oInNpbmdsZVNob3QiLCBzaW5nbGVTaG90KTsKKyAgICBkYXRhLT5zZXRJ bnRlZ2VyKEFTQ0lJTGl0ZXJhbCgidGltZXJJZCIpLCB0aW1lcklkKTsKKyAgICBkYXRhLT5zZXRJ bnRlZ2VyKEFTQ0lJTGl0ZXJhbCgidGltZW91dCIpLCB0aW1lb3V0KTsKKyAgICBkYXRhLT5zZXRC b29sZWFuKEFTQ0lJTGl0ZXJhbCgic2luZ2xlU2hvdCIpLCBzaW5nbGVTaG90KTsKICAgICByZXR1 cm4gV1RGOjptb3ZlKGRhdGEpOwogfQogCiBSZWY8SW5zcGVjdG9yT2JqZWN0PiBUaW1lbGluZVJl Y29yZEZhY3Rvcnk6OmNyZWF0ZUV2YWx1YXRlU2NyaXB0RGF0YShjb25zdCBTdHJpbmcmIHVybCwg ZG91YmxlIGxpbmVOdW1iZXIpCiB7CiAgICAgUmVmPEluc3BlY3Rvck9iamVjdD4gZGF0YSA9IElu c3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7Ci0gICAgZGF0YS0+c2V0U3RyaW5nKCJ1cmwiLCB1cmwp OwotICAgIGRhdGEtPnNldEludGVnZXIoImxpbmVOdW1iZXIiLCBsaW5lTnVtYmVyKTsKKyAgICBk YXRhLT5zZXRTdHJpbmcoQVNDSUlMaXRlcmFsKCJ1cmwiKSwgdXJsKTsKKyAgICBkYXRhLT5zZXRJ bnRlZ2VyKEFTQ0lJTGl0ZXJhbCgibGluZU51bWJlciIpLCBsaW5lTnVtYmVyKTsKICAgICByZXR1 cm4gV1RGOjptb3ZlKGRhdGEpOwogfQogCiBSZWY8SW5zcGVjdG9yT2JqZWN0PiBUaW1lbGluZVJl Y29yZEZhY3Rvcnk6OmNyZWF0ZVRpbWVTdGFtcERhdGEoY29uc3QgU3RyaW5nJiBtZXNzYWdlKQog ewogICAgIFJlZjxJbnNwZWN0b3JPYmplY3Q+IGRhdGEgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0 ZSgpOwotICAgIGRhdGEtPnNldFN0cmluZygibWVzc2FnZSIsIG1lc3NhZ2UpOwotICAgIHJldHVy biBXVEY6Om1vdmUoZGF0YSk7Ci19Ci0KLVJlZjxJbnNwZWN0b3JPYmplY3Q+IFRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlTGF5b3V0RGF0YSh1bnNpZ25lZCBkaXJ0eU9iamVjdHMsIHVuc2ln bmVkIHRvdGFsT2JqZWN0cywgYm9vbCBwYXJ0aWFsTGF5b3V0KQotewotICAgIFJlZjxJbnNwZWN0 b3JPYmplY3Q+IGRhdGEgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgIGRhdGEtPnNl dEludGVnZXIoImRpcnR5T2JqZWN0cyIsIGRpcnR5T2JqZWN0cyk7Ci0gICAgZGF0YS0+c2V0SW50 ZWdlcigidG90YWxPYmplY3RzIiwgdG90YWxPYmplY3RzKTsKLSAgICBkYXRhLT5zZXRCb29sZWFu KCJwYXJ0aWFsTGF5b3V0IiwgcGFydGlhbExheW91dCk7CisgICAgZGF0YS0+c2V0U3RyaW5nKEFT Q0lJTGl0ZXJhbCgibWVzc2FnZSIpLCBtZXNzYWdlKTsKICAgICByZXR1cm4gV1RGOjptb3ZlKGRh dGEpOwogfQogCiBSZWY8SW5zcGVjdG9yT2JqZWN0PiBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNy ZWF0ZVBhcnNlSFRNTERhdGEodW5zaWduZWQgc3RhcnRMaW5lKQogewogICAgIFJlZjxJbnNwZWN0 b3JPYmplY3Q+IGRhdGEgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgIGRhdGEtPnNl dEludGVnZXIoInN0YXJ0TGluZSIsIHN0YXJ0TGluZSk7CisgICAgZGF0YS0+c2V0SW50ZWdlcihB U0NJSUxpdGVyYWwoInN0YXJ0TGluZSIpLCBzdGFydExpbmUpOwogICAgIHJldHVybiBXVEY6Om1v dmUoZGF0YSk7CiB9CiAKIFJlZjxJbnNwZWN0b3JPYmplY3Q+IFRpbWVsaW5lUmVjb3JkRmFjdG9y eTo6Y3JlYXRlQW5pbWF0aW9uRnJhbWVEYXRhKGludCBjYWxsYmFja0lkKQogewogICAgIFJlZjxJ bnNwZWN0b3JPYmplY3Q+IGRhdGEgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgIGRh dGEtPnNldEludGVnZXIoImlkIiwgY2FsbGJhY2tJZCk7CisgICAgZGF0YS0+c2V0SW50ZWdlcihB U0NJSUxpdGVyYWwoImlkIiksIGNhbGxiYWNrSWQpOwogICAgIHJldHVybiBXVEY6Om1vdmUoZGF0 YSk7CiB9CiAKQEAgLTE3MSwxMyArMTUwLDEzIEBAIHN0YXRpYyBSZWY8SW5zcGVjdG9yQXJyYXk+ IGNyZWF0ZVF1YWQoY29uc3QgRmxvYXRRdWFkJiBxdWFkKQogUmVmPEluc3BlY3Rvck9iamVjdD4g VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVQYWludERhdGEoY29uc3QgRmxvYXRRdWFkJiBx dWFkKQogewogICAgIFJlZjxJbnNwZWN0b3JPYmplY3Q+IGRhdGEgPSBJbnNwZWN0b3JPYmplY3Q6 OmNyZWF0ZSgpOwotICAgIGRhdGEtPnNldEFycmF5KCJjbGlwIiwgY3JlYXRlUXVhZChxdWFkKSk7 CisgICAgZGF0YS0+c2V0QXJyYXkoQVNDSUlMaXRlcmFsKCJjbGlwIiksIGNyZWF0ZVF1YWQocXVh ZCkpOwogICAgIHJldHVybiBXVEY6Om1vdmUoZGF0YSk7CiB9CiAKIHZvaWQgVGltZWxpbmVSZWNv cmRGYWN0b3J5OjphcHBlbmRMYXlvdXRSb290KEluc3BlY3Rvck9iamVjdCogZGF0YSwgY29uc3Qg RmxvYXRRdWFkJiBxdWFkKQogewotICAgIGRhdGEtPnNldEFycmF5KCJyb290IiwgY3JlYXRlUXVh ZChxdWFkKSk7CisgICAgZGF0YS0+c2V0QXJyYXkoQVNDSUlMaXRlcmFsKCJyb290IiksIGNyZWF0 ZVF1YWQocXVhZCkpOwogfQogCiBzdGF0aWMgUmVmPFByb3RvY29sOjpUaW1lbGluZTo6Q1BVUHJv ZmlsZU5vZGVBZ2dyZWdhdGVDYWxsSW5mbz4gYnVpbGRBZ2dyZWdhdGVDYWxsSW5mb0luc3BlY3Rv ck9iamVjdChjb25zdCBKU0M6OlByb2ZpbGVOb2RlKiBub2RlKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCmluZGV4IGUzZTBiZjkuLjlhY2Fl N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZh Y3RvcnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0 b3J5LmgKQEAgLTMyLDcgKzMyLDYgQEAKICNpZm5kZWYgVGltZWxpbmVSZWNvcmRGYWN0b3J5X2gK ICNkZWZpbmUgVGltZWxpbmVSZWNvcmRGYWN0b3J5X2gKIAotI2luY2x1ZGUgIlVSTC5oIgogI2lu Y2x1ZGUgPGluc3BlY3Rvci9JbnNwZWN0b3JWYWx1ZXMuaD4KICNpbmNsdWRlIDx3dGYvRm9yd2Fy ZC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgpAQCAtNDcsNDcgKzQ2LDMxIEBA IHN0cnVjdCBTY3JpcHRCcmVha3BvaW50QWN0aW9uOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK LSAgICBjbGFzcyBFdmVudDsKLSAgICBjbGFzcyBGbG9hdFF1YWQ7Ci0gICAgY2xhc3MgUmVzb3Vy Y2VSZXF1ZXN0OwotICAgIGNsYXNzIFJlc291cmNlUmVzcG9uc2U7Ci0gICAgY2xhc3MgU2NyaXB0 UHJvZmlsZTsKLQotICAgIGNsYXNzIFRpbWVsaW5lUmVjb3JkRmFjdG9yeSB7Ci0gICAgcHVibGlj OgotICAgICAgICBzdGF0aWMgUmVmPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBjcmVhdGVH ZW5lcmljUmVjb3JkKGRvdWJsZSBzdGFydFRpbWUsIGludCBtYXhDYWxsU3RhY2tEZXB0aCk7Ci0g ICAgICAgIHN0YXRpYyBSZWY8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZUJhY2tn cm91bmRSZWNvcmQoZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgU3RyaW5nJiB0aHJlYWQpOwotCi0g ICAgICAgIHN0YXRpYyBSZWY8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZUZ1bmN0 aW9uQ2FsbERhdGEoY29uc3QgU3RyaW5nJiBzY3JpcHROYW1lLCBpbnQgc2NyaXB0TGluZSk7Ci0g ICAgICAgIHN0YXRpYyBSZWY8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZUNvbnNv bGVQcm9maWxlRGF0YShjb25zdCBTdHJpbmcmIHRpdGxlKTsKLQotICAgICAgICBzdGF0aWMgUmVm PEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBjcmVhdGVQcm9iZVNhbXBsZURhdGEoY29uc3Qg SW5zcGVjdG9yOjpTY3JpcHRCcmVha3BvaW50QWN0aW9uJiwgdW5zaWduZWQgc2FtcGxlSWQpOwot Ci0gICAgICAgIHN0YXRpYyBSZWY8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZUV2 ZW50RGlzcGF0Y2hEYXRhKGNvbnN0IEV2ZW50Jik7Ci0KLSAgICAgICAgc3RhdGljIFJlZjxJbnNw ZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gY3JlYXRlR2VuZXJpY1RpbWVyRGF0YShpbnQgdGltZXJJ ZCk7Ci0KLSAgICAgICAgc3RhdGljIFJlZjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gY3Jl YXRlVGltZXJJbnN0YWxsRGF0YShpbnQgdGltZXJJZCwgaW50IHRpbWVvdXQsIGJvb2wgc2luZ2xl U2hvdCk7Ci0KLSAgICAgICAgc3RhdGljIFJlZjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4g Y3JlYXRlRXZhbHVhdGVTY3JpcHREYXRhKGNvbnN0IFN0cmluZyYsIGRvdWJsZSBsaW5lTnVtYmVy KTsKLQotICAgICAgICBzdGF0aWMgUmVmPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBjcmVh dGVUaW1lU3RhbXBEYXRhKGNvbnN0IFN0cmluZyYpOwotCi0gICAgICAgIHN0YXRpYyBSZWY8SW5z cGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZUxheW91dERhdGEodW5zaWduZWQgZGlydHlP YmplY3RzLCB1bnNpZ25lZCB0b3RhbE9iamVjdHMsIGJvb2wgcGFydGlhbExheW91dCk7Ci0KLSAg ICAgICAgc3RhdGljIFJlZjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gY3JlYXRlUGFyc2VI VE1MRGF0YSh1bnNpZ25lZCBzdGFydExpbmUpOwotCi0gICAgICAgIHN0YXRpYyBSZWY8SW5zcGVj dG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZUFuaW1hdGlvbkZyYW1lRGF0YShpbnQgY2FsbGJh Y2tJZCk7Ci0KLSAgICAgICAgc3RhdGljIFJlZjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4g Y3JlYXRlUGFpbnREYXRhKGNvbnN0IEZsb2F0UXVhZCYpOwotCi0gICAgICAgIHN0YXRpYyB2b2lk IGFwcGVuZExheW91dFJvb3QoSW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3QqIGRhdGEsIGNvbnN0 IEZsb2F0UXVhZCYpOwotCi0gICAgICAgIHN0YXRpYyB2b2lkIGFwcGVuZFByb2ZpbGUoSW5zcGVj dG9yOjpJbnNwZWN0b3JPYmplY3QqLCBSZWZQdHI8SlNDOjpQcm9maWxlPiYmKTsKLQotICAgIHBy aXZhdGU6Ci0gICAgICAgIFRpbWVsaW5lUmVjb3JkRmFjdG9yeSgpIHsgfQotICAgIH07CitjbGFz cyBFdmVudDsKK2NsYXNzIEZsb2F0UXVhZDsKKworY2xhc3MgVGltZWxpbmVSZWNvcmRGYWN0b3J5 IHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgUmVmPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBj cmVhdGVHZW5lcmljUmVjb3JkKGRvdWJsZSBzdGFydFRpbWUsIGludCBtYXhDYWxsU3RhY2tEZXB0 aCk7CisKKyAgICBzdGF0aWMgUmVmPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBjcmVhdGVG dW5jdGlvbkNhbGxEYXRhKGNvbnN0IFN0cmluZyYgc2NyaXB0TmFtZSwgaW50IHNjcmlwdExpbmUp OworICAgIHN0YXRpYyBSZWY8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZUNvbnNv bGVQcm9maWxlRGF0YShjb25zdCBTdHJpbmcmIHRpdGxlKTsKKyAgICBzdGF0aWMgUmVmPEluc3Bl Y3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBjcmVhdGVQcm9iZVNhbXBsZURhdGEoY29uc3QgSW5zcGVj dG9yOjpTY3JpcHRCcmVha3BvaW50QWN0aW9uJiwgdW5zaWduZWQgc2FtcGxlSWQpOworICAgIHN0 YXRpYyBSZWY8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZUV2ZW50RGlzcGF0Y2hE YXRhKGNvbnN0IEV2ZW50Jik7CisgICAgc3RhdGljIFJlZjxJbnNwZWN0b3I6Okluc3BlY3Rvck9i amVjdD4gY3JlYXRlR2VuZXJpY1RpbWVyRGF0YShpbnQgdGltZXJJZCk7CisgICAgc3RhdGljIFJl ZjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gY3JlYXRlVGltZXJJbnN0YWxsRGF0YShpbnQg dGltZXJJZCwgaW50IHRpbWVvdXQsIGJvb2wgc2luZ2xlU2hvdCk7CisgICAgc3RhdGljIFJlZjxJ bnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gY3JlYXRlRXZhbHVhdGVTY3JpcHREYXRhKGNvbnN0 IFN0cmluZyYsIGRvdWJsZSBsaW5lTnVtYmVyKTsKKyAgICBzdGF0aWMgUmVmPEluc3BlY3Rvcjo6 SW5zcGVjdG9yT2JqZWN0PiBjcmVhdGVUaW1lU3RhbXBEYXRhKGNvbnN0IFN0cmluZyYpOworICAg IHN0YXRpYyBSZWY8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZVBhcnNlSFRNTERh dGEodW5zaWduZWQgc3RhcnRMaW5lKTsKKyAgICBzdGF0aWMgUmVmPEluc3BlY3Rvcjo6SW5zcGVj dG9yT2JqZWN0PiBjcmVhdGVBbmltYXRpb25GcmFtZURhdGEoaW50IGNhbGxiYWNrSWQpOworICAg IHN0YXRpYyBSZWY8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZVBhaW50RGF0YShj b25zdCBGbG9hdFF1YWQmKTsKKworICAgIHN0YXRpYyB2b2lkIGFwcGVuZExheW91dFJvb3QoSW5z cGVjdG9yOjpJbnNwZWN0b3JPYmplY3QqIGRhdGEsIGNvbnN0IEZsb2F0UXVhZCYpOworICAgIHN0 YXRpYyB2b2lkIGFwcGVuZFByb2ZpbGUoSW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3QqLCBSZWZQ dHI8SlNDOjpQcm9maWxlPiYmKTsKKworcHJpdmF0ZToKKyAgICBUaW1lbGluZVJlY29yZEZhY3Rv cnkoKSB7IH0KK307CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFu Z2VMb2cKaW5kZXggYzM5ODYxNWQ4ZC4uNGY3NmIyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9n CkBAIC0xLDUgKzEsMjQgQEAKIDIwMTUtMTAtMjggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJv QGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBDbGVhbiB1cCBhbmQgYXVkaXQg VGltZWxpbmVSZWNvcmRGYWN0b3J5IHJlY29yZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDY2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVN YW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5 cGUuX3Byb2Nlc3NSZWNvcmQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdl ci5wcm90b3R5cGUuX3Byb2Nlc3NFdmVudCk6CisgICAgICAgIEFkZCBGSVhNRSBmb3IgcGF5bG9h ZCBkYXRhIHdoaWNoIHdlIGFyZSBub3QgeWV0IHVzaW5nIGJ1dCBjb3VsZC4KKyAgICAgICAgRml4 IHR5cG8gaW4gc29tZSByQUYgcmVjb3JkcyB3aGVyZSB3ZSB3ZXJlIG1pc3Rha2VubHkgdXNpbmcg InRpbWVySWQiCisgICAgICAgIGluc3RlYWQgb2YgImlkIiBmb3IgdGhlIHJlcXVlc3QgaWRlbnRp Zmllci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1NjcmlwdFRpbWVsaW5lUmVj b3JkLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50 VHlwZS5kaXNwbGF5TmFtZSk6CisgICAgICAgIERpc3BsYXkgdGhlIG5vdyBjb3JyZWN0bHkgYWNj ZXNzZWQgckFGIGlkZW50aWZpZXIgaW4gdGhlIFNjcmlwdHMgdGltZWxpbmUuCisKKzIwMTUtMTAt MjggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIg SW5zcGVjdG9yOiBBZGQgInJldmVydCIgdG8gQ1NTIHZhbHVlIGF1dG9jb21wbGV0aW9uCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTA2NTIKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2Vu Lmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggMzVmNTcxYWYwMWYwMDg2MzE3MWExNTZj ZDA2NThmYWJjMjQ0YjQ0MS4uMzUyZWUwMTM5MWY5MGZiNzU5NDdlNTEwNGNmMjc3MjM2NWY1OWY1 MCAxMDA2NDQKR0lUIGJpbmFyeSBwYXRjaApkZWx0YSA3Ngp6Y21YP2JvMkJDKCVaNiRoVz50cGIk clVwOFYwdyM4RVNUbiN3VmR1UiZTKjZgVDFFalpGayF5cDxlam9HdylvXz8KUnZPMWdOV3Vpbmtg eF9QaDFefW56ODZwNHgKCmRlbHRhIDM1CnFjbWVDVSQ4ejh7JVo2JjEmNT8zO3FMWTdIWGlWTzNF SGNeSyhoVyF9WStoYGZgV3BaZmJQcXJQCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2Vy LmpzCmluZGV4IDRiOWVjYTUuLjM2NGE2NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1h bmFnZXIuanMKQEAgLTM4NCw2ICszODQsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2Vy ID0gY2xhc3MgVGltZWxpbmVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAg ICAgICAgICAgY29uc29sZS5hc3NlcnQoaXNOYU4oZW5kVGltZSkpOwogCiAgICAgICAgICAgICAv LyBQYXNzIHRoZSBzdGFydFRpbWUgYXMgdGhlIGVuZFRpbWUgc2luY2UgdGhpcyByZWNvcmQgdHlw ZSBoYXMgbm8gZHVyYXRpb24uCisgICAgICAgICAgICAvLyBGSVhNRTogTWFrZSB1c2Ugb2YgInRp bWVvdXQiIGFuZCAic2luZ2xlU2hvdCIgcGF5bG9hZCBwcm9wZXJ0aWVzLgogICAgICAgICAgICAg cmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQoV2ViSW5zcGVjdG9y LlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5UaW1lckluc3RhbGxlZCwgc3RhcnRUaW1l LCBzdGFydFRpbWUsIGNhbGxGcmFtZXMsIHNvdXJjZUNvZGVMb2NhdGlvbiwgcmVjb3JkUGF5bG9h ZC5kYXRhLnRpbWVySWQpOwogCiAgICAgICAgIGNhc2UgVGltZWxpbmVBZ2VudC5FdmVudFR5cGUu VGltZXJSZW1vdmU6CkBAIC0zOTYsMTMgKzM5NywxMyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVN YW5hZ2VyID0gY2xhc3MgVGltZWxpbmVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVj dAogICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoaXNOYU4oZW5kVGltZSkpOwogCiAgICAgICAg ICAgICAvLyBQYXNzIHRoZSBzdGFydFRpbWUgYXMgdGhlIGVuZFRpbWUgc2luY2UgdGhpcyByZWNv cmQgdHlwZSBoYXMgbm8gZHVyYXRpb24uCi0gICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3Bl Y3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZChXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNv cmQuRXZlbnRUeXBlLkFuaW1hdGlvbkZyYW1lUmVxdWVzdGVkLCBzdGFydFRpbWUsIHN0YXJ0VGlt ZSwgY2FsbEZyYW1lcywgc291cmNlQ29kZUxvY2F0aW9uLCByZWNvcmRQYXlsb2FkLmRhdGEudGlt ZXJJZCk7CisgICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGlu ZVJlY29yZChXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkFuaW1h dGlvbkZyYW1lUmVxdWVzdGVkLCBzdGFydFRpbWUsIHN0YXJ0VGltZSwgY2FsbEZyYW1lcywgc291 cmNlQ29kZUxvY2F0aW9uLCByZWNvcmRQYXlsb2FkLmRhdGEuaWQpOwogCiAgICAgICAgIGNhc2Ug VGltZWxpbmVBZ2VudC5FdmVudFR5cGUuQ2FuY2VsQW5pbWF0aW9uRnJhbWU6CiAgICAgICAgICAg ICBjb25zb2xlLmFzc2VydChpc05hTihlbmRUaW1lKSk7CiAKICAgICAgICAgICAgIC8vIFBhc3Mg dGhlIHN0YXJ0VGltZSBhcyB0aGUgZW5kVGltZSBzaW5jZSB0aGlzIHJlY29yZCB0eXBlIGhhcyBu byBkdXJhdGlvbi4KLSAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdFRp bWVsaW5lUmVjb3JkKFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUu QW5pbWF0aW9uRnJhbWVDYW5jZWxlZCwgc3RhcnRUaW1lLCBzdGFydFRpbWUsIGNhbGxGcmFtZXMs IHNvdXJjZUNvZGVMb2NhdGlvbiwgcmVjb3JkUGF5bG9hZC5kYXRhLnRpbWVySWQpOworICAgICAg ICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQoV2ViSW5z cGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5BbmltYXRpb25GcmFtZUNhbmNl bGVkLCBzdGFydFRpbWUsIHN0YXJ0VGltZSwgY2FsbEZyYW1lcywgc291cmNlQ29kZUxvY2F0aW9u LCByZWNvcmRQYXlsb2FkLmRhdGEuaWQpOwogICAgICAgICB9CiAKICAgICAgICAgcmV0dXJuIG51 bGw7CkBAIC00MTIsNiArNDEzLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlciA9IGNs YXNzIFRpbWVsaW5lTWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICB7CiAg ICAgICAgIHN3aXRjaCAocmVjb3JkUGF5bG9hZC50eXBlKSB7CiAgICAgICAgIGNhc2UgVGltZWxp bmVBZ2VudC5FdmVudFR5cGUuVGltZVN0YW1wOgorICAgICAgICAgICAgLy8gRklYTUU6IE1ha2Ug dXNlIG9mICJtZXNzYWdlIiBwYXlsb2FkIHByb3BlcnRpZXMuCiAgICAgICAgICAgICB2YXIgdGlt ZXN0YW1wID0gdGhpcy5hY3RpdmVSZWNvcmRpbmcuY29tcHV0ZUVsYXBzZWRUaW1lKHJlY29yZFBh eWxvYWQuc3RhcnRUaW1lKTsKICAgICAgICAgICAgIHZhciBldmVudE1hcmtlciA9IG5ldyBXZWJJ bnNwZWN0b3IuVGltZWxpbmVNYXJrZXIodGltZXN0YW1wLCBXZWJJbnNwZWN0b3IuVGltZWxpbmVN YXJrZXIuVHlwZS5UaW1lU3RhbXApOwogICAgICAgICAgICAgdGhpcy5fYWN0aXZlUmVjb3JkaW5n LmFkZEV2ZW50TWFya2VyKGV2ZW50TWFya2VyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHRUaW1lbGluZVJlY29yZC5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHRUaW1lbGluZVJl Y29yZC5qcwppbmRleCA5NTI2N2Y0Li4wYmM0OTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0VGltZWxpbmVSZWNvcmQuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NjcmlwdFRpbWVs aW5lUmVjb3JkLmpzCkBAIC0zNjUsMTAgKzM2NSwxNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0VGlt ZWxpbmVSZWNvcmQuRXZlbnRUeXBlLmRpc3BsYXlOYW1lID0gZnVuY3Rpb24oZXZlbnRUeXBlLCBk ZQogICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGltZXIgJXMgUmVt b3ZlZCIpLmZvcm1hdChkZXRhaWxzKTsKICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0 cmluZygiVGltZXIgUmVtb3ZlZCIpOwogICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVs aW5lUmVjb3JkLkV2ZW50VHlwZS5BbmltYXRpb25GcmFtZUZpcmVkOgorICAgICAgICBpZiAoZGV0 YWlscyAmJiBpbmNsdWRlRGV0YWlsc0luTWFpblRpdGxlKQorICAgICAgICAgICAgcmV0dXJuIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiQW5pbWF0aW9uIEZyYW1lICVzIEZpcmVkIikuZm9ybWF0KGRl dGFpbHMpOwogICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBbmltYXRpb24g RnJhbWUgRmlyZWQiKTsKICAgICBjYXNlIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29y ZC5FdmVudFR5cGUuQW5pbWF0aW9uRnJhbWVSZXF1ZXN0ZWQ6CisgICAgICAgIGlmIChkZXRhaWxz ICYmIGluY2x1ZGVEZXRhaWxzSW5NYWluVGl0bGUpCisgICAgICAgICAgICByZXR1cm4gV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJBbmltYXRpb24gRnJhbWUgJXMgUmVxdWVzdGVkIikuZm9ybWF0KGRl dGFpbHMpOwogICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBbmltYXRpb24g RnJhbWUgUmVxdWVzdGVkIik7CiAgICAgY2FzZSBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVS ZWNvcmQuRXZlbnRUeXBlLkFuaW1hdGlvbkZyYW1lQ2FuY2VsZWQ6CisgICAgICAgIGlmIChkZXRh aWxzICYmIGluY2x1ZGVEZXRhaWxzSW5NYWluVGl0bGUpCisgICAgICAgICAgICByZXR1cm4gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJBbmltYXRpb24gRnJhbWUgJXMgQ2FuY2VsZWQiKS5mb3JtYXQo ZGV0YWlscyk7CiAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFuaW1hdGlv biBGcmFtZSBDYW5jZWxlZCIpOwogICAgIH0KIH07Cg==