108599 2013-02-01 01:52:43 -0800 Web Inspector: display background events on Timeline 2013-02-26 04:45:55 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 822505 0 caseq 2013-02-01 01:52:43 -0800 This adds support for displaying events that happened off the main thread as hollow bars aligned to the latest top-level event before the background event. 822529 1 185987 caseq 2013-02-01 02:14:45 -0800 Created attachment 185987 Patch 822819 2 185987 pfeldman 2013-02-01 08:35:04 -0800 Comment on attachment 185987 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185987&action=review > Source/WebCore/inspector/Inspector.json:2576 > + { "name": "thread", "type": "string", "optional": true, "description": "If present, identifies the thread that produced the event." }, ThreadId? 841884 3 caseq 2013-02-26 04:45:55 -0800 Committed r144039: <http://trac.webkit.org/changeset/144039> 185987 2013-02-01 02:14:45 -0800 2013-02-01 08:35:04 -0800 Patch bug-108599-20130201141128.patch text/plain 11452 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGJmNzAwYTI2NDg2ZDc5 MGZkMTQ4YmYyZDAxOTE4YzdiOTM3YzE4MS4uNGM5YzMwYTQzMDc5YzUyZjNiYzY0ZTBlNWZhMmIz MzBkZTNmMjU3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEzLTAyLTAxICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogZGlzcGxheSBiYWNrZ3JvdW5kIGV2ZW50cyBvbiBUaW1lbGluZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4NTk5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBhZGQgb3B0aW9uYWwgYHRocmVhZCcg ZmllbGQgdG8gdGltZWxpbmUgZXZlbnQ7CisgICAgICAgIC0gaWYgdGhyZWFkIGZpZWxkIGlzIHBy ZXNlbnQsIGRpc3BsYXkgdGhlIGV2ZW50IGFzICdiYWNrZ3JvdW5kJyAoaG9sbG93IGJhciAvIGxp c3QgaWNvbiksIGFsaWduIHRvIG5lYXJlc3QgZm9yZWdyb3VuZCBldmVudDsKKyAgICAgICAgLSBk byBub3QgYWNjb3VudCBiYWNrZ3JvdW5kIGV2ZW50cyBpbiBGcmFtZSBtb2RlIG9mIG92ZXJ2aWV3 LgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvclRpbWVsaW5lQWdlbnQ6OmFwcGVuZEJhY2tncm91bmRUaHJlYWRSZWNvcmQpOgorICAgICAg ICAoV2ViQ29yZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQu aDoKKyAgICAgICAgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvVGltZWxpbmVGcmFtZUNvbnRyb2xsZXIuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGltZWxpbmVGcmFtZUNvbnRyb2xsZXIucHJvdG90eXBlLl9hZGRSZWNvcmQpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZVJlY29yZExpc3RSb3cucHJvdG90eXBlLnVwZGF0ZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRHcmFwaFJvdy5wcm90b3R5cGUudXBkYXRl KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUHJlc2VudGF0aW9uTW9k ZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5S ZWNvcmQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwu aW5zZXJ0UmV0cm9zcGVjaXR2ZVJlY29yZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVQcmVzZW50YXRpb25Nb2RlbC5SZWNvcmQucHJvdG90eXBlLmdldCBpc0JhY2tncm91bmQpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvdGltZWxpbmVQYW5lbC5jc3M6CisgICAgICAg ICgudGltZWxpbmUtdHJlZS1pdGVtLmJhY2tncm91bmQgLnRpbWVsaW5lLXRyZWUtaWNvbik6Cisg ICAgICAgICgudGltZWxpbmUtZ3JhcGgtc2lkZS5iYWNrZ3JvdW5kIC50aW1lbGluZS1ncmFwaC1i YXIpOgorCiAyMDEzLTAyLTAxICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+ CiAKICAgICAgICAgQVg6IHdoZW4gYXJpYS1hY3RpdmVkZXNjZW5kYW50IGlzIHVzZWQgd2l0aCBh IENvbWJvQm94IHJvbGUsIGZvY3VzIHNob3VsZCBub3QgYmUgY2hhbmdlZApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4IDZlMjRhYjc3MTQxMDVmOTNhNWE1YmM4OTI3 NDU1NTQ1OTU3NzRiYjkuLmU3ZDA5ZmQ5ZDcxOWZmNjYyZTk3MTg4NDIyNDE4ZTAwYTQ0NmRlNWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTI1NzMsNiArMjU3 Myw3IEBACiAgICAgICAgICAgICAgICAgInR5cGUiOiAib2JqZWN0IiwKICAgICAgICAgICAgICAg ICAicHJvcGVydGllcyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0eXBlIiwg InR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkV2ZW50IHR5cGUuIiB9LAorICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogInRocmVhZCIsICJ0eXBlIjogInN0cmluZyIsICJvcHRp b25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJJZiBwcmVzZW50LCBpZGVudGlmaWVzIHRoZSB0 aHJlYWQgdGhhdCBwcm9kdWNlZCB0aGUgZXZlbnQuIiB9LAogICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogImRhdGEiLCAidHlwZSI6ICJvYmplY3QiLCAiZGVzY3JpcHRpb24iOiAiRXZlbnQg ZGF0YS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY2hpbGRyZW4iLCAidHlw ZSI6ICJhcnJheSIsICJvcHRpb25hbCI6IHRydWUsICJpdGVtcyI6IHsgIiRyZWYiOiAiVGltZWxp bmVFdmVudCIgfSwgImRlc2NyaXB0aW9uIjogIk5lc3RlZCByZWNvcmRzLiIgfQogICAgICAgICAg ICAgICAgIF0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y VGltZWxpbmVBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudC5jcHAKaW5kZXggYWM3YWRjYjBhYTM1NmZlNzcwY2RmZmMzMDM5NjkyNTY2NTc4 YTI1Ny4uNTA2NDdmMjg3YmE1NDQ5Mzg5NTFjZTg0YzRkNWYxY2FiNjU4YjBjYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcApA QCAtNTc5LDYgKzU3OSwxNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmFwcGVuZFJl Y29yZChQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YSwgY29ucwogICAgIGFkZFJlY29y ZFRvVGltZWxpbmUocmVjb3JkLnJlbGVhc2UoKSwgdHlwZSwgZnJhbWVJZCk7CiB9CiAKK3ZvaWQg SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6YXBwZW5kQmFja2dyb3VuZFRocmVhZFJlY29yZChQYXNz UmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YSwgY29uc3QgU3RyaW5nJiB0eXBlLCBkb3VibGUg c3RhcnRUaW1lLCBkb3VibGUgZW5kVGltZSwgY29uc3QgU3RyaW5nJiB0aHJlYWROYW1lKQorewor ICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9y eTo6Y3JlYXRlR2VuZXJpY1JlY29yZCh0aW1lc3RhbXBGcm9tTWljcm9zZWNvbmRzKHN0YXJ0VGlt ZSksIDApOworICAgIHJlY29yZC0+c2V0T2JqZWN0KCJkYXRhIiwgZGF0YSk7CisgICAgcmVjb3Jk LT5zZXRTdHJpbmcoInR5cGUiLCB0eXBlKTsKKyAgICByZWNvcmQtPnNldFN0cmluZygidGhyZWFk IiwgdGhyZWFkTmFtZSk7CisgICAgcmVjb3JkLT5zZXROdW1iZXIoImVuZFRpbWUiLCB0aW1lc3Rh bXBGcm9tTWljcm9zZWNvbmRzKGVuZFRpbWUpKTsKKyAgICBSZWZQdHI8VHlwZUJ1aWxkZXI6OlRp bWVsaW5lOjpUaW1lbGluZUV2ZW50PiByZWNvcmRDaGVja2VkID0gVHlwZUJ1aWxkZXI6OlRpbWVs aW5lOjpUaW1lbGluZUV2ZW50OjpydW50aW1lQ2FzdChyZWNvcmQucmVsZWFzZSgpKTsKKyAgICBt X2Zyb250ZW5kLT5ldmVudFJlY29yZGVkKHJlY29yZENoZWNrZWQucmVsZWFzZSgpKTsKK30KKwog dm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpwdXNoQ3VycmVudFJlY29yZChQYXNzUmVmUHRy PEluc3BlY3Rvck9iamVjdD4gZGF0YSwgY29uc3QgU3RyaW5nJiB0eXBlLCBib29sIGNhcHR1cmVD YWxsU3RhY2ssIEZyYW1lKiBmcmFtZSwgYm9vbCBoYXNMb3dMZXZlbERldGFpbHMpCiB7CiAgICAg cHVzaEdDRXZlbnRSZWNvcmRzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclRpbWVsaW5lQWdlbnQuaAppbmRleCBlNzA2MmExMTgxODhmYWNkZDU0MzRhMTIxMWQz YzdmYzVmMDZlOTY2Li4zM2IyYjVhMDE5Y2EwMmRhMzljMWIwNWI4MTZlNmE3ODBkZjg2NDA3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50 LmgKQEAgLTE4MSwxNiArMTgxLDE3IEBAIHByaXZhdGU6CiAgICAgICAgIAogICAgIEluc3BlY3Rv clRpbWVsaW5lQWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50cyosIEluc3BlY3RvclBhZ2VBZ2VudCos IEluc3BlY3RvckNvbXBvc2l0ZVN0YXRlKiwgSW5zcGVjdG9yVHlwZSwgSW5zcGVjdG9yQ2xpZW50 Kik7CiAKKyAgICB2b2lkIGFwcGVuZEJhY2tncm91bmRUaHJlYWRSZWNvcmQoUGFzc1JlZlB0cjxJ bnNwZWN0b3JPYmplY3Q+IGRhdGEsIGNvbnN0IFN0cmluZyYgdHlwZSwgZG91YmxlIHN0YXJ0VGlt ZSwgZG91YmxlIGVuZFRpbWUsIGNvbnN0IFN0cmluZyYgdGhyZWFkTmFtZSk7CisgICAgdm9pZCBh cHBlbmRSZWNvcmQoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGRhdGEsIGNvbnN0IFN0cmlu ZyYgdHlwZSwgYm9vbCBjYXB0dXJlQ2FsbFN0YWNrLCBGcmFtZSopOwogICAgIHZvaWQgcHVzaEN1 cnJlbnRSZWNvcmQoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+LCBjb25zdCBTdHJpbmcmIHR5 cGUsIGJvb2wgY2FwdHVyZUNhbGxTdGFjaywgRnJhbWUqLCBib29sIGhhc0xvd0xldmVsRGV0YWls cyA9IGZhbHNlKTsKLSAgICB2b2lkIHNldEhlYXBTaXplU3RhdGlzdGljcyhJbnNwZWN0b3JPYmpl Y3QqIHJlY29yZCk7Ci0KICAgICB2b2lkIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChjb25zdCBT dHJpbmcmIHR5cGUpOworCisgICAgdm9pZCBzZXRIZWFwU2l6ZVN0YXRpc3RpY3MoSW5zcGVjdG9y T2JqZWN0KiByZWNvcmQpOworICAgIHZvaWQgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgdm9p ZCBjb21taXRGcmFtZVJlY29yZCgpOwotICAgIHZvaWQgYXBwZW5kUmVjb3JkKFBhc3NSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiBkYXRhLCBjb25zdCBTdHJpbmcmIHR5cGUsIGJvb2wgY2FwdHVyZUNh bGxTdGFjaywgRnJhbWUqKTsKKwogICAgIHZvaWQgYWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVm UHRyPEluc3BlY3Rvck9iamVjdD4sIGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBm cmFtZUlkKTsKICAgICB2b2lkIGlubmVyQWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPElu c3BlY3Rvck9iamVjdD4sIGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBmcmFtZUlk KTsKLQotICAgIHZvaWQgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgdm9pZCBjbGVhclJlY29y ZFN0YWNrKCk7CiAKICAgICBkb3VibGUgdGltZXN0YW1wKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lRnJhbWVDb250cm9sbGVyLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUZyYW1lQ29udHJvbGxl ci5qcwppbmRleCBlYTEwNTk0ZGIzOTI4Y2MzN2ZlZWU5ODUxZTBjZjNkMWQ2MDQxOGZkLi44MWVi YzFmZDE1MTUyMDUwMzRiODFhNjg5ZGZiYjk0ODllM2ExMmE5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lRnJhbWVDb250cm9sbGVyLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVGcmFtZUNvbnRy b2xsZXIuanMKQEAgLTYyLDYgKzYyLDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRnJhbWVDb250 cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICBfYWRkUmVjb3JkOiBmdW5jdGlvbihyZWNvcmQpCiAg ICAgewogICAgICAgICB2YXIgcmVjb3JkczsKKyAgICAgICAgaWYgKHJlY29yZC5pc0JhY2tncm91 bmQpCisgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIGlmIChyZWNvcmQudHlwZSA9PT0gV2Vi SW5zcGVjdG9yLlRpbWVsaW5lTW9kZWwuUmVjb3JkVHlwZS5Qcm9ncmFtKQogICAgICAgICAgICAg cmVjb3JkcyA9IHJlY29yZFsiY2hpbGRyZW4iXSB8fCBbXTsKICAgICAgICAgZWxzZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCmlu ZGV4IGEzM2JlZWU0NDY0NmRhYmI4Yzk0MzkwYWVjNzI5ODNlNzkxNGNmMGIuLjMyNzNjZjRmMGFj ZTY1NTBiMjEzMjYzMmUwZmQxOTRkODEwZmNiOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTEzMzgsNiArMTMzOCw4 IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZExpc3RSb3cucHJvdG90eXBlID0gewogICAg ICAgICAgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoIndhcm5pbmciKTsKICAgICAgICAg ZWxzZSBpZiAocmVjb3JkLmNoaWxkSGFzV2FybmluZykKICAgICAgICAgICAgIHRoaXMuZWxlbWVu dC5hZGRTdHlsZUNsYXNzKCJjaGlsZC13YXJuaW5nIik7CisgICAgICAgIGlmIChyZWNvcmQuaXNC YWNrZ3JvdW5kKQorICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImJhY2tn cm91bmQiKTsKIAogICAgICAgICB0aGlzLl90eXBlRWxlbWVudC50ZXh0Q29udGVudCA9IHJlY29y ZC50aXRsZTsKIApAQCAtMTQxMCw3ICsxNDEyLDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJl Y29yZEdyYXBoUm93LnByb3RvdHlwZSA9IHsKICAgICB1cGRhdGU6IGZ1bmN0aW9uKHJlY29yZCwg aXNFdmVuLCBjYWxjdWxhdG9yLCBleHBhbmRPZmZzZXQsIGluZGV4KQogICAgIHsKICAgICAgICAg dGhpcy5fcmVjb3JkID0gcmVjb3JkOwotICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0g InRpbWVsaW5lLWdyYXBoLXNpZGUgdGltZWxpbmUtY2F0ZWdvcnktIiArIHJlY29yZC5jYXRlZ29y eS5uYW1lICsgKGlzRXZlbiA/ICIgZXZlbiIgOiAiIik7CisgICAgICAgIHRoaXMuZWxlbWVudC5j bGFzc05hbWUgPSAidGltZWxpbmUtZ3JhcGgtc2lkZSB0aW1lbGluZS1jYXRlZ29yeS0iICsgcmVj b3JkLmNhdGVnb3J5Lm5hbWU7CisgICAgICAgIGlmIChpc0V2ZW4pCisgICAgICAgICAgICB0aGlz LmVsZW1lbnQuYWRkU3R5bGVDbGFzcygiZXZlbiIpOworICAgICAgICBpZiAocmVjb3JkLmlzQmFj a2dyb3VuZCkKKyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJiYWNrZ3Jv dW5kIik7CisKICAgICAgICAgdmFyIGJhclBvc2l0aW9uID0gY2FsY3VsYXRvci5jb21wdXRlQmFy R3JhcGhXaW5kb3dQb3NpdGlvbihyZWNvcmQpOwogICAgICAgICB0aGlzLl9iYXJXaXRoQ2hpbGRy ZW5FbGVtZW50LnN0eWxlLmxlZnQgPSBiYXJQb3NpdGlvbi5sZWZ0ICsgInB4IjsKICAgICAgICAg dGhpcy5fYmFyV2l0aENoaWxkcmVuRWxlbWVudC5zdHlsZS53aWR0aCA9IGJhclBvc2l0aW9uLndp ZHRoV2l0aENoaWxkcmVuICsgInB4IjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5qcwppbmRl eCBiMDBiNTk2OGY1MjBmNzc0MmM2MmExNDNmYTRlNTlhMjMzNmUzNjJjLi43ZTliNzM5NmY5ODFi NzBkOWY0NmExMzQ3OWEwNjFhN2Q1ZDM4NTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVs LmpzCkBAIC01MTMsNyArNTEzLDEwIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlv bk1vZGVsLlJlY29yZCA9IGZ1bmN0aW9uKHByZXNlbnRhdGlvbk1vZGVsLCByZWNvCiAgICAgdGhp cy5fY2hpbGRyZW4gPSBbXTsKICAgICBpZiAoIWhpZGRlbiAmJiBwYXJlbnRSZWNvcmQpIHsKICAg ICAgICAgdGhpcy5wYXJlbnQgPSBwYXJlbnRSZWNvcmQ7Ci0gICAgICAgIHBhcmVudFJlY29yZC5j aGlsZHJlbi5wdXNoKHRoaXMpOworICAgICAgICBpZiAodGhpcy5pc0JhY2tncm91bmQgJiYgcGFy ZW50UmVjb3JkID09PSBwcmVzZW50YXRpb25Nb2RlbC5fcm9vdFJlY29yZCkKKyAgICAgICAgICAg IFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmluc2VydFJldHJvc3BlY2l0 dmVSZWNvcmQocGFyZW50UmVjb3JkLCB0aGlzKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAg cGFyZW50UmVjb3JkLmNoaWxkcmVuLnB1c2godGhpcyk7CiAgICAgfQogICAgIGlmIChvcmlnaW4p CiAgICAgICAgIHRoaXMuX29yaWdpbiA9IG9yaWdpbjsKQEAgLTYxMywxMiArNjE2LDggQEAgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuUmVjb3JkID0gZnVuY3Rpb24ocHJl c2VudGF0aW9uTW9kZWwsIHJlY28KICAgICAgICAgICAgICAgICB2YXIgb3BlblJlY29yZCA9IHJl Y29yZFN0YWNrW2luZGV4IC0gMV07CiAgICAgICAgICAgICAgICAgaWYgKG9wZW5SZWNvcmQuc3Rh cnRUaW1lID4gdGltZVJlY29yZC5zdGFydFRpbWUpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRp bnVlOwotICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGNvbXBhcmVTdGFydFRpbWUodmFsdWUsIHJl Y29yZCkKLSAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiB2YWx1 ZSA8IHJlY29yZC5zdGFydFRpbWUgPyAtMSA6IDE7Ci0gICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICAgIHRpbWVSZWNvcmQucGFyZW50LmNoaWxkcmVuLnNwbGljZSh0aW1lUmVjb3JkLnBh cmVudC5jaGlsZHJlbi5pbmRleE9mKHRpbWVSZWNvcmQpKTsKLSAgICAgICAgICAgICAgICBvcGVu UmVjb3JkLmNoaWxkcmVuLnNwbGljZShpbnNlcnRpb25JbmRleEZvck9iamVjdEluTGlzdFNvcnRl ZEJ5RnVuY3Rpb24odGltZVJlY29yZC5zdGFydFRpbWUsIG9wZW5SZWNvcmQuY2hpbGRyZW4sIGNv bXBhcmVTdGFydFRpbWUpLCAwLCB0aW1lUmVjb3JkKTsKKyAgICAgICAgICAgICAgICBXZWJJbnNw ZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5pbnNlcnRSZXRyb3NwZWNpdHZlUmVjb3Jk KG9wZW5SZWNvcmQsIHRpbWVSZWNvcmQpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICAgICAgfQogICAgICAgICB9CkBAIC02NTAsNiArNjQ5LDE2IEBAIFdlYkluc3BlY3Rvci5UaW1l bGluZVByZXNlbnRhdGlvbk1vZGVsLlJlY29yZCA9IGZ1bmN0aW9uKHByZXNlbnRhdGlvbk1vZGVs LCByZWNvCiAgICAgfQogfQogCitXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2Rl bC5pbnNlcnRSZXRyb3NwZWNpdHZlUmVjb3JkID0gZnVuY3Rpb24ocGFyZW50LCByZWNvcmQpCit7 CisgICAgZnVuY3Rpb24gY29tcGFyZVN0YXJ0VGltZSh2YWx1ZSwgcmVjb3JkKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIHZhbHVlIDwgcmVjb3JkLnN0YXJ0VGltZSA/IC0xIDogMTsKKyAgICB9Cisg ICAgCisgICAgcGFyZW50LmNoaWxkcmVuLnNwbGljZShpbnNlcnRpb25JbmRleEZvck9iamVjdElu TGlzdFNvcnRlZEJ5RnVuY3Rpb24ocmVjb3JkLnN0YXJ0VGltZSwgcGFyZW50LmNoaWxkcmVuLCBj b21wYXJlU3RhcnRUaW1lKSwgMCwgcmVjb3JkKTsKK30KKwogV2ViSW5zcGVjdG9yLlRpbWVsaW5l UHJlc2VudGF0aW9uTW9kZWwuUmVjb3JkLnByb3RvdHlwZSA9IHsKICAgICBnZXQgbGFzdENoaWxk RW5kVGltZSgpCiAgICAgewpAQCAtNzUwLDYgKzc1OSwxNCBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVQcmVzZW50YXRpb25Nb2RlbC5SZWNvcmQucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAv KioKKyAgICAgKiBAcmV0dXJuIHtib29sZWFufQorICAgICAqLworICAgIGdldCBpc0JhY2tncm91 bmQoKQorICAgIHsKKyAgICAgICAgcmV0dXJuICEhdGhpcy5fcmVjb3JkLnRocmVhZDsKKyAgICB9 LAorCisgICAgLyoqCiAgICAgICogQHJldHVybiB7T2JqZWN0fQogICAgICAqLwogICAgIGdldCBk YXRhKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGlt ZWxpbmVQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RpbWVs aW5lUGFuZWwuY3NzCmluZGV4IGE3YWJkNTFlNmYwZjc0ZjVhYTJmOGQ4OTc0MWViMGFkMTJmNDc0 M2UuLjEwN2ZhMDhhMjhhYWJhYzkwMDRhMjYzODZiM2JlYmQ0ZWM3ZDcyN2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGltZWxpbmVQYW5lbC5jc3MKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90aW1lbGluZVBhbmVsLmNzcwpA QCAtMjY3LDYgKzI2NywxMCBAQAogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKIH0KIAorLnRpbWVs aW5lLXRyZWUtaXRlbS5iYWNrZ3JvdW5kIC50aW1lbGluZS10cmVlLWljb24geworICAgIGJhY2tn cm91bmQ6IG5vbmUgIWltcG9ydGFudDsKK30KKwogLnRpbWVsaW5lLXRyZWUtaXRlbS5ldmVuIHsK ICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDAsIDAsIDAsIDAuMDUpOwogfQpAQCAtMzU4LDYg KzM2MiwxNSBAQAogICAgIG9wYWNpdHk6IDAuNzsKIH0KIAorLnRpbWVsaW5lLWdyYXBoLXNpZGUu YmFja2dyb3VuZCAudGltZWxpbmUtZ3JhcGgtYmFyIHsKKyAgICBiYWNrZ3JvdW5kOiB0cmFuc3Bh cmVudCAhaW1wb3J0YW50OworfQorCisudGltZWxpbmUtZ3JhcGgtc2lkZS5iYWNrZ3JvdW5kIC50 aW1lbGluZS1ncmFwaC1iYXIgeworICAgIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50ICFpbXBvcnRh bnQ7CisgICAgYm9yZGVyLXdpZHRoOiAycHg7Cit9CisKIC50aW1lbGluZS1ncmFwaC1zaWRlLmV2 ZW4gewogICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoMCwgMCwgMCwgMC4wNSk7CiB9Cg==