31065 2009-11-03 09:24:58 -0800 Web Inspector: Timeline should show resources loading. 2009-11-04 09:17:26 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 knorton knorton bweinstein commit-queue joepeck keishi pfeldman pmuellr rik timothy oldest_to_newest 160085 0 knorton 2009-11-03 09:24:58 -0800 The default resource tracking has more overhead than is necessary, so the plan is to just add lighter weight callbacks to InspectorTimelineAgent with just enough information to display a pill box on the timeline. If resource tracking is enabled, the UI can use the identifier to cross-link to give users more detail about a particular resource. (cleaning up a patch now) 160165 1 42404 knorton 2009-11-03 12:28:14 -0800 Created attachment 42404 Proposed implementation for resources in the timeline. Let me know what you guys think of this approach. 160192 2 42412 knorton 2009-11-03 13:26:55 -0800 Created attachment 42412 Fixes some issues. 160279 3 42412 timothy 2009-11-03 17:50:39 -0800 Comment on attachment 42412 Fixes some issues. I'll land this, since TimelineAgent.js will conflict with another cq+ change. 160450 4 42485 knorton 2009-11-04 08:43:11 -0800 Created attachment 42485 Updates and resolves the conflicts. 160460 5 42485 commit-queue 2009-11-04 09:17:22 -0800 Comment on attachment 42485 Updates and resolves the conflicts. Clearing flags on attachment: 42485 Committed r50515: <http://trac.webkit.org/changeset/50515> 160461 6 commit-queue 2009-11-04 09:17:26 -0800 All reviewed patches have been landed. Closing bug. 42404 2009-11-03 12:28:14 -0800 2009-11-03 13:26:55 -0800 Proposed implementation for resources in the timeline. Timeline-resources.diff text/plain 11703 knorton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTU3YTY3My4uNWJhYmIzOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAwOS0xMS0wMyAgS2VsbHkgTm9ydG9u ICA8a25vcnRvbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZHMgbGlnaHR3ZWlnaHQgbmV0d29yayByZXNvdXJjZXMgdG8gSW5z cGVjdG9yVGltZWxpbmVBZ2VudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMxMDY1CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjp3aWxsU2Vu ZFJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkUmVj ZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRp ZEZpbmlzaExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6 ZGlkRmFpbExvYWRpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFn ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxT ZW5kUmVzb3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZEZpbmlzaExvYWRpbmdSZXNvdXJjZSk6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6 Oik6CisgICAgICAgICogaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlU2VuZFJl cXVlc3RUaW1lbGluZVJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZVJlc291cmNlUmVjZWl2ZVJlc3BvbnNlVGltZWxpbmVSZWNvcmQpOgorICAg ICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZUZpbmlz aFRpbWVsaW5lUmVjb3JkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0 b3J5Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50LmpzOgor CiAyMDA5LTExLTAzICBLZWlzaGkgSGF0dG9yaSAgPGNhc2V5LmhhdHRvcmlAZ21haWwuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggYzJjM2U0Yy4uOTQ4OGI0YyAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTk0MSw4ICs5NDEsMTEgQEAg Ym9vbCBJbnNwZWN0b3JDb250cm9sbGVyOjppc01haW5SZXNvdXJjZUxvYWRlcihEb2N1bWVudExv YWRlciogbG9hZGVyLCBjb25zdCBLVVIKICAgICByZXR1cm4gbG9hZGVyLT5mcmFtZSgpID09IG1f aW5zcGVjdGVkUGFnZS0+bWFpbkZyYW1lKCkgJiYgcmVxdWVzdFVybCA9PSBsb2FkZXItPnJlcXVl c3RVUkwoKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjp3aWxsU2VuZFJlcXVlc3Qo RG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFJlc291cmNlUmVxdWVz dCYgcmVxdWVzdCwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSkKK3Zv aWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6d2lsbFNlbmRSZXF1ZXN0KERvY3VtZW50TG9hZGVyKiBs b2FkZXIsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0 LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKQogeworICAgIGlmICht X3RpbWVsaW5lQWdlbnQpCisgICAgICAgIG1fdGltZWxpbmVBZ2VudC0+d2lsbFNlbmRSZXNvdXJj ZVJlcXVlc3QoaWRlbnRpZmllciwgaXNNYWluUmVzb3VyY2VMb2FkZXIobG9hZGVyLCByZXF1ZXN0 LnVybCgpKSwgcmVxdWVzdCk7CisKICAgICBSZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+IHJlc291 cmNlID0gZ2V0VHJhY2tlZFJlc291cmNlKGlkZW50aWZpZXIpOwogICAgIGlmICghcmVzb3VyY2Up CiAgICAgICAgIHJldHVybjsKQEAgLTk2MCw2ICs5NjMsOSBAQCB2b2lkIEluc3BlY3RvckNvbnRy b2xsZXI6OndpbGxTZW5kUmVxdWVzdChEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRl bnRpZgogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFJlY2VpdmVSZXNwb25zZShEb2N1 bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNw b25zZSYgcmVzcG9uc2UpCiB7CisgICAgaWYgKG1fdGltZWxpbmVBZ2VudCkKKyAgICAgICAgbV90 aW1lbGluZUFnZW50LT5kaWRSZWNlaXZlUmVzb3VyY2VSZXNwb25zZShpZGVudGlmaWVyLCByZXNw b25zZSk7CisKICAgICBSZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+IHJlc291cmNlID0gZ2V0VHJh Y2tlZFJlc291cmNlKGlkZW50aWZpZXIpOwogICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgIHJl dHVybjsKQEAgLTk4NSw2ICs5OTEsOSBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFJl Y2VpdmVDb250ZW50TGVuZ3RoKERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZwogCiB2b2lk IEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZEZpbmlzaExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpCiB7CisgICAgaWYgKG1fdGltZWxpbmVBZ2VudCkKKyAg ICAgICAgbV90aW1lbGluZUFnZW50LT5kaWRGaW5pc2hMb2FkaW5nUmVzb3VyY2UoaWRlbnRpZmll ciwgZmFsc2UpOworCiAgICAgUmVmUHRyPEluc3BlY3RvclJlc291cmNlPiByZXNvdXJjZSA9IGdl dFRyYWNrZWRSZXNvdXJjZShpZGVudGlmaWVyKTsKICAgICBpZiAoIXJlc291cmNlKQogICAgICAg ICByZXR1cm47CkBAIC0xMDA1LDYgKzEwMTQsOSBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6 OmRpZEZpbmlzaExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aQog CiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZEZhaWxMb2FkaW5nKERvY3VtZW50TG9hZGVy KiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZUVycm9yJiAvKmVycm9y Ki8pCiB7CisgICAgaWYgKG1fdGltZWxpbmVBZ2VudCkKKyAgICAgICAgbV90aW1lbGluZUFnZW50 LT5kaWRGaW5pc2hMb2FkaW5nUmVzb3VyY2UoaWRlbnRpZmllciwgdHJ1ZSk7CisKICAgICBSZWZQ dHI8SW5zcGVjdG9yUmVzb3VyY2U+IHJlc291cmNlID0gZ2V0VHJhY2tlZFJlc291cmNlKGlkZW50 aWZpZXIpOwogICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKaW5kZXggOGIxZmNiOC4uOTQ2NWRk ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5j cHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKQEAg LTM1LDYgKzM1LDggQEAKIAogI2luY2x1ZGUgIkV2ZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9y RnJvbnRlbmQuaCIKKyNpbmNsdWRlICJSZXNvdXJjZVJlcXVlc3QuaCIKKyNpbmNsdWRlICJSZXNv dXJjZVJlc3BvbnNlLmgiCiAjaW5jbHVkZSAiVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgiCiAKICNp bmNsdWRlIDx3dGYvQ3VycmVudFRpbWUuaD4KQEAgLTE1Niw2ICsxNTgsMjUgQEAgdm9pZCBJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpkaWRFdmFsdWF0ZVNjcmlwdCgpCiAgICAgZGlkQ29tcGxldGVD dXJyZW50UmVjb3JkKEV2YWx1YXRlU2NyaXB0VGltZWxpbmVSZWNvcmRUeXBlKTsKIH0KIAordm9p ZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsU2VuZFJlc291cmNlUmVxdWVzdCh1bnNpZ25l ZCBsb25nIGlkZW50aWZpZXIsIGJvb2wgaXNNYWluUmVzb3VyY2UsCisgICAgY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0KQoreworICAgIGFkZFJlY29yZFRvVGltZWxpbmUoVGltZWxpbmVS ZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZVNlbmRSZXF1ZXN0VGltZWxpbmVSZWNvcmQobV9m cm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpLAorICAgICAgICBpZGVudGlmaWVy LCBpc01haW5SZXNvdXJjZSwgcmVxdWVzdCksIFJlc291cmNlU2VuZFJlcXVlc3RUaW1lbGluZVJl Y29yZFR5cGUpOworfQorCit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZFJlY2VpdmVS ZXNvdXJjZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VS ZXNwb25zZSYgcmVzcG9uc2UpCit7CisgICAgYWRkUmVjb3JkVG9UaW1lbGluZShUaW1lbGluZVJl Y29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlUmVjZWl2ZVJlc3BvbnNlVGltZWxpbmVSZWNvcmQo bV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpLAorICAgICAgICBpZGVudGlm aWVyLCByZXNwb25zZSksIFJlc291cmNlUmVjZWl2ZVJlc3BvbnNlVGltZWxpbmVSZWNvcmRUeXBl KTsKK30KKwordm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRGaW5pc2hMb2FkaW5nUmVz b3VyY2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBib29sIGRpZEZhaWwpCit7CisgICAgYWRk UmVjb3JkVG9UaW1lbGluZShUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlRmlu aXNoVGltZWxpbmVSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygp LAorICAgICAgICBpZGVudGlmaWVyLCBkaWRGYWlsKSwgUmVzb3VyY2VGaW5pc2hUaW1lbGluZVJl Y29yZFR5cGUpOworfQorCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJlc2V0KCkKIHsK ICAgICBtX3JlY29yZFN0YWNrLmNsZWFyKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JU aW1lbGluZUFnZW50LmgKaW5kZXggNWNmYTlhZi4uYWQ5MmUwYSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaApAQCAtNDAsNiArNDAsOCBAQAogbmFtZXNwYWNl IFdlYkNvcmUgewogICAgIGNsYXNzIEV2ZW50OwogICAgIGNsYXNzIEluc3BlY3RvckZyb250ZW5k OworICAgIGNsYXNzIFJlc291cmNlUmVxdWVzdDsKKyAgICBjbGFzcyBSZXNvdXJjZVJlc3BvbnNl OwogCiAgICAgLy8gTXVzdCBiZSBrZXB0IGluIHN5bmMgd2l0aCBUaW1lbGluZUFnZW50LmpzCiAg ICAgZW51bSBUaW1lbGluZVJlY29yZFR5cGUgewpAQCAtNTQsNiArNTYsOSBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIFhIUlJlYWR5U3RhdGVDaGFuZ2VSZWNvcmRUeXBlID0gOCwKICAg ICAgICAgWEhSTG9hZFJlY29yZFR5cGUgPSA5LAogICAgICAgICBFdmFsdWF0ZVNjcmlwdFRpbWVs aW5lUmVjb3JkVHlwZSA9IDEwLAorICAgICAgICBSZXNvdXJjZVNlbmRSZXF1ZXN0VGltZWxpbmVS ZWNvcmRUeXBlID0gMTEsCisgICAgICAgIFJlc291cmNlUmVjZWl2ZVJlc3BvbnNlVGltZWxpbmVS ZWNvcmRUeXBlID0gMTIsCisgICAgICAgIFJlc291cmNlRmluaXNoVGltZWxpbmVSZWNvcmRUeXBl ID0gMTMsCiAgICAgfTsKIAogICAgIGNsYXNzIEluc3BlY3RvclRpbWVsaW5lQWdlbnQgewpAQCAt OTMsNiArOTgsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHdpbGxFdmFs dWF0ZVNjcmlwdChjb25zdCBTdHJpbmcmLCBpbnQpOwogICAgICAgICB2b2lkIGRpZEV2YWx1YXRl U2NyaXB0KCk7CiAKKyAgICAgICAgdm9pZCB3aWxsU2VuZFJlc291cmNlUmVxdWVzdCh1bnNpZ25l ZCBsb25nLCBib29sIGlzTWFpblJlc291cmNlLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKKyAg ICAgICAgdm9pZCBkaWRSZWNlaXZlUmVzb3VyY2VSZXNwb25zZSh1bnNpZ25lZCBsb25nLCBjb25z dCBSZXNvdXJjZVJlc3BvbnNlJik7CisgICAgICAgIHZvaWQgZGlkRmluaXNoTG9hZGluZ1Jlc291 cmNlKHVuc2lnbmVkIGxvbmcsIGJvb2wgZGlkRmFpbCk7CisKICAgICAgICAgc3RhdGljIEluc3Bl Y3RvclRpbWVsaW5lQWdlbnQqIHJldHJpZXZlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqKTsKICAg ICBwcml2YXRlOgogICAgICAgICBzdHJ1Y3QgVGltZWxpbmVSZWNvcmRFbnRyeSB7CmRpZmYgLS1n aXQgYS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwIGIvV2ViQ29y ZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcAppbmRleCAyNzhlN2ZiLi45OTIy NThjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3Rvcnku Y3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAKQEAg LTM1LDggKzM1LDExIEBACiAKICNpbmNsdWRlICJFdmVudC5oIgogI2luY2x1ZGUgIkluc3BlY3Rv ckZyb250ZW5kLmgiCisjaW5jbHVkZSAiUmVzb3VyY2VSZXF1ZXN0LmgiCisjaW5jbHVkZSAiUmVz b3VyY2VSZXNwb25zZS5oIgogI2luY2x1ZGUgIlNjcmlwdEFycmF5LmgiCiAjaW5jbHVkZSAiU2Ny aXB0T2JqZWN0LmgiCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogU2NyaXB0T2JqZWN0IFRpbWVs aW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChJbnNwZWN0b3JGcm9udGVuZCog ZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUpCkBAIC0xMDQsNiArMTA3LDQzIEBAIFNjcmlwdE9i amVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2YWx1YXRlU2NyaXB0VGltZWxpbmVS ZWNvcmQoSW5zcGVjdG9yCiAgICAgcmV0dXJuIGl0ZW07CiB9CiAKK1NjcmlwdE9iamVjdCBUaW1l bGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlU2VuZFJlcXVlc3RUaW1lbGluZVJlY29y ZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsCisgICAgdW5z aWduZWQgbG9uZyBpZGVudGlmaWVyLCBib29sIGlzTWFpblJlc291cmNlLCBjb25zdCBSZXNvdXJj ZVJlcXVlc3QmIHJlcXVlc3QpCit7CisgICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9IGNyZWF0ZUdl bmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0YXJ0VGltZSk7CisgICAgU2NyaXB0T2JqZWN0IGRhdGEg PSBmcm9udGVuZC0+bmV3U2NyaXB0T2JqZWN0KCk7CisgICAgZGF0YS5zZXQoImlkZW50aWZpZXIi LCBzdGF0aWNfY2FzdDxsb25nIGxvbmc+KGlkZW50aWZpZXIpKTsKKyAgICBkYXRhLnNldCgidXJs IiwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKSk7CisgICAgZGF0YS5zZXQoInJlcXVlc3RNZXRob2Qi LCByZXF1ZXN0Lmh0dHBNZXRob2QoKSk7CisgICAgZGF0YS5zZXQoImlzTWFpblJlc291cmNlIiwg aXNNYWluUmVzb3VyY2UpOworICAgIHJlY29yZC5zZXQoImRhdGEiLCBkYXRhKTsKKyAgICByZXR1 cm4gcmVjb3JkOworfQorCitTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVh dGVSZXNvdXJjZVJlY2VpdmVSZXNwb25zZVRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5k KiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSwKKyAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZp ZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQoreworICAgIFNjcmlwdE9iamVj dCByZWNvcmQgPSBjcmVhdGVHZW5lcmljUmVjb3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOworICAg IFNjcmlwdE9iamVjdCBkYXRhID0gZnJvbnRlbmQtPm5ld1NjcmlwdE9iamVjdCgpOworICAgIGRh dGEuc2V0KCJpZGVudGlmaWVyIiwgc3RhdGljX2Nhc3Q8bG9uZyBsb25nPihpZGVudGlmaWVyKSk7 CisgICAgZGF0YS5zZXQoInN0YXR1c0NvZGUiLCByZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpKTsK KyAgICBkYXRhLnNldCgibWltZVR5cGUiLCByZXNwb25zZS5taW1lVHlwZSgpKTsKKyAgICBkYXRh LnNldCgiZXhwZWN0ZWRDb250ZW50TGVuZ3RoIiwgcmVzcG9uc2UuZXhwZWN0ZWRDb250ZW50TGVu Z3RoKCkpOworICAgIHJlY29yZC5zZXQoImRhdGEiLCBkYXRhKTsKKyAgICByZXR1cm4gcmVjb3Jk OworfQorCitTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJj ZUZpbmlzaFRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91Ymxl IHN0YXJ0VGltZSwKKyAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGJvb2wgZGlkRmFpbCkK K3sKKyAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVu ZCwgc3RhcnRUaW1lKTsKKyAgICBTY3JpcHRPYmplY3QgZGF0YSA9IGZyb250ZW5kLT5uZXdTY3Jp cHRPYmplY3QoKTsKKyAgICBkYXRhLnNldCgiaWRlbnRpZmllciIsIHN0YXRpY19jYXN0PGxvbmcg bG9uZz4oaWRlbnRpZmllcikpOworICAgIGRhdGEuc2V0KCJkaWRGYWlsIiwgZGlkRmFpbCk7Cisg ICAgcmVjb3JkLnNldCgiZGF0YSIsIGRhdGEpOworICAgIHJldHVybiByZWNvcmQ7Cit9CisKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShJTlNQRUNUT1IpCmRpZmYg LS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuaCBiL1dlYkNv cmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCmluZGV4IDJkMmI4ODIuLjk3NTQ4 NGUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5o CisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCkBAIC0zNyw2 ICszNyw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGNsYXNzIEV2ZW50OwogICAgIGNs YXNzIEluc3BlY3RvckZyb250ZW5kOworICAgIGNsYXNzIFJlc291cmNlUmVxdWVzdDsKKyAgICBj bGFzcyBSZXNvdXJjZVJlc3BvbnNlOwogICAgIGNsYXNzIFNjcmlwdE9iamVjdDsKIAogICAgIGNs YXNzIFRpbWVsaW5lUmVjb3JkRmFjdG9yeSB7CkBAIC01Myw3ICs1NSwxMyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlWEhSTG9hZFRpbWVs aW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgU3Ry aW5nJiB1cmwpOwogICAgICAgICAKICAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVF dmFsdWF0ZVNjcmlwdFRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0 YXJ0VGltZSwgY29uc3QgU3RyaW5nJiwgZG91YmxlIGxpbmVOdW1iZXIpOwotCisgICAgICAgIAor ICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVJlc291cmNlU2VuZFJlcXVlc3RUaW1l bGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUsCisgICAgICAg ICAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGJvb2wgaXNNYWluUmVzb3VyY2UsIGNvbnN0 IFJlc291cmNlUmVxdWVzdCYpOworICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVJl c291cmNlUmVjZWl2ZVJlc3BvbnNlVGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBk b3VibGUgc3RhcnRUaW1lLAorICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBj b25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CisgICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3Jl YXRlUmVzb3VyY2VGaW5pc2hUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJs ZSBzdGFydFRpbWUsCisgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGJvb2wg ZGlkRmFpbCk7CiAgICAgcHJpdmF0ZToKICAgICAgICAgVGltZWxpbmVSZWNvcmRGYWN0b3J5KCkg eyB9CiAgICAgfTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1l bGluZUFnZW50LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQu anMKaW5kZXggM2VkMWQ3ZC4uOGNlZjYwMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1RpbWVsaW5lQWdlbnQuanMKQEAgLTM0LDE3ICszNCwyMCBAQCBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVBZ2VudCA9IGZ1bmN0aW9uKCkgewogCiAvLyBNdXN0IGJlIGtlcHQgaW4gc3luYyB3aXRo IFRpbWVsaW5lSXRlbS5oCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlID0g ewotICAgIEV2ZW50RGlzcGF0Y2ggICAgICAgOiAwLAotICAgIExheW91dCAgICAgICAgICAgICAg OiAxLAotICAgIFJlY2FsY3VsYXRlU3R5bGVzICAgOiAyLAotICAgIFBhaW50ICAgICAgICAgICAg ICAgOiAzLAotICAgIFBhcnNlSFRNTCAgICAgICAgICAgOiA0LAotICAgIFRpbWVySW5zdGFsbCAg ICAgICAgOiA1LAotICAgIFRpbWVyUmVtb3ZlICAgICAgICAgOiA2LAotICAgIFRpbWVyRmlyZSAg ICAgICAgICAgOiA3LAotICAgIFhIUlJlYWR5U3RhdGVDaGFuZ2UgOiA4LAotICAgIFhIUkxvYWQg ICAgICAgICAgICAgOiA5LAotICAgIEV2YWx1YXRlU2NyaXB0ICAgICAgOiAxMAorICAgIEV2ZW50 RGlzcGF0Y2ggICAgICAgICAgIDogMCwKKyAgICBMYXlvdXQgICAgICAgICAgICAgICAgICA6IDEs CisgICAgUmVjYWxjdWxhdGVTdHlsZXMgICAgICAgOiAyLAorICAgIFBhaW50ICAgICAgICAgICAg ICAgICAgIDogMywKKyAgICBQYXJzZUhUTUwgICAgICAgICAgICAgICA6IDQsCisgICAgVGltZXJJ bnN0YWxsICAgICAgICAgICAgOiA1LAorICAgIFRpbWVyUmVtb3ZlICAgICAgICAgICAgIDogNiwK KyAgICBUaW1lckZpcmUgICAgICAgICAgICAgICA6IDcsCisgICAgWEhSUmVhZHlTdGF0ZUNoYW5n ZSAgICAgOiA4LAorICAgIFhIUkxvYWQgICAgICAgICAgICAgICAgIDogOSwKKyAgICBFdmFsdWF0 ZVNjcmlwdCAgICAgICAgICA6IDEwLAorICAgIFJlc291cmNlU2VuZFJlcXVlc3QgICAgIDogMTEs CisgICAgUmVzb3VyY2VSZWNlaXZlUmVzcG9uc2UgOiAxMiwKKyAgICBSZXNvdXJjZUZpbmlzaCAg ICAgICAgICA6IDEzLAogfTsKIAogV2ViSW5zcGVjdG9yLmFkZFJlY29yZFRvVGltZWxpbmUgPSBm dW5jdGlvbihyZWNvcmQpIHsK 42412 2009-11-03 13:26:55 -0800 2009-11-04 08:43:11 -0800 Fixes some issues. Timeline-resources.diff text/plain 11744 knorton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTU3YTY3My4uNWJhYmIzOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAwOS0xMS0wMyAgS2VsbHkgTm9ydG9u ICA8a25vcnRvbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZHMgbGlnaHR3ZWlnaHQgbmV0d29yayByZXNvdXJjZXMgdG8gSW5z cGVjdG9yVGltZWxpbmVBZ2VudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMxMDY1CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjp3aWxsU2Vu ZFJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkUmVj ZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRp ZEZpbmlzaExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6 ZGlkRmFpbExvYWRpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFn ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxT ZW5kUmVzb3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZEZpbmlzaExvYWRpbmdSZXNvdXJjZSk6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6 Oik6CisgICAgICAgICogaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlU2VuZFJl cXVlc3RUaW1lbGluZVJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZVJlc291cmNlUmVjZWl2ZVJlc3BvbnNlVGltZWxpbmVSZWNvcmQpOgorICAg ICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZUZpbmlz aFRpbWVsaW5lUmVjb3JkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0 b3J5Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50LmpzOgor CiAyMDA5LTExLTAzICBLZWlzaGkgSGF0dG9yaSAgPGNhc2V5LmhhdHRvcmlAZ21haWwuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggYzJjM2U0Yy4uOTQ4OGI0YyAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTk0MSw4ICs5NDEsMTEgQEAg Ym9vbCBJbnNwZWN0b3JDb250cm9sbGVyOjppc01haW5SZXNvdXJjZUxvYWRlcihEb2N1bWVudExv YWRlciogbG9hZGVyLCBjb25zdCBLVVIKICAgICByZXR1cm4gbG9hZGVyLT5mcmFtZSgpID09IG1f aW5zcGVjdGVkUGFnZS0+bWFpbkZyYW1lKCkgJiYgcmVxdWVzdFVybCA9PSBsb2FkZXItPnJlcXVl c3RVUkwoKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjp3aWxsU2VuZFJlcXVlc3Qo RG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFJlc291cmNlUmVxdWVz dCYgcmVxdWVzdCwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSkKK3Zv aWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6d2lsbFNlbmRSZXF1ZXN0KERvY3VtZW50TG9hZGVyKiBs b2FkZXIsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0 LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKQogeworICAgIGlmICht X3RpbWVsaW5lQWdlbnQpCisgICAgICAgIG1fdGltZWxpbmVBZ2VudC0+d2lsbFNlbmRSZXNvdXJj ZVJlcXVlc3QoaWRlbnRpZmllciwgaXNNYWluUmVzb3VyY2VMb2FkZXIobG9hZGVyLCByZXF1ZXN0 LnVybCgpKSwgcmVxdWVzdCk7CisKICAgICBSZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+IHJlc291 cmNlID0gZ2V0VHJhY2tlZFJlc291cmNlKGlkZW50aWZpZXIpOwogICAgIGlmICghcmVzb3VyY2Up CiAgICAgICAgIHJldHVybjsKQEAgLTk2MCw2ICs5NjMsOSBAQCB2b2lkIEluc3BlY3RvckNvbnRy b2xsZXI6OndpbGxTZW5kUmVxdWVzdChEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRl bnRpZgogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFJlY2VpdmVSZXNwb25zZShEb2N1 bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNw b25zZSYgcmVzcG9uc2UpCiB7CisgICAgaWYgKG1fdGltZWxpbmVBZ2VudCkKKyAgICAgICAgbV90 aW1lbGluZUFnZW50LT5kaWRSZWNlaXZlUmVzb3VyY2VSZXNwb25zZShpZGVudGlmaWVyLCByZXNw b25zZSk7CisKICAgICBSZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+IHJlc291cmNlID0gZ2V0VHJh Y2tlZFJlc291cmNlKGlkZW50aWZpZXIpOwogICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgIHJl dHVybjsKQEAgLTk4NSw2ICs5OTEsOSBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFJl Y2VpdmVDb250ZW50TGVuZ3RoKERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZwogCiB2b2lk IEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZEZpbmlzaExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpCiB7CisgICAgaWYgKG1fdGltZWxpbmVBZ2VudCkKKyAg ICAgICAgbV90aW1lbGluZUFnZW50LT5kaWRGaW5pc2hMb2FkaW5nUmVzb3VyY2UoaWRlbnRpZmll ciwgZmFsc2UpOworCiAgICAgUmVmUHRyPEluc3BlY3RvclJlc291cmNlPiByZXNvdXJjZSA9IGdl dFRyYWNrZWRSZXNvdXJjZShpZGVudGlmaWVyKTsKICAgICBpZiAoIXJlc291cmNlKQogICAgICAg ICByZXR1cm47CkBAIC0xMDA1LDYgKzEwMTQsOSBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6 OmRpZEZpbmlzaExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aQog CiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZEZhaWxMb2FkaW5nKERvY3VtZW50TG9hZGVy KiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZUVycm9yJiAvKmVycm9y Ki8pCiB7CisgICAgaWYgKG1fdGltZWxpbmVBZ2VudCkKKyAgICAgICAgbV90aW1lbGluZUFnZW50 LT5kaWRGaW5pc2hMb2FkaW5nUmVzb3VyY2UoaWRlbnRpZmllciwgdHJ1ZSk7CisKICAgICBSZWZQ dHI8SW5zcGVjdG9yUmVzb3VyY2U+IHJlc291cmNlID0gZ2V0VHJhY2tlZFJlc291cmNlKGlkZW50 aWZpZXIpOwogICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKaW5kZXggOGIxZmNiOC4uNmViMGRj YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5j cHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKQEAg LTM1LDYgKzM1LDggQEAKIAogI2luY2x1ZGUgIkV2ZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9y RnJvbnRlbmQuaCIKKyNpbmNsdWRlICJSZXNvdXJjZVJlcXVlc3QuaCIKKyNpbmNsdWRlICJSZXNv dXJjZVJlc3BvbnNlLmgiCiAjaW5jbHVkZSAiVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgiCiAKICNp bmNsdWRlIDx3dGYvQ3VycmVudFRpbWUuaD4KQEAgLTE1Niw2ICsxNTgsMzEgQEAgdm9pZCBJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpkaWRFdmFsdWF0ZVNjcmlwdCgpCiAgICAgZGlkQ29tcGxldGVD dXJyZW50UmVjb3JkKEV2YWx1YXRlU2NyaXB0VGltZWxpbmVSZWNvcmRUeXBlKTsKIH0KIAordm9p ZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsU2VuZFJlc291cmNlUmVxdWVzdCh1bnNpZ25l ZCBsb25nIGlkZW50aWZpZXIsIGJvb2wgaXNNYWluUmVzb3VyY2UsCisgICAgY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0KQoreworICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBUaW1lbGlu ZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlU2VuZFJlcXVlc3RUaW1lbGluZVJlY29yZCht X2Zyb250ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCksCisgICAgICAgIGlkZW50aWZp ZXIsIGlzTWFpblJlc291cmNlLCByZXF1ZXN0KTsKKyAgICByZWNvcmQuc2V0KCJ0eXBlIiwgUmVz b3VyY2VTZW5kUmVxdWVzdFRpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAgbV9mcm9udGVuZC0+YWRk UmVjb3JkVG9UaW1lbGluZShyZWNvcmQpOworfQorCit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwg Y29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCit7CisgICAgU2NyaXB0T2JqZWN0IHJl Y29yZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VSZWNlaXZlUmVzcG9u c2VUaW1lbGluZVJlY29yZChtX2Zyb250ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCks CisgICAgICAgIGlkZW50aWZpZXIsIHJlc3BvbnNlKTsKKyAgICByZWNvcmQuc2V0KCJ0eXBlIiwg UmVzb3VyY2VSZWNlaXZlUmVzcG9uc2VUaW1lbGluZVJlY29yZFR5cGUpOworICAgIG1fZnJvbnRl bmQtPmFkZFJlY29yZFRvVGltZWxpbmUocmVjb3JkKTsKK30KKwordm9pZCBJbnNwZWN0b3JUaW1l bGluZUFnZW50OjpkaWRGaW5pc2hMb2FkaW5nUmVzb3VyY2UodW5zaWduZWQgbG9uZyBpZGVudGlm aWVyLCBib29sIGRpZEZhaWwpCit7CisgICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9IFRpbWVsaW5l UmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VGaW5pc2hUaW1lbGluZVJlY29yZChtX2Zyb250 ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCksCisgICAgICAgIGlkZW50aWZpZXIsIGRp ZEZhaWwpOworICAgIHJlY29yZC5zZXQoInR5cGUiLCBSZXNvdXJjZUZpbmlzaFRpbWVsaW5lUmVj b3JkVHlwZSk7CisgICAgbV9mcm9udGVuZC0+YWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQpOwor fQorCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJlc2V0KCkKIHsKICAgICBtX3JlY29y ZFN0YWNrLmNsZWFyKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JU aW1lbGluZUFnZW50LmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50 LmgKaW5kZXggNWNmYTlhZi4uYWQ5MmUwYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clRpbWVsaW5lQWdlbnQuaApAQCAtNDAsNiArNDAsOCBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgIGNsYXNzIEV2ZW50OwogICAgIGNsYXNzIEluc3BlY3RvckZyb250ZW5kOworICAgIGNsYXNz IFJlc291cmNlUmVxdWVzdDsKKyAgICBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlOwogCiAgICAgLy8g TXVzdCBiZSBrZXB0IGluIHN5bmMgd2l0aCBUaW1lbGluZUFnZW50LmpzCiAgICAgZW51bSBUaW1l bGluZVJlY29yZFR5cGUgewpAQCAtNTQsNiArNTYsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgIFhIUlJlYWR5U3RhdGVDaGFuZ2VSZWNvcmRUeXBlID0gOCwKICAgICAgICAgWEhSTG9h ZFJlY29yZFR5cGUgPSA5LAogICAgICAgICBFdmFsdWF0ZVNjcmlwdFRpbWVsaW5lUmVjb3JkVHlw ZSA9IDEwLAorICAgICAgICBSZXNvdXJjZVNlbmRSZXF1ZXN0VGltZWxpbmVSZWNvcmRUeXBlID0g MTEsCisgICAgICAgIFJlc291cmNlUmVjZWl2ZVJlc3BvbnNlVGltZWxpbmVSZWNvcmRUeXBlID0g MTIsCisgICAgICAgIFJlc291cmNlRmluaXNoVGltZWxpbmVSZWNvcmRUeXBlID0gMTMsCiAgICAg fTsKIAogICAgIGNsYXNzIEluc3BlY3RvclRpbWVsaW5lQWdlbnQgewpAQCAtOTMsNiArOTgsMTAg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHdpbGxFdmFsdWF0ZVNjcmlwdChj b25zdCBTdHJpbmcmLCBpbnQpOwogICAgICAgICB2b2lkIGRpZEV2YWx1YXRlU2NyaXB0KCk7CiAK KyAgICAgICAgdm9pZCB3aWxsU2VuZFJlc291cmNlUmVxdWVzdCh1bnNpZ25lZCBsb25nLCBib29s IGlzTWFpblJlc291cmNlLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKKyAgICAgICAgdm9pZCBk aWRSZWNlaXZlUmVzb3VyY2VSZXNwb25zZSh1bnNpZ25lZCBsb25nLCBjb25zdCBSZXNvdXJjZVJl c3BvbnNlJik7CisgICAgICAgIHZvaWQgZGlkRmluaXNoTG9hZGluZ1Jlc291cmNlKHVuc2lnbmVk IGxvbmcsIGJvb2wgZGlkRmFpbCk7CisKICAgICAgICAgc3RhdGljIEluc3BlY3RvclRpbWVsaW5l QWdlbnQqIHJldHJpZXZlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqKTsKICAgICBwcml2YXRlOgog ICAgICAgICBzdHJ1Y3QgVGltZWxpbmVSZWNvcmRFbnRyeSB7CmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3Iv VGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcAppbmRleCAyNzhlN2ZiLi45OTIyNThjIDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwCisrKyBiL1dl YkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAKQEAgLTM1LDggKzM1LDEx IEBACiAKICNpbmNsdWRlICJFdmVudC5oIgogI2luY2x1ZGUgIkluc3BlY3RvckZyb250ZW5kLmgi CisjaW5jbHVkZSAiUmVzb3VyY2VSZXF1ZXN0LmgiCisjaW5jbHVkZSAiUmVzb3VyY2VSZXNwb25z ZS5oIgogI2luY2x1ZGUgIlNjcmlwdEFycmF5LmgiCiAjaW5jbHVkZSAiU2NyaXB0T2JqZWN0Lmgi CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFj dG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGRv dWJsZSBzdGFydFRpbWUpCkBAIC0xMDQsNiArMTA3LDQzIEBAIFNjcmlwdE9iamVjdCBUaW1lbGlu ZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2YWx1YXRlU2NyaXB0VGltZWxpbmVSZWNvcmQoSW5zcGVj dG9yCiAgICAgcmV0dXJuIGl0ZW07CiB9CiAKK1NjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZVJlc291cmNlU2VuZFJlcXVlc3RUaW1lbGluZVJlY29yZChJbnNwZWN0b3JG cm9udGVuZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsCisgICAgdW5zaWduZWQgbG9uZyBp ZGVudGlmaWVyLCBib29sIGlzTWFpblJlc291cmNlLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJl cXVlc3QpCit7CisgICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQo ZnJvbnRlbmQsIHN0YXJ0VGltZSk7CisgICAgU2NyaXB0T2JqZWN0IGRhdGEgPSBmcm9udGVuZC0+ bmV3U2NyaXB0T2JqZWN0KCk7CisgICAgZGF0YS5zZXQoImlkZW50aWZpZXIiLCBzdGF0aWNfY2Fz dDxsb25nIGxvbmc+KGlkZW50aWZpZXIpKTsKKyAgICBkYXRhLnNldCgidXJsIiwgcmVxdWVzdC51 cmwoKS5zdHJpbmcoKSk7CisgICAgZGF0YS5zZXQoInJlcXVlc3RNZXRob2QiLCByZXF1ZXN0Lmh0 dHBNZXRob2QoKSk7CisgICAgZGF0YS5zZXQoImlzTWFpblJlc291cmNlIiwgaXNNYWluUmVzb3Vy Y2UpOworICAgIHJlY29yZC5zZXQoImRhdGEiLCBkYXRhKTsKKyAgICByZXR1cm4gcmVjb3JkOwor fQorCitTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZVJl Y2VpdmVSZXNwb25zZVRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwg ZG91YmxlIHN0YXJ0VGltZSwKKyAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJl c291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQoreworICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBj cmVhdGVHZW5lcmljUmVjb3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOworICAgIFNjcmlwdE9iamVj dCBkYXRhID0gZnJvbnRlbmQtPm5ld1NjcmlwdE9iamVjdCgpOworICAgIGRhdGEuc2V0KCJpZGVu dGlmaWVyIiwgc3RhdGljX2Nhc3Q8bG9uZyBsb25nPihpZGVudGlmaWVyKSk7CisgICAgZGF0YS5z ZXQoInN0YXR1c0NvZGUiLCByZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpKTsKKyAgICBkYXRhLnNl dCgibWltZVR5cGUiLCByZXNwb25zZS5taW1lVHlwZSgpKTsKKyAgICBkYXRhLnNldCgiZXhwZWN0 ZWRDb250ZW50TGVuZ3RoIiwgcmVzcG9uc2UuZXhwZWN0ZWRDb250ZW50TGVuZ3RoKCkpOworICAg IHJlY29yZC5zZXQoImRhdGEiLCBkYXRhKTsKKyAgICByZXR1cm4gcmVjb3JkOworfQorCitTY3Jp cHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZUZpbmlzaFRpbWVs aW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSwK KyAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGJvb2wgZGlkRmFpbCkKK3sKKyAgICBTY3Jp cHRPYmplY3QgcmVjb3JkID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRUaW1l KTsKKyAgICBTY3JpcHRPYmplY3QgZGF0YSA9IGZyb250ZW5kLT5uZXdTY3JpcHRPYmplY3QoKTsK KyAgICBkYXRhLnNldCgiaWRlbnRpZmllciIsIHN0YXRpY19jYXN0PGxvbmcgbG9uZz4oaWRlbnRp ZmllcikpOworICAgIGRhdGEuc2V0KCJkaWRGYWlsIiwgZGlkRmFpbCk7CisgICAgcmVjb3JkLnNl dCgiZGF0YSIsIGRhdGEpOworICAgIHJldHVybiByZWNvcmQ7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShJTlNQRUNUT1IpCmRpZmYgLS1naXQgYS9XZWJD b3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuaCBiL1dlYkNvcmUvaW5zcGVjdG9y L1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCmluZGV4IDJkMmI4ODIuLjk3NTQ4NGUgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCisrKyBiL1dlYkNv cmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCkBAIC0zNyw2ICszNyw4IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGNsYXNzIEV2ZW50OwogICAgIGNsYXNzIEluc3BlY3Rv ckZyb250ZW5kOworICAgIGNsYXNzIFJlc291cmNlUmVxdWVzdDsKKyAgICBjbGFzcyBSZXNvdXJj ZVJlc3BvbnNlOwogICAgIGNsYXNzIFNjcmlwdE9iamVjdDsKIAogICAgIGNsYXNzIFRpbWVsaW5l UmVjb3JkRmFjdG9yeSB7CkBAIC01Myw3ICs1NSwxMyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlWEhSTG9hZFRpbWVsaW5lUmVjb3JkKElu c3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgU3RyaW5nJiB1cmwpOwog ICAgICAgICAKICAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVFdmFsdWF0ZVNjcmlw dFRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwgY29u c3QgU3RyaW5nJiwgZG91YmxlIGxpbmVOdW1iZXIpOwotCisgICAgICAgIAorICAgICAgICBzdGF0 aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVJlc291cmNlU2VuZFJlcXVlc3RUaW1lbGluZVJlY29yZChJ bnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUsCisgICAgICAgICAgICB1bnNpZ25l ZCBsb25nIGlkZW50aWZpZXIsIGJvb2wgaXNNYWluUmVzb3VyY2UsIGNvbnN0IFJlc291cmNlUmVx dWVzdCYpOworICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVJlc291cmNlUmVjZWl2 ZVJlc3BvbnNlVGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBkb3VibGUgc3RhcnRU aW1lLAorICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJik7CisgICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlUmVzb3VyY2VG aW5pc2hUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUs CisgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGJvb2wgZGlkRmFpbCk7CiAg ICAgcHJpdmF0ZToKICAgICAgICAgVGltZWxpbmVSZWNvcmRGYWN0b3J5KCkgeyB9CiAgICAgfTsK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50Lmpz IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMKaW5kZXggM2Vk MWQ3ZC4uY2ZmMTNlYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Rp bWVsaW5lQWdlbnQuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5l QWdlbnQuanMKQEAgLTM0LDE3ICszNCwyMCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudCA9 IGZ1bmN0aW9uKCkgewogCiAvLyBNdXN0IGJlIGtlcHQgaW4gc3luYyB3aXRoIFRpbWVsaW5lSXRl bS5oCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlID0gewotICAgIEV2ZW50 RGlzcGF0Y2ggICAgICAgOiAwLAotICAgIExheW91dCAgICAgICAgICAgICAgOiAxLAotICAgIFJl Y2FsY3VsYXRlU3R5bGVzICAgOiAyLAotICAgIFBhaW50ICAgICAgICAgICAgICAgOiAzLAotICAg IFBhcnNlSFRNTCAgICAgICAgICAgOiA0LAotICAgIFRpbWVySW5zdGFsbCAgICAgICAgOiA1LAot ICAgIFRpbWVyUmVtb3ZlICAgICAgICAgOiA2LAotICAgIFRpbWVyRmlyZSAgICAgICAgICAgOiA3 LAorICAgIEV2ZW50RGlzcGF0Y2ggOiAwLAorICAgIExheW91dCA6IDEsCisgICAgUmVjYWxjdWxh dGVTdHlsZXMgOiAyLAorICAgIFBhaW50IDogMywKKyAgICBQYXJzZUhUTUwgOiA0LAorICAgIFRp bWVySW5zdGFsbCA6IDUsCisgICAgVGltZXJSZW1vdmUgOiA2LAorICAgIFRpbWVyRmlyZSA6IDcs CiAgICAgWEhSUmVhZHlTdGF0ZUNoYW5nZSA6IDgsCi0gICAgWEhSTG9hZCAgICAgICAgICAgICA6 IDksCi0gICAgRXZhbHVhdGVTY3JpcHQgICAgICA6IDEwCisgICAgWEhSTG9hZCA6IDksCisgICAg RXZhbHVhdGVTY3JpcHQgOiAxMCwKKyAgICBSZXNvdXJjZVNlbmRSZXF1ZXN0IDogMTEsCisgICAg UmVzb3VyY2VSZWNlaXZlUmVzcG9uc2UgOiAxMiwKKyAgICBSZXNvdXJjZUZpbmlzaCA6IDEzCiB9 OwogCiBXZWJJbnNwZWN0b3IuYWRkUmVjb3JkVG9UaW1lbGluZSA9IGZ1bmN0aW9uKHJlY29yZCkg ewo= 42485 2009-11-04 08:43:11 -0800 2009-11-04 09:17:22 -0800 Updates and resolves the conflicts. Timeline-resources.diff text/plain 12333 knorton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWIxOWZlOS4uOWJlY2ExYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAwOS0xMS0wMyAgS2VsbHkgTm9ydG9u ICA8a25vcnRvbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZHMgbGlnaHR3ZWlnaHQgbmV0d29yayByZXNvdXJjZXMgdG8gSW5z cGVjdG9yVGltZWxpbmVBZ2VudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMxMDY1CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjp3aWxsU2Vu ZFJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkUmVj ZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRp ZEZpbmlzaExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6 ZGlkRmFpbExvYWRpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFn ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxT ZW5kUmVzb3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZEZpbmlzaExvYWRpbmdSZXNvdXJjZSk6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6 Oik6CisgICAgICAgICogaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlU2VuZFJl cXVlc3RUaW1lbGluZVJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZVJlc291cmNlUmVjZWl2ZVJlc3BvbnNlVGltZWxpbmVSZWNvcmQpOgorICAg ICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZUZpbmlz aFRpbWVsaW5lUmVjb3JkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0 b3J5Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50LmpzOgor CiAyMDA5LTExLTA0ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBT b3J0IFdlYkNvcmUuYmFzZS5leHAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxl ci5jcHAKaW5kZXggZTQ0Mjk2MC4uN2Y5YjViNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ29udHJvbGxlci5jcHAKQEAgLTk0Nyw4ICs5NDcsMTEgQEAgYm9vbCBJbnNwZWN0b3JDb250 cm9sbGVyOjppc01haW5SZXNvdXJjZUxvYWRlcihEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25z dCBLVVIKICAgICByZXR1cm4gbG9hZGVyLT5mcmFtZSgpID09IG1faW5zcGVjdGVkUGFnZS0+bWFp bkZyYW1lKCkgJiYgcmVxdWVzdFVybCA9PSBsb2FkZXItPnJlcXVlc3RVUkwoKTsKIH0KIAotdm9p ZCBJbnNwZWN0b3JDb250cm9sbGVyOjp3aWxsU2VuZFJlcXVlc3QoRG9jdW1lbnRMb2FkZXIqLCB1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3Qg UmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSkKK3ZvaWQgSW5zcGVjdG9yQ29udHJv bGxlcjo6d2lsbFNlbmRSZXF1ZXN0KERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIHVuc2lnbmVkIGxv bmcgaWRlbnRpZmllciwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBSZXNvdXJjZVJl c3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKQogeworICAgIGlmIChtX3RpbWVsaW5lQWdlbnQpCisg ICAgICAgIG1fdGltZWxpbmVBZ2VudC0+d2lsbFNlbmRSZXNvdXJjZVJlcXVlc3QoaWRlbnRpZmll ciwgaXNNYWluUmVzb3VyY2VMb2FkZXIobG9hZGVyLCByZXF1ZXN0LnVybCgpKSwgcmVxdWVzdCk7 CisKICAgICBSZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+IHJlc291cmNlID0gZ2V0VHJhY2tlZFJl c291cmNlKGlkZW50aWZpZXIpOwogICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgIHJldHVybjsK QEAgLTk2Niw2ICs5NjksOSBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OndpbGxTZW5kUmVx dWVzdChEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZgogCiB2b2lkIEluc3Bl Y3RvckNvbnRyb2xsZXI6OmRpZFJlY2VpdmVSZXNwb25zZShEb2N1bWVudExvYWRlciosIHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7 CisgICAgaWYgKG1fdGltZWxpbmVBZ2VudCkKKyAgICAgICAgbV90aW1lbGluZUFnZW50LT5kaWRS ZWNlaXZlUmVzb3VyY2VSZXNwb25zZShpZGVudGlmaWVyLCByZXNwb25zZSk7CisKICAgICBSZWZQ dHI8SW5zcGVjdG9yUmVzb3VyY2U+IHJlc291cmNlID0gZ2V0VHJhY2tlZFJlc291cmNlKGlkZW50 aWZpZXIpOwogICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgIHJldHVybjsKQEAgLTk5MSw2ICs5 OTcsOSBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFJlY2VpdmVDb250ZW50TGVuZ3Ro KERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZwogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xs ZXI6OmRpZEZpbmlzaExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50 aWZpZXIpCiB7CisgICAgaWYgKG1fdGltZWxpbmVBZ2VudCkKKyAgICAgICAgbV90aW1lbGluZUFn ZW50LT5kaWRGaW5pc2hMb2FkaW5nUmVzb3VyY2UoaWRlbnRpZmllciwgZmFsc2UpOworCiAgICAg UmVmUHRyPEluc3BlY3RvclJlc291cmNlPiByZXNvdXJjZSA9IGdldFRyYWNrZWRSZXNvdXJjZShp ZGVudGlmaWVyKTsKICAgICBpZiAoIXJlc291cmNlKQogICAgICAgICByZXR1cm47CkBAIC0xMDEx LDYgKzEwMjAsOSBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZEZpbmlzaExvYWRpbmco RG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aQogCiB2b2lkIEluc3BlY3RvckNv bnRyb2xsZXI6OmRpZEZhaWxMb2FkaW5nKERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBp ZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZUVycm9yJiAvKmVycm9yKi8pCiB7CisgICAgaWYgKG1f dGltZWxpbmVBZ2VudCkKKyAgICAgICAgbV90aW1lbGluZUFnZW50LT5kaWRGaW5pc2hMb2FkaW5n UmVzb3VyY2UoaWRlbnRpZmllciwgdHJ1ZSk7CisKICAgICBSZWZQdHI8SW5zcGVjdG9yUmVzb3Vy Y2U+IHJlc291cmNlID0gZ2V0VHJhY2tlZFJlc291cmNlKGlkZW50aWZpZXIpOwogICAgIGlmICgh cmVzb3VyY2UpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y VGltZWxpbmVBZ2VudC5jcHAKaW5kZXggZjA1MWMxYS4uYmZiZDhhYSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKQEAgLTM2LDYgKzM2LDggQEAKICNp bmNsdWRlICJFdmVudC5oIgogI2luY2x1ZGUgIkluc3BlY3RvckZyb250ZW5kLmgiCiAjaW5jbHVk ZSAiSW50UmVjdC5oIgorI2luY2x1ZGUgIlJlc291cmNlUmVxdWVzdC5oIgorI2luY2x1ZGUgIlJl c291cmNlUmVzcG9uc2UuaCIKICNpbmNsdWRlICJUaW1lbGluZVJlY29yZEZhY3RvcnkuaCIKIAog I2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5oPgpAQCAtMTU4LDYgKzE2MCwzMSBAQCB2b2lkIElu c3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZEV2YWx1YXRlU2NyaXB0KCkKICAgICBkaWRDb21wbGV0 ZUN1cnJlbnRSZWNvcmQoRXZhbHVhdGVTY3JpcHRUaW1lbGluZVJlY29yZFR5cGUpOwogfQogCit2 b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxTZW5kUmVzb3VyY2VSZXF1ZXN0KHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllciwgYm9vbCBpc01haW5SZXNvdXJjZSwKKyAgICBjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QpCit7CisgICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9IFRpbWVs aW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VTZW5kUmVxdWVzdFRpbWVsaW5lUmVjb3Jk KG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSwKKyAgICAgICAgaWRlbnRp ZmllciwgaXNNYWluUmVzb3VyY2UsIHJlcXVlc3QpOworICAgIHJlY29yZC5zZXQoInR5cGUiLCBS ZXNvdXJjZVNlbmRSZXF1ZXN0VGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBtX2Zyb250ZW5kLT5h ZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29yZCk7Cit9CisKK3ZvaWQgSW5zcGVjdG9yVGltZWxpbmVB Z2VudDo6ZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9uc2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKK3sKKyAgICBTY3JpcHRPYmplY3Qg cmVjb3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZVJlY2VpdmVSZXNw b25zZVRpbWVsaW5lUmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMo KSwKKyAgICAgICAgaWRlbnRpZmllciwgcmVzcG9uc2UpOworICAgIHJlY29yZC5zZXQoInR5cGUi LCBSZXNvdXJjZVJlY2VpdmVSZXNwb25zZVRpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAgbV9mcm9u dGVuZC0+YWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQpOworfQorCit2b2lkIEluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OmRpZEZpbmlzaExvYWRpbmdSZXNvdXJjZSh1bnNpZ25lZCBsb25nIGlkZW50 aWZpZXIsIGJvb2wgZGlkRmFpbCkKK3sKKyAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0gVGltZWxp bmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZUZpbmlzaFRpbWVsaW5lUmVjb3JkKG1fZnJv bnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSwKKyAgICAgICAgaWRlbnRpZmllciwg ZGlkRmFpbCk7CisgICAgcmVjb3JkLnNldCgidHlwZSIsIFJlc291cmNlRmluaXNoVGltZWxpbmVS ZWNvcmRUeXBlKTsKKyAgICBtX2Zyb250ZW5kLT5hZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29yZCk7 Cit9CisKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTWFya1RpbWVsaW5lKGNvbnN0 IFN0cmluZyYgbWVzc2FnZSkKIHsKICAgICBhZGRSZWNvcmRUb1RpbWVsaW5lKFRpbWVsaW5lUmVj b3JkRmFjdG9yeTo6Y3JlYXRlTWFya1RpbWVsaW5lUmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRU aW1lSW5NaWxsaXNlY29uZHMoKSwgbWVzc2FnZSksIE1hcmtUaW1lbGluZVJlY29yZFR5cGUpOwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oIGIv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCmluZGV4IGQ1MDAwOTAu LmMzZjUxMzkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5l QWdlbnQuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgK QEAgLTQxLDYgKzQxLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIEV2ZW50Owog ICAgIGNsYXNzIEluc3BlY3RvckZyb250ZW5kOwogICAgIGNsYXNzIEludFJlY3Q7CisgICAgY2xh c3MgUmVzb3VyY2VSZXF1ZXN0OworICAgIGNsYXNzIFJlc291cmNlUmVzcG9uc2U7CiAKICAgICAv LyBNdXN0IGJlIGtlcHQgaW4gc3luYyB3aXRoIFRpbWVsaW5lQWdlbnQuanMKICAgICBlbnVtIFRp bWVsaW5lUmVjb3JkVHlwZSB7CkBAIC01Niw2ICs1OCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgWEhSTG9hZFJlY29yZFR5cGUgPSA5LAogICAgICAgICBFdmFsdWF0ZVNjcmlwdFRp bWVsaW5lUmVjb3JkVHlwZSA9IDEwLAogICAgICAgICBNYXJrVGltZWxpbmVSZWNvcmRUeXBlID0g MTEsCisgICAgICAgIFJlc291cmNlU2VuZFJlcXVlc3RUaW1lbGluZVJlY29yZFR5cGUgPSAxMiwK KyAgICAgICAgUmVzb3VyY2VSZWNlaXZlUmVzcG9uc2VUaW1lbGluZVJlY29yZFR5cGUgPSAxMywK KyAgICAgICAgUmVzb3VyY2VGaW5pc2hUaW1lbGluZVJlY29yZFR5cGUgPSAxNCwKICAgICB9Owog CiAgICAgY2xhc3MgSW5zcGVjdG9yVGltZWxpbmVBZ2VudCB7CkBAIC05Nyw2ICsxMDIsMTAgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZvaWQgZGlkTWFya1RpbWVsaW5lKGNvbnN0 IFN0cmluZyYpOwogCisgICAgICAgIHZvaWQgd2lsbFNlbmRSZXNvdXJjZVJlcXVlc3QodW5zaWdu ZWQgbG9uZywgYm9vbCBpc01haW5SZXNvdXJjZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7Cisg ICAgICAgIHZvaWQgZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9uc2UodW5zaWduZWQgbG9uZywgY29u c3QgUmVzb3VyY2VSZXNwb25zZSYpOworICAgICAgICB2b2lkIGRpZEZpbmlzaExvYWRpbmdSZXNv dXJjZSh1bnNpZ25lZCBsb25nLCBib29sIGRpZEZhaWwpOworCiAgICAgICAgIHN0YXRpYyBJbnNw ZWN0b3JUaW1lbGluZUFnZW50KiByZXRyaWV2ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7CiAg ICAgcHJpdmF0ZToKICAgICAgICAgc3RydWN0IFRpbWVsaW5lUmVjb3JkRW50cnkgewpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcCBiL1dlYkNv cmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAKaW5kZXggYjM1MjkwZi4uMDhm YjczOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5 LmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwCkBA IC0zNiw4ICszNiwxMSBAQAogI2luY2x1ZGUgIkV2ZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9y RnJvbnRlbmQuaCIKICNpbmNsdWRlICJJbnRSZWN0LmgiCisjaW5jbHVkZSAiUmVzb3VyY2VSZXF1 ZXN0LmgiCisjaW5jbHVkZSAiUmVzb3VyY2VSZXNwb25zZS5oIgogI2luY2x1ZGUgIlNjcmlwdEFy cmF5LmgiCiAjaW5jbHVkZSAiU2NyaXB0T2JqZWN0LmgiCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29y ZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUpCkBAIC0xMTQs NiArMTE3LDQ0IEBAIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZU1h cmtUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCoKICAgICByZXR1cm4gaXRlbTsKIH0K IAorCitTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJjZVNl bmRSZXF1ZXN0VGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3Vi bGUgc3RhcnRUaW1lLAorICAgIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgYm9vbCBpc01haW5S ZXNvdXJjZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQoreworICAgIFNjcmlwdE9i amVjdCByZWNvcmQgPSBjcmVhdGVHZW5lcmljUmVjb3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOwor ICAgIFNjcmlwdE9iamVjdCBkYXRhID0gZnJvbnRlbmQtPm5ld1NjcmlwdE9iamVjdCgpOworICAg IGRhdGEuc2V0KCJpZGVudGlmaWVyIiwgc3RhdGljX2Nhc3Q8bG9uZyBsb25nPihpZGVudGlmaWVy KSk7CisgICAgZGF0YS5zZXQoInVybCIsIHJlcXVlc3QudXJsKCkuc3RyaW5nKCkpOworICAgIGRh dGEuc2V0KCJyZXF1ZXN0TWV0aG9kIiwgcmVxdWVzdC5odHRwTWV0aG9kKCkpOworICAgIGRhdGEu c2V0KCJpc01haW5SZXNvdXJjZSIsIGlzTWFpblJlc291cmNlKTsKKyAgICByZWNvcmQuc2V0KCJk YXRhIiwgZGF0YSk7CisgICAgcmV0dXJuIHJlY29yZDsKK30KKworU2NyaXB0T2JqZWN0IFRpbWVs aW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VSZWNlaXZlUmVzcG9uc2VUaW1lbGluZVJl Y29yZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsCisgICAg dW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25z ZSkKK3sKKyAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9u dGVuZCwgc3RhcnRUaW1lKTsKKyAgICBTY3JpcHRPYmplY3QgZGF0YSA9IGZyb250ZW5kLT5uZXdT Y3JpcHRPYmplY3QoKTsKKyAgICBkYXRhLnNldCgiaWRlbnRpZmllciIsIHN0YXRpY19jYXN0PGxv bmcgbG9uZz4oaWRlbnRpZmllcikpOworICAgIGRhdGEuc2V0KCJzdGF0dXNDb2RlIiwgcmVzcG9u c2UuaHR0cFN0YXR1c0NvZGUoKSk7CisgICAgZGF0YS5zZXQoIm1pbWVUeXBlIiwgcmVzcG9uc2Uu bWltZVR5cGUoKSk7CisgICAgZGF0YS5zZXQoImV4cGVjdGVkQ29udGVudExlbmd0aCIsIHJlc3Bv bnNlLmV4cGVjdGVkQ29udGVudExlbmd0aCgpKTsKKyAgICByZWNvcmQuc2V0KCJkYXRhIiwgZGF0 YSk7CisgICAgcmV0dXJuIHJlY29yZDsKK30KKworU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3Jk RmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VGaW5pc2hUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9u dGVuZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsCisgICAgdW5zaWduZWQgbG9uZyBpZGVu dGlmaWVyLCBib29sIGRpZEZhaWwpCit7CisgICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9IGNyZWF0 ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0YXJ0VGltZSk7CisgICAgU2NyaXB0T2JqZWN0IGRh dGEgPSBmcm9udGVuZC0+bmV3U2NyaXB0T2JqZWN0KCk7CisgICAgZGF0YS5zZXQoImlkZW50aWZp ZXIiLCBzdGF0aWNfY2FzdDxsb25nIGxvbmc+KGlkZW50aWZpZXIpKTsKKyAgICBkYXRhLnNldCgi ZGlkRmFpbCIsIGRpZEZhaWwpOworICAgIHJlY29yZC5zZXQoImRhdGEiLCBkYXRhKTsKKyAgICBy ZXR1cm4gcmVjb3JkOworfQorCiBTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5Ojpj cmVhdGVQYWludFRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91 YmxlIHN0YXJ0VGltZSwgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICAgICBTY3JpcHRPYmplY3Qg cmVjb3JkID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRUaW1lKTsKZGlmZiAt LWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oIGIvV2ViQ29y ZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgKaW5kZXggZTQwZTY4Yi4uZDUyZTky ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgK KysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgKQEAgLTM4LDYg KzM4LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIEV2ZW50OwogICAgIGNsYXNz IEluc3BlY3RvckZyb250ZW5kOwogICAgIGNsYXNzIEludFJlY3Q7CisgICAgY2xhc3MgUmVzb3Vy Y2VSZXF1ZXN0OworICAgIGNsYXNzIFJlc291cmNlUmVzcG9uc2U7CiAgICAgY2xhc3MgU2NyaXB0 T2JqZWN0OwogCiAgICAgY2xhc3MgVGltZWxpbmVSZWNvcmRGYWN0b3J5IHsKQEAgLTU1LDEwICs1 NywxNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIAogICAgICAgICBzdGF0aWMgU2Ny aXB0T2JqZWN0IGNyZWF0ZUV2YWx1YXRlU2NyaXB0VGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJv bnRlbmQqLCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBTdHJpbmcmLCBkb3VibGUgbGluZU51bWJl cik7CiAgICAgICAgIAotICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVBhaW50VGlt ZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBJ bnRSZWN0Jik7Ci0KICAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVNYXJrVGltZWxp bmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBTdHJp bmcmKTsKIAorICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVJlc291cmNlU2VuZFJl cXVlc3RUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUs CisgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGJvb2wgaXNNYWluUmVzb3Vy Y2UsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOworICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0 IGNyZWF0ZVJlc291cmNlUmVjZWl2ZVJlc3BvbnNlVGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJv bnRlbmQqLCBkb3VibGUgc3RhcnRUaW1lLAorICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBpZGVu dGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CisgICAgICAgIHN0YXRpYyBTY3JpcHRP YmplY3QgY3JlYXRlUmVzb3VyY2VGaW5pc2hUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVu ZCosIGRvdWJsZSBzdGFydFRpbWUsCisgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZp ZXIsIGJvb2wgZGlkRmFpbCk7CisKKyAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVQ YWludFRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwg Y29uc3QgSW50UmVjdCYpOworCiAgICAgcHJpdmF0ZToKICAgICAgICAgVGltZWxpbmVSZWNvcmRG YWN0b3J5KCkgeyB9CiAgICAgfTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9UaW1lbGluZUFnZW50LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVs aW5lQWdlbnQuanMKaW5kZXggMzczNGI3MS4uYzllOWQ2NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMKQEAgLTM0LDE4ICszNCwyMSBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVBZ2VudCA9IGZ1bmN0aW9uKCkgewogCiAvLyBNdXN0IGJlIGtlcHQgaW4g c3luYyB3aXRoIFRpbWVsaW5lSXRlbS5oCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNv cmRUeXBlID0gewotICAgIEV2ZW50RGlzcGF0Y2ggICAgICAgOiAwLAotICAgIExheW91dCAgICAg ICAgICAgICAgOiAxLAotICAgIFJlY2FsY3VsYXRlU3R5bGVzICAgOiAyLAotICAgIFBhaW50ICAg ICAgICAgICAgICAgOiAzLAotICAgIFBhcnNlSFRNTCAgICAgICAgICAgOiA0LAotICAgIFRpbWVy SW5zdGFsbCAgICAgICAgOiA1LAotICAgIFRpbWVyUmVtb3ZlICAgICAgICAgOiA2LAotICAgIFRp bWVyRmlyZSAgICAgICAgICAgOiA3LAorICAgIEV2ZW50RGlzcGF0Y2ggOiAwLAorICAgIExheW91 dCA6IDEsCisgICAgUmVjYWxjdWxhdGVTdHlsZXMgOiAyLAorICAgIFBhaW50IDogMywKKyAgICBQ YXJzZUhUTUwgOiA0LAorICAgIFRpbWVySW5zdGFsbCA6IDUsCisgICAgVGltZXJSZW1vdmUgOiA2 LAorICAgIFRpbWVyRmlyZSA6IDcsCiAgICAgWEhSUmVhZHlTdGF0ZUNoYW5nZSA6IDgsCi0gICAg WEhSTG9hZCAgICAgICAgICAgICA6IDksCi0gICAgRXZhbHVhdGVTY3JpcHQgICAgICA6IDEwLAot ICAgIE1hcmtUaW1lbGluZSAgICAgICAgOiAxMQorICAgIFhIUkxvYWQgOiA5LAorICAgIEV2YWx1 YXRlU2NyaXB0IDogMTAsCisgICAgTWFya1RpbWVsaW5lIDogMTEsCisgICAgUmVzb3VyY2VTZW5k UmVxdWVzdCA6IDEyLAorICAgIFJlc291cmNlUmVjZWl2ZVJlc3BvbnNlIDogMTMsCisgICAgUmVz b3VyY2VGaW5pc2ggOiAxNAogfTsKIAogV2ViSW5zcGVjdG9yLmFkZFJlY29yZFRvVGltZWxpbmUg PSBmdW5jdGlvbihyZWNvcmQpIHsK