123359 2013-10-25 14:18:08 -0700 Web Inspector: Track callFrames and sourceCodeLocation per TimelineRecord 2014-01-20 19:00:04 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy graouts joepeck timothy webkit-bug-importer oldest_to_newest 943745 0 timothy 2013-10-25 14:18:08 -0700 We should always track callFrames and sourceCodeLocation per record. They are universally needed. 943746 1 webkit-bug-importer 2013-10-25 14:18:48 -0700 <rdar://problem/15323286> 943751 2 215212 timothy 2013-10-25 14:22:55 -0700 Created attachment 215212 Patch 944147 3 215212 joepeck 2013-10-28 10:37:02 -0700 Comment on attachment 215212 Patch r=me 970112 4 timothy 2014-01-20 19:00:04 -0800 https://trac.webkit.org/changeset/162399 215212 2013-10-25 14:22:55 -0700 2013-10-28 10:37:02 -0700 Patch bug-123359-20131025142254.patch text/plain 23185 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3ODg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi MjE0YjU2MWY3ODBjYzhlZTkyM2VkNmU4MjdlZGE0NTJhZmJiZDJjLi43YTc5ZjM2NDA5ZjRiYWE0 NjUxNTg3MzlmYTBhMTkxZjY3ZTEwY2ZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyNyBAQAogMjAxMy0xMC0yNSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgVHJhY2sgY2FsbEZyYW1lcyBhbmQgc291cmNlQ29kZUxvY2F0aW9uIHBl ciBUaW1lbGluZVJlY29yZC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTIzMzU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0xheW91dFRpbWVsaW5lUmVjb3JkLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lUmVjb3JkKTogUGFzcyBjYWxsRnJhbWVz IGFuZCBzb3VyY2VDb2RlTG9jYXRpb24gdG8gc3VwZXJjbGFzcy4KKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1NjcmlwdFRpbWVsaW5lUmVjb3JkLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNj cmlwdFRpbWVsaW5lUmVjb3JkKTogUGFzcyBjYWxsRnJhbWVzIGFuZCBzb3VyY2VDb2RlTG9jYXRp b24gdG8gc3VwZXJjbGFzcy4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1RpbWVsaW5lTWFuYWdl ci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLmV2 ZW50UmVjb3JkZWQucHJvY2Vzc1JlY29yZCk6IEFkZCAiUGF5bG9hZCIgc3VmZml4IHRvIGJldHRl ciB0cmFjayB3aGF0IGlzIGEgcHJvdG9jb2wgb2JqZWN0LgorICAgICAgICBQYXNzIHRoZSBjYWxs RnJhbWVzIGFuZCBzb3VyY2VDb2RlTG9jYXRpb24gdG8gYWxsIHRoZSBuZXcgVGltZWxpbmVSZWNv cmRzLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUuZXZl bnRSZWNvcmRlZCk6IEFkZCAiUGF5bG9hZCIgc3VmZml4LgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVGltZWxpbmVSZWNvcmQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNv cmQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLnByb3RvdHlwZS5nZXQg Y2FsbEZyYW1lcyk6IEFkZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3Jk LnByb3RvdHlwZS5nZXQgaW5pdGlhdG9yQ2FsbEZyYW1lKTogQWRkZWQuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVSZWNvcmQucHJvdG90eXBlLmdldCBzb3VyY2VDb2RlTG9jYXRpb24p OiBBZGRlZC4KKworMjAxMy0xMC0yNSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKICAgICAgICAgQ2hhbmdlIGhvdyB0aGUgbG9hZCBhbmQgY29udGVudCByZWFkeSBldmVu dCB0aW1lc3RhbXBzIGFyZSB0cmFja2VkLgogCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjMzNTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0xheW91dFRpbWVsaW5lUmVjb3JkLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTGF5b3V0VGltZWxpbmVSZWNvcmQuanMKaW5kZXggNjNi Y2YzNWI1YTZkMWEwZDczN2Q3MjEyYjAwZTQxNGQ2OTI2MjExMC4uYTliYjgzNGM4NzZlYWQ1NmU3 MTg4MmViMmQ2OTFiMWY2MWU2MzA0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTGF5b3V0VGltZWxpbmVSZWNvcmQuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTGF5b3V0VGltZWxpbmVSZWNvcmQuanMKQEAgLTIzLDkg KzIzLDkgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi1XZWJJ bnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQgPSBmdW5jdGlvbihldmVudFR5cGUsIHN0YXJ0 VGltZSwgZW5kVGltZSwgY2FsbEZyYW1lcywgeCwgeSwgd2lkdGgsIGhlaWdodCwgcXVhZCkKK1dl Ykluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVJlY29yZCA9IGZ1bmN0aW9uKGV2ZW50VHlwZSwgc3Rh cnRUaW1lLCBlbmRUaW1lLCBjYWxsRnJhbWVzLCBzb3VyY2VDb2RlTG9jYXRpb24sIHgsIHksIHdp ZHRoLCBoZWlnaHQsIHF1YWQpCiB7Ci0gICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLmNh bGwodGhpcywgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTGF5b3V0LCBzdGFydFRp bWUsIGVuZFRpbWUpOworICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5jYWxsKHRoaXMs IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLkxheW91dCwgc3RhcnRUaW1lLCBlbmRU aW1lLCBjYWxsRnJhbWVzLCBzb3VyY2VDb2RlTG9jYXRpb24pOwogCiAgICAgY29uc29sZS5hc3Nl cnQoZXZlbnRUeXBlKTsKIApAQCAtMzMsNyArMzMsNiBAQCBXZWJJbnNwZWN0b3IuTGF5b3V0VGlt ZWxpbmVSZWNvcmQgPSBmdW5jdGlvbihldmVudFR5cGUsIHN0YXJ0VGltZSwgZW5kVGltZSwgY2Fs bAogICAgICAgICBldmVudFR5cGUgPSBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQu RXZlbnRUeXBlW2V2ZW50VHlwZV07CiAKICAgICB0aGlzLl9ldmVudFR5cGUgPSBldmVudFR5cGU7 Ci0gICAgdGhpcy5fY2FsbEZyYW1lcyA9IGNhbGxGcmFtZXMgfHwgW107CiAgICAgdGhpcy5feCA9 IHR5cGVvZiB4ID09PSAibnVtYmVyIiA/IHggOiBOYU47CiAgICAgdGhpcy5feSA9IHR5cGVvZiB5 ID09PSAibnVtYmVyIiA/IHkgOiBOYU47CiAgICAgdGhpcy5fd2lkdGggPSB0eXBlb2Ygd2lkdGgg PT09ICJudW1iZXIiID8gd2lkdGggOiBOYU47CkBAIC03NSwyNiArNzQsNiBAQCBXZWJJbnNwZWN0 b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhp cy5fZXZlbnRUeXBlOwogICAgIH0sCiAKLSAgICBnZXQgY2FsbEZyYW1lcygpCi0gICAgewotICAg ICAgICByZXR1cm4gdGhpcy5fY2FsbEZyYW1lczsKLSAgICB9LAotCi0gICAgZ2V0IGluaXRpYXRv ckNhbGxGcmFtZSgpCi0gICAgewotICAgICAgICBpZiAoIXRoaXMuX2NhbGxGcmFtZXMgfHwgIXRo aXMuX2NhbGxGcmFtZXMubGVuZ3RoKQotICAgICAgICAgICAgcmV0dXJuIG51bGw7Ci0KLSAgICAg ICAgLy8gUmV0dXJuIHRoZSBmaXJzdCBub24tbmF0aXZlIGNvZGUgY2FsbCBmcmFtZSBhcyB0aGUg aW5pdGlhdG9yLgotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2NhbGxGcmFtZXMu bGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIGlmICh0aGlzLl9jYWxsRnJhbWVzW2ldLm5hdGl2 ZUNvZGUpCi0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICByZXR1cm4gdGhp cy5fY2FsbEZyYW1lc1tpXTsKLSAgICAgICAgfQotCi0gICAgICAgIHJldHVybiBudWxsOwotICAg IH0sCi0KICAgICBnZXQgeCgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5feDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1NjcmlwdFRpbWVsaW5l UmVjb3JkLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvU2NyaXB0VGlt ZWxpbmVSZWNvcmQuanMKaW5kZXggZmVkZWU0Mzc5YWNjYWFjMmIxYzQ5ZTBmYzExYTYwZTc2NzU0 MTRlNi4uNWViM2YzMzlhMDU4ZTc3MzE0Y2Q2MDc3YzczMDhkZjliMjhmZGFkZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvU2NyaXB0VGltZWxpbmVSZWNv cmQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvU2NyaXB0VGlt ZWxpbmVSZWNvcmQuanMKQEAgLTIzLDkgKzIzLDkgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KICAqLwogCi1XZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQgPSBm dW5jdGlvbihldmVudFR5cGUsIHN0YXJ0VGltZSwgZW5kVGltZSwgZGV0YWlscywgcmVzb3VyY2Us IGxpbmVOdW1iZXIsIGNhbGxGcmFtZXMpCitXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNv cmQgPSBmdW5jdGlvbihldmVudFR5cGUsIHN0YXJ0VGltZSwgZW5kVGltZSwgY2FsbEZyYW1lcywg c291cmNlQ29kZUxvY2F0aW9uLCBkZXRhaWxzKQogewotICAgIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZC5jYWxsKHRoaXMsIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlNjcmlw dCwgc3RhcnRUaW1lLCBlbmRUaW1lKTsKKyAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQu Y2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5TY3JpcHQsIHN0YXJ0 VGltZSwgZW5kVGltZSwgY2FsbEZyYW1lcywgc291cmNlQ29kZUxvY2F0aW9uKTsKIAogICAgIGNv bnNvbGUuYXNzZXJ0KGV2ZW50VHlwZSk7CiAKQEAgLTM0LDkgKzM0LDYgQEAgV2ViSW5zcGVjdG9y LlNjcmlwdFRpbWVsaW5lUmVjb3JkID0gZnVuY3Rpb24oZXZlbnRUeXBlLCBzdGFydFRpbWUsIGVu ZFRpbWUsIGRldGEKIAogICAgIHRoaXMuX2V2ZW50VHlwZSA9IGV2ZW50VHlwZTsKICAgICB0aGlz Ll9kZXRhaWxzID0gZGV0YWlscyB8fCAiIjsKLSAgICB0aGlzLl9yZXNvdXJjZSA9IHJlc291cmNl IHx8IG51bGw7Ci0gICAgdGhpcy5fbGluZU51bWJlciA9IGxpbmVOdW1iZXIgfHwgTmFOOwotICAg IHRoaXMuX2NhbGxGcmFtZXMgPSBjYWxsRnJhbWVzIHx8IG51bGw7CiB9OwogCiBXZWJJbnNwZWN0 b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlID0gewpAQCAtNzksNTMgKzc2LDYgQEAg V2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLnByb3RvdHlwZSA9IHsKICAgICBnZXQg ZGV0YWlscygpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fZGV0YWlsczsKLSAgICB9LAot Ci0gICAgZ2V0IHJlc291cmNlKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9yZXNvdXJj ZTsKLSAgICB9LAotCi0gICAgZ2V0IGxpbmVOdW1iZXIoKQotICAgIHsKLSAgICAgICAgcmV0dXJu IHRoaXMuX2xpbmVOdW1iZXI7Ci0gICAgfSwKLQotICAgIGdldCBjYWxsRnJhbWVzKCkKLSAgICB7 Ci0gICAgICAgIHJldHVybiB0aGlzLl9jYWxsRnJhbWVzOwotICAgIH0sCi0KLSAgICBnZXQgc291 cmNlQ29kZUxvY2F0aW9uKCkKLSAgICB7Ci0gICAgICAgIGlmICgiX3NvdXJjZUNvZGVMb2NhdGlv biIgaW4gdGhpcykKLSAgICAgICAgICAgIHJldHVybiB0aGlzLl9zb3VyY2VDb2RlTG9jYXRpb247 Ci0KLSAgICAgICAgaWYgKCF0aGlzLl9yZXNvdXJjZSkgewotICAgICAgICAgICAgdGhpcy5fc291 cmNlQ29kZUxvY2F0aW9uID0gbnVsbDsKLSAgICAgICAgICAgIHJldHVybiB0aGlzLl9zb3VyY2VD b2RlTG9jYXRpb247Ci0gICAgICAgIH0KLQotICAgICAgICAvLyBGSVhNRTogU2NyaXB0IFRpbWVs aW5lIEV2ZW50cyB3aXRoIGEgbG9jYXRpb24gc2hvdWxkIGFsd2F5cyBjb250YWluIGEgY2FsbCBz dGFjawotICAgICAgICAvLyBvciBhIGNvbXBsZXRlICh1cmw6bGluZTpjb2x1bW4pIHRyaXBsZXQu Ci0KLSAgICAgICAgaWYgKHRoaXMuX2NhbGxGcmFtZXMpIHsKLSAgICAgICAgICAgIGZvciAodmFy IGkgPSAwOyBpIDwgdGhpcy5fY2FsbEZyYW1lcy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAg ICAgIHZhciBjYWxsRnJhbWUgPSB0aGlzLl9jYWxsRnJhbWVzW2ldOwotICAgICAgICAgICAgICAg IGlmIChjYWxsRnJhbWUubmF0aXZlQ29kZSkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7 Ci0KLSAgICAgICAgICAgICAgICBpZiAoIWNhbGxGcmFtZS5zb3VyY2VDb2RlTG9jYXRpb24pCi0g ICAgICAgICAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgICAgICAgICAgdGhpcy5fc291cmNl Q29kZUxvY2F0aW9uID0gY2FsbEZyYW1lLnNvdXJjZUNvZGVMb2NhdGlvbjsKLSAgICAgICAgICAg ICAgICByZXR1cm4gdGhpcy5fc291cmNlQ29kZUxvY2F0aW9uOwotICAgICAgICAgICAgfQotICAg ICAgICB9Ci0KLSAgICAgICAgdmFyIGxpbmVOdW1iZXIgPSBpc05hTih0aGlzLl9saW5lTnVtYmVy KSA/IDAgOiB0aGlzLl9saW5lTnVtYmVyOwotICAgICAgICB0aGlzLl9zb3VyY2VDb2RlTG9jYXRp b24gPSB0aGlzLl9yZXNvdXJjZS5jcmVhdGVTb3VyY2VDb2RlTG9jYXRpb24obGluZU51bWJlciwg MCk7Ci0gICAgICAgIHJldHVybiB0aGlzLl9zb3VyY2VDb2RlTG9jYXRpb247CiAgICAgfQogfTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxp bmVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxp bmVNYW5hZ2VyLmpzCmluZGV4IDhjZWZhZWM3YTNhOTRjODg5ZWQ0YmU2ODAxMzBiNmZhYjEyYzBl YmEuLmM3ZWNkMzJjMTg1Njg5MjYyZDQyNjdjOGRiZWM0NWUwNTQ5NjIxNzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lTWFuYWdlci5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZU1hbmFnZXIu anMKQEAgLTkxLDIyICs5MSwzNCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLnByb3Rv dHlwZSA9IHsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVj dG9yLlRpbWVsaW5lTWFuYWdlci5FdmVudC5SZWNvcmRpbmdTdG9wcGVkKTsKICAgICB9LAogCi0g ICAgZXZlbnRSZWNvcmRlZDogZnVuY3Rpb24ob3JpZ2luYWxSZWNvcmQpCisgICAgZXZlbnRSZWNv cmRlZDogZnVuY3Rpb24ob3JpZ2luYWxSZWNvcmRQYXlsb2FkKQogICAgIHsKICAgICAgICAgLy8g Q2FsbGVkIGZyb20gV2ViSW5zcGVjdG9yLlRpbWVsaW5lT2JzZXJ2ZXIuCiAKICAgICAgICAgaWYg KCF0aGlzLl9yZWNvcmRpbmcpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgZnVuY3Rp b24gcHJvY2Vzc1JlY29yZChyZWNvcmQsIHBhcmVudFJlY29yZCkKKyAgICAgICAgZnVuY3Rpb24g cHJvY2Vzc1JlY29yZChyZWNvcmRQYXlsb2FkLCBwYXJlbnRSZWNvcmRQYXlsb2FkKQogICAgICAg ICB7CiAgICAgICAgICAgICAvLyBDb252ZXJ0IHRoZSB0aW1lc3RhbXBzIHRvIHNlY29uZHMgdG8g bWF0Y2ggdGhlIHJlc291cmNlIHRpbWVzdGFtcHMuCi0gICAgICAgICAgICB2YXIgc3RhcnRUaW1l ID0gcmVjb3JkLnN0YXJ0VGltZSAvIDEwMDA7Ci0gICAgICAgICAgICB2YXIgZW5kVGltZSA9IHJl Y29yZC5lbmRUaW1lIC8gMTAwMDsKKyAgICAgICAgICAgIHZhciBzdGFydFRpbWUgPSByZWNvcmRQ YXlsb2FkLnN0YXJ0VGltZSAvIDEwMDA7CisgICAgICAgICAgICB2YXIgZW5kVGltZSA9IHJlY29y ZFBheWxvYWQuZW5kVGltZSAvIDEwMDA7CiAKLSAgICAgICAgICAgIHZhciBjYWxsRnJhbWVzID0g dGhpcy5fY2FsbEZyYW1lc0Zyb21QYXlsb2FkKHJlY29yZC5zdGFja1RyYWNlKTsKKyAgICAgICAg ICAgIHZhciBjYWxsRnJhbWVzID0gdGhpcy5fY2FsbEZyYW1lc0Zyb21QYXlsb2FkKHJlY29yZFBh eWxvYWQuc3RhY2tUcmFjZSk7CiAKLSAgICAgICAgICAgIHN3aXRjaCAocmVjb3JkLnR5cGUpIHsK KyAgICAgICAgICAgIHZhciBzaWduaWZpY2FudENhbGxGcmFtZSA9IG51bGw7CisgICAgICAgICAg ICBpZiAoY2FsbEZyYW1lcykgeworICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwg Y2FsbEZyYW1lcy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgICAgICAgICBpZiAoY2FsbEZy YW1lc1tpXS5uYXRpdmVDb2RlKQorICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgICAgICAgICAgICAgIHNpZ25pZmljYW50Q2FsbEZyYW1lID0gY2FsbEZyYW1lc1tpXTsK KyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgfQorCisgICAgICAgICAgICB2YXIgc291cmNlQ29kZUxvY2F0aW9uID0gc2lnbmlmaWNhbnRD YWxsRnJhbWUgJiYgc2lnbmlmaWNhbnRDYWxsRnJhbWUuc291cmNlQ29kZUxvY2F0aW9uOworCisg ICAgICAgICAgICBzd2l0Y2ggKHJlY29yZFBheWxvYWQudHlwZSkgewogICAgICAgICAgICAgY2Fz ZSBUaW1lbGluZUFnZW50LkV2ZW50VHlwZS5NYXJrTG9hZDoKICAgICAgICAgICAgICAgICBjb25z b2xlLmFzc2VydChpc05hTihlbmRUaW1lKSk7CiAKQEAgLTE0Niw1MCArMTU4LDU4IEBAIFdlYklu c3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlID0gewogCiAgICAgICAgICAgICBjYXNl IFRpbWVsaW5lQWdlbnQuRXZlbnRUeXBlLlNjaGVkdWxlU3R5bGVSZWNhbGN1bGF0aW9uOgogICAg ICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGlzTmFOKGVuZFRpbWUpKTsKKwogICAgICAgICAg ICAgICAgIC8vIFBhc3MgdGhlIHN0YXJ0VGltZSBhcyB0aGUgZW5kVGltZSBzaW5jZSB0aGlzIHJl Y29yZCB0eXBlIGhhcyBubyBkdXJhdGlvbi4KLSAgICAgICAgICAgICAgICB0aGlzLl9hZGRSZWNv cmQobmV3IFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVJlY29yZChXZWJJbnNwZWN0b3IuTGF5 b3V0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkludmFsaWRhdGVTdHlsZXMsIHN0YXJ0VGltZSwg c3RhcnRUaW1lLCBjYWxsRnJhbWVzKSk7CisgICAgICAgICAgICAgICAgdGhpcy5fYWRkUmVjb3Jk KG5ldyBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQoV2ViSW5zcGVjdG9yLkxheW91 dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5JbnZhbGlkYXRlU3R5bGVzLCBzdGFydFRpbWUsIHN0 YXJ0VGltZSwgY2FsbEZyYW1lcywgc291cmNlQ29kZUxvY2F0aW9uKSk7CiAgICAgICAgICAgICAg ICAgYnJlYWs7CiAKICAgICAgICAgICAgIGNhc2UgVGltZWxpbmVBZ2VudC5FdmVudFR5cGUuUmVj YWxjdWxhdGVTdHlsZXM6Ci0gICAgICAgICAgICAgICAgdGhpcy5fYWRkUmVjb3JkKG5ldyBXZWJJ bnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5l UmVjb3JkLkV2ZW50VHlwZS5SZWNhbGN1bGF0ZVN0eWxlcywgc3RhcnRUaW1lLCBlbmRUaW1lLCBj YWxsRnJhbWVzKSk7CisgICAgICAgICAgICAgICAgdGhpcy5fYWRkUmVjb3JkKG5ldyBXZWJJbnNw ZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lUmVj b3JkLkV2ZW50VHlwZS5SZWNhbGN1bGF0ZVN0eWxlcywgc3RhcnRUaW1lLCBlbmRUaW1lLCBjYWxs RnJhbWVzLCBzb3VyY2VDb2RlTG9jYXRpb24pKTsKICAgICAgICAgICAgICAgICBicmVhazsKIAog ICAgICAgICAgICAgY2FzZSBUaW1lbGluZUFnZW50LkV2ZW50VHlwZS5JbnZhbGlkYXRlTGF5b3V0 OgogICAgICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGlzTmFOKGVuZFRpbWUpKTsKKwogICAg ICAgICAgICAgICAgIC8vIFBhc3MgdGhlIHN0YXJ0VGltZSBhcyB0aGUgZW5kVGltZSBzaW5jZSB0 aGlzIHJlY29yZCB0eXBlIGhhcyBubyBkdXJhdGlvbi4KLSAgICAgICAgICAgICAgICB0aGlzLl9h ZGRSZWNvcmQobmV3IFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVJlY29yZChXZWJJbnNwZWN0 b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkludmFsaWRhdGVMYXlvdXQsIHN0YXJ0 VGltZSwgc3RhcnRUaW1lLCBjYWxsRnJhbWVzKSk7CisgICAgICAgICAgICAgICAgdGhpcy5fYWRk UmVjb3JkKG5ldyBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQoV2ViSW5zcGVjdG9y LkxheW91dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5JbnZhbGlkYXRlTGF5b3V0LCBzdGFydFRp bWUsIHN0YXJ0VGltZSwgY2FsbEZyYW1lcywgc291cmNlQ29kZUxvY2F0aW9uKSk7CiAgICAgICAg ICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgIGNhc2UgVGltZWxpbmVBZ2VudC5FdmVudFR5 cGUuTGF5b3V0OgogICAgICAgICAgICAgICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyA2KTogTGF5 b3V0IHJlY29yZHMgZGlkIG5vdCBjb250YWluIGFyZWEgcHJvcGVydGllcy4gVGhpcyBpcyBub3Qg ZXhwb3NlZCB2aWEgYSBxdWFkICJyb290Ii4KLSAgICAgICAgICAgICAgICB2YXIgcXVhZCA9IHJl Y29yZC5kYXRhLnJvb3QgPyBuZXcgV2ViSW5zcGVjdG9yLlF1YWQocmVjb3JkLmRhdGEucm9vdCkg OiBudWxsOworICAgICAgICAgICAgICAgIHZhciBxdWFkID0gcmVjb3JkUGF5bG9hZC5kYXRhLnJv b3QgPyBuZXcgV2ViSW5zcGVjdG9yLlF1YWQocmVjb3JkUGF5bG9hZC5kYXRhLnJvb3QpIDogbnVs bDsKICAgICAgICAgICAgICAgICBpZiAocXVhZCkKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5f YWRkUmVjb3JkKG5ldyBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQoV2ViSW5zcGVj dG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5MYXlvdXQsIHN0YXJ0VGltZSwgZW5k VGltZSwgY2FsbEZyYW1lcywgcXVhZC5wb2ludHNbMF0ueCwgcXVhZC5wb2ludHNbMF0ueSwgcXVh ZC53aWR0aCwgcXVhZC5oZWlnaHQsIHF1YWQpKTsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5f YWRkUmVjb3JkKG5ldyBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQoV2ViSW5zcGVj dG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5MYXlvdXQsIHN0YXJ0VGltZSwgZW5k VGltZSwgY2FsbEZyYW1lcywgc291cmNlQ29kZUxvY2F0aW9uLCBxdWFkLnBvaW50c1swXS54LCBx dWFkLnBvaW50c1swXS55LCBxdWFkLndpZHRoLCBxdWFkLmhlaWdodCwgcXVhZCkpOwogICAgICAg ICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5fYWRkUmVjb3JkKG5ldyBX ZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVs aW5lUmVjb3JkLkV2ZW50VHlwZS5MYXlvdXQsIHN0YXJ0VGltZSwgZW5kVGltZSwgY2FsbEZyYW1l cykpOworICAgICAgICAgICAgICAgICAgICB0aGlzLl9hZGRSZWNvcmQobmV3IFdlYkluc3BlY3Rv ci5MYXlvdXRUaW1lbGluZVJlY29yZChXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQu RXZlbnRUeXBlLkxheW91dCwgc3RhcnRUaW1lLCBlbmRUaW1lLCBjYWxsRnJhbWVzLCBzb3VyY2VD b2RlTG9jYXRpb24pKTsKICAgICAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICAgICAgY2Fz ZSBUaW1lbGluZUFnZW50LkV2ZW50VHlwZS5QYWludDoKICAgICAgICAgICAgICAgICAvLyBDT01Q QVRJQklMSVRZIChpT1MgNik6IFBhaW50IHJlY29yZHMgZGF0YSBjb250YWluZWQgeCwgeSwgd2lk dGgsIGhlaWdodCBwcm9wZXJ0aWVzLiBUaGlzIGJlY2FtZSBhIHF1YWQgImNsaXAiLgotICAgICAg ICAgICAgICAgIHZhciBxdWFkID0gcmVjb3JkLmRhdGEuY2xpcCA/IG5ldyBXZWJJbnNwZWN0b3Iu UXVhZChyZWNvcmQuZGF0YS5jbGlwKSA6IG51bGw7CisgICAgICAgICAgICAgICAgdmFyIHF1YWQg PSByZWNvcmRQYXlsb2FkLmRhdGEuY2xpcCA/IG5ldyBXZWJJbnNwZWN0b3IuUXVhZChyZWNvcmRQ YXlsb2FkLmRhdGEuY2xpcCkgOiBudWxsOwogICAgICAgICAgICAgICAgIGlmIChxdWFkKQotICAg ICAgICAgICAgICAgICAgICB0aGlzLl9hZGRSZWNvcmQobmV3IFdlYkluc3BlY3Rvci5MYXlvdXRU aW1lbGluZVJlY29yZChXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBl LlBhaW50LCBzdGFydFRpbWUsIGVuZFRpbWUsIGNhbGxGcmFtZXMsIG51bGwsIG51bGwsIHF1YWQu d2lkdGgsIHF1YWQuaGVpZ2h0LCBxdWFkKSk7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX2Fk ZFJlY29yZChuZXcgV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lUmVjb3JkKFdlYkluc3BlY3Rv ci5MYXlvdXRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuUGFpbnQsIHN0YXJ0VGltZSwgZW5kVGlt ZSwgY2FsbEZyYW1lcywgc291cmNlQ29kZUxvY2F0aW9uLCBudWxsLCBudWxsLCBxdWFkLndpZHRo LCBxdWFkLmhlaWdodCwgcXVhZCkpOwogICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAg ICAgICAgICAgdGhpcy5fYWRkUmVjb3JkKG5ldyBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVS ZWNvcmQoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5QYWludCwg c3RhcnRUaW1lLCBlbmRUaW1lLCBjYWxsRnJhbWVzLCByZWNvcmQuZGF0YS54LCByZWNvcmQuZGF0 YS55LCByZWNvcmQuZGF0YS53aWR0aCwgcmVjb3JkLmRhdGEuaGVpZ2h0KSk7CisgICAgICAgICAg ICAgICAgICAgIHRoaXMuX2FkZFJlY29yZChuZXcgV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5l UmVjb3JkKFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuUGFpbnQs IHN0YXJ0VGltZSwgZW5kVGltZSwgY2FsbEZyYW1lcywgc291cmNlQ29kZUxvY2F0aW9uLCByZWNv cmRQYXlsb2FkLmRhdGEueCwgcmVjb3JkUGF5bG9hZC5kYXRhLnksIHJlY29yZFBheWxvYWQuZGF0 YS53aWR0aCwgcmVjb3JkUGF5bG9hZC5kYXRhLmhlaWdodCkpOwogICAgICAgICAgICAgICAgIGJy ZWFrOwogCiAgICAgICAgICAgICBjYXNlIFRpbWVsaW5lQWdlbnQuRXZlbnRUeXBlLkV2YWx1YXRl U2NyaXB0OgotICAgICAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IFdlYkluc3BlY3Rvci5mcmFt ZVJlc291cmNlTWFuYWdlci5yZXNvdXJjZUZvclVSTChyZWNvcmQuZGF0YS51cmwpOwotCi0gICAg ICAgICAgICAgICAgLy8gVGhlIGxpbmVOdW1iZXIgaXMgMS1iYXNlZCwgYnV0IHdlIGV4cGVjdCAw LWJhc2VkLgotICAgICAgICAgICAgICAgIHZhciBsaW5lTnVtYmVyID0gcmVjb3JkLmRhdGEubGlu ZU51bWJlciAtIDE7CisgICAgICAgICAgICAgICAgaWYgKCFzb3VyY2VDb2RlTG9jYXRpb24pIHsK KyAgICAgICAgICAgICAgICAgICAgdmFyIG1haW5GcmFtZSA9IFdlYkluc3BlY3Rvci5mcmFtZVJl c291cmNlTWFuYWdlci5tYWluRnJhbWU7CisgICAgICAgICAgICAgICAgICAgIHZhciBzY3JpcHRS ZXNvdXJjZSA9IG1haW5GcmFtZS51cmwgPT09IHJlY29yZFBheWxvYWQuZGF0YS51cmwgPyBtYWlu RnJhbWUubWFpblJlc291cmNlIDogbWFpbkZyYW1lLnJlc291cmNlRm9yVVJMKHJlY29yZFBheWxv YWQuZGF0YS51cmwsIHRydWUpOworICAgICAgICAgICAgICAgICAgICBpZiAoc2NyaXB0UmVzb3Vy Y2UpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIFRoZSBsaW5lTnVtYmVyIGlzIDEtYmFz ZWQsIGJ1dCB3ZSBleHBlY3QgMC1iYXNlZC4KKyAgICAgICAgICAgICAgICAgICAgICAgIHZhciBs aW5lTnVtYmVyID0gcmVjb3JkUGF5bG9hZC5kYXRhLmxpbmVOdW1iZXIgLSAxOworCisgICAgICAg ICAgICAgICAgICAgICAgICBzb3VyY2VDb2RlTG9jYXRpb24gPSBzY3JpcHRSZXNvdXJjZS5jcmVh dGVTb3VyY2VDb2RlTG9jYXRpb24obGluZU51bWJlciwgMCk7CisgICAgICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICBzd2l0Y2ggKHBhcmVudCA/ IHBhcmVudC50eXBlIDogbnVsbCkgeworICAgICAgICAgICAgICAgIHN3aXRjaCAocGFyZW50UmVj b3JkUGF5bG9hZCAmJiBwYXJlbnRSZWNvcmRQYXlsb2FkLnR5cGUpIHsKICAgICAgICAgICAgICAg ICBjYXNlIFRpbWVsaW5lQWdlbnQuRXZlbnRUeXBlLlRpbWVyRmlyZToKLSAgICAgICAgICAgICAg ICAgICAgdGhpcy5fYWRkUmVjb3JkKG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNv cmQoV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5UaW1lckZpcmVk LCBzdGFydFRpbWUsIGVuZFRpbWUsIHBhcmVudC5kYXRhLnRpbWVySWQsIHJlc291cmNlLCBsaW5l TnVtYmVyLCBjYWxsRnJhbWVzKSk7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX2FkZFJlY29y ZChuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkKFdlYkluc3BlY3Rvci5TY3Jp cHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuVGltZXJGaXJlZCwgc3RhcnRUaW1lLCBlbmRUaW1l LCBjYWxsRnJhbWVzLCBzb3VyY2VDb2RlTG9jYXRpb24sIHBhcmVudFJlY29yZFBheWxvYWQuZGF0 YS50aW1lcklkKSk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAg IGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgICAgIHRoaXMuX2FkZFJlY29yZChuZXcgV2ViSW5z cGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkKFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJl Y29yZC5FdmVudFR5cGUuU2NyaXB0RXZhbHVhdGVkLCBzdGFydFRpbWUsIGVuZFRpbWUsIG51bGws IHJlc291cmNlLCBsaW5lTnVtYmVyLCBjYWxsRnJhbWVzKSk7CisgICAgICAgICAgICAgICAgICAg IHRoaXMuX2FkZFJlY29yZChuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkKFdl Ykluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuU2NyaXB0RXZhbHVhdGVk LCBzdGFydFRpbWUsIGVuZFRpbWUsIGNhbGxGcmFtZXMsIHNvdXJjZUNvZGVMb2NhdGlvbiwgbnVs bCkpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9CiAKQEAg LTIwNCwyOSArMjI0LDI0IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBl ID0gewogICAgICAgICAgICAgY2FzZSBUaW1lbGluZUFnZW50LkV2ZW50VHlwZS5GdW5jdGlvbkNh bGw6CiAgICAgICAgICAgICAgICAgLy8gRnVuY3Rpb25DYWxsIGFsd2F5cyBoYXBwZW5zIGFzIGEg Y2hpbGQgb2YgYW5vdGhlciByZWNvcmQsIGFuZCBzaW5jZSB0aGUgRnVuY3Rpb25DYWxsIHJlY29y ZAogICAgICAgICAgICAgICAgIC8vIGhhcyB1c2VmdWwgaW5mbyB3ZSBqdXN0IG1ha2UgdGhlIHRp bWVsaW5lIHJlY29yZCBoZXJlIChjb21iaW5pbmcgdGhlIGRhdGEgZnJvbSBib3RoIHJlY29yZHMp LgotICAgICAgICAgICAgICAgIGlmICghcGFyZW50KQorICAgICAgICAgICAgICAgIGlmICghcGFy ZW50UmVjb3JkUGF5bG9hZCkKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAKLSAgICAgICAg ICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIu cmVzb3VyY2VGb3JVUkwocmVjb3JkLmRhdGEuc2NyaXB0TmFtZSk7Ci0KLSAgICAgICAgICAgICAg ICAvLyBUaGUgc2NyaXB0TGluZSBpcyAxLWJhc2VkLCBidXQgd2UgZXhwZWN0IDAtYmFzZWQuCi0g ICAgICAgICAgICAgICAgdmFyIGxpbmVOdW1iZXIgPSByZWNvcmQuZGF0YS5zY3JpcHRMaW5lIC0g MTsKLQotICAgICAgICAgICAgICAgIHN3aXRjaCAocGFyZW50LnR5cGUpIHsKKyAgICAgICAgICAg ICAgICBzd2l0Y2ggKHBhcmVudFJlY29yZFBheWxvYWQudHlwZSkgewogICAgICAgICAgICAgICAg IGNhc2UgVGltZWxpbmVBZ2VudC5FdmVudFR5cGUuVGltZXJGaXJlOgotICAgICAgICAgICAgICAg ICAgICB0aGlzLl9hZGRSZWNvcmQobmV3IFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29y ZChXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLlRpbWVyRmlyZWQs IHN0YXJ0VGltZSwgZW5kVGltZSwgcGFyZW50LmRhdGEudGltZXJJZCwgcmVzb3VyY2UsIGxpbmVO dW1iZXIsIGNhbGxGcmFtZXMpKTsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fYWRkUmVjb3Jk KG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQoV2ViSW5zcGVjdG9yLlNjcmlw dFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5UaW1lckZpcmVkLCBzdGFydFRpbWUsIGVuZFRpbWUs IGNhbGxGcmFtZXMsIHNvdXJjZUNvZGVMb2NhdGlvbiwgcGFyZW50UmVjb3JkUGF5bG9hZC5kYXRh LnRpbWVySWQpKTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAg Y2FzZSBUaW1lbGluZUFnZW50LkV2ZW50VHlwZS5FdmVudERpc3BhdGNoOgotICAgICAgICAgICAg ICAgICAgICB0aGlzLl9hZGRSZWNvcmQobmV3IFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJl Y29yZChXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkV2ZW50RGlz cGF0Y2hlZCwgc3RhcnRUaW1lLCBlbmRUaW1lLCBwYXJlbnQuZGF0YS50eXBlLCByZXNvdXJjZSwg bGluZU51bWJlciwgY2FsbEZyYW1lcykpOworICAgICAgICAgICAgICAgICAgICB0aGlzLl9hZGRS ZWNvcmQobmV3IFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZChXZWJJbnNwZWN0b3Iu U2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkV2ZW50RGlzcGF0Y2hlZCwgc3RhcnRUaW1l LCBlbmRUaW1lLCBjYWxsRnJhbWVzLCBzb3VyY2VDb2RlTG9jYXRpb24sIHBhcmVudFJlY29yZFBh eWxvYWQuZGF0YS50eXBlKSk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAg ICAgICAgIGNhc2UgVGltZWxpbmVBZ2VudC5FdmVudFR5cGUuWEhSTG9hZDoKLSAgICAgICAgICAg ICAgICAgICAgdGhpcy5fYWRkUmVjb3JkKG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVS ZWNvcmQoV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlwZS5FdmVudERp c3BhdGNoZWQsIHN0YXJ0VGltZSwgZW5kVGltZSwgImxvYWQiLCByZXNvdXJjZSwgbGluZU51bWJl ciwgY2FsbEZyYW1lcykpOworICAgICAgICAgICAgICAgICAgICB0aGlzLl9hZGRSZWNvcmQobmV3 IFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZChXZWJJbnNwZWN0b3IuU2NyaXB0VGlt ZWxpbmVSZWNvcmQuRXZlbnRUeXBlLkV2ZW50RGlzcGF0Y2hlZCwgc3RhcnRUaW1lLCBlbmRUaW1l LCBjYWxsRnJhbWVzLCBzb3VyY2VDb2RlTG9jYXRpb24sICJsb2FkIikpOwogICAgICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNlIFRpbWVsaW5lQWdlbnQuRXZlbnRU eXBlLlhIUlJlYWR5U3RhdGVDaGFuZ2U6Ci0gICAgICAgICAgICAgICAgICAgIHRoaXMuX2FkZFJl Y29yZChuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkKFdlYkluc3BlY3Rvci5T Y3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuRXZlbnREaXNwYXRjaGVkLCBzdGFydFRpbWUs IGVuZFRpbWUsICJyZWFkeXN0YXRlY2hhbmdlIiwgcmVzb3VyY2UsIGxpbmVOdW1iZXIsIGNhbGxG cmFtZXMpKTsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fYWRkUmVjb3JkKG5ldyBXZWJJbnNw ZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQoV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVj b3JkLkV2ZW50VHlwZS5FdmVudERpc3BhdGNoZWQsIHN0YXJ0VGltZSwgZW5kVGltZSwgY2FsbEZy YW1lcywgc291cmNlQ29kZUxvY2F0aW9uLCAicmVhZHlzdGF0ZWNoYW5nZSIpKTsKICAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgY2FzZSBUaW1lbGluZUFnZW50LkV2 ZW50VHlwZS5GaXJlQW5pbWF0aW9uRnJhbWU6Ci0gICAgICAgICAgICAgICAgICAgIHRoaXMuX2Fk ZFJlY29yZChuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkKFdlYkluc3BlY3Rv ci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuQW5pbWF0aW9uRnJhbWVGaXJlZCwgc3Rh cnRUaW1lLCBlbmRUaW1lLCBwYXJlbnQuZGF0YS5pZCwgcmVzb3VyY2UsIGxpbmVOdW1iZXIsIGNh bGxGcmFtZXMpKTsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fYWRkUmVjb3JkKG5ldyBXZWJJ bnNwZWN0b3IuU2NyaXB0VGltZWxpbmVSZWNvcmQoV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5l UmVjb3JkLkV2ZW50VHlwZS5BbmltYXRpb25GcmFtZUZpcmVkLCBzdGFydFRpbWUsIGVuZFRpbWUs IGNhbGxGcmFtZXMsIHNvdXJjZUNvZGVMb2NhdGlvbiwgcGFyZW50UmVjb3JkUGF5bG9hZC5kYXRh LmlkKSk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0KIApA QCAtMjM0LDQ3ICsyNDksMzAgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5 cGUgPSB7CiAKICAgICAgICAgICAgIGNhc2UgVGltZWxpbmVBZ2VudC5FdmVudFR5cGUuVGltZXJJ bnN0YWxsOgogICAgICAgICAgICAgY2FzZSBUaW1lbGluZUFnZW50LkV2ZW50VHlwZS5UaW1lclJl bW92ZToKLSAgICAgICAgICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgNik6IFRpbWVySW5z dGFsbCBhbmQgVGltZXJSZW1vdmUgZGlkIG5vdCBoYXZlIGEgc3RhY2sgdHJhY2UuCi0gICAgICAg ICAgICAgICAgdmFyIGNhbGxGcmFtZSA9IG51bGw7Ci0gICAgICAgICAgICAgICAgaWYgKGNhbGxG cmFtZXMpIHsKLSAgICAgICAgICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBjYWxsRnJh bWVzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoY2FsbEZyYW1l c1tpXS5uYXRpdmVDb2RlKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwot ICAgICAgICAgICAgICAgICAgICAgICAgY2FsbEZyYW1lID0gY2FsbEZyYW1lc1tpXTsKLSAgICAg ICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICAgICAgfQotCi0gICAgICAgICAgICAgICAgdmFyIHNvdXJjZUNvZGVMb2NhdGlvbiA9IGNh bGxGcmFtZSAmJiBjYWxsRnJhbWUuc291cmNlQ29kZUxvY2F0aW9uOwotICAgICAgICAgICAgICAg IHZhciByZXNvdXJjZSA9IHNvdXJjZUNvZGVMb2NhdGlvbiA/IHNvdXJjZUNvZGVMb2NhdGlvbi5z b3VyY2VDb2RlIDogbnVsbDsKLSAgICAgICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IHNvdXJj ZUNvZGVMb2NhdGlvbiA/IHNvdXJjZUNvZGVMb2NhdGlvbi5saW5lTnVtYmVyIDogbnVsbDsKLQot ICAgICAgICAgICAgICAgIGlmIChyZWNvcmQudHlwZSA9PT0gVGltZWxpbmVBZ2VudC5FdmVudFR5 cGUuVGltZXJJbnN0YWxsKQotICAgICAgICAgICAgICAgICAgICB0aGlzLl9hZGRSZWNvcmQobmV3 IFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZChXZWJJbnNwZWN0b3IuU2NyaXB0VGlt ZWxpbmVSZWNvcmQuRXZlbnRUeXBlLlRpbWVySW5zdGFsbGVkLCBzdGFydFRpbWUsIGVuZFRpbWUs IHJlY29yZC5kYXRhLnRpbWVySWQsIHJlc291cmNlLCBsaW5lTnVtYmVyLCBjYWxsRnJhbWVzKSk7 CisgICAgICAgICAgICAgICAgaWYgKHJlY29yZFBheWxvYWQudHlwZSA9PT0gVGltZWxpbmVBZ2Vu dC5FdmVudFR5cGUuVGltZXJJbnN0YWxsKQorICAgICAgICAgICAgICAgICAgICB0aGlzLl9hZGRS ZWNvcmQobmV3IFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZChXZWJJbnNwZWN0b3Iu U2NyaXB0VGltZWxpbmVSZWNvcmQuRXZlbnRUeXBlLlRpbWVySW5zdGFsbGVkLCBzdGFydFRpbWUs IGVuZFRpbWUsIGNhbGxGcmFtZXMsIHNvdXJjZUNvZGVMb2NhdGlvbiwgcmVjb3JkUGF5bG9hZC5k YXRhLnRpbWVySWQpKTsKICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAg IHRoaXMuX2FkZFJlY29yZChuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkKFdl Ykluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVJlY29yZC5FdmVudFR5cGUuVGltZXJSZW1vdmVkLCBz dGFydFRpbWUsIGVuZFRpbWUsIHJlY29yZC5kYXRhLnRpbWVySWQsIHJlc291cmNlLCBsaW5lTnVt YmVyLCBjYWxsRnJhbWVzKSk7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX2FkZFJlY29yZChu ZXcgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lUmVjb3JkKFdlYkluc3BlY3Rvci5TY3JpcHRU aW1lbGluZVJlY29yZC5FdmVudFR5cGUuVGltZXJSZW1vdmVkLCBzdGFydFRpbWUsIGVuZFRpbWUs IGNhbGxGcmFtZXMsIHNvdXJjZUNvZGVMb2NhdGlvbiwgcmVjb3JkUGF5bG9hZC5kYXRhLnRpbWVy SWQpKTsKIAogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQotCi0gICAgICAg ICAgICByZXR1cm4gbnVsbDsKICAgICAgICAgfQogCiAgICAgICAgIC8vIEl0ZXJhdGUgb3ZlciB0 aGUgcmVjb3JkcyB0cmVlIHVzaW5nIGEgc3RhY2suIERvaW5nIHRoaXMgcmVjdXJzaXZlbHkgaGFz CiAgICAgICAgIC8vIGJlZW4ga25vd24gdG8gY2F1c2UgYSBjYWxsIHN0YWNrIG92ZXJmbG93LiBo dHRwczovL3dlYmtpdC5vcmcvYi83OTEwNgotICAgICAgICB2YXIgc3RhY2sgPSBbe2FycmF5OiBb b3JpZ2luYWxSZWNvcmRdLCBwYXJlbnQ6IG51bGwsIGluZGV4OiAwfV07CisgICAgICAgIHZhciBz dGFjayA9IFt7YXJyYXk6IFtvcmlnaW5hbFJlY29yZFBheWxvYWRdLCBwYXJlbnQ6IG51bGwsIGlu ZGV4OiAwfV07CiAgICAgICAgIHdoaWxlIChzdGFjay5sZW5ndGgpIHsKICAgICAgICAgICAgIHZh ciBlbnRyeSA9IHN0YWNrLmxhc3RWYWx1ZTsKLSAgICAgICAgICAgIHZhciByZWNvcmRzID0gZW50 cnkuYXJyYXk7Ci0gICAgICAgICAgICB2YXIgcGFyZW50ID0gZW50cnkucGFyZW50OworICAgICAg ICAgICAgdmFyIHJlY29yZFBheWxvYWRzID0gZW50cnkuYXJyYXk7CisgICAgICAgICAgICB2YXIg cGFyZW50UmVjb3JkUGF5bG9hZCA9IGVudHJ5LnBhcmVudDsKIAotICAgICAgICAgICAgaWYgKGVu dHJ5LmluZGV4IDwgcmVjb3Jkcy5sZW5ndGgpIHsKLSAgICAgICAgICAgICAgICB2YXIgcmVjb3Jk ID0gcmVjb3Jkc1tlbnRyeS5pbmRleF07CisgICAgICAgICAgICBpZiAoZW50cnkuaW5kZXggPCBy ZWNvcmRQYXlsb2Fkcy5sZW5ndGgpIHsKKyAgICAgICAgICAgICAgICB2YXIgcmVjb3JkUGF5bG9h ZCA9IHJlY29yZFBheWxvYWRzW2VudHJ5LmluZGV4XTsKIAotICAgICAgICAgICAgICAgIHByb2Nl c3NSZWNvcmQuY2FsbCh0aGlzLCByZWNvcmQsIHBhcmVudCk7CisgICAgICAgICAgICAgICAgcHJv Y2Vzc1JlY29yZC5jYWxsKHRoaXMsIHJlY29yZFBheWxvYWQsIHBhcmVudFJlY29yZFBheWxvYWQp OwogCi0gICAgICAgICAgICAgICAgaWYgKHJlY29yZC5jaGlsZHJlbikKLSAgICAgICAgICAgICAg ICAgICAgc3RhY2sucHVzaCh7YXJyYXk6IHJlY29yZC5jaGlsZHJlbiwgcGFyZW50OiByZWNvcmQs IGluZGV4OiAwfSk7CisgICAgICAgICAgICAgICAgaWYgKHJlY29yZFBheWxvYWQuY2hpbGRyZW4p CisgICAgICAgICAgICAgICAgICAgIHN0YWNrLnB1c2goe2FycmF5OiByZWNvcmRQYXlsb2FkLmNo aWxkcmVuLCBwYXJlbnQ6IHJlY29yZFBheWxvYWQsIGluZGV4OiAwfSk7CiAgICAgICAgICAgICAg ICAgKytlbnRyeS5pbmRleDsKICAgICAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgICAgIHN0 YWNrLnBvcCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVGltZWxpbmVSZWNvcmQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9UaW1lbGluZVJlY29yZC5qcwppbmRleCAwNjM4OGVlZTQwZmM0ODZjZTY0NWRkMTk3YTRjY2Y4 ZDU0ODViZmZhLi44YTRhNzVhOGRlZDg1Y2Y3ZmZmYTk3MDE1MGUwNTIxNzgxYjczYWNiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVJlY29y ZC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVJl Y29yZC5qcwpAQCAtMjMsNyArMjMsNyBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgogICovCiAKLVdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZCA9IGZ1bmN0aW9uKHR5cGUs IHN0YXJ0VGltZSwgZW5kVGltZSkKK1dlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZCA9IGZ1bmN0 aW9uKHR5cGUsIHN0YXJ0VGltZSwgZW5kVGltZSwgY2FsbEZyYW1lcywgc291cmNlQ29kZUxvY2F0 aW9uKQogewogICAgIFdlYkluc3BlY3Rvci5PYmplY3QuY2FsbCh0aGlzKTsKIApAQCAtMzUsNiAr MzUsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQgPSBmdW5jdGlvbih0eXBlLCBzdGFy dFRpbWUsIGVuZFRpbWUpCiAgICAgdGhpcy5fdHlwZSA9IHR5cGU7CiAgICAgdGhpcy5fc3RhcnRU aW1lID0gc3RhcnRUaW1lIHx8IE5hTjsKICAgICB0aGlzLl9lbmRUaW1lID0gZW5kVGltZSB8fCBO YU47CisgICAgdGhpcy5fY2FsbEZyYW1lcyA9IGNhbGxGcmFtZXMgfHwgbnVsbDsKKyAgICB0aGlz Ll9zb3VyY2VDb2RlTG9jYXRpb24gPSBzb3VyY2VDb2RlTG9jYXRpb24gfHwgbnVsbDsKIH07CiAK IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5FdmVudCA9IHsKQEAgLTgzLDYgKzg1LDMxIEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAg ICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzIGlmIG5lZWRlZC4KICAgICAgICAgcmV0dXJu IHRoaXMuZHVyYXRpb247CisgICAgfSwKKworICAgIGdldCBjYWxsRnJhbWVzKCkKKyAgICB7Cisg ICAgICAgIHJldHVybiB0aGlzLl9jYWxsRnJhbWVzOworICAgIH0sCisKKyAgICBnZXQgaW5pdGlh dG9yQ2FsbEZyYW1lKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fY2FsbEZyYW1lcyB8fCAh dGhpcy5fY2FsbEZyYW1lcy5sZW5ndGgpCisgICAgICAgICAgICByZXR1cm4gbnVsbDsKKworICAg ICAgICAvLyBSZXR1cm4gdGhlIGZpcnN0IG5vbi1uYXRpdmUgY29kZSBjYWxsIGZyYW1lIGFzIHRo ZSBpbml0aWF0b3IuCisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fY2FsbEZyYW1l cy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgaWYgKHRoaXMuX2NhbGxGcmFtZXNbaV0ubmF0 aXZlQ29kZSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIHJldHVybiB0 aGlzLl9jYWxsRnJhbWVzW2ldOworICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuIG51bGw7Cisg ICAgfSwKKworICAgIGdldCBzb3VyY2VDb2RlTG9jYXRpb24oKQorICAgIHsKKyAgICAgICAgcmV0 dXJuIHRoaXMuX3NvdXJjZUNvZGVMb2NhdGlvbjsKICAgICB9CiB9OwogCg==