54951 2011-02-22 06:07:44 -0800 Web Inspector: Timeline agent should have same lifetime as InspectorAgent 2011-02-22 07:33:09 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 54112 1 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 355215 0 yurys 2011-02-22 06:07:44 -0800 Web Inspector: Timeline agent should have same lifetime as InspectorAgent 355218 1 83304 yurys 2011-02-22 06:11:28 -0800 Created attachment 83304 Patch 355224 2 83304 pfeldman 2011-02-22 06:28:43 -0800 Comment on attachment 83304 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83304&action=review > LayoutTests/inspector/timeline/timeline-network-resource.html:21 > + TimelineAgent.startTimelineProfiler(step1); TimelineAgent.start() > LayoutTests/inspector/timeline/timeline-network-resource.html:31 > + TimelineAgent.stopTimelineProfiler(step3); .stop() > Source/WebCore/inspector/InspectorTimelineAgent.cpp:96 > +/* Comment? 355248 3 83310 yurys 2011-02-22 07:23:55 -0800 Created attachment 83310 Patch that I'm going to land All comments were addressed. 355254 4 yurys 2011-02-22 07:33:09 -0800 Committed r79323: <http://trac.webkit.org/changeset/79323> 83304 2011-02-22 06:11:28 -0800 2011-02-22 06:28:43 -0800 Patch bug-54951-20110222171125.patch text/plain 24218 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogNzkzMDIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjNjlkYjdlODVmYjgwMzdmY2IwNGI2 MDFjNjE4MWE4YjQyN2QyMWVlLi43MmExYTZiNjJiYjRjY2UzZjlmMDI2MWYyYmZmM2U5NDliOGJi ZjQxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDItMjIgIFl1cnkgU2VtaWtoYXRza3kg IDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxpbmUgYWdlbnQgc2hvdWxkIGhhdmUg c2FtZSBsaWZldGltZSBhcyBJbnNwZWN0b3JBZ2VudAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ5NTEKKworICAgICAgICAqIGluc3BlY3Rvci90aW1l bGluZS90aW1lbGluZS1uZXR3b3JrLXJlc291cmNlLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9y L3RpbWVsaW5lL3RpbWVsaW5lLXNjcmlwdC10YWctMS5odG1sOgorICAgICAgICAqIGluc3BlY3Rv ci90aW1lbGluZS90aW1lbGluZS1zY3JpcHQtdGFnLTIuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0 b3IvdGltZWxpbmUvdGltZWxpbmUtdGVzdC5qczoKKyAgICAgICAgKGluaXRpYWxpemVfVGltZWxp bmUuSW5zcGVjdG9yVGVzdC5wZXJmb3JtQWN0aW9uc0FuZFByaW50LnN0ZXAyKToKKyAgICAgICAg KiBpbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtdHJpdmlhbC5odG1sOgorCiAyMDExLTAyLTIy ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJl dmlld2VkLCBHVEsgcmViYXNlbGluZSBvZiBtZWRpYS92aWRlby1hc3BlY3QtcmF0aW8uaHRtbApk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLW5ldHdv cmstcmVzb3VyY2UuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90aW1lbGlu ZS1uZXR3b3JrLXJlc291cmNlLmh0bWwKaW5kZXggMTA1NGI3MGNhNjc1MWJkODlmZThjYjM2Y2M5 MzVlZDdlNDBiYjVmNi4uZGM4YmVlZDVlMzZkMTcwNjNlNTRlOGY4Y2QyZWM5YzljYTBlOTdkMyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLW5ldHdv cmstcmVzb3VyY2UuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvdGlt ZWxpbmUtbmV0d29yay1yZXNvdXJjZS5odG1sCkBAIC0xOCw3ICsxOCw3IEBAIGZ1bmN0aW9uIHRl c3QoKQogICAgIHZhciByZXNvdXJjZUlkOwogICAgIHZhciBzY3JpcHRVcmwgPSAidGltZWxpbmUt bmV0d29yay1yZXNvdXJjZS5qcyI7CiAKLSAgICBJbnNwZWN0b3JBZ2VudC5zdGFydFRpbWVsaW5l UHJvZmlsZXIoc3RlcDEpOworICAgIFRpbWVsaW5lQWdlbnQuc3RhcnRUaW1lbGluZVByb2ZpbGVy KHN0ZXAxKTsKIAogICAgIGZ1bmN0aW9uIHN0ZXAxKCkKICAgICB7CkBAIC0yOCw3ICsyOCw3IEBA IGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgZnVuY3Rpb24gc3RlcDIoKQogICAgIHsKLSAgICAgICAg SW5zcGVjdG9yQWdlbnQuc3RvcFRpbWVsaW5lUHJvZmlsZXIoc3RlcDMpOworICAgICAgICBUaW1l bGluZUFnZW50LnN0b3BUaW1lbGluZVByb2ZpbGVyKHN0ZXAzKTsKICAgICB9CiAKICAgICBmdW5j dGlvbiBzdGVwMygpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUv dGltZWxpbmUtc2NyaXB0LXRhZy0xLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxp bmUvdGltZWxpbmUtc2NyaXB0LXRhZy0xLmh0bWwKaW5kZXggODI0YTVjMDJmZDJiZDBhMjhhYjdk MmQzZmQxZGRmZmRkYzIxNTYzNS4uNjdiYjFhNjZiMGQzZjJmOGM4YjQ3MGVhMmVhNDFlNDE3MjU1 ZDM3MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5l LXNjcmlwdC10YWctMS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90 aW1lbGluZS1zY3JpcHQtdGFnLTEuaHRtbApAQCAtMTMsNyArMTMsNyBAQCBmdW5jdGlvbiBwZXJm b3JtQWN0aW9ucygpCiAKIGZ1bmN0aW9uIHRlc3QoKSAKIHsKLSAgICBJbnNwZWN0b3JBZ2VudC5z dGFydFRpbWVsaW5lUHJvZmlsZXIoc3RlcDEpOworICAgIFRpbWVsaW5lQWdlbnQuc3RhcnRUaW1l bGluZVByb2ZpbGVyKHN0ZXAxKTsKICAgICBmdW5jdGlvbiBzdGVwMSgpCiAgICAgewogICAgICAg ICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKCJwZXJmb3JtQWN0aW9ucygpIik7CkBAIC0y Miw3ICsyMiw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgZnVuY3Rpb24gc3RlcDIoKQogICAg IHsKLSAgICAgICAgSW5zcGVjdG9yQWdlbnQuc3RvcFRpbWVsaW5lUHJvZmlsZXIoc3RlcDMpOwor ICAgICAgICBUaW1lbGluZUFnZW50LnN0b3BUaW1lbGluZVByb2ZpbGVyKHN0ZXAzKTsKICAgICB9 CiAKICAgICBmdW5jdGlvbiBzdGVwMygpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvdGltZWxpbmUvdGltZWxpbmUtc2NyaXB0LXRhZy0yLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtc2NyaXB0LXRhZy0yLmh0bWwKaW5kZXggNGNkZDdkNGVi YTBhYzg1ZWQwNWZjZjMxMWM5NWJlNDlhZWY5ZjcyZC4uOTVjNjE5NmQ3ZWE2YzE5MDdmOWViNmQx MDRiMTEzYjk5Mzc1M2ZiNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVs aW5lL3RpbWVsaW5lLXNjcmlwdC10YWctMi5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci90aW1lbGluZS90aW1lbGluZS1zY3JpcHQtdGFnLTIuaHRtbApAQCAtMTMsNyArMTMsNyBAQCBm dW5jdGlvbiBwZXJmb3JtQWN0aW9ucygpCiAKIGZ1bmN0aW9uIHRlc3QoKSAKIHsKLSAgICBJbnNw ZWN0b3JBZ2VudC5zdGFydFRpbWVsaW5lUHJvZmlsZXIoc3RlcDEpOworICAgIFRpbWVsaW5lQWdl bnQuc3RhcnRUaW1lbGluZVByb2ZpbGVyKHN0ZXAxKTsKICAgICBmdW5jdGlvbiBzdGVwMSgpCiAg ICAgewogICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFNuaWZmZXIoV2ViSW5zcGVjdG9yLkNvbnNv bGVWaWV3LnByb3RvdHlwZSwgImFkZE1lc3NhZ2UiLCBzdGVwMik7CkBAIC0yMiw3ICsyMiw3IEBA IGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgZnVuY3Rpb24gc3RlcDIoKQogICAgIHsKLSAgICAgICAg SW5zcGVjdG9yQWdlbnQuc3RvcFRpbWVsaW5lUHJvZmlsZXIoc3RlcDMpOworICAgICAgICBUaW1l bGluZUFnZW50LnN0b3BUaW1lbGluZVByb2ZpbGVyKHN0ZXAzKTsKICAgICB9CiAKICAgICBmdW5j dGlvbiBzdGVwMygpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUv dGltZWxpbmUtdGVzdC5qcyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90aW1lbGlu ZS10ZXN0LmpzCmluZGV4IDJjNGIzOWQzZmE5NzFhNDVkOTFlYWQwNTFmMzZlYzBhMDYzMGQxMzku LmFkM2FmNDk0ZTU5MTRiYzY4MTVlMjhmNTU1NTNmOTgxZDViNDI5YzggMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS10ZXN0LmpzCisrKyBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS10ZXN0LmpzCkBAIC0xNyw3ICsxNyw3 IEBAIEluc3BlY3RvclRlc3QudGltZWxpbmVOb25EZXRlcm1pbmlzdGljUHJvcHMgPSB7CiAKIElu c3BlY3RvclRlc3QucGVyZm9ybUFjdGlvbnNBbmRQcmludCA9IGZ1bmN0aW9uKGFjdGlvbnMsIHR5 cGVOYW1lKQogewotICAgIEluc3BlY3RvckFnZW50LnN0YXJ0VGltZWxpbmVQcm9maWxlcihzdGVw MSk7CisgICAgVGltZWxpbmVBZ2VudC5zdGFydFRpbWVsaW5lUHJvZmlsZXIoc3RlcDEpOwogICAg IGZ1bmN0aW9uIHN0ZXAxKCkKICAgICB7CiAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJ blBhZ2UoYWN0aW9ucywgc3RlcDIpOwpAQCAtMjUsNyArMjUsNyBAQCBJbnNwZWN0b3JUZXN0LnBl cmZvcm1BY3Rpb25zQW5kUHJpbnQgPSBmdW5jdGlvbihhY3Rpb25zLCB0eXBlTmFtZSkKIAogICAg IGZ1bmN0aW9uIHN0ZXAyKCkKICAgICB7Ci0gICAgICAgIEluc3BlY3RvckFnZW50LnN0b3BUaW1l bGluZVByb2ZpbGVyKHN0ZXAzKTsKKyAgICAgICAgVGltZWxpbmVBZ2VudC5zdG9wVGltZWxpbmVQ cm9maWxlcihzdGVwMyk7CiAgICAgfQogCiAgICAgZnVuY3Rpb24gc3RlcDMoKQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLXRyaXZpYWwuaHRtbCBi L0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS10cml2aWFsLmh0bWwKaW5k ZXggODhiMjM5OTY3OWYyMThiMGZmYWQ4YmFmN2M1NTFlZDBlNDRlMzdlOS4uYWFmOTU4N2RkM2U0 YzYzMTI2NTBkY2Y3ZDlmNDNlMjRhYWEyZmNjZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLXRyaXZpYWwuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtdHJpdmlhbC5odG1sCkBAIC0xMCw3ICsxMCw3IEBA IGZ1bmN0aW9uIHRlc3QoKSB7CiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJUaW1l bGluZSBzdGFydGVkIik7CiAgICAgICAgIEluc3BlY3RvclRlc3QuY29tcGxldGVUZXN0KCk7CiAg ICAgfQotICAgIEluc3BlY3RvckFnZW50LnN0YXJ0VGltZWxpbmVQcm9maWxlcihjYWxsYmFjayk7 CisgICAgVGltZWxpbmVBZ2VudC5zdGFydFRpbWVsaW5lUHJvZmlsZXIoY2FsbGJhY2spOwogfQog CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwppbmRleCAwODc3MjVjYWY3OTVjODIzNjZlMGRjYjJhYzcwMTkxYjljOWI5NTAw Li43YTI3NzY1YTE4MGZmNjIyMWE2MDg0ZDUxZGE2YTA0Mzk5ZjEyMzZiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsNDQgQEAKKzIwMTEtMDItMjIgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgV2ViIEluc3BlY3RvcjogVGltZWxpbmUgYWdlbnQgc2hvdWxkIGhhdmUgc2FtZSBsaWZldGlt ZSBhcyBJbnNwZWN0b3JBZ2VudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTQ5NTEKKworICAgICAgICAqIGluc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5z cGVjdG9yLnBtOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuaWRsOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JBZ2VudDo6SW5zcGVjdG9yQWdlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQWdl bnQ6OnJlc3RvcmVJbnNwZWN0b3JTdGF0ZUZyb21Db29raWUpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQWdlbnQ6OnNldEZyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckFnZW50OjpkaXNjb25uZWN0RnJvbnRlbmQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y QWdlbnQ6OnJlbGVhc2VGcm9udGVuZExpZmV0aW1lQWdlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckFnZW50OjpkaWRDb21taXRMb2FkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvckFnZW50Ojpkb21Db250ZW50TG9hZGVkRXZlbnRGaXJlZCk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JBZ2VudDo6bG9hZEV2ZW50RmlyZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnN0YXJ0VGltZWxp bmVQcm9maWxlcik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpzdG9w VGltZWxpbmVQcm9maWxlcik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVy Ojp0aW1lbGluZVByb2ZpbGVyRW5hYmxlZCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv ckluc3RydW1lbnRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb246OnJldHJpZXZlVGltZWxpbmVBZ2VudCk6CisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6fkluc3BlY3RvclRpbWVsaW5lQWdlbnQpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6c2V0RnJvbnRlbmQpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6Y2xlYXJGcm9udGVuZCk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpyZXN0b3JlKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN0YXJ0VGltZWxpbmVQcm9maWxlcik6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpzdG9wVGltZWxpbmVQcm9maWxlcik6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp0aW1lbGluZVByb2ZpbGVy U3RhcnRlZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRD b21taXRMb2FkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6Oklu c3BlY3RvclRpbWVsaW5lQWdlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6Y2xlYXJSZWNvcmRTdGFjayk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv clRpbWVsaW5lQWdlbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OmNyZWF0ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVs LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl90b2dn bGVUaW1lbGluZUJ1dHRvbkNsaWNrZWQpOgorCiAyMDExLTAyLTIyICBQaGlsaXBwZSBOb3JtYW5k ICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBYYW4gTG9wZXou CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3Bl Y3Rvci5wbSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9y LnBtCmluZGV4IDY5ZGMwNmQzNTczMmQ4OGMyOTM2NTA2YjM0ODQ5YTJkNjRjYjc0MTMuLjg0ZGU0 NjAyM2M0MjI0YWJlZDUwZjlkNmNiYTdlNWNlM2I3Zjk3ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnBtCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnBtCkBAIC03OCw2ICs3OCwx MSBAQCAkdHlwZVRyYW5zZm9ybXsiUnVudGltZSJ9ID0gewogICAgICJoZWFkZXIiID0+ICJJbnNw ZWN0b3JSdW50aW1lQWdlbnQuaCIsCiAgICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0 b3JBZ2VudC0+cnVudGltZUFnZW50KCkiLAogfTsKKyR0eXBlVHJhbnNmb3JteyJUaW1lbGluZSJ9 ID0geworICAgICJmb3J3YXJkIiA9PiAiSW5zcGVjdG9yVGltZWxpbmVBZ2VudCIsCisgICAgImhl YWRlciIgPT4gIkluc3BlY3RvclRpbWVsaW5lQWdlbnQuaCIsCisgICAgImRvbWFpbkFjY2Vzc29y IiA9PiAibV9pbnNwZWN0b3JBZ2VudC0+dGltZWxpbmVBZ2VudCgpIiwKK307CiAKICR0eXBlVHJh bnNmb3JteyJGcm9udGVuZCJ9ID0gewogICAgICJmb3J3YXJkIiA9PiAiSW5zcGVjdG9yRnJvbnRl bmQiLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbAppbmRleCA4MGMyNGRiODBh NDk4MTkxZmYwM2Y0ZDY1MWNkYjc1MjIyZDlkN2U1Li4xN2E2YTc5YTNhYWQ1MmYzY2ViZDRiYzIy ZjNjZWExMDMzYzhjZGY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yLmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbApA QCAtNjMsOSArNjMsNiBAQCBtb2R1bGUgY29yZSB7CiAgICAgICAgIHZvaWQgZGVsZXRlQ29va2ll KGluIFN0cmluZyBjb29raWVOYW1lLCBpbiBTdHJpbmcgZG9tYWluKTsKIAogICAgICAgICAvLyBG SVhNRTogZGlzcGF0Y2ggb24gYWdlbnRzLgotICAgICAgICB2b2lkIHN0YXJ0VGltZWxpbmVQcm9m aWxlcigpOwotICAgICAgICB2b2lkIHN0b3BUaW1lbGluZVByb2ZpbGVyKCk7Ci0KICNpZiBkZWZp bmVkKEVOQUJMRV9KQVZBU0NSSVBUX0RFQlVHR0VSKSAmJiBFTkFCTEVfSkFWQVNDUklQVF9ERUJV R0dFUgogICAgICAgICB2b2lkIGVuYWJsZURlYnVnZ2VyKCk7CiAgICAgICAgIHZvaWQgZGlzYWJs ZURlYnVnZ2VyKCk7CkBAIC0xOTgsNiArMTk1LDggQEAgbW9kdWxlIGNvcmUgewogICAgIH07CiAK ICAgICBpbnRlcmZhY2UgW0NvbmRpdGlvbmFsPUlOU1BFQ1RPUl0gVGltZWxpbmUgeworICAgICAg ICB2b2lkIHN0YXJ0VGltZWxpbmVQcm9maWxlcigpOworICAgICAgICB2b2lkIHN0b3BUaW1lbGlu ZVByb2ZpbGVyKCk7CiAgICAgICAgIFtub3RpZnldIHZvaWQgdGltZWxpbmVQcm9maWxlcldhc1N0 YXJ0ZWQoKTsKICAgICAgICAgW25vdGlmeV0gdm9pZCB0aW1lbGluZVByb2ZpbGVyV2FzU3RvcHBl ZCgpOwogICAgICAgICBbbm90aWZ5XSB2b2lkIGFkZFJlY29yZFRvVGltZWxpbmUob3V0IE9iamVj dCByZWNvcmQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHAK aW5kZXggZDJlYWE2NmMyODRhZTcwYzA1NDNiMmQ5OTZiZGMzZmRkNWVjNWEzYi4uNGYxN2Y2YWVk NWIxZmE4N2E3NmZmZTdlZWRiNzU2ZGE3NGRhYzc4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwCkBAIC0xNDcsNiArMTQ3LDcgQEAgSW5zcGVjdG9yQWdl bnQ6Okluc3BlY3RvckFnZW50KFBhZ2UqIHBhZ2UsIEluc3BlY3RvckNsaWVudCogY2xpZW50KQog ICAgICwgbV9kb21TdG9yYWdlQWdlbnQoSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50OjpjcmVhdGUo bV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpKSkKICNlbmRpZgogICAgICwgbV9zdGF0ZShuZXcg SW5zcGVjdG9yU3RhdGUoY2xpZW50KSkKKyAgICAsIG1fdGltZWxpbmVBZ2VudChJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpjcmVhdGUobV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpLCBtX3N0YXRl LmdldCgpKSkKICAgICAsIG1fY29uc29sZUFnZW50KG5ldyBJbnNwZWN0b3JDb25zb2xlQWdlbnQo bV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpLCB0aGlzLCBtX3N0YXRlLmdldCgpLCBtX2luamVj dGVkU2NyaXB0SG9zdC5nZXQoKSwgbV9kb21BZ2VudC5nZXQoKSkpCiAjaWYgRU5BQkxFKEpBVkFT Q1JJUFRfREVCVUdHRVIpCiAgICAgLCBtX3Byb2ZpbGVyQWdlbnQoSW5zcGVjdG9yUHJvZmlsZXJB Z2VudDo6Y3JlYXRlKHRoaXMpKQpAQCAtMjAyLDcgKzIwMyw3IEBAIHZvaWQgSW5zcGVjdG9yQWdl bnQ6OnJlc3RvcmVJbnNwZWN0b3JTdGF0ZUZyb21Db29raWUoY29uc3QgU3RyaW5nJiBpbnNwZWN0 b3JTdGF0CiAgICAgcHVzaERhdGFDb2xsZWN0ZWRPZmZsaW5lKCk7CiAKICAgICBtX3Jlc291cmNl QWdlbnQgPSBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXN0b3JlKG1faW5zcGVjdGVkUGFnZSwg bV9zdGF0ZS5nZXQoKSwgbV9mcm9udGVuZCk7Ci0gICAgbV90aW1lbGluZUFnZW50ID0gSW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6cmVzdG9yZShtX3N0YXRlLmdldCgpLCBtX2Zyb250ZW5kKTsKKyAg ICBtX3RpbWVsaW5lQWdlbnQtPnJlc3RvcmUobV9zdGF0ZS5nZXQoKSwgbV9mcm9udGVuZCk7CiAK ICNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKICAgICByZXN0b3JlRGVidWdnZXIoZmFs c2UpOwpAQCAtMzQ0LDYgKzM0NSw3IEBAIHZvaWQgSW5zcGVjdG9yQWdlbnQ6OnNldEZyb250ZW5k KEluc3BlY3RvckZyb250ZW5kKiBpbnNwZWN0b3JGcm9udGVuZCkKIAogICAgIG1fZG9tQWdlbnQt PnNldEZyb250ZW5kKG1fZnJvbnRlbmQpOwogICAgIG1fY29uc29sZUFnZW50LT5zZXRGcm9udGVu ZChtX2Zyb250ZW5kKTsKKyAgICBtX3RpbWVsaW5lQWdlbnQtPnNldEZyb250ZW5kKG1fZnJvbnRl bmQpOwogI2lmIEVOQUJMRShEQVRBQkFTRSkKICAgICBtX2RhdGFiYXNlQWdlbnQtPnNldEZyb250 ZW5kKG1fZnJvbnRlbmQpOwogI2VuZGlmCkBAIC0zODIsNiArMzg0LDcgQEAgdm9pZCBJbnNwZWN0 b3JBZ2VudDo6ZGlzY29ubmVjdEZyb250ZW5kKCkKIAogICAgIG1fY29uc29sZUFnZW50LT5jbGVh ckZyb250ZW5kKCk7CiAgICAgbV9kb21BZ2VudC0+Y2xlYXJGcm9udGVuZCgpOworICAgIG1fdGlt ZWxpbmVBZ2VudC0+Y2xlYXJGcm9udGVuZCgpOwogI2lmIEVOQUJMRShEQVRBQkFTRSkKICAgICBt X2RhdGFiYXNlQWdlbnQtPmNsZWFyRnJvbnRlbmQoKTsKICNlbmRpZgpAQCAtNDEzLDggKzQxNiw2 IEBAIHZvaWQgSW5zcGVjdG9yQWdlbnQ6OnJlbGVhc2VGcm9udGVuZExpZmV0aW1lQWdlbnRzKCkK IHsKICAgICBtX3Jlc291cmNlQWdlbnQuY2xlYXIoKTsKICAgICBtX3J1bnRpbWVBZ2VudC5jbGVh cigpOwotICAgIG1fdGltZWxpbmVBZ2VudC5jbGVhcigpOwotCiAjaWYgRU5BQkxFKE9GRkxJTkVf V0VCX0FQUExJQ0FUSU9OUykKICAgICBtX2FwcGxpY2F0aW9uQ2FjaGVBZ2VudC5jbGVhcigpOwog I2VuZGlmCkBAIC01MDEsOCArNTAyLDggQEAgdm9pZCBJbnNwZWN0b3JBZ2VudDo6ZGlkQ29tbWl0 TG9hZChEb2N1bWVudExvYWRlciogbG9hZGVyKQogICAgICAgICBtX2luamVjdGVkU2NyaXB0SG9z dC0+ZGlzY2FyZEluamVjdGVkU2NyaXB0cygpOwogICAgICAgICBtX2NvbnNvbGVBZ2VudC0+cmVz ZXQoKTsKIAotICAgICAgICBpZiAobV90aW1lbGluZUFnZW50KQotICAgICAgICAgICAgbV90aW1l bGluZUFnZW50LT5kaWRDb21taXRMb2FkKCk7CisgICAgICAgIGlmIChJbnNwZWN0b3JUaW1lbGlu ZUFnZW50KiB0aW1lbGluZUFnZW50ID0gbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JU aW1lbGluZUFnZW50KCkpCisgICAgICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRDb21taXRMb2Fk KCk7CiAKICNpZiBFTkFCTEUoT0ZGTElORV9XRUJfQVBQTElDQVRJT05TKQogICAgICAgICBpZiAo bV9hcHBsaWNhdGlvbkNhY2hlQWdlbnQpCkBAIC01NDksOCArNTUwLDggQEAgdm9pZCBJbnNwZWN0 b3JBZ2VudDo6ZG9tQ29udGVudExvYWRlZEV2ZW50RmlyZWQoRG9jdW1lbnRMb2FkZXIqIGxvYWRl ciwgY29uc3QgS1UKIAogICAgIGlmIChJbnNwZWN0b3JET01BZ2VudCogZG9tQWdlbnQgPSBtX2lu c3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckRPTUFnZW50KCkpCiAgICAgICAgIGRvbUFnZW50 LT5tYWluRnJhbWVET01Db250ZW50TG9hZGVkKCk7Ci0gICAgaWYgKG1fdGltZWxpbmVBZ2VudCkK LSAgICAgICAgbV90aW1lbGluZUFnZW50LT5kaWRNYXJrRE9NQ29udGVudEV2ZW50KCk7CisgICAg aWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBtX2luc3RydW1lbnRp bmdBZ2VudHMtPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkKKyAgICAgICAgdGltZWxpbmVBZ2Vu dC0+ZGlkTWFya0RPTUNvbnRlbnRFdmVudCgpOwogICAgIGlmIChtX2Zyb250ZW5kKQogICAgICAg ICBtX2Zyb250ZW5kLT5kb21Db250ZW50RXZlbnRGaXJlZChjdXJyZW50VGltZSgpKTsKIH0KQEAg LTU2Niw4ICs1NjcsOCBAQCB2b2lkIEluc3BlY3RvckFnZW50Ojpsb2FkRXZlbnRGaXJlZChEb2N1 bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBLVVJMJiB1cmwpCiAgICAgaWYgKCFpc01haW5SZXNv dXJjZUxvYWRlcihsb2FkZXIsIHVybCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX3Rp bWVsaW5lQWdlbnQpCi0gICAgICAgIG1fdGltZWxpbmVBZ2VudC0+ZGlkTWFya0xvYWRFdmVudCgp OworICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gbV9pbnN0 cnVtZW50aW5nQWdlbnRzLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCkpCisgICAgICAgIHRpbWVs aW5lQWdlbnQtPmRpZE1hcmtMb2FkRXZlbnQoKTsKICAgICBpZiAobV9mcm9udGVuZCkKICAgICAg ICAgbV9mcm9udGVuZC0+bG9hZEV2ZW50RmlyZWQoY3VycmVudFRpbWUoKSk7CiB9CkBAIC01ODgs MTkgKzU4OSw2IEBAIHZvaWQgSW5zcGVjdG9yQWdlbnQ6OmFwcGx5VXNlckFnZW50T3ZlcnJpZGUo U3RyaW5nKiB1c2VyQWdlbnQpIGNvbnN0CiAgICAgICAgICp1c2VyQWdlbnQgPSBtX3VzZXJBZ2Vu dE92ZXJyaWRlOwogfQogCi12b2lkIEluc3BlY3RvckFnZW50OjpzdGFydFRpbWVsaW5lUHJvZmls ZXIoKQotewotICAgIGlmIChtX3RpbWVsaW5lQWdlbnQgfHwgIWVuYWJsZWQoKSB8fCAhbV9mcm9u dGVuZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV90aW1lbGluZUFnZW50ID0gSW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6Y3JlYXRlKG1fc3RhdGUuZ2V0KCksIG1fZnJvbnRlbmQpOwotfQotCi12 b2lkIEluc3BlY3RvckFnZW50OjpzdG9wVGltZWxpbmVQcm9maWxlcigpCi17Ci0gICAgbV90aW1l bGluZUFnZW50LmNsZWFyKCk7Ci19Ci0KICNpZiBFTkFCTEUoV09SS0VSUykKIGNsYXNzIFBvc3RX b3JrZXJOb3RpZmljYXRpb25Ub0Zyb250ZW5kVGFzayA6IHB1YmxpYyBTY3JpcHRFeGVjdXRpb25D b250ZXh0OjpUYXNrIHsKIHB1YmxpYzoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckFnZW50LmgKaW5kZXggNzVkMDM3NTliYmExOTFkMWJkYTRjN2JiYjQ4MmRkZDAzYWU0ODU2NC4u Zjk0NWIzMGI1Yzk1YTZjMGFjNzE3MDQ1YTZhZmM2YjgxZWM5NDE0OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmgKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmgKQEAgLTE2OCw5ICsxNjgsNiBAQCBwdWJsaWM6 CiAKICAgICB2b2lkIGRpZENvbW1pdExvYWQoRG9jdW1lbnRMb2FkZXIqKTsKIAotICAgIHZvaWQg c3RhcnRUaW1lbGluZVByb2ZpbGVyKCk7Ci0gICAgdm9pZCBzdG9wVGltZWxpbmVQcm9maWxlcigp OwotCiAgICAgdm9pZCBnZXRDb29raWVzKFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIGNvb2tpZXMs IFdURjo6U3RyaW5nKiBjb29raWVzU3RyaW5nKTsKICAgICB2b2lkIGRlbGV0ZUNvb2tpZShjb25z dCBTdHJpbmcmIGNvb2tpZU5hbWUsIGNvbnN0IFN0cmluZyYgZG9tYWluKTsKIApAQCAtMjc3LDgg KzI3NCw4IEBAIHByaXZhdGU6CiAgICAgT3duUHRyPEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudD4g bV9kb21TdG9yYWdlQWdlbnQ7CiAjZW5kaWYKIAotICAgIE93blB0cjxJbnNwZWN0b3JUaW1lbGlu ZUFnZW50PiBtX3RpbWVsaW5lQWdlbnQ7CiAgICAgT3duUHRyPEluc3BlY3RvclN0YXRlPiBtX3N0 YXRlOworICAgIE93blB0cjxJbnNwZWN0b3JUaW1lbGluZUFnZW50PiBtX3RpbWVsaW5lQWdlbnQ7 CiAKICNpZiBFTkFCTEUoT0ZGTElORV9XRUJfQVBQTElDQVRJT05TKQogICAgIE93blB0cjxJbnNw ZWN0b3JBcHBsaWNhdGlvbkNhY2hlQWdlbnQ+IG1fYXBwbGljYXRpb25DYWNoZUFnZW50OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4 IDMyN2Q4MzRlNjM3NjJjNTg0OGQ1OTAwMTJhYjVjNTZjMWI0NzViOGEuLmU2ZDc2MGIxZDc1NjRj ZjVmZjMzNmY0MzE4NzY1YzUzMTYxNzBkNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTQzLDYgKzQzLDcgQEAKICNpbmNsdWRl ICJJbnNwZWN0b3JGcm9udGVuZC5oIgogI2luY2x1ZGUgIkluc3BlY3RvckZyb250ZW5kQ2xpZW50 LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgiCisjaW5jbHVkZSAiSW5z cGVjdG9yVGltZWxpbmVBZ2VudC5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJTY3Jp cHRPYmplY3QuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgpAQCAtODQsMTIgKzg1LDEyIEBAIHZv aWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkQ2xlYXJXaW5kb3dPYmplY3RJbldvcmxkKEZyYW1l KiBmcmFtZSwgRE9NV3JhcHBlcldvCiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c3RhcnRU aW1lbGluZVByb2ZpbGVyKCkKIHsKLSAgICBtX2luc3BlY3RvckFnZW50LT5zdGFydFRpbWVsaW5l UHJvZmlsZXIoKTsKKyAgICBtX2luc3BlY3RvckFnZW50LT50aW1lbGluZUFnZW50KCktPnN0YXJ0 VGltZWxpbmVQcm9maWxlcigpOwogfQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnN0b3BU aW1lbGluZVByb2ZpbGVyKCkKIHsKLSAgICBtX2luc3BlY3RvckFnZW50LT5zdG9wVGltZWxpbmVQ cm9maWxlcigpOworICAgIG1faW5zcGVjdG9yQWdlbnQtPnRpbWVsaW5lQWdlbnQoKS0+c3RvcFRp bWVsaW5lUHJvZmlsZXIoKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpjb25uZWN0 RnJvbnRlbmQoKQpAQCAtMTg5LDcgKzE5MCw3IEBAIFBhZ2UqIEluc3BlY3RvckNvbnRyb2xsZXI6 Omluc3BlY3RlZFBhZ2UoKSBjb25zdAogCiBib29sIEluc3BlY3RvckNvbnRyb2xsZXI6OnRpbWVs aW5lUHJvZmlsZXJFbmFibGVkKCkKIHsKLSAgICByZXR1cm4gbV9pbnNwZWN0b3JBZ2VudC0+dGlt ZWxpbmVBZ2VudCgpOworICAgIHJldHVybiBtX2luc3BlY3RvckFnZW50LT50aW1lbGluZUFnZW50 KCktPnRpbWVsaW5lUHJvZmlsZXJTdGFydGVkKCk7CiB9CiAKICNpZiBFTkFCTEUoSkFWQVNDUklQ VF9ERUJVR0dFUikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JJbnN0cnVtZW50YXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckluc3RydW1lbnRhdGlvbi5jcHAKaW5kZXggZWYzMTEwMGVlMDQxMGNiN2UwNzM1YzMxNTZjMzgy OWNhNzI3ODc3NC4uOTNlYmVjNDU3NTczYjVhNWViNWM0MjIwZGE4YWQ3OWM0MDM1N2M5OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlv bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRh dGlvbi5jcHAKQEAgLTY4Miw3ICs2ODIsNyBAQCB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6Y2FuY2VsUGF1c2VPbk5hdGl2ZUV2ZW50KEluc3BlY3RvckFnZW50KiBpbnNwZWN0bwogCiBJ bnNwZWN0b3JUaW1lbGluZUFnZW50KiBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnJldHJpZXZl VGltZWxpbmVBZ2VudChJbnNwZWN0b3JBZ2VudCogaW5zcGVjdG9yQWdlbnQpCiB7Ci0gICAgcmV0 dXJuIGluc3BlY3RvckFnZW50LT50aW1lbGluZUFnZW50KCk7CisgICAgcmV0dXJuIGluc3BlY3Rv ckFnZW50LT5pbnN0cnVtZW50aW5nQWdlbnRzKCktPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKTsK IH0KIAogSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpy ZXRyaWV2ZVRpbWVsaW5lQWdlbnQoY29uc3QgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2ll JiBjb29raWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y VGltZWxpbmVBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudC5jcHAKaW5kZXggZGQwYTExOTAxYWU0NjI5MTA5YzRjM2RjMzUxZDhlZGY0Y2Fj ZGYzZi4uMzMwMjhlMTM1MWZlNzA3MWE1YmQwYjJiNjEwYmFiODk4NWRkOTg2YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcApA QCAtMzYsNiArMzYsNyBAQAogI2luY2x1ZGUgIkV2ZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9y RnJvbnRlbmQuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JTdGF0ZS5oIgorI2luY2x1ZGUgIkluc3Ry dW1lbnRpbmdBZ2VudHMuaCIKICNpbmNsdWRlICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAiUmVzb3Vy Y2VSZXF1ZXN0LmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VSZXNwb25zZS5oIgpAQCAtNDksMTUgKzUw LDYgQEAgbmFtZXNwYWNlIFRpbWVsaW5lQWdlbnRTdGF0ZSB7CiBzdGF0aWMgY29uc3QgY2hhciB0 aW1lbGluZUFnZW50RW5hYmxlZFtdID0gInRpbWVsaW5lQWdlbnRFbmFibGVkIjsKIH0KIAotaW50 IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnNfaWQgPSAwOwotCi1QYXNzT3duUHRyPEluc3BlY3Rv clRpbWVsaW5lQWdlbnQ+IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJlc3RvcmUoSW5zcGVjdG9y U3RhdGUqIHN0YXRlLCBJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpCi17Ci0gICAgaWYgKHN0 YXRlLT5nZXRCb29sZWFuKFRpbWVsaW5lQWdlbnRTdGF0ZTo6dGltZWxpbmVBZ2VudEVuYWJsZWQp KQotICAgICAgICByZXR1cm4gY3JlYXRlKHN0YXRlLCBmcm9udGVuZCk7Ci0gICAgcmV0dXJuIDA7 Ci19Ci0KIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cHVzaEdDRXZlbnRSZWNvcmRzKCkK IHsKICAgICBpZiAoIW1fZ2NFdmVudHMuc2l6ZSgpKQpAQCAtODAsMTEgKzcyLDYzIEBAIHZvaWQg SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkR0MoZG91YmxlIHN0YXJ0VGltZSwgZG91YmxlIGVu ZFRpbWUsIHNpemVfdCBjb2xsCiAKIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6On5JbnNwZWN0b3JU aW1lbGluZUFnZW50KCkKIHsKLSAgICBtX2Zyb250ZW5kLT50aW1lbGluZVByb2ZpbGVyV2FzU3Rv cHBlZCgpOworICAgIGNsZWFyRnJvbnRlbmQoKTsKK30KKwordm9pZCBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpzZXRGcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpCit7CisgICAg bV9mcm9udGVuZCA9IGZyb250ZW5kOworfQorCit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6 OmNsZWFyRnJvbnRlbmQoKQoreworICAgIHN0b3BUaW1lbGluZVByb2ZpbGVyKCk7CisgICAgbV9m cm9udGVuZCA9IDA7Cit9CisKK3ZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cmVzdG9yZShJ bnNwZWN0b3JTdGF0ZSogc3RhdGUsIEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKK3sKKyAg ICBzZXRGcm9udGVuZChmcm9udGVuZCk7CisgICAgaWYgKHN0YXRlLT5nZXRCb29sZWFuKFRpbWVs aW5lQWdlbnRTdGF0ZTo6dGltZWxpbmVBZ2VudEVuYWJsZWQpKQorICAgICAgICBzdGFydFRpbWVs aW5lUHJvZmlsZXIoKTsKK30KKworLyoKK0luc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmNsZWFyUmVj b3JkcygpCit7Cit9CisqLworCit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN0YXJ0VGlt ZWxpbmVQcm9maWxlcigpCit7CisgICAgaWYgKCFtX2Zyb250ZW5kKQorICAgICAgICByZXR1cm47 CisgICAgbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5zZXRJbnNwZWN0b3JUaW1lbGluZUFnZW50KHRo aXMpOworICAgIFNjcmlwdEdDRXZlbnQ6OmFkZEV2ZW50TGlzdGVuZXIodGhpcyk7CisgICAgbV9m cm9udGVuZC0+dGltZWxpbmVQcm9maWxlcldhc1N0YXJ0ZWQoKTsKKyAgICBtX3N0YXRlLT5zZXRC b29sZWFuKFRpbWVsaW5lQWdlbnRTdGF0ZTo6dGltZWxpbmVBZ2VudEVuYWJsZWQsIHRydWUpOwor fQorCit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnN0b3BUaW1lbGluZVByb2ZpbGVyKCkK K3sKKyAgICBpZiAoIXRpbWVsaW5lUHJvZmlsZXJTdGFydGVkKCkpCisgICAgICAgIHJldHVybjsK KyAgICBtX2luc3RydW1lbnRpbmdBZ2VudHMtPnNldEluc3BlY3RvclRpbWVsaW5lQWdlbnQoMCk7 CisgICAgaWYgKG1fZnJvbnRlbmQpCisgICAgICAgIG1fZnJvbnRlbmQtPnRpbWVsaW5lUHJvZmls ZXJXYXNTdG9wcGVkKCk7CiAgICAgU2NyaXB0R0NFdmVudDo6cmVtb3ZlRXZlbnRMaXN0ZW5lcih0 aGlzKTsKKworICAgIGNsZWFyUmVjb3JkU3RhY2soKTsKKyAgICBtX2djRXZlbnRzLmNsZWFyKCk7 CisKICAgICBtX3N0YXRlLT5zZXRCb29sZWFuKFRpbWVsaW5lQWdlbnRTdGF0ZTo6dGltZWxpbmVB Z2VudEVuYWJsZWQsIGZhbHNlKTsKIH0KIAorYm9vbCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp0 aW1lbGluZVByb2ZpbGVyU3RhcnRlZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fc3RhdGUtPmdl dEJvb2xlYW4oVGltZWxpbmVBZ2VudFN0YXRlOjp0aW1lbGluZUFnZW50RW5hYmxlZCk7Cit9CisK IHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbENhbGxGdW5jdGlvbihjb25zdCBTdHJp bmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5lKQogewogICAgIHB1c2hDdXJyZW50UmVjb3Jk KFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRnVuY3Rpb25DYWxsRGF0YShzY3JpcHROYW1l LCBzY3JpcHRMaW5lKSwgRnVuY3Rpb25DYWxsVGltZWxpbmVSZWNvcmRUeXBlKTsKQEAgLTI4MCwx NCArMzI0LDcgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRNYXJrTG9hZEV2ZW50 KCkKIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDb21taXRMb2FkKCkKIHsKLSAg ICBtX3JlY29yZFN0YWNrLmNsZWFyKCk7Ci19Ci0KLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6c2V0RnJvbnRlbmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQotewotICAgIEFTU0VS VChmcm9udGVuZCk7Ci0gICAgbV9yZWNvcmRTdGFjay5jbGVhcigpOwotICAgIG1fZnJvbnRlbmQg PSBmcm9udGVuZDsKKyAgICBjbGVhclJlY29yZFN0YWNrKCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6YWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9i amVjdD4gcHJwUmVjb3JkLCBUaW1lbGluZVJlY29yZFR5cGUgdHlwZSkKQEAgLTMyOSwxNCArMzY2 LDEyIEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ29tcGxldGVDdXJyZW50UmVj b3JkKFRpbWVsaW5lUmVjb3JkVHlwZSB0eXBlKQogICAgIH0KIH0KIAotSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudChJbnNwZWN0b3JTdGF0ZSogc3RhdGUsIElu c3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKLSAgICA6IG1fc3RhdGUoc3RhdGUpCi0gICAgLCBt X2Zyb250ZW5kKGZyb250ZW5kKQotICAgICwgbV9pZCgrK3NfaWQpCitJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3Ry dW1lbnRpbmdBZ2VudHMsIEluc3BlY3RvclN0YXRlKiBzdGF0ZSkKKyAgICA6IG1faW5zdHJ1bWVu dGluZ0FnZW50cyhpbnN0cnVtZW50aW5nQWdlbnRzKQorICAgICwgbV9zdGF0ZShzdGF0ZSkKKyAg ICAsIG1fZnJvbnRlbmQoMCkKKyAgICAsIG1faWQoMSkKIHsKLSAgICBTY3JpcHRHQ0V2ZW50Ojph ZGRFdmVudExpc3RlbmVyKHRoaXMpOwotICAgIG1fZnJvbnRlbmQtPnRpbWVsaW5lUHJvZmlsZXJX YXNTdGFydGVkKCk7Ci0gICAgbV9zdGF0ZS0+c2V0Qm9vbGVhbihUaW1lbGluZUFnZW50U3RhdGU6 OnRpbWVsaW5lQWdlbnRFbmFibGVkLCB0cnVlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpwdXNoQ3VycmVudFJlY29yZChQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0 YSwgVGltZWxpbmVSZWNvcmRUeXBlIHR5cGUpCkBAIC0zNDUsNiArMzgwLDEzIEBAIHZvaWQgSW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6cHVzaEN1cnJlbnRSZWNvcmQoUGFzc1JlZlB0cjxJbnNwZWN0 b3JPYmplY3Q+IGRhdGEsCiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVjb3JkID0gVGlt ZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKFdURjo6Y3VycmVudFRpbWVN UygpKTsKICAgICBtX3JlY29yZFN0YWNrLmFwcGVuZChUaW1lbGluZVJlY29yZEVudHJ5KHJlY29y ZC5yZWxlYXNlKCksIGRhdGEsIEluc3BlY3RvckFycmF5OjpjcmVhdGUoKSwgdHlwZSkpOwogfQor Cit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmNsZWFyUmVjb3JkU3RhY2soKQoreworICAg IG1fcmVjb3JkU3RhY2suY2xlYXIoKTsKKyAgICBtX2lkKys7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShJTlNQRUNUT1IpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaAppbmRleCAzNmMyZGYyM2Ri ZWQ4Y2ZiMDE1Yjg4ZjEwMDRhZDIwMWMxMmY0NGZhLi43ZGNjZDQ3OWYyMWIyZTA5ZTM4YWRiZDM2 ZmJkYmVlOTY0NTE1YjdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yVGltZWxpbmVBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JUaW1lbGluZUFnZW50LmgKQEAgLTQzLDYgKzQzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogY2xhc3MgRXZlbnQ7CiBjbGFzcyBJbnNwZWN0b3JGcm9udGVuZDsKIGNsYXNzIEluc3BlY3Rv clN0YXRlOworY2xhc3MgSW5zdHJ1bWVudGluZ0FnZW50czsKIGNsYXNzIEludFJlY3Q7CiBjbGFz cyBSZXNvdXJjZVJlcXVlc3Q7CiBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlOwpAQCAtNzUsMTkgKzc2 LDI1IEBAIGVudW0gVGltZWxpbmVSZWNvcmRUeXBlIHsKIGNsYXNzIEluc3BlY3RvclRpbWVsaW5l QWdlbnQgOiBTY3JpcHRHQ0V2ZW50TGlzdGVuZXIgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxF KEluc3BlY3RvclRpbWVsaW5lQWdlbnQpOwogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRy PEluc3BlY3RvclRpbWVsaW5lQWdlbnQ+IGNyZWF0ZShJbnNwZWN0b3JTdGF0ZSogc3RhdGUsIElu c3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkKKyAgICBzdGF0aWMgUGFzc093blB0cjxJbnNwZWN0 b3JUaW1lbGluZUFnZW50PiBjcmVhdGUoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGlu Z0FnZW50cywgSW5zcGVjdG9yU3RhdGUqIHN0YXRlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFk b3B0UHRyKG5ldyBJbnNwZWN0b3JUaW1lbGluZUFnZW50KHN0YXRlLCBmcm9udGVuZCkpOworICAg ICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEluc3BlY3RvclRpbWVsaW5lQWdlbnQoaW5zdHJ1bWVu dGluZ0FnZW50cywgc3RhdGUpKTsKICAgICB9CiAKLSAgICBzdGF0aWMgUGFzc093blB0cjxJbnNw ZWN0b3JUaW1lbGluZUFnZW50PiByZXN0b3JlKEluc3BlY3RvclN0YXRlKiwgSW5zcGVjdG9yRnJv bnRlbmQqKTsKLQogICAgIH5JbnNwZWN0b3JUaW1lbGluZUFnZW50KCk7CiAKKyAgICB2b2lkIHNl dEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5kKik7CisgICAgdm9pZCBjbGVhckZyb250ZW5kKCk7 CisKKyAgICB2b2lkIHJlc3RvcmUoSW5zcGVjdG9yU3RhdGUqLCBJbnNwZWN0b3JGcm9udGVuZCop OworCisgICAgdm9pZCBzdGFydFRpbWVsaW5lUHJvZmlsZXIoKTsKKyAgICB2b2lkIHN0b3BUaW1l bGluZVByb2ZpbGVyKCk7CisgICAgYm9vbCB0aW1lbGluZVByb2ZpbGVyU3RhcnRlZCgpIGNvbnN0 OworCiAgICAgaW50IGlkKCkgY29uc3QgeyByZXR1cm4gbV9pZDsgfQogCiAgICAgdm9pZCBkaWRD b21taXRMb2FkKCk7Ci0gICAgdm9pZCBzZXRGcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZCopOwog CiAgICAgLy8gTWV0aG9kcyBjYWxsZWQgZnJvbSBXZWJDb3JlLgogICAgIHZvaWQgd2lsbENhbGxG dW5jdGlvbihjb25zdCBTdHJpbmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5lKTsKQEAgLTE0 OSw3ICsxNTYsNyBAQCBwcml2YXRlOgogICAgICAgICBUaW1lbGluZVJlY29yZFR5cGUgdHlwZTsK ICAgICB9OwogICAgICAgICAKLSAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KEluc3BlY3RvclN0 YXRlKiwgSW5zcGVjdG9yRnJvbnRlbmQqKTsKKyAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KElu c3RydW1lbnRpbmdBZ2VudHMqLCBJbnNwZWN0b3JTdGF0ZSopOwogCiAgICAgdm9pZCBwdXNoQ3Vy cmVudFJlY29yZChQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4sIFRpbWVsaW5lUmVjb3JkVHlw ZSk7CiAgICAgdm9pZCBzZXRIZWFwU2l6ZVN0YXRpc3RpYyhJbnNwZWN0b3JPYmplY3QqIHJlY29y ZCk7CkBAIC0xNTksMTQgKzE2NiwxNSBAQCBwcml2YXRlOgogICAgIHZvaWQgYWRkUmVjb3JkVG9U aW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4sIFRpbWVsaW5lUmVjb3JkVHlwZSk7 CiAKICAgICB2b2lkIHB1c2hHQ0V2ZW50UmVjb3JkcygpOworICAgIHZvaWQgY2xlYXJSZWNvcmRT dGFjaygpOwogCisgICAgSW5zdHJ1bWVudGluZ0FnZW50cyogbV9pbnN0cnVtZW50aW5nQWdlbnRz OwogICAgIEluc3BlY3RvclN0YXRlKiBtX3N0YXRlOwogICAgIEluc3BlY3RvckZyb250ZW5kKiBt X2Zyb250ZW5kOwogCiAgICAgVmVjdG9yPFRpbWVsaW5lUmVjb3JkRW50cnk+IG1fcmVjb3JkU3Rh Y2s7CiAKLSAgICBzdGF0aWMgaW50IHNfaWQ7Ci0gICAgY29uc3QgaW50IG1faWQ7CisgICAgaW50 IG1faWQ7CiAgICAgc3RydWN0IEdDRXZlbnQgewogICAgICAgICBHQ0V2ZW50KGRvdWJsZSBzdGFy dFRpbWUsIGRvdWJsZSBlbmRUaW1lLCBzaXplX3QgY29sbGVjdGVkQnl0ZXMpCiAgICAgICAgICAg ICA6IHN0YXJ0VGltZShzdGFydFRpbWUpLCBlbmRUaW1lKGVuZFRpbWUpLCBjb2xsZWN0ZWRCeXRl cyhjb2xsZWN0ZWRCeXRlcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVGltZWxpbmVQYW5lbC5qcwppbmRleCBmZTllOGM4M2UwN2I0NzQ1N2M5NGM0NGZhNDg5 MzFiN2VmMjg4MTRlLi5mZjk1ZTY2MzQ1OWI5YjcyMTJkNmVlZjRkNTcwNmU3YjBhNWM4ZGY5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFu ZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBh bmVsLmpzCkBAIC0yNzAsMTAgKzI3MCwxMCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgX3RvZ2dsZVRpbWVsaW5lQnV0dG9uQ2xpY2tlZDogZnVuY3Rpb24o KQogICAgIHsKICAgICAgICAgaWYgKHRoaXMudG9nZ2xlVGltZWxpbmVCdXR0b24udG9nZ2xlZCkK LSAgICAgICAgICAgIEluc3BlY3RvckFnZW50LnN0b3BUaW1lbGluZVByb2ZpbGVyKCk7CisgICAg ICAgICAgICBUaW1lbGluZUFnZW50LnN0b3BUaW1lbGluZVByb2ZpbGVyKCk7CiAgICAgICAgIGVs c2UgewogICAgICAgICAgICAgdGhpcy5fY2xlYXJQYW5lbCgpOwotICAgICAgICAgICAgSW5zcGVj dG9yQWdlbnQuc3RhcnRUaW1lbGluZVByb2ZpbGVyKCk7CisgICAgICAgICAgICBUaW1lbGluZUFn ZW50LnN0YXJ0VGltZWxpbmVQcm9maWxlcigpOwogICAgICAgICB9CiAgICAgfSwKIAo= 83310 2011-02-22 07:23:55 -0800 2011-02-22 07:23:55 -0800 Patch that I'm going to land timeline.patch application/octet-stream 22677 yurys ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjNjlkYjdlLi41OGQ0ZjhhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDIt MjIgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBUaW1lbGlu ZSBhZ2VudCBzaG91bGQgaGF2ZSBzYW1lIGxpZmV0aW1lIGFzIEluc3BlY3RvckFnZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDk1MQorCisgICAg ICAgICogaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLW5ldHdvcmstcmVzb3VyY2UuaHRtbDoK KyAgICAgICAgKiBpbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtc2NyaXB0LXRhZy0xLmh0bWw6 CisgICAgICAgICogaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLXNjcmlwdC10YWctMi5odG1s OgorICAgICAgICAqIGluc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS10ZXN0LmpzOgorICAgICAg ICAoaW5pdGlhbGl6ZV9UaW1lbGluZS5JbnNwZWN0b3JUZXN0LnBlcmZvcm1BY3Rpb25zQW5kUHJp bnQuc3RlcDIpOgorICAgICAgICAqIGluc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS10cml2aWFs Lmh0bWw6CisKIDIwMTEtMDItMjIgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIEdUSyByZWJhc2VsaW5lIG9mIG1lZGlhL3ZpZGVv LWFzcGVjdC1yYXRpby5odG1sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGlt ZWxpbmUvdGltZWxpbmUtbmV0d29yay1yZXNvdXJjZS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3RpbWVsaW5lL3RpbWVsaW5lLW5ldHdvcmstcmVzb3VyY2UuaHRtbAppbmRleCAxMDU0Yjcw Li5mMDAwYzZjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvdGlt ZWxpbmUtbmV0d29yay1yZXNvdXJjZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci90 aW1lbGluZS90aW1lbGluZS1uZXR3b3JrLXJlc291cmNlLmh0bWwKQEAgLTE4LDcgKzE4LDcgQEAg ZnVuY3Rpb24gdGVzdCgpCiAgICAgdmFyIHJlc291cmNlSWQ7CiAgICAgdmFyIHNjcmlwdFVybCA9 ICJ0aW1lbGluZS1uZXR3b3JrLXJlc291cmNlLmpzIjsKIAotICAgIEluc3BlY3RvckFnZW50LnN0 YXJ0VGltZWxpbmVQcm9maWxlcihzdGVwMSk7CisgICAgVGltZWxpbmVBZ2VudC5zdGFydChzdGVw MSk7CiAKICAgICBmdW5jdGlvbiBzdGVwMSgpCiAgICAgewpAQCAtMjgsNyArMjgsNyBAQCBmdW5j dGlvbiB0ZXN0KCkKIAogICAgIGZ1bmN0aW9uIHN0ZXAyKCkKICAgICB7Ci0gICAgICAgIEluc3Bl Y3RvckFnZW50LnN0b3BUaW1lbGluZVByb2ZpbGVyKHN0ZXAzKTsKKyAgICAgICAgVGltZWxpbmVB Z2VudC5zdG9wKHN0ZXAzKTsKICAgICB9CiAKICAgICBmdW5jdGlvbiBzdGVwMygpCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtc2NyaXB0LXRhZy0x Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtc2NyaXB0LXRh Zy0xLmh0bWwKaW5kZXggODI0YTVjMC4uY2JiZjM5NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLXNjcmlwdC10YWctMS5odG1sCisrKyBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1zY3JpcHQtdGFnLTEuaHRtbApAQCAt MTMsNyArMTMsNyBAQCBmdW5jdGlvbiBwZXJmb3JtQWN0aW9ucygpCiAKIGZ1bmN0aW9uIHRlc3Qo KSAKIHsKLSAgICBJbnNwZWN0b3JBZ2VudC5zdGFydFRpbWVsaW5lUHJvZmlsZXIoc3RlcDEpOwor ICAgIFRpbWVsaW5lQWdlbnQuc3RhcnQoc3RlcDEpOwogICAgIGZ1bmN0aW9uIHN0ZXAxKCkKICAg ICB7CiAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoInBlcmZvcm1BY3Rpb25z KCkiKTsKQEAgLTIyLDcgKzIyLDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAKICAgICBmdW5jdGlvbiBz dGVwMigpCiAgICAgewotICAgICAgICBJbnNwZWN0b3JBZ2VudC5zdG9wVGltZWxpbmVQcm9maWxl cihzdGVwMyk7CisgICAgICAgIFRpbWVsaW5lQWdlbnQuc3RvcChzdGVwMyk7CiAgICAgfQogCiAg ICAgZnVuY3Rpb24gc3RlcDMoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Rp bWVsaW5lL3RpbWVsaW5lLXNjcmlwdC10YWctMi5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3RpbWVsaW5lL3RpbWVsaW5lLXNjcmlwdC10YWctMi5odG1sCmluZGV4IDRjZGQ3ZDQuLmZmNzM3 NWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1z Y3JpcHQtdGFnLTIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvdGlt ZWxpbmUtc2NyaXB0LXRhZy0yLmh0bWwKQEAgLTEzLDcgKzEzLDcgQEAgZnVuY3Rpb24gcGVyZm9y bUFjdGlvbnMoKQogCiBmdW5jdGlvbiB0ZXN0KCkgCiB7Ci0gICAgSW5zcGVjdG9yQWdlbnQuc3Rh cnRUaW1lbGluZVByb2ZpbGVyKHN0ZXAxKTsKKyAgICBUaW1lbGluZUFnZW50LnN0YXJ0KHN0ZXAx KTsKICAgICBmdW5jdGlvbiBzdGVwMSgpCiAgICAgewogICAgICAgICBJbnNwZWN0b3JUZXN0LmFk ZFNuaWZmZXIoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSwgImFkZE1lc3NhZ2Ui LCBzdGVwMik7CkBAIC0yMiw3ICsyMiw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgZnVuY3Rp b24gc3RlcDIoKQogICAgIHsKLSAgICAgICAgSW5zcGVjdG9yQWdlbnQuc3RvcFRpbWVsaW5lUHJv ZmlsZXIoc3RlcDMpOworICAgICAgICBUaW1lbGluZUFnZW50LnN0b3Aoc3RlcDMpOwogICAgIH0K IAogICAgIGZ1bmN0aW9uIHN0ZXAzKCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci90aW1lbGluZS90aW1lbGluZS10ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVs aW5lL3RpbWVsaW5lLXRlc3QuanMKaW5kZXggMmM0YjM5ZC4uOTE1MzY4MSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLXRlc3QuanMKKysrIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLXRlc3QuanMKQEAgLTE3LDcgKzE3 LDcgQEAgSW5zcGVjdG9yVGVzdC50aW1lbGluZU5vbkRldGVybWluaXN0aWNQcm9wcyA9IHsKIAog SW5zcGVjdG9yVGVzdC5wZXJmb3JtQWN0aW9uc0FuZFByaW50ID0gZnVuY3Rpb24oYWN0aW9ucywg dHlwZU5hbWUpCiB7Ci0gICAgSW5zcGVjdG9yQWdlbnQuc3RhcnRUaW1lbGluZVByb2ZpbGVyKHN0 ZXAxKTsKKyAgICBUaW1lbGluZUFnZW50LnN0YXJ0KHN0ZXAxKTsKICAgICBmdW5jdGlvbiBzdGVw MSgpCiAgICAgewogICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKGFjdGlvbnMs IHN0ZXAyKTsKQEAgLTI1LDcgKzI1LDcgQEAgSW5zcGVjdG9yVGVzdC5wZXJmb3JtQWN0aW9uc0Fu ZFByaW50ID0gZnVuY3Rpb24oYWN0aW9ucywgdHlwZU5hbWUpCiAKICAgICBmdW5jdGlvbiBzdGVw MigpCiAgICAgewotICAgICAgICBJbnNwZWN0b3JBZ2VudC5zdG9wVGltZWxpbmVQcm9maWxlcihz dGVwMyk7CisgICAgICAgIFRpbWVsaW5lQWdlbnQuc3RvcChzdGVwMyk7CiAgICAgfQogCiAgICAg ZnVuY3Rpb24gc3RlcDMoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVs aW5lL3RpbWVsaW5lLXRyaXZpYWwuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGlu ZS90aW1lbGluZS10cml2aWFsLmh0bWwKaW5kZXggODhiMjM5OS4uM2E0Zjc3NSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLXRyaXZpYWwuaHRtbAor KysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvdGltZWxpbmUtdHJpdmlhbC5odG1s CkBAIC0xMCw3ICsxMCw3IEBAIGZ1bmN0aW9uIHRlc3QoKSB7CiAgICAgICAgIEluc3BlY3RvclRl c3QuYWRkUmVzdWx0KCJUaW1lbGluZSBzdGFydGVkIik7CiAgICAgICAgIEluc3BlY3RvclRlc3Qu Y29tcGxldGVUZXN0KCk7CiAgICAgfQotICAgIEluc3BlY3RvckFnZW50LnN0YXJ0VGltZWxpbmVQ cm9maWxlcihjYWxsYmFjayk7CisgICAgVGltZWxpbmVBZ2VudC5zdGFydChjYWxsYmFjayk7CiB9 CiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IDA4NzcyNWMuLjEwZmNkZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSw0NCBAQAorMjAxMS0wMi0yMiAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgorCisgICAgICAgIFdlYiBJ bnNwZWN0b3I6IFRpbWVsaW5lIGFnZW50IHNob3VsZCBoYXZlIHNhbWUgbGlmZXRpbWUgYXMgSW5z cGVjdG9yQWdlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU0OTUxCisKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5w bToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmlkbDoKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQWdlbnQ6 Okluc3BlY3RvckFnZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckFnZW50OjpyZXN0 b3JlSW5zcGVjdG9yU3RhdGVGcm9tQ29va2llKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckFnZW50OjpzZXRGcm9udGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JBZ2VudDo6 ZGlzY29ubmVjdEZyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckFnZW50Ojpy ZWxlYXNlRnJvbnRlbmRMaWZldGltZUFnZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JBZ2VudDo6ZGlkQ29tbWl0TG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JBZ2Vu dDo6ZG9tQ29udGVudExvYWRlZEV2ZW50RmlyZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yQWdlbnQ6OmxvYWRFdmVudEZpcmVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y QWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpzdGFydFRpbWVsaW5lUHJvZmls ZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6c3RvcFRpbWVsaW5l UHJvZmlsZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6dGltZWxp bmVQcm9maWxlckVuYWJsZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVt ZW50YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u OjpyZXRyaWV2ZVRpbWVsaW5lQWdlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JU aW1lbGluZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdl bnQ6On5JbnNwZWN0b3JUaW1lbGluZUFnZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv clRpbWVsaW5lQWdlbnQ6OnNldEZyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv clRpbWVsaW5lQWdlbnQ6OmNsZWFyRnJvbnRlbmQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6cmVzdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpzdGFydFRpbWVsaW5lUHJvZmlsZXIpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6c3RvcFRpbWVsaW5lUHJvZmlsZXIpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6dGltZWxpbmVQcm9maWxlclN0YXJ0ZWQp OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ29tbWl0TG9h ZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpJbnNwZWN0b3JU aW1lbGluZUFnZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6 OmNsZWFyUmVjb3JkU3RhY2spOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGlu ZUFnZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpjcmVh dGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fdG9nZ2xlVGltZWxp bmVCdXR0b25DbGlja2VkKToKKwogMjAxMS0wMi0yMiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3Jt YW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWGFuIExvcGV6LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG0g Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5wbQppbmRl eCA2OWRjMDZkLi44NGRlNDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv Q29kZUdlbmVyYXRvckluc3BlY3Rvci5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv Q29kZUdlbmVyYXRvckluc3BlY3Rvci5wbQpAQCAtNzgsNiArNzgsMTEgQEAgJHR5cGVUcmFuc2Zv cm17IlJ1bnRpbWUifSA9IHsKICAgICAiaGVhZGVyIiA9PiAiSW5zcGVjdG9yUnVudGltZUFnZW50 LmgiLAogICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1faW5zcGVjdG9yQWdlbnQtPnJ1bnRpbWVB Z2VudCgpIiwKIH07CiskdHlwZVRyYW5zZm9ybXsiVGltZWxpbmUifSA9IHsKKyAgICAiZm9yd2Fy ZCIgPT4gIkluc3BlY3RvclRpbWVsaW5lQWdlbnQiLAorICAgICJoZWFkZXIiID0+ICJJbnNwZWN0 b3JUaW1lbGluZUFnZW50LmgiLAorICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1faW5zcGVjdG9y QWdlbnQtPnRpbWVsaW5lQWdlbnQoKSIsCit9OwogCiAkdHlwZVRyYW5zZm9ybXsiRnJvbnRlbmQi fSA9IHsKICAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3RvckZyb250ZW5kIiwKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKaW5kZXggODBjMjRkYi4uODFkOGNmNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKQEAgLTYzLDkgKzYzLDYgQEAgbW9kdWxlIGNv cmUgewogICAgICAgICB2b2lkIGRlbGV0ZUNvb2tpZShpbiBTdHJpbmcgY29va2llTmFtZSwgaW4g U3RyaW5nIGRvbWFpbik7CiAKICAgICAgICAgLy8gRklYTUU6IGRpc3BhdGNoIG9uIGFnZW50cy4K LSAgICAgICAgdm9pZCBzdGFydFRpbWVsaW5lUHJvZmlsZXIoKTsKLSAgICAgICAgdm9pZCBzdG9w VGltZWxpbmVQcm9maWxlcigpOwotCiAjaWYgZGVmaW5lZChFTkFCTEVfSkFWQVNDUklQVF9ERUJV R0dFUikgJiYgRU5BQkxFX0pBVkFTQ1JJUFRfREVCVUdHRVIKICAgICAgICAgdm9pZCBlbmFibGVE ZWJ1Z2dlcigpOwogICAgICAgICB2b2lkIGRpc2FibGVEZWJ1Z2dlcigpOwpAQCAtMTk4LDYgKzE5 NSw4IEBAIG1vZHVsZSBjb3JlIHsKICAgICB9OwogCiAgICAgaW50ZXJmYWNlIFtDb25kaXRpb25h bD1JTlNQRUNUT1JdIFRpbWVsaW5lIHsKKyAgICAgICAgdm9pZCBzdGFydCgpOworICAgICAgICB2 b2lkIHN0b3AoKTsKICAgICAgICAgW25vdGlmeV0gdm9pZCB0aW1lbGluZVByb2ZpbGVyV2FzU3Rh cnRlZCgpOwogICAgICAgICBbbm90aWZ5XSB2b2lkIHRpbWVsaW5lUHJvZmlsZXJXYXNTdG9wcGVk KCk7CiAgICAgICAgIFtub3RpZnldIHZvaWQgYWRkUmVjb3JkVG9UaW1lbGluZShvdXQgT2JqZWN0 IHJlY29yZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y QWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmNwcApp bmRleCBkMmVhYTY2Li40ZjE3ZjZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JBZ2VudC5jcHAKQEAgLTE0Nyw2ICsxNDcsNyBAQCBJbnNwZWN0b3JBZ2VudDo6SW5zcGVj dG9yQWdlbnQoUGFnZSogcGFnZSwgSW5zcGVjdG9yQ2xpZW50KiBjbGllbnQpCiAgICAgLCBtX2Rv bVN0b3JhZ2VBZ2VudChJbnNwZWN0b3JET01TdG9yYWdlQWdlbnQ6OmNyZWF0ZShtX2luc3RydW1l bnRpbmdBZ2VudHMuZ2V0KCkpKQogI2VuZGlmCiAgICAgLCBtX3N0YXRlKG5ldyBJbnNwZWN0b3JT dGF0ZShjbGllbnQpKQorICAgICwgbV90aW1lbGluZUFnZW50KEluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OmNyZWF0ZShtX2luc3RydW1lbnRpbmdBZ2VudHMuZ2V0KCksIG1fc3RhdGUuZ2V0KCkpKQog ICAgICwgbV9jb25zb2xlQWdlbnQobmV3IEluc3BlY3RvckNvbnNvbGVBZ2VudChtX2luc3RydW1l bnRpbmdBZ2VudHMuZ2V0KCksIHRoaXMsIG1fc3RhdGUuZ2V0KCksIG1faW5qZWN0ZWRTY3JpcHRI b3N0LmdldCgpLCBtX2RvbUFnZW50LmdldCgpKSkKICNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJV R0dFUikKICAgICAsIG1fcHJvZmlsZXJBZ2VudChJbnNwZWN0b3JQcm9maWxlckFnZW50OjpjcmVh dGUodGhpcykpCkBAIC0yMDIsNyArMjAzLDcgQEAgdm9pZCBJbnNwZWN0b3JBZ2VudDo6cmVzdG9y ZUluc3BlY3RvclN0YXRlRnJvbUNvb2tpZShjb25zdCBTdHJpbmcmIGluc3BlY3RvclN0YXQKICAg ICBwdXNoRGF0YUNvbGxlY3RlZE9mZmxpbmUoKTsKIAogICAgIG1fcmVzb3VyY2VBZ2VudCA9IElu c3BlY3RvclJlc291cmNlQWdlbnQ6OnJlc3RvcmUobV9pbnNwZWN0ZWRQYWdlLCBtX3N0YXRlLmdl dCgpLCBtX2Zyb250ZW5kKTsKLSAgICBtX3RpbWVsaW5lQWdlbnQgPSBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpyZXN0b3JlKG1fc3RhdGUuZ2V0KCksIG1fZnJvbnRlbmQpOworICAgIG1fdGltZWxp bmVBZ2VudC0+cmVzdG9yZShtX3N0YXRlLmdldCgpLCBtX2Zyb250ZW5kKTsKIAogI2lmIEVOQUJM RShKQVZBU0NSSVBUX0RFQlVHR0VSKQogICAgIHJlc3RvcmVEZWJ1Z2dlcihmYWxzZSk7CkBAIC0z NDQsNiArMzQ1LDcgQEAgdm9pZCBJbnNwZWN0b3JBZ2VudDo6c2V0RnJvbnRlbmQoSW5zcGVjdG9y RnJvbnRlbmQqIGluc3BlY3RvckZyb250ZW5kKQogCiAgICAgbV9kb21BZ2VudC0+c2V0RnJvbnRl bmQobV9mcm9udGVuZCk7CiAgICAgbV9jb25zb2xlQWdlbnQtPnNldEZyb250ZW5kKG1fZnJvbnRl bmQpOworICAgIG1fdGltZWxpbmVBZ2VudC0+c2V0RnJvbnRlbmQobV9mcm9udGVuZCk7CiAjaWYg RU5BQkxFKERBVEFCQVNFKQogICAgIG1fZGF0YWJhc2VBZ2VudC0+c2V0RnJvbnRlbmQobV9mcm9u dGVuZCk7CiAjZW5kaWYKQEAgLTM4Miw2ICszODQsNyBAQCB2b2lkIEluc3BlY3RvckFnZW50Ojpk aXNjb25uZWN0RnJvbnRlbmQoKQogCiAgICAgbV9jb25zb2xlQWdlbnQtPmNsZWFyRnJvbnRlbmQo KTsKICAgICBtX2RvbUFnZW50LT5jbGVhckZyb250ZW5kKCk7CisgICAgbV90aW1lbGluZUFnZW50 LT5jbGVhckZyb250ZW5kKCk7CiAjaWYgRU5BQkxFKERBVEFCQVNFKQogICAgIG1fZGF0YWJhc2VB Z2VudC0+Y2xlYXJGcm9udGVuZCgpOwogI2VuZGlmCkBAIC00MTMsOCArNDE2LDYgQEAgdm9pZCBJ bnNwZWN0b3JBZ2VudDo6cmVsZWFzZUZyb250ZW5kTGlmZXRpbWVBZ2VudHMoKQogewogICAgIG1f cmVzb3VyY2VBZ2VudC5jbGVhcigpOwogICAgIG1fcnVudGltZUFnZW50LmNsZWFyKCk7Ci0gICAg bV90aW1lbGluZUFnZW50LmNsZWFyKCk7Ci0KICNpZiBFTkFCTEUoT0ZGTElORV9XRUJfQVBQTElD QVRJT05TKQogICAgIG1fYXBwbGljYXRpb25DYWNoZUFnZW50LmNsZWFyKCk7CiAjZW5kaWYKQEAg LTUwMSw4ICs1MDIsOCBAQCB2b2lkIEluc3BlY3RvckFnZW50OjpkaWRDb21taXRMb2FkKERvY3Vt ZW50TG9hZGVyKiBsb2FkZXIpCiAgICAgICAgIG1faW5qZWN0ZWRTY3JpcHRIb3N0LT5kaXNjYXJk SW5qZWN0ZWRTY3JpcHRzKCk7CiAgICAgICAgIG1fY29uc29sZUFnZW50LT5yZXNldCgpOwogCi0g ICAgICAgIGlmIChtX3RpbWVsaW5lQWdlbnQpCi0gICAgICAgICAgICBtX3RpbWVsaW5lQWdlbnQt PmRpZENvbW1pdExvYWQoKTsKKyAgICAgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRp bWVsaW5lQWdlbnQgPSBtX2luc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvclRpbWVsaW5lQWdl bnQoKSkKKyAgICAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZENvbW1pdExvYWQoKTsKIAogI2lm IEVOQUJMRShPRkZMSU5FX1dFQl9BUFBMSUNBVElPTlMpCiAgICAgICAgIGlmIChtX2FwcGxpY2F0 aW9uQ2FjaGVBZ2VudCkKQEAgLTU0OSw4ICs1NTAsOCBAQCB2b2lkIEluc3BlY3RvckFnZW50Ojpk b21Db250ZW50TG9hZGVkRXZlbnRGaXJlZChEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBL VQogCiAgICAgaWYgKEluc3BlY3RvckRPTUFnZW50KiBkb21BZ2VudCA9IG1faW5zdHJ1bWVudGlu Z0FnZW50cy0+aW5zcGVjdG9yRE9NQWdlbnQoKSkKICAgICAgICAgZG9tQWdlbnQtPm1haW5GcmFt ZURPTUNvbnRlbnRMb2FkZWQoKTsKLSAgICBpZiAobV90aW1lbGluZUFnZW50KQotICAgICAgICBt X3RpbWVsaW5lQWdlbnQtPmRpZE1hcmtET01Db250ZW50RXZlbnQoKTsKKyAgICBpZiAoSW5zcGVj dG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IG1faW5zdHJ1bWVudGluZ0FnZW50cy0+ aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpKQorICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRNYXJr RE9NQ29udGVudEV2ZW50KCk7CiAgICAgaWYgKG1fZnJvbnRlbmQpCiAgICAgICAgIG1fZnJvbnRl bmQtPmRvbUNvbnRlbnRFdmVudEZpcmVkKGN1cnJlbnRUaW1lKCkpOwogfQpAQCAtNTY2LDggKzU2 Nyw4IEBAIHZvaWQgSW5zcGVjdG9yQWdlbnQ6OmxvYWRFdmVudEZpcmVkKERvY3VtZW50TG9hZGVy KiBsb2FkZXIsIGNvbnN0IEtVUkwmIHVybCkKICAgICBpZiAoIWlzTWFpblJlc291cmNlTG9hZGVy KGxvYWRlciwgdXJsKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1fdGltZWxpbmVBZ2Vu dCkKLSAgICAgICAgbV90aW1lbGluZUFnZW50LT5kaWRNYXJrTG9hZEV2ZW50KCk7CisgICAgaWYg KEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBtX2luc3RydW1lbnRpbmdB Z2VudHMtPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkKKyAgICAgICAgdGltZWxpbmVBZ2VudC0+ ZGlkTWFya0xvYWRFdmVudCgpOwogICAgIGlmIChtX2Zyb250ZW5kKQogICAgICAgICBtX2Zyb250 ZW5kLT5sb2FkRXZlbnRGaXJlZChjdXJyZW50VGltZSgpKTsKIH0KQEAgLTU4OCwxOSArNTg5LDYg QEAgdm9pZCBJbnNwZWN0b3JBZ2VudDo6YXBwbHlVc2VyQWdlbnRPdmVycmlkZShTdHJpbmcqIHVz ZXJBZ2VudCkgY29uc3QKICAgICAgICAgKnVzZXJBZ2VudCA9IG1fdXNlckFnZW50T3ZlcnJpZGU7 CiB9CiAKLXZvaWQgSW5zcGVjdG9yQWdlbnQ6OnN0YXJ0VGltZWxpbmVQcm9maWxlcigpCi17Ci0g ICAgaWYgKG1fdGltZWxpbmVBZ2VudCB8fCAhZW5hYmxlZCgpIHx8ICFtX2Zyb250ZW5kKQotICAg ICAgICByZXR1cm47Ci0KLSAgICBtX3RpbWVsaW5lQWdlbnQgPSBJbnNwZWN0b3JUaW1lbGluZUFn ZW50OjpjcmVhdGUobV9zdGF0ZS5nZXQoKSwgbV9mcm9udGVuZCk7Ci19Ci0KLXZvaWQgSW5zcGVj dG9yQWdlbnQ6OnN0b3BUaW1lbGluZVByb2ZpbGVyKCkKLXsKLSAgICBtX3RpbWVsaW5lQWdlbnQu Y2xlYXIoKTsKLX0KLQogI2lmIEVOQUJMRShXT1JLRVJTKQogY2xhc3MgUG9zdFdvcmtlck5vdGlm aWNhdGlvblRvRnJvbnRlbmRUYXNrIDogcHVibGljIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OlRh c2sgewogcHVibGljOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuaApp bmRleCA3NWQwMzc1Li5mOTQ1YjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQWdlbnQuaApAQCAtMTY4LDkgKzE2OCw2IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZGlkQ29t bWl0TG9hZChEb2N1bWVudExvYWRlciopOwogCi0gICAgdm9pZCBzdGFydFRpbWVsaW5lUHJvZmls ZXIoKTsKLSAgICB2b2lkIHN0b3BUaW1lbGluZVByb2ZpbGVyKCk7Ci0KICAgICB2b2lkIGdldENv b2tpZXMoUmVmUHRyPEluc3BlY3RvckFycmF5PiogY29va2llcywgV1RGOjpTdHJpbmcqIGNvb2tp ZXNTdHJpbmcpOwogICAgIHZvaWQgZGVsZXRlQ29va2llKGNvbnN0IFN0cmluZyYgY29va2llTmFt ZSwgY29uc3QgU3RyaW5nJiBkb21haW4pOwogCkBAIC0yNzcsOCArMjc0LDggQEAgcHJpdmF0ZToK ICAgICBPd25QdHI8SW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50PiBtX2RvbVN0b3JhZ2VBZ2VudDsK ICNlbmRpZgogCi0gICAgT3duUHRyPEluc3BlY3RvclRpbWVsaW5lQWdlbnQ+IG1fdGltZWxpbmVB Z2VudDsKICAgICBPd25QdHI8SW5zcGVjdG9yU3RhdGU+IG1fc3RhdGU7CisgICAgT3duUHRyPElu c3BlY3RvclRpbWVsaW5lQWdlbnQ+IG1fdGltZWxpbmVBZ2VudDsKIAogI2lmIEVOQUJMRShPRkZM SU5FX1dFQl9BUFBMSUNBVElPTlMpCiAgICAgT3duUHRyPEluc3BlY3RvckFwcGxpY2F0aW9uQ2Fj aGVBZ2VudD4gbV9hcHBsaWNhdGlvbkNhY2hlQWdlbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggMzI3ZDgzNC4uYjJhZThkMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNw cApAQCAtNDMsNiArNDMsNyBAQAogI2luY2x1ZGUgIkluc3BlY3RvckZyb250ZW5kLmgiCiAjaW5j bHVkZSAiSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb24uaCIKKyNpbmNsdWRlICJJbnNwZWN0b3JUaW1lbGluZUFnZW50LmgiCiAjaW5j bHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlNjcmlwdE9iamVjdC5oIgogI2luY2x1ZGUgIlNldHRp bmdzLmgiCkBAIC04NCwxMiArODUsMTIgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRD bGVhcldpbmRvd09iamVjdEluV29ybGQoRnJhbWUqIGZyYW1lLCBET01XcmFwcGVyV28KIAogdm9p ZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzdGFydFRpbWVsaW5lUHJvZmlsZXIoKQogewotICAgIG1f aW5zcGVjdG9yQWdlbnQtPnN0YXJ0VGltZWxpbmVQcm9maWxlcigpOworICAgIG1faW5zcGVjdG9y QWdlbnQtPnRpbWVsaW5lQWdlbnQoKS0+c3RhcnQoKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JDb250 cm9sbGVyOjpzdG9wVGltZWxpbmVQcm9maWxlcigpCiB7Ci0gICAgbV9pbnNwZWN0b3JBZ2VudC0+ c3RvcFRpbWVsaW5lUHJvZmlsZXIoKTsKKyAgICBtX2luc3BlY3RvckFnZW50LT50aW1lbGluZUFn ZW50KCktPnN0b3AoKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpjb25uZWN0RnJv bnRlbmQoKQpAQCAtMTg5LDcgKzE5MCw3IEBAIFBhZ2UqIEluc3BlY3RvckNvbnRyb2xsZXI6Omlu c3BlY3RlZFBhZ2UoKSBjb25zdAogCiBib29sIEluc3BlY3RvckNvbnRyb2xsZXI6OnRpbWVsaW5l UHJvZmlsZXJFbmFibGVkKCkKIHsKLSAgICByZXR1cm4gbV9pbnNwZWN0b3JBZ2VudC0+dGltZWxp bmVBZ2VudCgpOworICAgIHJldHVybiBtX2luc3BlY3RvckFnZW50LT50aW1lbGluZUFnZW50KCkt PnN0YXJ0ZWQoKTsKIH0KIAogI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNw cAppbmRleCBlZjMxMTAwLi45M2ViZWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcApAQCAtNjgyLDcgKzY4Miw3IEBA IHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpjYW5jZWxQYXVzZU9uTmF0aXZlRXZlbnQo SW5zcGVjdG9yQWdlbnQqIGluc3BlY3RvCiAKIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6cmV0cmlldmVUaW1lbGluZUFnZW50KEluc3BlY3RvckFnZW50 KiBpbnNwZWN0b3JBZ2VudCkKIHsKLSAgICByZXR1cm4gaW5zcGVjdG9yQWdlbnQtPnRpbWVsaW5l QWdlbnQoKTsKKyAgICByZXR1cm4gaW5zcGVjdG9yQWdlbnQtPmluc3RydW1lbnRpbmdBZ2VudHMo KS0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpOwogfQogCiBJbnNwZWN0b3JUaW1lbGluZUFnZW50 KiBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnJldHJpZXZlVGltZWxpbmVBZ2VudChjb25zdCBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUmIGNvb2tpZSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAppbmRleCBkZDBhMTE5 Li4zNTRiZGFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y VGltZWxpbmVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clRpbWVsaW5lQWdlbnQuY3BwCkBAIC0zNiw2ICszNiw3IEBACiAjaW5jbHVkZSAiRXZlbnQuaCIK ICNpbmNsdWRlICJJbnNwZWN0b3JGcm9udGVuZC5oIgogI2luY2x1ZGUgIkluc3BlY3RvclN0YXRl LmgiCisjaW5jbHVkZSAiSW5zdHJ1bWVudGluZ0FnZW50cy5oIgogI2luY2x1ZGUgIkludFJlY3Qu aCIKICNpbmNsdWRlICJSZXNvdXJjZVJlcXVlc3QuaCIKICNpbmNsdWRlICJSZXNvdXJjZVJlc3Bv bnNlLmgiCkBAIC00OSwxNSArNTAsNiBAQCBuYW1lc3BhY2UgVGltZWxpbmVBZ2VudFN0YXRlIHsK IHN0YXRpYyBjb25zdCBjaGFyIHRpbWVsaW5lQWdlbnRFbmFibGVkW10gPSAidGltZWxpbmVBZ2Vu dEVuYWJsZWQiOwogfQogCi1pbnQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6c19pZCA9IDA7Ci0K LVBhc3NPd25QdHI8SW5zcGVjdG9yVGltZWxpbmVBZ2VudD4gSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6cmVzdG9yZShJbnNwZWN0b3JTdGF0ZSogc3RhdGUsIEluc3BlY3RvckZyb250ZW5kKiBmcm9u dGVuZCkKLXsKLSAgICBpZiAoc3RhdGUtPmdldEJvb2xlYW4oVGltZWxpbmVBZ2VudFN0YXRlOjp0 aW1lbGluZUFnZW50RW5hYmxlZCkpCi0gICAgICAgIHJldHVybiBjcmVhdGUoc3RhdGUsIGZyb250 ZW5kKTsKLSAgICByZXR1cm4gMDsKLX0KLQogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojpw dXNoR0NFdmVudFJlY29yZHMoKQogewogICAgIGlmICghbV9nY0V2ZW50cy5zaXplKCkpCkBAIC04 MCwxMSArNzIsNTcgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRHQyhkb3VibGUg c3RhcnRUaW1lLCBkb3VibGUgZW5kVGltZSwgc2l6ZV90IGNvbGwKIAogSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6fkluc3BlY3RvclRpbWVsaW5lQWdlbnQoKQogewotICAgIG1fZnJvbnRlbmQtPnRp bWVsaW5lUHJvZmlsZXJXYXNTdG9wcGVkKCk7CisgICAgY2xlYXJGcm9udGVuZCgpOworfQorCit2 b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnNldEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5k KiBmcm9udGVuZCkKK3sKKyAgICBtX2Zyb250ZW5kID0gZnJvbnRlbmQ7Cit9CisKK3ZvaWQgSW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6Y2xlYXJGcm9udGVuZCgpCit7CisgICAgc3RvcCgpOworICAg IG1fZnJvbnRlbmQgPSAwOworfQorCit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJlc3Rv cmUoSW5zcGVjdG9yU3RhdGUqIHN0YXRlLCBJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpCit7 CisgICAgc2V0RnJvbnRlbmQoZnJvbnRlbmQpOworICAgIGlmIChzdGF0ZS0+Z2V0Qm9vbGVhbihU aW1lbGluZUFnZW50U3RhdGU6OnRpbWVsaW5lQWdlbnRFbmFibGVkKSkKKyAgICAgICAgc3RhcnQo KTsKK30KKwordm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpzdGFydCgpCit7CisgICAgaWYg KCFtX2Zyb250ZW5kKQorICAgICAgICByZXR1cm47CisgICAgbV9pbnN0cnVtZW50aW5nQWdlbnRz LT5zZXRJbnNwZWN0b3JUaW1lbGluZUFnZW50KHRoaXMpOworICAgIFNjcmlwdEdDRXZlbnQ6OmFk ZEV2ZW50TGlzdGVuZXIodGhpcyk7CisgICAgbV9mcm9udGVuZC0+dGltZWxpbmVQcm9maWxlcldh c1N0YXJ0ZWQoKTsKKyAgICBtX3N0YXRlLT5zZXRCb29sZWFuKFRpbWVsaW5lQWdlbnRTdGF0ZTo6 dGltZWxpbmVBZ2VudEVuYWJsZWQsIHRydWUpOworfQorCit2b2lkIEluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OnN0b3AoKQoreworICAgIGlmICghc3RhcnRlZCgpKQorICAgICAgICByZXR1cm47Cisg ICAgbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5zZXRJbnNwZWN0b3JUaW1lbGluZUFnZW50KDApOwor ICAgIGlmIChtX2Zyb250ZW5kKQorICAgICAgICBtX2Zyb250ZW5kLT50aW1lbGluZVByb2ZpbGVy V2FzU3RvcHBlZCgpOwogICAgIFNjcmlwdEdDRXZlbnQ6OnJlbW92ZUV2ZW50TGlzdGVuZXIodGhp cyk7CisKKyAgICBjbGVhclJlY29yZFN0YWNrKCk7CisgICAgbV9nY0V2ZW50cy5jbGVhcigpOwor CiAgICAgbV9zdGF0ZS0+c2V0Qm9vbGVhbihUaW1lbGluZUFnZW50U3RhdGU6OnRpbWVsaW5lQWdl bnRFbmFibGVkLCBmYWxzZSk7CiB9CiAKK2Jvb2wgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6c3Rh cnRlZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fc3RhdGUtPmdldEJvb2xlYW4oVGltZWxpbmVB Z2VudFN0YXRlOjp0aW1lbGluZUFnZW50RW5hYmxlZCk7Cit9CisKIHZvaWQgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6d2lsbENhbGxGdW5jdGlvbihjb25zdCBTdHJpbmcmIHNjcmlwdE5hbWUsIGlu dCBzY3JpcHRMaW5lKQogewogICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFj dG9yeTo6Y3JlYXRlRnVuY3Rpb25DYWxsRGF0YShzY3JpcHROYW1lLCBzY3JpcHRMaW5lKSwgRnVu Y3Rpb25DYWxsVGltZWxpbmVSZWNvcmRUeXBlKTsKQEAgLTI4MCwxNCArMzE4LDcgQEAgdm9pZCBJ bnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRNYXJrTG9hZEV2ZW50KCkKIAogdm9pZCBJbnNwZWN0 b3JUaW1lbGluZUFnZW50OjpkaWRDb21taXRMb2FkKCkKIHsKLSAgICBtX3JlY29yZFN0YWNrLmNs ZWFyKCk7Ci19Ci0KLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6c2V0RnJvbnRlbmQoSW5z cGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQotewotICAgIEFTU0VSVChmcm9udGVuZCk7Ci0gICAg bV9yZWNvcmRTdGFjay5jbGVhcigpOwotICAgIG1fZnJvbnRlbmQgPSBmcm9udGVuZDsKKyAgICBj bGVhclJlY29yZFN0YWNrKCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6YWRk UmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcHJwUmVjb3JkLCBU aW1lbGluZVJlY29yZFR5cGUgdHlwZSkKQEAgLTMyOSwxNCArMzYwLDEyIEBAIHZvaWQgSW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6ZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3Jk VHlwZSB0eXBlKQogICAgIH0KIH0KIAotSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6SW5zcGVjdG9y VGltZWxpbmVBZ2VudChJbnNwZWN0b3JTdGF0ZSogc3RhdGUsIEluc3BlY3RvckZyb250ZW5kKiBm cm9udGVuZCkKLSAgICA6IG1fc3RhdGUoc3RhdGUpCi0gICAgLCBtX2Zyb250ZW5kKGZyb250ZW5k KQotICAgICwgbV9pZCgrK3NfaWQpCitJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpJbnNwZWN0b3JU aW1lbGluZUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIElu c3BlY3RvclN0YXRlKiBzdGF0ZSkKKyAgICA6IG1faW5zdHJ1bWVudGluZ0FnZW50cyhpbnN0cnVt ZW50aW5nQWdlbnRzKQorICAgICwgbV9zdGF0ZShzdGF0ZSkKKyAgICAsIG1fZnJvbnRlbmQoMCkK KyAgICAsIG1faWQoMSkKIHsKLSAgICBTY3JpcHRHQ0V2ZW50OjphZGRFdmVudExpc3RlbmVyKHRo aXMpOwotICAgIG1fZnJvbnRlbmQtPnRpbWVsaW5lUHJvZmlsZXJXYXNTdGFydGVkKCk7Ci0gICAg bV9zdGF0ZS0+c2V0Qm9vbGVhbihUaW1lbGluZUFnZW50U3RhdGU6OnRpbWVsaW5lQWdlbnRFbmFi bGVkLCB0cnVlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpwdXNoQ3VycmVu dFJlY29yZChQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YSwgVGltZWxpbmVSZWNvcmRU eXBlIHR5cGUpCkBAIC0zNDUsNiArMzc0LDEzIEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6cHVzaEN1cnJlbnRSZWNvcmQoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGRhdGEsCiAg ICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVjb3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5 OjpjcmVhdGVHZW5lcmljUmVjb3JkKFdURjo6Y3VycmVudFRpbWVNUygpKTsKICAgICBtX3JlY29y ZFN0YWNrLmFwcGVuZChUaW1lbGluZVJlY29yZEVudHJ5KHJlY29yZC5yZWxlYXNlKCksIGRhdGEs IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKSwgdHlwZSkpOwogfQorCit2b2lkIEluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OmNsZWFyUmVjb3JkU3RhY2soKQoreworICAgIG1fcmVjb3JkU3RhY2suY2xl YXIoKTsKKyAgICBtX2lkKys7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlm IC8vIEVOQUJMRShJTlNQRUNUT1IpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclRpbWVsaW5lQWdlbnQuaAppbmRleCAzNmMyZGYyLi5iODFhY2JiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKQEAgLTQz LDYgKzQzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgRXZlbnQ7CiBjbGFzcyBJbnNw ZWN0b3JGcm9udGVuZDsKIGNsYXNzIEluc3BlY3RvclN0YXRlOworY2xhc3MgSW5zdHJ1bWVudGlu Z0FnZW50czsKIGNsYXNzIEludFJlY3Q7CiBjbGFzcyBSZXNvdXJjZVJlcXVlc3Q7CiBjbGFzcyBS ZXNvdXJjZVJlc3BvbnNlOwpAQCAtNzUsMTkgKzc2LDI1IEBAIGVudW0gVGltZWxpbmVSZWNvcmRU eXBlIHsKIGNsYXNzIEluc3BlY3RvclRpbWVsaW5lQWdlbnQgOiBTY3JpcHRHQ0V2ZW50TGlzdGVu ZXIgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEluc3BlY3RvclRpbWVsaW5lQWdlbnQpOwog cHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPEluc3BlY3RvclRpbWVsaW5lQWdlbnQ+IGNy ZWF0ZShJbnNwZWN0b3JTdGF0ZSogc3RhdGUsIEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCkK KyAgICBzdGF0aWMgUGFzc093blB0cjxJbnNwZWN0b3JUaW1lbGluZUFnZW50PiBjcmVhdGUoSW5z dHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgSW5zcGVjdG9yU3RhdGUqIHN0 YXRlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50KHN0YXRlLCBmcm9udGVuZCkpOworICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IElu c3BlY3RvclRpbWVsaW5lQWdlbnQoaW5zdHJ1bWVudGluZ0FnZW50cywgc3RhdGUpKTsKICAgICB9 CiAKLSAgICBzdGF0aWMgUGFzc093blB0cjxJbnNwZWN0b3JUaW1lbGluZUFnZW50PiByZXN0b3Jl KEluc3BlY3RvclN0YXRlKiwgSW5zcGVjdG9yRnJvbnRlbmQqKTsKLQogICAgIH5JbnNwZWN0b3JU aW1lbGluZUFnZW50KCk7CiAKKyAgICB2b2lkIHNldEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5k Kik7CisgICAgdm9pZCBjbGVhckZyb250ZW5kKCk7CisKKyAgICB2b2lkIHJlc3RvcmUoSW5zcGVj dG9yU3RhdGUqLCBJbnNwZWN0b3JGcm9udGVuZCopOworCisgICAgdm9pZCBzdGFydCgpOworICAg IHZvaWQgc3RvcCgpOworICAgIGJvb2wgc3RhcnRlZCgpIGNvbnN0OworCiAgICAgaW50IGlkKCkg Y29uc3QgeyByZXR1cm4gbV9pZDsgfQogCiAgICAgdm9pZCBkaWRDb21taXRMb2FkKCk7Ci0gICAg dm9pZCBzZXRGcm9udGVuZChJbnNwZWN0b3JGcm9udGVuZCopOwogCiAgICAgLy8gTWV0aG9kcyBj YWxsZWQgZnJvbSBXZWJDb3JlLgogICAgIHZvaWQgd2lsbENhbGxGdW5jdGlvbihjb25zdCBTdHJp bmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5lKTsKQEAgLTE0OSw3ICsxNTYsNyBAQCBwcml2 YXRlOgogICAgICAgICBUaW1lbGluZVJlY29yZFR5cGUgdHlwZTsKICAgICB9OwogICAgICAgICAK LSAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KEluc3BlY3RvclN0YXRlKiwgSW5zcGVjdG9yRnJv bnRlbmQqKTsKKyAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMq LCBJbnNwZWN0b3JTdGF0ZSopOwogCiAgICAgdm9pZCBwdXNoQ3VycmVudFJlY29yZChQYXNzUmVm UHRyPEluc3BlY3Rvck9iamVjdD4sIFRpbWVsaW5lUmVjb3JkVHlwZSk7CiAgICAgdm9pZCBzZXRI ZWFwU2l6ZVN0YXRpc3RpYyhJbnNwZWN0b3JPYmplY3QqIHJlY29yZCk7CkBAIC0xNTksMTQgKzE2 NiwxNSBAQCBwcml2YXRlOgogICAgIHZvaWQgYWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRy PEluc3BlY3Rvck9iamVjdD4sIFRpbWVsaW5lUmVjb3JkVHlwZSk7CiAKICAgICB2b2lkIHB1c2hH Q0V2ZW50UmVjb3JkcygpOworICAgIHZvaWQgY2xlYXJSZWNvcmRTdGFjaygpOwogCisgICAgSW5z dHJ1bWVudGluZ0FnZW50cyogbV9pbnN0cnVtZW50aW5nQWdlbnRzOwogICAgIEluc3BlY3RvclN0 YXRlKiBtX3N0YXRlOwogICAgIEluc3BlY3RvckZyb250ZW5kKiBtX2Zyb250ZW5kOwogCiAgICAg VmVjdG9yPFRpbWVsaW5lUmVjb3JkRW50cnk+IG1fcmVjb3JkU3RhY2s7CiAKLSAgICBzdGF0aWMg aW50IHNfaWQ7Ci0gICAgY29uc3QgaW50IG1faWQ7CisgICAgaW50IG1faWQ7CiAgICAgc3RydWN0 IEdDRXZlbnQgewogICAgICAgICBHQ0V2ZW50KGRvdWJsZSBzdGFydFRpbWUsIGRvdWJsZSBlbmRU aW1lLCBzaXplX3QgY29sbGVjdGVkQnl0ZXMpCiAgICAgICAgICAgICA6IHN0YXJ0VGltZShzdGFy dFRpbWUpLCBlbmRUaW1lKGVuZFRpbWUpLCBjb2xsZWN0ZWRCeXRlcyhjb2xsZWN0ZWRCeXRlcykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQ YW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5l bC5qcwppbmRleCBmZTllOGM4Li41YmQ5MTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCkBAIC0yNzAsMTAgKzI3MCwxMCBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgX3RvZ2dsZVRp bWVsaW5lQnV0dG9uQ2xpY2tlZDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMu dG9nZ2xlVGltZWxpbmVCdXR0b24udG9nZ2xlZCkKLSAgICAgICAgICAgIEluc3BlY3RvckFnZW50 LnN0b3BUaW1lbGluZVByb2ZpbGVyKCk7CisgICAgICAgICAgICBUaW1lbGluZUFnZW50LnN0b3Ao KTsKICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICB0aGlzLl9jbGVhclBhbmVsKCk7Ci0gICAg ICAgICAgICBJbnNwZWN0b3JBZ2VudC5zdGFydFRpbWVsaW5lUHJvZmlsZXIoKTsKKyAgICAgICAg ICAgIFRpbWVsaW5lQWdlbnQuc3RhcnQoKTsKICAgICAgICAgfQogICAgIH0sCiAK