33853 2010-01-19 11:35:43 -0800 InspectorTimelineAgent refactor to support reporting data when closing a record 2010-01-19 13:49:45 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 jaimeyap webkit-unassigned commit-queue knorton pfeldman timothy oldest_to_newest 182346 0 jaimeyap 2010-01-19 11:35:43 -0800 This patch (soon to be attached) refactors the TimelineRecordFactory and InspectorTimelineAgent to support reporting data when closing a record. Since ScriptObject has no get method for retrieving fields, eagerly installing a data object on the base record precluded us from adding any fields to it later on. This patch also includes grabbing the start and end line number for parse HTML records as a reference use case for the above refactor. 182354 1 46932 jaimeyap 2010-01-19 11:49:59 -0800 Created attachment 46932 InspectorTimelineAgent refactor to support reporting data when closing a record 182429 2 46932 commit-queue 2010-01-19 13:49:38 -0800 Comment on attachment 46932 InspectorTimelineAgent refactor to support reporting data when closing a record Clearing flags on attachment: 46932 Committed r53488: <http://trac.webkit.org/changeset/53488> 182430 3 commit-queue 2010-01-19 13:49:45 -0800 All reviewed patches have been landed. Closing bug. 46932 2010-01-19 11:49:59 -0800 2010-01-19 13:49:38 -0800 InspectorTimelineAgent refactor to support reporting data when closing a record parsehtml-line-number.patch text/plain 27440 jaimeyap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzQ3OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNTYgQEAKKzIwMTAtMDEtMTkgIEphaW1lIFlhcCAgPGphaW1leWFwQGdvb2dsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAg ICAgICBSZWZhY3RvcnMgdGhlIFRpbWVsaW5lUmVjb3JkRmFjdG9yeSBhbmQgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudCB0byBzdXBwb3J0IHJlcG9ydGluZyBkYXRhCisgICAgICAgIHdoZW4gY2xvc2lu ZyBhIHJlY29yZC4gQWxzbyBpbmNsdWRlcyBncmFiYmluZyB0aGUgc3RhcnQgYW5kIGVuZCBsaW5l IG51bWJlciBmb3IgcGFyc2UgSFRNTAorICAgICAgICByZWNvcmRzIGFzIGEgcmVmZXJlbmNlIHVz ZSBjYXNlIGZvciB0aGUgYWJvdmUgcmVmYWN0b3IKKworICAgICAgICBUZXN0cyB1cGRhdGVkOgor ICAgICAgICAgICAgaW5zcGVjdG9yL3RpbWVsaW5lLXBhcnNlLWh0bWwtZXhwZWN0ZWQudHh0Cisg ICAgICAgICAgICBpbnNwZWN0b3IvdGltZWxpbmUtbGF5b3V0LWV4cGVjdGVkLnR4dAorICAgICAg ICAgICAgaW5zcGVjdG9yL3RpbWVsaW5lLXJlY2FsY3VsYXRlLXN0eWxlcy1leHBlY3RlZC50eHQK KworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM4NTMK KworICAgICAgICAqIGh0bWwvSFRNTFRva2VuaXplci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpI VE1MVG9rZW5pemVyOjp3cml0ZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclRpbWVs aW5lQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6 d2lsbERpc3BhdGNoRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVB Z2VudDo6d2lsbExheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFn ZW50Ojp3aWxsUmVjYWxjdWxhdGVTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JU aW1lbGluZUFnZW50Ojp3aWxsUGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6d2lsbFdyaXRlSFRNTCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpkaWRXcml0ZUhUTUwpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6ZGlkSW5zdGFsbFRpbWVyKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvclRpbWVsaW5lQWdlbnQ6OmRpZFJlbW92ZVRpbWVyKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxGaXJlVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbENoYW5nZVhIUlJlYWR5U3RhdGUpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbExvYWRYSFIpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbEV2YWx1YXRlU2NyaXB0KToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxTZW5kUmVzb3Vy Y2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRp ZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OmRpZEZpbmlzaExvYWRpbmdSZXNvdXJjZSk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRNYXJrVGltZWxpbmUpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnB1c2hDdXJyZW50UmVj b3JkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6VGltZWxpbmVSZWNvcmRFbnRy eTo6VGltZWxpbmVSZWNvcmRFbnRyeSk6CisgICAgICAgICogaW5zcGVjdG9yL1RpbWVsaW5lUmVj b3JkRmFjdG9yeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6 OmNyZWF0ZUV2ZW50RGlzcGF0Y2hEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1RpbWVyRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpU aW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVRpbWVySW5zdGFsbERhdGEpOgorICAgICAgICAo V2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVYSFJSZWFkeVN0YXRlQ2hhbmdl RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhI UkxvYWREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3Jl YXRlRXZhbHVhdGVTY3JpcHREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVsaW5lUmVjb3Jk RmFjdG9yeTo6Y3JlYXRlTWFya1RpbWVsaW5lRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpUaW1l bGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlU2VuZFJlcXVlc3REYXRhKToKKyAgICAg ICAgKFdlYkNvcmU6OlRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VSZWNlaXZl UmVzcG9uc2VEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6 Y3JlYXRlUmVzb3VyY2VGaW5pc2hEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlUGFpbnREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVsaW5l UmVjb3JkRmFjdG9yeTo6Y3JlYXRlUGFyc2VIVE1MRGF0YSk6CisgICAgICAgICogaW5zcGVjdG9y L1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oOgorCiAyMDEwLTAxLTE5ICBFcmljIENhcmxzb24gIDxl cmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4u CkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwCShyZXZpc2lvbiA1MzQ3NikKKysrIFdlYkNvcmUv aHRtbC9IVE1MVG9rZW5pemVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY3Miw3ICsxNjcyLDcg QEAgdm9pZCBIVE1MVG9rZW5pemVyOjp3cml0ZShjb25zdCBTZWdtZW50ZQogCiAjaWYgRU5BQkxF KElOU1BFQ1RPUikKICAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2Vu dCA9IG1fZG9jLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCkpCi0gICAgICAgIHRpbWVsaW5lQWdl bnQtPndpbGxXcml0ZUhUTUwoc291cmNlLmxlbmd0aCgpKTsKKyAgICAgICAgdGltZWxpbmVBZ2Vu dC0+d2lsbFdyaXRlSFRNTChzb3VyY2UubGVuZ3RoKCksIG1fbGluZU51bWJlcik7CiAjZW5kaWYK ICAgCiAgICAgRnJhbWUqIGZyYW1lID0gbV9kb2MtPmZyYW1lKCk7CkBAIC0xNzk4LDcgKzE3OTgs NyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OndyaXRlKGNvbnN0IFNlZ21lbnRlCiAKICNpZiBFTkFC TEUoSU5TUEVDVE9SKQogICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFn ZW50ID0gbV9kb2MtPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkKLSAgICAgICAgdGltZWxpbmVB Z2VudC0+ZGlkV3JpdGVIVE1MKCk7CisgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZFdyaXRlSFRN TChtX2xpbmVOdW1iZXIpOwogI2VuZGlmCiAKICAgICBtX2luV3JpdGUgPSB3YXNJbldyaXRlOwpJ bmRleDogV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAJKHJl dmlzaW9uIDUzNDc2KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU2LDcgKzU2LDcgQEAgSW5zcGVjdG9yVGltZWxpbmVB Z2VudDo6fkluc3BlY3RvclRpbWVsaQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6Ondp bGxEaXNwYXRjaEV2ZW50KGNvbnN0IEV2ZW50JiBldmVudCkKIHsKLSAgICBwdXNoQ3VycmVudFJl Y29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2ZW50RGlzcGF0Y2hSZWNvcmQobV9m cm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpLCBldmVudCksCisgICAgcHVzaEN1 cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmVudERpc3BhdGNoRGF0 YShtX2Zyb250ZW5kLCBldmVudCksCiAgICAgICAgIEV2ZW50RGlzcGF0Y2hUaW1lbGluZVJlY29y ZFR5cGUpOwogfQogCkBAIC02Nyw3ICs2Nyw3IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6ZGlkRGlzcGF0Y2gKIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsTGF5b3V0 KCkKIHsKLSAgICBwdXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0 ZUdlbmVyaWNSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpKSwg TGF5b3V0VGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBwdXNoQ3VycmVudFJlY29yZChtX2Zyb250 ZW5kLT5uZXdTY3JpcHRPYmplY3QoKSwgTGF5b3V0VGltZWxpbmVSZWNvcmRUeXBlKTsKIH0KIAog dm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRMYXlvdXQoKQpAQCAtNzcsNyArNzcsNyBA QCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZExheW91dCgpCiAKIHZvaWQgSW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6d2lsbFJlY2FsY3VsYXRlU3R5bGUoKQogewotICAgIHB1c2hDdXJy ZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChtX2Zy b250ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCkpLCBSZWNhbGN1bGF0ZVN0eWxlc1Rp bWVsaW5lUmVjb3JkVHlwZSk7CisgICAgcHVzaEN1cnJlbnRSZWNvcmQobV9mcm9udGVuZC0+bmV3 U2NyaXB0T2JqZWN0KCksIFJlY2FsY3VsYXRlU3R5bGVzVGltZWxpbmVSZWNvcmRUeXBlKTsKIH0K IAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRSZWNhbGN1bGF0ZVN0eWxlKCkKQEAg LTg3LDggKzg3LDcgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRSZWNhbGN1bAog CiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxQYWludChjb25zdCBJbnRSZWN0JiBy ZWN0KQogewotICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3Jl YXRlUGFpbnRSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpLCBy ZWN0KSwKLSAgICAgICAgUGFpbnRUaW1lbGluZVJlY29yZFR5cGUpOworICAgIHB1c2hDdXJyZW50 UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUGFpbnREYXRhKG1fZnJvbnRlbmQs IHJlY3QpLCBQYWludFRpbWVsaW5lUmVjb3JkVHlwZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6ZGlkUGFpbnQoKQpAQCAtOTYsMzIgKzk1LDM3IEBAIHZvaWQgSW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6ZGlkUGFpbnQoKQogICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChQ YWludFRpbWVsaW5lUmVjb3JkVHlwZSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6d2lsbFdyaXRlSFRNTCh1bnNpZ25lZCBsZW5ndGgpCit2b2lkIEluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OndpbGxXcml0ZUhUTUwodW5zaWduZWQgaW50IGxlbmd0aCwgdW5zaWduZWQgaW50IHN0 YXJ0TGluZSkKIHsKLSAgICBwdXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6 OmNyZWF0ZVBhcnNlSFRNTFJlY29yZChtX2Zyb250ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNv bmRzKCksIGxlbmd0aCksIFBhcnNlSFRNTFRpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAgcHVzaEN1 cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVQYXJzZUhUTUxEYXRhKG1f ZnJvbnRlbmQsIGxlbmd0aCwgc3RhcnRMaW5lKSwgUGFyc2VIVE1MVGltZWxpbmVSZWNvcmRUeXBl KTsKIH0KIAotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRXcml0ZUhUTUwoKQordm9p ZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRXcml0ZUhUTUwodW5zaWduZWQgaW50IGVuZExp bmUpCiB7Ci0gICAgZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKFBhcnNlSFRNTFRpbWVsaW5lUmVj b3JkVHlwZSk7CisgICAgaWYgKCFtX3JlY29yZFN0YWNrLmlzRW1wdHkoKSkgeworICAgICAgICBU aW1lbGluZVJlY29yZEVudHJ5IGVudHJ5ID0gbV9yZWNvcmRTdGFjay5sYXN0KCk7CisgICAgICAg IGVudHJ5LmRhdGEuc2V0KCJlbmRMaW5lIiwgZW5kTGluZSk7CisgICAgICAgIGRpZENvbXBsZXRl Q3VycmVudFJlY29yZChQYXJzZUhUTUxUaW1lbGluZVJlY29yZFR5cGUpOworICAgIH0KIH0KICAg IAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRJbnN0YWxsVGltZXIoaW50IHRpbWVy SWQsIGludCB0aW1lb3V0LCBib29sIHNpbmdsZVNob3QpCiB7Ci0gICAgYWRkUmVjb3JkVG9UaW1l bGluZShUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVRpbWVySW5zdGFsbFJlY29yZChtX2Zy b250ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCksIHRpbWVySWQsCi0gICAgICAgIHRp bWVvdXQsIHNpbmdsZVNob3QpLCBUaW1lckluc3RhbGxUaW1lbGluZVJlY29yZFR5cGUpOworICAg IFNjcmlwdE9iamVjdCByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdlbmVy aWNSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpKTsKKyAgICBy ZWNvcmQuc2V0KCJkYXRhIiwgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVUaW1lckluc3Rh bGxEYXRhKG1fZnJvbnRlbmQsIHRpbWVySWQsIHRpbWVvdXQsIHNpbmdsZVNob3QpKTsKKyAgICBh ZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29yZCwgVGltZXJJbnN0YWxsVGltZWxpbmVSZWNvcmRUeXBl KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRSZW1vdmVUaW1lcihpbnQg dGltZXJJZCkKIHsKLSAgICBhZGRSZWNvcmRUb1RpbWVsaW5lKFRpbWVsaW5lUmVjb3JkRmFjdG9y eTo6Y3JlYXRlR2VuZXJpY1RpbWVyUmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxs aXNlY29uZHMoKSwgdGltZXJJZCksCi0gICAgICAgIFRpbWVyUmVtb3ZlVGltZWxpbmVSZWNvcmRU eXBlKTsKKyAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5Ojpj cmVhdGVHZW5lcmljUmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMo KSk7CisgICAgcmVjb3JkLnNldCgiZGF0YSIsIFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRl R2VuZXJpY1RpbWVyRGF0YShtX2Zyb250ZW5kLCB0aW1lcklkKSk7CisgICAgYWRkUmVjb3JkVG9U aW1lbGluZShyZWNvcmQsIFRpbWVyUmVtb3ZlVGltZWxpbmVSZWNvcmRUeXBlKTsKIH0KIAogdm9p ZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsRmlyZVRpbWVyKGludCB0aW1lcklkKQogewot ICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJp Y1RpbWVyUmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSwgdGlt ZXJJZCksCi0gICAgICAgIFRpbWVyRmlyZVRpbWVsaW5lUmVjb3JkVHlwZSk7IAorICAgIHB1c2hD dXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1RpbWVyRGF0 YShtX2Zyb250ZW5kLCB0aW1lcklkKSwgVGltZXJGaXJlVGltZWxpbmVSZWNvcmRUeXBlKTsgCiB9 CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkRmlyZVRpbWVyKCkKQEAgLTEzMSw4 ICsxMzUsNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZEZpcmVUaW1lCiAKIHZv aWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbENoYW5nZVhIUlJlYWR5U3RhdGUoY29uc3Qg U3RyaW5nJiB1cmwsIGludCByZWFkeVN0YXRlKQogewotICAgIHB1c2hDdXJyZW50UmVjb3JkKFRp bWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlWEhSUmVhZHlTdGF0ZUNoYW5nZVJlY29yZChtX2Zy b250ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCksIHVybCwgcmVhZHlTdGF0ZSksCi0g ICAgICAgIFhIUlJlYWR5U3RhdGVDaGFuZ2VSZWNvcmRUeXBlKTsKKyAgICBwdXNoQ3VycmVudFJl Y29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhIUlJlYWR5U3RhdGVDaGFuZ2VEYXRh KG1fZnJvbnRlbmQsIHVybCwgcmVhZHlTdGF0ZSksIFhIUlJlYWR5U3RhdGVDaGFuZ2VSZWNvcmRU eXBlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDaGFuZ2VYSFJSZWFk eVN0YXRlKCkKQEAgLTE0Miw3ICsxNDUsNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6 OmRpZENoYW5nZVhICiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbExvYWRYSFIo Y29uc3QgU3RyaW5nJiB1cmwpIAogewotICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlWEhSTG9hZFJlY29yZChtX2Zyb250ZW5kLCBjdXJyZW50VGltZUlu TWlsbGlzZWNvbmRzKCksIHVybCksIFhIUkxvYWRSZWNvcmRUeXBlKTsKKyAgICBwdXNoQ3VycmVu dFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhIUkxvYWREYXRhKG1fZnJvbnRl bmQsIHVybCksIFhIUkxvYWRSZWNvcmRUeXBlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpkaWRMb2FkWEhSKCkKQEAgLTE1Miw3ICsxNTUsNyBAQCB2b2lkIEluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OmRpZExvYWRYSFIoCiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6 d2lsbEV2YWx1YXRlU2NyaXB0KGNvbnN0IFN0cmluZyYgdXJsLCBpbnQgbGluZU51bWJlcikKIHsK LSAgICBwdXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2YWx1 YXRlU2NyaXB0UmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSwg dXJsLCBsaW5lTnVtYmVyKSwgRXZhbHVhdGVTY3JpcHRUaW1lbGluZVJlY29yZFR5cGUpOworICAg IHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRXZhbHVhdGVT Y3JpcHREYXRhKG1fZnJvbnRlbmQsIHVybCwgbGluZU51bWJlciksIEV2YWx1YXRlU2NyaXB0VGlt ZWxpbmVSZWNvcmRUeXBlKTsKIH0KICAgICAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6 ZGlkRXZhbHVhdGVTY3JpcHQoKQpAQCAtMTYzLDMxICsxNjYsMzMgQEAgdm9pZCBJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpkaWRFdmFsdWF0ZQogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3 aWxsU2VuZFJlc291cmNlUmVxdWVzdCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGJvb2wgaXNN YWluUmVzb3VyY2UsCiAgICAgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogewotICAg IFNjcmlwdE9iamVjdCByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291 cmNlU2VuZFJlcXVlc3RSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25k cygpLAotICAgICAgICBpZGVudGlmaWVyLCBpc01haW5SZXNvdXJjZSwgcmVxdWVzdCk7CisgICAg U2NyaXB0T2JqZWN0IHJlY29yZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJp Y1JlY29yZChtX2Zyb250ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCkpOworICAgIHJl Y29yZC5zZXQoImRhdGEiLCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlU2Vu ZFJlcXVlc3REYXRhKG1fZnJvbnRlbmQsIGlkZW50aWZpZXIsIGlzTWFpblJlc291cmNlLCByZXF1 ZXN0KSk7CiAgICAgcmVjb3JkLnNldCgidHlwZSIsIFJlc291cmNlU2VuZFJlcXVlc3RUaW1lbGlu ZVJlY29yZFR5cGUpOwogICAgIG1fZnJvbnRlbmQtPmFkZFJlY29yZFRvVGltZWxpbmUocmVjb3Jk KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRSZWNlaXZlUmVzb3VyY2VS ZXNwb25zZSh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2Um IHJlc3BvbnNlKQogewotICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZVJlc291cmNlUmVjZWl2ZVJlc3BvbnNlUmVjb3JkKG1fZnJvbnRlbmQsIGN1 cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSwKLSAgICAgICAgaWRlbnRpZmllciwgcmVzcG9uc2Up OworICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0 ZUdlbmVyaWNSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpKTsK KyAgICByZWNvcmQuc2V0KCJkYXRhIiwgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNv dXJjZVJlY2VpdmVSZXNwb25zZURhdGEobV9mcm9udGVuZCwgaWRlbnRpZmllciwgcmVzcG9uc2Up KTsKICAgICByZWNvcmQuc2V0KCJ0eXBlIiwgUmVzb3VyY2VSZWNlaXZlUmVzcG9uc2VUaW1lbGlu ZVJlY29yZFR5cGUpOwogICAgIG1fZnJvbnRlbmQtPmFkZFJlY29yZFRvVGltZWxpbmUocmVjb3Jk KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRGaW5pc2hMb2FkaW5nUmVz b3VyY2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBib29sIGRpZEZhaWwpCiB7Ci0gICAgU2Ny aXB0T2JqZWN0IHJlY29yZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VG aW5pc2hSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpLAotICAg ICAgICBpZGVudGlmaWVyLCBkaWRGYWlsKTsKKyAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0gVGlt ZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJl bnRUaW1lSW5NaWxsaXNlY29uZHMoKSk7CisgICAgcmVjb3JkLnNldCgiZGF0YSIsIFRpbWVsaW5l UmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VGaW5pc2hEYXRhKG1fZnJvbnRlbmQsIGlkZW50 aWZpZXIsIGRpZEZhaWwpKTsKICAgICByZWNvcmQuc2V0KCJ0eXBlIiwgUmVzb3VyY2VGaW5pc2hU aW1lbGluZVJlY29yZFR5cGUpOwogICAgIG1fZnJvbnRlbmQtPmFkZFJlY29yZFRvVGltZWxpbmUo cmVjb3JkKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRNYXJrVGltZWxp bmUoY29uc3QgU3RyaW5nJiBtZXNzYWdlKQogewotICAgIGFkZFJlY29yZFRvVGltZWxpbmUoVGlt ZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVNYXJrVGltZWxpbmVSZWNvcmQobV9mcm9udGVuZCwg Y3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpLCBtZXNzYWdlKSwgTWFya1RpbWVsaW5lUmVjb3Jk VHlwZSk7CisgICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6 Y3JlYXRlR2VuZXJpY1JlY29yZChtX2Zyb250ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRz KCkpOworICAgIHJlY29yZC5zZXQoImRhdGEiLCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0 ZU1hcmtUaW1lbGluZURhdGEobV9mcm9udGVuZCwgbWVzc2FnZSkpOworICAgIGFkZFJlY29yZFRv VGltZWxpbmUocmVjb3JkLCBNYXJrVGltZWxpbmVSZWNvcmRUeXBlKTsKIH0KIAogdm9pZCBJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpyZXNldCgpCkBAIC0yMjEsNiArMjI2LDcgQEAgdm9pZCBJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDb21wbGV0ZQogICAgICAgICBUaW1lbGluZVJlY29yZEVu dHJ5IGVudHJ5ID0gbV9yZWNvcmRTdGFjay5sYXN0KCk7CiAgICAgICAgIG1fcmVjb3JkU3RhY2su cmVtb3ZlTGFzdCgpOwogICAgICAgICBBU1NFUlQoZW50cnkudHlwZSA9PSB0eXBlKTsKKyAgICAg ICAgZW50cnkucmVjb3JkLnNldCgiZGF0YSIsIGVudHJ5LmRhdGEpOwogICAgICAgICBlbnRyeS5y ZWNvcmQuc2V0KCJjaGlsZHJlbiIsIGVudHJ5LmNoaWxkcmVuKTsKICAgICAgICAgZW50cnkucmVj b3JkLnNldCgiZW5kVGltZSIsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSk7CiAgICAgICAg IGFkZFJlY29yZFRvVGltZWxpbmUoZW50cnkucmVjb3JkLCB0eXBlKTsKQEAgLTIzMiw5ICsyMzgs OSBAQCBkb3VibGUgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6Y3VycmVudFRpCiAgICAgcmV0dXJu IGN1cnJlbnRUaW1lKCkgKiAxMDAwLjA7CiB9CiAKLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6cHVzaEN1cnJlbnRSZWNvcmQoU2NyaXB0T2JqZWN0IHJlY29yZCwgVGltZWxpbmVSZWNvcmRU eXBlIHR5cGUpCit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnB1c2hDdXJyZW50UmVjb3Jk KFNjcmlwdE9iamVjdCBkYXRhLCBUaW1lbGluZVJlY29yZFR5cGUgdHlwZSkKIHsKLSAgICBtX3Jl Y29yZFN0YWNrLmFwcGVuZChUaW1lbGluZVJlY29yZEVudHJ5KHJlY29yZCwgbV9mcm9udGVuZC0+ bmV3U2NyaXB0QXJyYXkoKSwgdHlwZSkpOworICAgIG1fcmVjb3JkU3RhY2suYXBwZW5kKFRpbWVs aW5lUmVjb3JkRW50cnkoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3Jk KG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSksIGRhdGEsIG1fZnJvbnRl bmQtPm5ld1NjcmlwdEFycmF5KCksIHR5cGUpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaAkocmV2 aXNpb24gNTM0NzYpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50 LmgJKHdvcmtpbmcgY29weSkKQEAgLTg2LDggKzg2LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgICAgICB2b2lkIHdpbGxQYWludChjb25zdCBJbnRSZWN0Jik7CiAgICAgICAgIHZvaWQgZGlk UGFpbnQoKTsKIAotICAgICAgICB2b2lkIHdpbGxXcml0ZUhUTUwodW5zaWduZWQgbGVuZ3RoKTsK LSAgICAgICAgdm9pZCBkaWRXcml0ZUhUTUwoKTsKKyAgICAgICAgdm9pZCB3aWxsV3JpdGVIVE1M KHVuc2lnbmVkIGludCBsZW5ndGgsIHVuc2lnbmVkIGludCBzdGFydExpbmUpOworICAgICAgICB2 b2lkIGRpZFdyaXRlSFRNTCh1bnNpZ25lZCBpbnQgZW5kTGluZSk7CiAgICAgICAgIAogICAgICAg ICB2b2lkIGRpZEluc3RhbGxUaW1lcihpbnQgdGltZXJJZCwgaW50IHRpbWVvdXQsIGJvb2wgc2lu Z2xlU2hvdCk7CiAgICAgICAgIHZvaWQgZGlkUmVtb3ZlVGltZXIoaW50IHRpbWVySWQpOwpAQCAt MTExLDggKzExMSw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgc3RhdGljIEluc3Bl Y3RvclRpbWVsaW5lQWdlbnQqIHJldHJpZXZlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqKTsKICAg ICBwcml2YXRlOgogICAgICAgICBzdHJ1Y3QgVGltZWxpbmVSZWNvcmRFbnRyeSB7Ci0gICAgICAg ICAgICBUaW1lbGluZVJlY29yZEVudHJ5KFNjcmlwdE9iamVjdCByZWNvcmQsIFNjcmlwdEFycmF5 IGNoaWxkcmVuLCBUaW1lbGluZVJlY29yZFR5cGUgdHlwZSkgOiByZWNvcmQocmVjb3JkKSwgY2hp bGRyZW4oY2hpbGRyZW4pLCB0eXBlKHR5cGUpIHsgfQorICAgICAgICAgICAgVGltZWxpbmVSZWNv cmRFbnRyeShTY3JpcHRPYmplY3QgcmVjb3JkLCBTY3JpcHRPYmplY3QgZGF0YSwgU2NyaXB0QXJy YXkgY2hpbGRyZW4sIFRpbWVsaW5lUmVjb3JkVHlwZSB0eXBlKSA6IHJlY29yZChyZWNvcmQpLCBk YXRhKGRhdGEpLCBjaGlsZHJlbihjaGlsZHJlbiksIHR5cGUodHlwZSkgeyB9CiAgICAgICAgICAg ICBTY3JpcHRPYmplY3QgcmVjb3JkOworICAgICAgICAgICAgU2NyaXB0T2JqZWN0IGRhdGE7CiAg ICAgICAgICAgICBTY3JpcHRBcnJheSBjaGlsZHJlbjsKICAgICAgICAgICAgIFRpbWVsaW5lUmVj b3JkVHlwZSB0eXBlOwogICAgICAgICB9OwpAQCAtMTIyLDcgKzEyMyw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgc3RhdGljIGRvdWJsZSBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRz KCk7CiAKICAgICAgICAgdm9pZCBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNv cmRUeXBlKTsKLSAgICAgICAgCisKICAgICAgICAgdm9pZCBhZGRSZWNvcmRUb1RpbWVsaW5lKFNj cmlwdE9iamVjdCwgVGltZWxpbmVSZWNvcmRUeXBlKTsKIAogICAgICAgICBJbnNwZWN0b3JGcm9u dGVuZCogbV9mcm9udGVuZDsKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3Jk RmFjdG9yeS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNv cmRGYWN0b3J5LmNwcAkocmV2aXNpb24gNTM0NzYpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9UaW1l bGluZVJlY29yZEZhY3RvcnkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MCwxMzAgKzUwLDEwNCBA QCBTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhCiAgICAgcmV0dXJuIHJl Y29yZDsKIH0KIAotU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRXZl bnREaXNwYXRjaFJlY29yZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFy dFRpbWUsIGNvbnN0IEV2ZW50JiBldmVudCkKK1NjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZUV2ZW50RGlzcGF0Y2hEYXRhKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVu ZCwgY29uc3QgRXZlbnQmIGV2ZW50KQogewotICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBjcmVh dGVHZW5lcmljUmVjb3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOwogICAgIFNjcmlwdE9iamVjdCBk YXRhID0gZnJvbnRlbmQtPm5ld1NjcmlwdE9iamVjdCgpOwogICAgIGRhdGEuc2V0KCJ0eXBlIiwg ZXZlbnQudHlwZSgpLnN0cmluZygpKTsKLSAgICByZWNvcmQuc2V0KCJkYXRhIiwgZGF0YSk7Ci0g ICAgcmV0dXJuIHJlY29yZDsKKyAgICByZXR1cm4gZGF0YTsKIH0KIAotU2NyaXB0T2JqZWN0IFRp bWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1RpbWVyUmVjb3JkKEluc3BlY3RvckZy b250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSwgaW50IHRpbWVySWQpCitTY3JpcHRP YmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljVGltZXJEYXRhKEluc3Bl Y3RvckZyb250ZW5kKiBmcm9udGVuZCwgaW50IHRpbWVySWQpCiB7Ci0gICAgU2NyaXB0T2JqZWN0 IHJlY29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0YXJ0VGltZSk7CiAgICAg U2NyaXB0T2JqZWN0IGRhdGEgPSBmcm9udGVuZC0+bmV3U2NyaXB0T2JqZWN0KCk7CiAgICAgZGF0 YS5zZXQoInRpbWVySWQiLCB0aW1lcklkKTsKLSAgICByZWNvcmQuc2V0KCJkYXRhIiwgZGF0YSk7 Ci0gICAgcmV0dXJuIHJlY29yZDsKKyAgICByZXR1cm4gZGF0YTsKIH0KIAotU2NyaXB0T2JqZWN0 IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlVGltZXJJbnN0YWxsUmVjb3JkKEluc3BlY3Rv ckZyb250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSwgaW50IHRpbWVySWQsIGludCB0 aW1lb3V0LCBib29sIHNpbmdsZVNob3QpCitTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0 b3J5OjpjcmVhdGVUaW1lckluc3RhbGxEYXRhKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwg aW50IHRpbWVySWQsIGludCB0aW1lb3V0LCBib29sIHNpbmdsZVNob3QpCiB7Ci0gICAgU2NyaXB0 T2JqZWN0IHJlY29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0YXJ0VGltZSk7 CiAgICAgU2NyaXB0T2JqZWN0IGRhdGEgPSBmcm9udGVuZC0+bmV3U2NyaXB0T2JqZWN0KCk7CiAg ICAgZGF0YS5zZXQoInRpbWVySWQiLCB0aW1lcklkKTsKICAgICBkYXRhLnNldCgidGltZW91dCIs IHRpbWVvdXQpOwogICAgIGRhdGEuc2V0KCJzaW5nbGVTaG90Iiwgc2luZ2xlU2hvdCk7Ci0gICAg cmVjb3JkLnNldCgiZGF0YSIsIGRhdGEpOwotICAgIHJldHVybiByZWNvcmQ7CisgICAgcmV0dXJu IGRhdGE7CiB9CiAKLVNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhI UlJlYWR5U3RhdGVDaGFuZ2VSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3Vi bGUgc3RhcnRUaW1lLCBjb25zdCBTdHJpbmcmIHVybCwgaW50IHJlYWR5U3RhdGUpCitTY3JpcHRP YmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVYSFJSZWFkeVN0YXRlQ2hhbmdlRGF0 YShJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGNvbnN0IFN0cmluZyYgdXJsLCBpbnQgcmVh ZHlTdGF0ZSkKIHsKLSAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0gY3JlYXRlR2VuZXJpY1JlY29y ZChmcm9udGVuZCwgc3RhcnRUaW1lKTsKICAgICBTY3JpcHRPYmplY3QgZGF0YSA9IGZyb250ZW5k LT5uZXdTY3JpcHRPYmplY3QoKTsKICAgICBkYXRhLnNldCgidXJsIiwgdXJsKTsKICAgICBkYXRh LnNldCgicmVhZHlTdGF0ZSIsIHJlYWR5U3RhdGUpOwotICAgIHJlY29yZC5zZXQoImRhdGEiLCBk YXRhKTsKLSAgICByZXR1cm4gcmVjb3JkOworICAgIHJldHVybiBkYXRhOwogfQogCi1TY3JpcHRP YmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVYSFJMb2FkUmVjb3JkKEluc3BlY3Rv ckZyb250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgU3RyaW5nJiB1cmwp CitTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVYSFJMb2FkRGF0YShJ bnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGNvbnN0IFN0cmluZyYgdXJsKQogewotICAgIFNj cmlwdE9iamVjdCByZWNvcmQgPSBjcmVhdGVHZW5lcmljUmVjb3JkKGZyb250ZW5kLCBzdGFydFRp bWUpOwogICAgIFNjcmlwdE9iamVjdCBkYXRhID0gZnJvbnRlbmQtPm5ld1NjcmlwdE9iamVjdCgp OwogICAgIGRhdGEuc2V0KCJ1cmwiLCB1cmwpOwotICAgIHJlY29yZC5zZXQoImRhdGEiLCBkYXRh KTsKLSAgICByZXR1cm4gcmVjb3JkOworICAgIHJldHVybiBkYXRhOwogfQogCi1TY3JpcHRPYmpl Y3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdFJlY29yZChJbnNw ZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0IFN0cmluZyYg dXJsLCBkb3VibGUgbGluZU51bWJlcikgCitTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0 b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdERhdGEoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5k LCBjb25zdCBTdHJpbmcmIHVybCwgZG91YmxlIGxpbmVOdW1iZXIpIAogewotICAgIFNjcmlwdE9i amVjdCByZWNvcmQgPSBjcmVhdGVHZW5lcmljUmVjb3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOwog ICAgIFNjcmlwdE9iamVjdCBkYXRhID0gZnJvbnRlbmQtPm5ld1NjcmlwdE9iamVjdCgpOwogICAg IGRhdGEuc2V0KCJ1cmwiLCB1cmwpOwogICAgIGRhdGEuc2V0KCJsaW5lTnVtYmVyIiwgbGluZU51 bWJlcik7Ci0gICAgcmVjb3JkLnNldCgiZGF0YSIsIGRhdGEpOwotICAgIHJldHVybiByZWNvcmQ7 CisgICAgcmV0dXJuIGRhdGE7CiB9CiAKLVNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rv cnk6OmNyZWF0ZU1hcmtUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQs IGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSkgCitTY3JpcHRPYmplY3Qg VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVNYXJrVGltZWxpbmVEYXRhKEluc3BlY3RvckZy b250ZW5kKiBmcm9udGVuZCwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKSAKIHsKLSAgICBTY3JpcHRP YmplY3QgcmVjb3JkID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRUaW1lKTsK ICAgICBTY3JpcHRPYmplY3QgZGF0YSA9IGZyb250ZW5kLT5uZXdTY3JpcHRPYmplY3QoKTsKICAg ICBkYXRhLnNldCgibWVzc2FnZSIsIG1lc3NhZ2UpOwotICAgIHJlY29yZC5zZXQoImRhdGEiLCBk YXRhKTsKLSAgICByZXR1cm4gcmVjb3JkOworICAgIHJldHVybiBkYXRhOwogfQogCiAKLVNjcmlw dE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlU2VuZFJlcXVlc3RS ZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUgc3RhcnRUaW1lLAotICAg IHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgYm9vbCBpc01haW5SZXNvdXJjZSwgY29uc3QgUmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQorU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9y eTo6Y3JlYXRlUmVzb3VyY2VTZW5kUmVxdWVzdERhdGEoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250 ZW5kLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGJvb2wgaXNNYWluUmVzb3VyY2UsIGNvbnN0 IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKLSAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0g Y3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRUaW1lKTsKICAgICBTY3JpcHRPYmpl Y3QgZGF0YSA9IGZyb250ZW5kLT5uZXdTY3JpcHRPYmplY3QoKTsKICAgICBkYXRhLnNldCgiaWRl bnRpZmllciIsIGlkZW50aWZpZXIpOwogICAgIGRhdGEuc2V0KCJ1cmwiLCByZXF1ZXN0LnVybCgp LnN0cmluZygpKTsKICAgICBkYXRhLnNldCgicmVxdWVzdE1ldGhvZCIsIHJlcXVlc3QuaHR0cE1l dGhvZCgpKTsKICAgICBkYXRhLnNldCgiaXNNYWluUmVzb3VyY2UiLCBpc01haW5SZXNvdXJjZSk7 Ci0gICAgcmVjb3JkLnNldCgiZGF0YSIsIGRhdGEpOwotICAgIHJldHVybiByZWNvcmQ7CisgICAg cmV0dXJuIGRhdGE7CiB9CiAKLVNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNy ZWF0ZVJlc291cmNlUmVjZWl2ZVJlc3BvbnNlUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9u dGVuZCwgZG91YmxlIHN0YXJ0VGltZSwKLSAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNv bnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQorU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VSZWNlaXZlUmVzcG9uc2VEYXRhKEluc3BlY3RvckZy b250ZW5kKiBmcm9udGVuZCwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKLSAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0gY3JlYXRl R2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRUaW1lKTsKICAgICBTY3JpcHRPYmplY3QgZGF0 YSA9IGZyb250ZW5kLT5uZXdTY3JpcHRPYmplY3QoKTsKICAgICBkYXRhLnNldCgiaWRlbnRpZmll ciIsIGlkZW50aWZpZXIpOwogICAgIGRhdGEuc2V0KCJzdGF0dXNDb2RlIiwgcmVzcG9uc2UuaHR0 cFN0YXR1c0NvZGUoKSk7CiAgICAgZGF0YS5zZXQoIm1pbWVUeXBlIiwgcmVzcG9uc2UubWltZVR5 cGUoKSk7CiAgICAgZGF0YS5zZXQoImV4cGVjdGVkQ29udGVudExlbmd0aCIsIHJlc3BvbnNlLmV4 cGVjdGVkQ29udGVudExlbmd0aCgpKTsKLSAgICByZWNvcmQuc2V0KCJkYXRhIiwgZGF0YSk7Ci0g ICAgcmV0dXJuIHJlY29yZDsKKyAgICByZXR1cm4gZGF0YTsKIH0KIAotU2NyaXB0T2JqZWN0IFRp bWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VGaW5pc2hSZWNvcmQoSW5zcGVjdG9y RnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUgc3RhcnRUaW1lLAotICAgIHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgYm9vbCBkaWRGYWlsKQorU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFj dG9yeTo6Y3JlYXRlUmVzb3VyY2VGaW5pc2hEYXRhKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVu ZCwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBib29sIGRpZEZhaWwpCiB7Ci0gICAgU2NyaXB0 T2JqZWN0IHJlY29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0YXJ0VGltZSk7 CiAgICAgU2NyaXB0T2JqZWN0IGRhdGEgPSBmcm9udGVuZC0+bmV3U2NyaXB0T2JqZWN0KCk7CiAg ICAgZGF0YS5zZXQoImlkZW50aWZpZXIiLCBpZGVudGlmaWVyKTsKICAgICBkYXRhLnNldCgiZGlk RmFpbCIsIGRpZEZhaWwpOwotICAgIHJlY29yZC5zZXQoImRhdGEiLCBkYXRhKTsKLSAgICByZXR1 cm4gcmVjb3JkOworICAgIHJldHVybiBkYXRhOwogfQogCi1TY3JpcHRPYmplY3QgVGltZWxpbmVS ZWNvcmRGYWN0b3J5OjpjcmVhdGVQYWludFJlY29yZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRl bmQsIGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0IEludFJlY3QmIHJlY3QpCitTY3JpcHRPYmplY3Qg VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVQYWludERhdGEoSW5zcGVjdG9yRnJvbnRlbmQq IGZyb250ZW5kLCBjb25zdCBJbnRSZWN0JiByZWN0KQogewotICAgIFNjcmlwdE9iamVjdCByZWNv cmQgPSBjcmVhdGVHZW5lcmljUmVjb3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOwogICAgIFNjcmlw dE9iamVjdCBkYXRhID0gZnJvbnRlbmQtPm5ld1NjcmlwdE9iamVjdCgpOwogICAgIGRhdGEuc2V0 KCJ4IiwgcmVjdC54KCkpOwogICAgIGRhdGEuc2V0KCJ5IiwgcmVjdC55KCkpOwogICAgIGRhdGEu c2V0KCJ3aWR0aCIsIHJlY3Qud2lkdGgoKSk7CiAgICAgZGF0YS5zZXQoImhlaWdodCIsIHJlY3Qu aGVpZ2h0KCkpOwotICAgIHJlY29yZC5zZXQoImRhdGEiLCBkYXRhKTsKLSAgICByZXR1cm4gcmVj b3JkOworICAgIHJldHVybiBkYXRhOwogfQogCi1TY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRG YWN0b3J5OjpjcmVhdGVQYXJzZUhUTUxSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5k LCBkb3VibGUgc3RhcnRUaW1lLCB1bnNpZ25lZCBsZW5ndGgpCitTY3JpcHRPYmplY3QgVGltZWxp bmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVQYXJzZUhUTUxEYXRhKEluc3BlY3RvckZyb250ZW5kKiBm cm9udGVuZCwgdW5zaWduZWQgaW50IGxlbmd0aCwgdW5zaWduZWQgaW50IHN0YXJ0TGluZSkKIHsK LSAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwg c3RhcnRUaW1lKTsKICAgICBTY3JpcHRPYmplY3QgZGF0YSA9IGZyb250ZW5kLT5uZXdTY3JpcHRP YmplY3QoKTsKICAgICBkYXRhLnNldCgibGVuZ3RoIiwgbGVuZ3RoKTsKLSAgICByZWNvcmQuc2V0 KCJkYXRhIiwgZGF0YSk7Ci0gICAgcmV0dXJuIHJlY29yZDsKKyAgICBkYXRhLnNldCgic3RhcnRM aW5lIiwgc3RhcnRMaW5lKTsKKyAgICByZXR1cm4gZGF0YTsKIH0KIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgJ KHJldmlzaW9uIDUzNDc2KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0 b3J5LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDI5ICs0NiwzMCBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgcHVibGljOgogICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZUdlbmVy aWNSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBkb3VibGUgc3RhcnRUaW1lKTsKIAotICAgICAg ICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZUV2ZW50RGlzcGF0Y2hSZWNvcmQoSW5zcGVjdG9y RnJvbnRlbmQqLCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBFdmVudCYpOworICAgICAgICBzdGF0 aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZUV2ZW50RGlzcGF0Y2hEYXRhKEluc3BlY3RvckZyb250ZW5k KiwgY29uc3QgRXZlbnQmKTsKIAotICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZUdl bmVyaWNUaW1lclJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUsIGlu dCB0aW1lcklkKTsKKyAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVHZW5lcmljVGlt ZXJEYXRhKEluc3BlY3RvckZyb250ZW5kKiwgaW50IHRpbWVySWQpOwogCi0gICAgICAgIHN0YXRp YyBTY3JpcHRPYmplY3QgY3JlYXRlVGltZXJJbnN0YWxsUmVjb3JkKEluc3BlY3RvckZyb250ZW5k KiwgZG91YmxlIHN0YXJ0VGltZSwgaW50IHRpbWVySWQsIGludCB0aW1lb3V0LCBib29sIHNpbmds ZVNob3QpOworICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVRpbWVySW5zdGFsbERh dGEoSW5zcGVjdG9yRnJvbnRlbmQqLCBpbnQgdGltZXJJZCwgaW50IHRpbWVvdXQsIGJvb2wgc2lu Z2xlU2hvdCk7CiAKLSAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVYSFJSZWFkeVN0 YXRlQ2hhbmdlUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwgY29u c3QgU3RyaW5nJiB1cmwsIGludCByZWFkeVN0YXRlKTsKLSAgICAgICAgc3RhdGljIFNjcmlwdE9i amVjdCBjcmVhdGVYSFJMb2FkUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0 VGltZSwgY29uc3QgU3RyaW5nJiB1cmwpOworICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNy ZWF0ZVhIUlJlYWR5U3RhdGVDaGFuZ2VEYXRhKEluc3BlY3RvckZyb250ZW5kKiwgY29uc3QgU3Ry aW5nJiB1cmwsIGludCByZWFkeVN0YXRlKTsKKworICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0 IGNyZWF0ZVhIUkxvYWREYXRhKEluc3BlY3RvckZyb250ZW5kKiwgY29uc3QgU3RyaW5nJiB1cmwp OwogICAgICAgICAKLSAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVFdmFsdWF0ZVNj cmlwdFJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0IFN0 cmluZyYsIGRvdWJsZSBsaW5lTnVtYmVyKTsKKyAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBj cmVhdGVFdmFsdWF0ZVNjcmlwdERhdGEoSW5zcGVjdG9yRnJvbnRlbmQqLCBjb25zdCBTdHJpbmcm LCBkb3VibGUgbGluZU51bWJlcik7CiAgICAgICAgIAotICAgICAgICBzdGF0aWMgU2NyaXB0T2Jq ZWN0IGNyZWF0ZU1hcmtUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBz dGFydFRpbWUsIGNvbnN0IFN0cmluZyYpOworICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNy ZWF0ZU1hcmtUaW1lbGluZURhdGEoSW5zcGVjdG9yRnJvbnRlbmQqLCBjb25zdCBTdHJpbmcmKTsK KworICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVJlc291cmNlU2VuZFJlcXVlc3RE YXRhKEluc3BlY3RvckZyb250ZW5kKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLAorICAgICAg ICAgICAgYm9vbCBpc01haW5SZXNvdXJjZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7CisKKyAg ICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVSZXNvdXJjZVJlY2VpdmVSZXNwb25zZURh dGEoSW5zcGVjdG9yRnJvbnRlbmQqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJl c291cmNlUmVzcG9uc2UmKTsKIAotICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVJl c291cmNlU2VuZFJlcXVlc3RSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBkb3VibGUgc3RhcnRU aW1lLAotICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBib29sIGlzTWFpblJl c291cmNlLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKLSAgICAgICAgc3RhdGljIFNjcmlwdE9i amVjdCBjcmVhdGVSZXNvdXJjZVJlY2VpdmVSZXNwb25zZVJlY29yZChJbnNwZWN0b3JGcm9udGVu ZCosIGRvdWJsZSBzdGFydFRpbWUsCi0gICAgICAgICAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZp ZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKLSAgICAgICAgc3RhdGljIFNjcmlwdE9iamVj dCBjcmVhdGVSZXNvdXJjZUZpbmlzaFJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBz dGFydFRpbWUsCi0gICAgICAgICAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGJvb2wgZGlk RmFpbCk7CisgICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlUmVzb3VyY2VGaW5pc2hE YXRhKEluc3BlY3RvckZyb250ZW5kKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBib29sIGRp ZEZhaWwpOwogCi0gICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlUGFpbnRSZWNvcmQo SW5zcGVjdG9yRnJvbnRlbmQqLCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBJbnRSZWN0Jik7Cisg ICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlUGFpbnREYXRhKEluc3BlY3RvckZyb250 ZW5kKiwgY29uc3QgSW50UmVjdCYpOwogCi0gICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3Jl YXRlUGFyc2VIVE1MUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwg dW5zaWduZWQgbGVuZ3RoKTsKKyAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVQYXJz ZUhUTUxEYXRhKEluc3BlY3RvckZyb250ZW5kKiwgdW5zaWduZWQgaW50IGxlbmd0aCwgdW5zaWdu ZWQgaW50IHN0YXJ0TGluZSk7CiAKICAgICBwcml2YXRlOgogICAgICAgICBUaW1lbGluZVJlY29y ZEZhY3RvcnkoKSB7IH0KSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDUzNDc4KQorKysgTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDEtMTkgIEph aW1lIFlhcCAgPGphaW1leWFwQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdCBjaGFuZ2VzIHRvIGFjY29tb2RhdGUgcmVmYWN0 b3Igb2YgVGltZWxpbmVSZWNvcmRGYWN0b3J5IGFuZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50IHRv CisgICAgICAgIHN1cHBvcnQgcmVwb3J0aW5nIGRhdGEgd2hlbiBjbG9zaW5nIGEgcmVjb3JkLgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzg1Mwor CisgICAgICAgICogaW5zcGVjdG9yL3RpbWVsaW5lLWxheW91dC1leHBlY3RlZC50eHQ6CisgICAg ICAgICogaW5zcGVjdG9yL3RpbWVsaW5lLXBhcnNlLWh0bWwtZXhwZWN0ZWQudHh0OgorICAgICAg ICAqIGluc3BlY3Rvci90aW1lbGluZS1yZWNhbGN1bGF0ZS1zdHlsZXMtZXhwZWN0ZWQudHh0Ogor CiAyMDEwLTAxLTE5ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCkluZGV4OiBMYXlvdXRUZXN0cy9pbnNwZWN0 b3IvdGltZWxpbmUtbGF5b3V0LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9pbnNwZWN0b3IvdGltZWxpbmUtbGF5b3V0LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gNTM0NzYp CisrKyBMYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUtbGF5b3V0LWV4cGVjdGVkLnR4dAko d29ya2luZyBjb3B5KQpAQCAtMiw2ICsyLDggQEAgVGVzdHMgdGhlIFRpbWVsaW5lIEFQSSBpbnN0 cnVtZW50YXRpb24gbwogCiBMYXlvdXQgUHJvcGVydGllczoKICsgc3RhcnRUaW1lIDogKiBERUZJ TkVEICoKKysgZGF0YSA6IHsKKysgfQogKyBjaGlsZHJlbiA6ICogREVGSU5FRCAqCiArIGVuZFRp bWUgOiAqIERFRklORUQgKgogKyB0eXBlIDogMQpJbmRleDogTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3RpbWVsaW5lLXBhcnNlLWh0bWwtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL2luc3BlY3Rvci90aW1lbGluZS1wYXJzZS1odG1sLWV4cGVjdGVkLnR4dAkocmV2aXNpb24g NTM0NzYpCisrKyBMYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUtcGFyc2UtaHRtbC1leHBl Y3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTQsNiArNCw4IEBAIFBhcnNlSFRNTCBQcm9wZXJ0 aWVzOgogKyBzdGFydFRpbWUgOiAqIERFRklORUQgKgogKyBkYXRhIDogewogKy0gbGVuZ3RoIDog OQorKy0gc3RhcnRMaW5lIDogMAorKy0gZW5kTGluZSA6IDAKICsgfQogKyBjaGlsZHJlbiA6ICog REVGSU5FRCAqCiArIGVuZFRpbWUgOiAqIERFRklORUQgKgpJbmRleDogTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3RpbWVsaW5lLXJlY2FsY3VsYXRlLXN0eWxlcy1leHBlY3RlZC50eHQKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lLXJlY2FsY3VsYXRlLXN0eWxlcy1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDUzNDc2KQorKysgTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Rp bWVsaW5lLXJlY2FsY3VsYXRlLXN0eWxlcy1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAg LTIsNiArMiw4IEBAIFRlc3RzIHRoZSBUaW1lbGluZSBBUEkgaW5zdHJ1bWVudGF0aW9uIG8KIAog UmVjYWxjdWxhdGVTdHlsZXMgUHJvcGVydGllczoKICsgc3RhcnRUaW1lIDogKiBERUZJTkVEICoK KysgZGF0YSA6IHsKKysgfQogKyBjaGlsZHJlbiA6ICogREVGSU5FRCAqCiArIGVuZFRpbWUgOiAq IERFRklORUQgKgogKyB0eXBlIDogMgo=