94233 2012-08-16 11:21:17 -0700 [Chromium] Avoid aliasing global symbol monotonicallyIncreasingTime(). 2012-08-16 12:54:19 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 reveman reveman cc-bugs jamesr webkit.review.bot oldest_to_newest 697298 0 reveman 2012-08-16 11:21:17 -0700 Rename virtual function CCDelayBasedTimeSource::monotonicallyIncreasingTime() that exist for testing purposes to CCDelayBasedTimeSource::monotonicTimeNow(). 697301 1 158858 reveman 2012-08-16 11:23:58 -0700 Created attachment 158858 Patch 697304 2 158858 jamesr 2012-08-16 11:27:51 -0700 Comment on attachment 158858 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=158858&action=review Thanks! > Source/WebKit/chromium/tests/CCSchedulerTestCommon.h:130 > + virtual double monotonicTimeNow() const { return m_monotonicTimeNow; } since you're here, can you add an OVERRIDE? 697312 3 158865 reveman 2012-08-16 11:38:09 -0700 Created attachment 158865 Patch Add missing OVERRIDE 697387 4 158865 webkit.review.bot 2012-08-16 12:54:16 -0700 Comment on attachment 158865 Patch Clearing flags on attachment: 158865 Committed r125802: <http://trac.webkit.org/changeset/125802> 697388 5 webkit.review.bot 2012-08-16 12:54:19 -0700 All reviewed patches have been landed. Closing bug. 158858 2012-08-16 11:23:58 -0700 2012-08-16 11:38:07 -0700 Patch bug-94233-20120816142323.patch text/plain 16892 reveman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2RmYTJiY2FhYmU0ODc0 YWFlZGI2MWMzNTE5MmI5ZDYyMTk1YWJiZi4uZjY0MTA4OWNjMzNiMDUyZGFiMzE2ZDhmYTU0MGVk NjZlN2Q1ZDNlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA4LTE2ICBEYXZp ZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBB dm9pZCBhbGlhc2luZyBnbG9iYWwgc3ltYm9sIG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgp LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQyMzMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUg dmlydHVhbCBmdW5jdGlvbiBDQ0RlbGF5QmFzZWRUaW1lU291cmNlOjptb25vdG9uaWNhbGx5SW5j cmVhc2luZ1RpbWUoKQorICAgICAgICB0aGF0IGV4aXN0IGZvciB0ZXN0aW5nIHB1cnBvc2VzIHRv IENDRGVsYXlCYXNlZFRpbWVTb3VyY2U6Om1vbm90b25pY1RpbWVOb3coKS4KKworICAgICAgICBO byBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0RlbGF5QmFzZWRUaW1lU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDRGVsYXlCYXNl ZFRpbWVTb3VyY2U6OnNldEFjdGl2ZSk6CisgICAgICAgIChXZWJDb3JlOjpDQ0RlbGF5QmFzZWRU aW1lU291cmNlOjpvblRpbWVyRmlyZWQpOgorICAgICAgICAoV2ViQ29yZTo6Q0NEZWxheUJhc2Vk VGltZVNvdXJjZTo6bW9ub3RvbmljVGltZU5vdyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vY2MvQ0NEZWxheUJhc2VkVGltZVNvdXJjZS5oOgorCiAyMDEyLTA4LTE2ICBT ZXJnZXkgUm9ndWxlbmtvICA8cm9ndWxlbmtvQGdvb2dsZS5jb20+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogYWRkZWQgUGFpbnQgZXZlbnRzIGZvciBJbWFnZXMgdG8gVGltZWxpbmVBZ2VudApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA1NTYwMzJlZTFlMTA2NDYwNjM2OTMxM2QzZmQ2 ODk0M2QyYzQzYjQzLi40Zjc2MmEyYmUxMzg1OWZhZWM2NzQ0ZjE5YjFmZjI5ZWIwMzA4Zjg4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA4LTE2ICBE YXZpZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVt XSBBdm9pZCBhbGlhc2luZyBnbG9iYWwgc3ltYm9sIG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGlt ZSgpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQy MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5h bWUgdmlydHVhbCBmdW5jdGlvbiBDQ0RlbGF5QmFzZWRUaW1lU291cmNlOjptb25vdG9uaWNhbGx5 SW5jcmVhc2luZ1RpbWUoKQorICAgICAgICB0aGF0IGV4aXN0IGZvciB0ZXN0aW5nIHB1cnBvc2Vz IHRvIENDRGVsYXlCYXNlZFRpbWVTb3VyY2U6Om1vbm90b25pY1RpbWVOb3coKS4KKworICAgICAg ICAqIHRlc3RzL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2VUZXN0LmNwcDoKKyAgICAgICAgKFdlYktp dFRlc3RzOjpURVNUKToKKyAgICAgICAgKiB0ZXN0cy9DQ0ZyYW1lUmF0ZUNvbnRyb2xsZXJUZXN0 LmNwcDoKKyAgICAgICAgKFdlYktpdFRlc3RzOjpURVNUKToKKyAgICAgICAgKiB0ZXN0cy9DQ1Nj aGVkdWxlclRlc3RDb21tb24uaDoKKyAgICAgICAgKFdlYktpdFRlc3RzOjpGYWtlQ0NEZWxheUJh c2VkVGltZVNvdXJjZTo6c2V0TW9ub3RvbmljVGltZU5vdyk6CisgICAgICAgIChXZWJLaXRUZXN0 czo6RmFrZUNDRGVsYXlCYXNlZFRpbWVTb3VyY2U6Om1vbm90b25pY1RpbWVOb3cpOgorICAgICAg ICAoV2ViS2l0VGVzdHM6OkZha2VDQ0RlbGF5QmFzZWRUaW1lU291cmNlOjpGYWtlQ0NEZWxheUJh c2VkVGltZVNvdXJjZSk6CisgICAgICAgIChGYWtlQ0NEZWxheUJhc2VkVGltZVNvdXJjZSk6CisK IDIwMTItMDgtMTYgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBbY2hyb21pdW1dIFJlbW92ZSBhbHdheXNSZXNlcnZlVGV4dHVyZXMgY29kZSAtIGl0IGRv ZXNuJ3QgZG8gYW55dGhpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2UuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NEZWxheUJhc2VkVGltZVNvdXJj ZS5jcHAKaW5kZXggM2YwZDdjNDQ4MDVjZmYwNzhmZTI4YWUxZGQ0N2M0NDc3YTFiZDk2MC4uYmY1 MDk5NGI0M2Y0OTVlOTJiNmU5ZTQ3MDRjMzFjMGIwZTE0ZWU0ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NEZWxheUJhc2VkVGltZVNv dXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NEZWxheUJhc2VkVGltZVNvdXJjZS5jcHAKQEAgLTg4LDcgKzg4LDcgQEAgdm9pZCBDQ0Rl bGF5QmFzZWRUaW1lU291cmNlOjpzZXRBY3RpdmUoYm9vbCBhY3RpdmUpCiAKICAgICBtX3N0YXRl ID0gU1RBVEVfQUNUSVZFOwogCi0gICAgZG91YmxlIG5vdyA9IG1vbm90b25pY2FsbHlJbmNyZWFz aW5nVGltZSgpOworICAgIGRvdWJsZSBub3cgPSBtb25vdG9uaWNUaW1lTm93KCk7CiAgICAgcG9z dE5leHRUaWNrVGFzayhub3cpOwogfQogCkBAIC0xMDYsNyArMTA2LDcgQEAgdm9pZCBDQ0RlbGF5 QmFzZWRUaW1lU291cmNlOjpvblRpbWVyRmlyZWQoKQogewogICAgIEFTU0VSVChtX3N0YXRlICE9 IFNUQVRFX0lOQUNUSVZFKTsKIAotICAgIGRvdWJsZSBub3cgPSBtb25vdG9uaWNhbGx5SW5jcmVh c2luZ1RpbWUoKTsKKyAgICBkb3VibGUgbm93ID0gbW9ub3RvbmljVGltZU5vdygpOwogICAgIG1f bGFzdFRpY2tUaW1lID0gbm93OwogCiAgICAgaWYgKG1fc3RhdGUgPT0gU1RBVEVfU1RBUlRJTkcp IHsKQEAgLTE1Nyw5ICsxNTcsOSBAQCB2b2lkIENDRGVsYXlCYXNlZFRpbWVTb3VyY2U6OnNldFRp bWViYXNlQW5kSW50ZXJ2YWwoZG91YmxlIHRpbWViYXNlLCBkb3VibGUgaW50ZQogICAgIH0KIH0K IAotZG91YmxlIENDRGVsYXlCYXNlZFRpbWVTb3VyY2U6Om1vbm90b25pY2FsbHlJbmNyZWFzaW5n VGltZSgpIGNvbnN0Citkb3VibGUgQ0NEZWxheUJhc2VkVGltZVNvdXJjZTo6bW9ub3RvbmljVGlt ZU5vdygpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIFdURjo6bW9ub3RvbmljYWxseUluY3JlYXNpbmdU aW1lKCk7CisgICAgcmV0dXJuIG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpOwogfQogCiAv LyBUaGlzIGNvZGUgdHJpZXMgdG8gYWNoaWV2ZSBhbiBhdmVyYWdlIHRpY2sgcmF0ZSBhcyBjbG9z ZSB0byBtX2ludGVydmFsTXMgYXMgcG9zc2libGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0RlbGF5QmFz ZWRUaW1lU291cmNlLmgKaW5kZXggNjFmNjM3YWQ3MWY5Yzc5ODU2ODFlMTBiZmU2ZjA4NzM2NzQ1 NWRkZC4uYmY0NjM3OGM3ZTAyM2Y2NDM4YjRhMTE4NmYwYmM2YzVjOTQ3N2YxZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NEZWxheUJh c2VkVGltZVNvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2UuaApAQCAtNTksNyArNTksNyBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCB2b2lkIG9uVGltZXJGaXJlZCgpIE9WRVJSSURFOwogCiAgICAgLy8g VmlydHVhbCBmb3IgdGVzdGluZy4KLSAgICB2aXJ0dWFsIGRvdWJsZSBtb25vdG9uaWNhbGx5SW5j cmVhc2luZ1RpbWUoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGRvdWJsZSBtb25vdG9uaWNUaW1lTm93 KCkgY29uc3Q7CiAKIHByb3RlY3RlZDoKICAgICBDQ0RlbGF5QmFzZWRUaW1lU291cmNlKGRvdWJs ZSBpbnRlcnZhbCwgQ0NUaHJlYWQqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvQ0NEZWxheUJhc2VkVGltZVNvdXJjZVRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS90ZXN0cy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlVGVzdC5jcHAKaW5kZXggMDhiNWQ4 MjAyZTRhZTA3MzM2YjgxMzhhYmIwYjNhNWY0NDkzYjYwZi4uOTMwNDM5ZmY5ODZkMjU4MjM1YjVl NzNmNTg4OTAzNGMxMGMxYTYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90 ZXN0cy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS90ZXN0cy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlVGVzdC5jcHAKQEAgLTQ0LDEyICs0 NCwxMiBAQCBURVNUKENDRGVsYXlCYXNlZFRpbWVTb3VyY2VUZXN0LCBUYXNrUG9zdGVkQW5kVGlj a0NhbGxlZCkKICAgICBSZWZQdHI8RmFrZUNDRGVsYXlCYXNlZFRpbWVTb3VyY2U+IHRpbWVyID0g RmFrZUNDRGVsYXlCYXNlZFRpbWVTb3VyY2U6OmNyZWF0ZSgxLjAgLyA2MC4wLCAmdGhyZWFkKTsK ICAgICB0aW1lci0+c2V0Q2xpZW50KCZjbGllbnQpOwogCi0gICAgdGltZXItPnNldE1vbm90b25p Y2FsbHlJbmNyZWFzaW5nVGltZSgwKTsKKyAgICB0aW1lci0+c2V0TW9ub3RvbmljVGltZU5vdygw KTsKICAgICB0aW1lci0+c2V0QWN0aXZlKHRydWUpOwogICAgIEVYUEVDVF9UUlVFKHRpbWVyLT5h Y3RpdmUoKSk7CiAgICAgRVhQRUNUX1RSVUUodGhyZWFkLmhhc1BlbmRpbmdUYXNrKCkpOwogCi0g ICAgdGltZXItPnNldE1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgwLjAxNik7CisgICAgdGlt ZXItPnNldE1vbm90b25pY1RpbWVOb3coMC4wMTYpOwogICAgIHRocmVhZC5ydW5QZW5kaW5nVGFz aygpOwogICAgIEVYUEVDVF9UUlVFKHRpbWVyLT5hY3RpdmUoKSk7CiAgICAgRVhQRUNUX1RSVUUo Y2xpZW50LnRpY2tDYWxsZWQoKSk7CkBAIC0xMDksNyArMTA5LDcgQEAgVEVTVChDQ0RlbGF5QmFz ZWRUaW1lU291cmNlLCBOZXh0RGVsYXlTYW5lV2hlbkV4YWN0bHlPblJlcXVlc3RlZFRpbWUpCiAK ICAgICBFWFBFQ1RfRVEoMTYsIHRocmVhZC5wZW5kaW5nRGVsYXlNcygpKTsKIAotICAgIHRpbWVy LT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoaW50ZXJ2YWwpOworICAgIHRpbWVyLT5z ZXRNb25vdG9uaWNUaW1lTm93KGludGVydmFsKTsKICAgICB0aHJlYWQucnVuUGVuZGluZ1Rhc2so KTsKIAogICAgIEVYUEVDVF9FUSgxNiwgdGhyZWFkLnBlbmRpbmdEZWxheU1zKCkpOwpAQCAtMTMw LDcgKzEzMCw3IEBAIFRFU1QoQ0NEZWxheUJhc2VkVGltZVNvdXJjZSwgTmV4dERlbGF5U2FuZVdo ZW5TbGlnaHRseUFmdGVyUmVxdWVzdGVkVGltZSkKIAogICAgIEVYUEVDVF9FUSgxNiwgdGhyZWFk LnBlbmRpbmdEZWxheU1zKCkpOwogCi0gICAgdGltZXItPnNldE1vbm90b25pY2FsbHlJbmNyZWFz aW5nVGltZShpbnRlcnZhbCArIDAuMDAwMDAwMSk7CisgICAgdGltZXItPnNldE1vbm90b25pY1Rp bWVOb3coaW50ZXJ2YWwgKyAwLjAwMDAwMDEpOwogICAgIHRocmVhZC5ydW5QZW5kaW5nVGFzaygp OwogCiAgICAgRVhQRUNUX0VRKDE2LCB0aHJlYWQucGVuZGluZ0RlbGF5TXMoKSk7CkBAIC0xNTEs NyArMTUxLDcgQEAgVEVTVChDQ0RlbGF5QmFzZWRUaW1lU291cmNlLCBOZXh0RGVsYXlTYW5lV2hl bkV4YWN0bHlUd2ljZUFmdGVyUmVxdWVzdGVkVGltZSkKIAogICAgIEVYUEVDVF9FUSgxNiwgdGhy ZWFkLnBlbmRpbmdEZWxheU1zKCkpOwogCi0gICAgdGltZXItPnNldE1vbm90b25pY2FsbHlJbmNy ZWFzaW5nVGltZSgyKmludGVydmFsKTsKKyAgICB0aW1lci0+c2V0TW9ub3RvbmljVGltZU5vdygy KmludGVydmFsKTsKICAgICB0aHJlYWQucnVuUGVuZGluZ1Rhc2soKTsKIAogICAgIEVYUEVDVF9F USgxNiwgdGhyZWFkLnBlbmRpbmdEZWxheU1zKCkpOwpAQCAtMTcyLDcgKzE3Miw3IEBAIFRFU1Qo Q0NEZWxheUJhc2VkVGltZVNvdXJjZSwgTmV4dERlbGF5U2FuZVdoZW5TbGlnaHRseUFmdGVyVHdp Y2VSZXF1ZXN0ZWRUaW1lKQogCiAgICAgRVhQRUNUX0VRKDE2LCB0aHJlYWQucGVuZGluZ0RlbGF5 TXMoKSk7CiAKLSAgICB0aW1lci0+c2V0TW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKDIqaW50 ZXJ2YWwgKyAwLjAwMDAwMDEpOworICAgIHRpbWVyLT5zZXRNb25vdG9uaWNUaW1lTm93KDIqaW50 ZXJ2YWwgKyAwLjAwMDAwMDEpOwogICAgIHRocmVhZC5ydW5QZW5kaW5nVGFzaygpOwogCiAgICAg RVhQRUNUX0VRKDE2LCB0aHJlYWQucGVuZGluZ0RlbGF5TXMoKSk7CkBAIC0xOTMsNyArMTkzLDcg QEAgVEVTVChDQ0RlbGF5QmFzZWRUaW1lU291cmNlLCBOZXh0RGVsYXlTYW5lV2hlbkhhbGZBZnRl clJlcXVlc3RlZFRpbWUpCiAKICAgICBFWFBFQ1RfRVEoMTYsIHRocmVhZC5wZW5kaW5nRGVsYXlN cygpKTsKIAotICAgIHRpbWVyLT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoaW50ZXJ2 YWwgKyBpbnRlcnZhbCAqIDAuNSk7CisgICAgdGltZXItPnNldE1vbm90b25pY1RpbWVOb3coaW50 ZXJ2YWwgKyBpbnRlcnZhbCAqIDAuNSk7CiAgICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7CiAK ICAgICBFWFBFQ1RfRVEoOCwgdGhyZWFkLnBlbmRpbmdEZWxheU1zKCkpOwpAQCAtMjE2LDcgKzIx Niw3IEBAIFRFU1QoQ0NEZWxheUJhc2VkVGltZVNvdXJjZSwgU2FuZUhhbmRsaW5nT2ZKaXR0ZXJ5 VGltZWJhc2UpCiAKICAgICAvLyBKaXR0ZXIgdGltZWJhc2UgfjFtcyBsYXRlCiAgICAgdGltZXIt PnNldFRpbWViYXNlQW5kSW50ZXJ2YWwoaW50ZXJ2YWwgKyAwLjAwMSwgaW50ZXJ2YWwpOwotICAg IHRpbWVyLT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoaW50ZXJ2YWwpOworICAgIHRp bWVyLT5zZXRNb25vdG9uaWNUaW1lTm93KGludGVydmFsKTsKICAgICB0aHJlYWQucnVuUGVuZGlu Z1Rhc2soKTsKIAogICAgIC8vIFdpdGhvdXQgZG91YmxlIHRpY2sgcHJldmVudGlvbiwgcGVuZGlu Z0RlbGF5TXMgd291bGQgYmUgMS4KQEAgLTIyNCw3ICsyMjQsNyBAQCBURVNUKENDRGVsYXlCYXNl ZFRpbWVTb3VyY2UsIFNhbmVIYW5kbGluZ09mSml0dGVyeVRpbWViYXNlKQogCiAgICAgLy8gSml0 dGVyIHRpbWViYXNlIH4xbXMgZWFybHkKICAgICB0aW1lci0+c2V0VGltZWJhc2VBbmRJbnRlcnZh bChpbnRlcnZhbCAqIDIgLSAwLjAwMSwgaW50ZXJ2YWwpOwotICAgIHRpbWVyLT5zZXRNb25vdG9u aWNhbGx5SW5jcmVhc2luZ1RpbWUoaW50ZXJ2YWwgKiAyKTsKKyAgICB0aW1lci0+c2V0TW9ub3Rv bmljVGltZU5vdyhpbnRlcnZhbCAqIDIpOwogICAgIHRocmVhZC5ydW5QZW5kaW5nVGFzaygpOwog CiAgICAgRVhQRUNUX0VRKDE1LCB0aHJlYWQucGVuZGluZ0RlbGF5TXMoKSk7CkBAIC0yNDQsNyAr MjQ0LDcgQEAgVEVTVChDQ0RlbGF5QmFzZWRUaW1lU291cmNlLCBIYW5sZGxlc1NpZ25pZmljYW50 VGltZWJhc2VDaGFuZ2VzSW1tZWRpYXRlbHkpCiAgICAgRVhQRUNUX0VRKDE2LCB0aHJlYWQucGVu ZGluZ0RlbGF5TXMoKSk7CiAKICAgICAvLyBUaWNrLCB0aGVuIHNoaWZ0IHRpbWViYXNlIGJ5ICs3 bXMuCi0gICAgdGltZXItPnNldE1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZShpbnRlcnZhbCk7 CisgICAgdGltZXItPnNldE1vbm90b25pY1RpbWVOb3coaW50ZXJ2YWwpOwogICAgIHRocmVhZC5y dW5QZW5kaW5nVGFzaygpOwogCiAgICAgRVhQRUNUX0VRKDE2LCB0aHJlYWQucGVuZGluZ0RlbGF5 TXMoKSk7CkBAIC0yNTgsNyArMjU4LDcgQEAgVEVTVChDQ0RlbGF5QmFzZWRUaW1lU291cmNlLCBI YW5sZGxlc1NpZ25pZmljYW50VGltZWJhc2VDaGFuZ2VzSW1tZWRpYXRlbHkpCiAgICAgRVhQRUNU X0VRKDcsIHRocmVhZC5wZW5kaW5nRGVsYXlNcygpKTsKIAogICAgIC8vIFRpY2ssIHRoZW4gc2hp ZnQgdGltZWJhc2UgYnkgLTdtcy4KLSAgICB0aW1lci0+c2V0TW9ub3RvbmljYWxseUluY3JlYXNp bmdUaW1lKGludGVydmFsICsgMC4wMDcwMDAxKTsKKyAgICB0aW1lci0+c2V0TW9ub3RvbmljVGlt ZU5vdyhpbnRlcnZhbCArIDAuMDA3MDAwMSk7CiAgICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7 CiAKICAgICBFWFBFQ1RfRVEoMTYsIHRocmVhZC5wZW5kaW5nRGVsYXlNcygpKTsKQEAgLTI4Niw3 ICsyODYsNyBAQCBURVNUKENDRGVsYXlCYXNlZFRpbWVTb3VyY2UsIEhhbmxkbGVzU2lnbmlmaWNh bnRJbnRlcnZhbENoYW5nZXNJbW1lZGlhdGVseSkKICAgICBFWFBFQ1RfRVEoMTYsIHRocmVhZC5w ZW5kaW5nRGVsYXlNcygpKTsKIAogICAgIC8vIFRpY2ssIHRoZW4gZG91YmxlIHRoZSBpbnRlcnZh bC4KLSAgICB0aW1lci0+c2V0TW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKGludGVydmFsKTsK KyAgICB0aW1lci0+c2V0TW9ub3RvbmljVGltZU5vdyhpbnRlcnZhbCk7CiAgICAgdGhyZWFkLnJ1 blBlbmRpbmdUYXNrKCk7CiAKICAgICBFWFBFQ1RfRVEoMTYsIHRocmVhZC5wZW5kaW5nRGVsYXlN cygpKTsKQEAgLTMwMCw3ICszMDAsNyBAQCBURVNUKENDRGVsYXlCYXNlZFRpbWVTb3VyY2UsIEhh bmxkbGVzU2lnbmlmaWNhbnRJbnRlcnZhbENoYW5nZXNJbW1lZGlhdGVseSkKICAgICBFWFBFQ1Rf RVEoMzMsIHRocmVhZC5wZW5kaW5nRGVsYXlNcygpKTsKIAogICAgIC8vIFRpY2ssIHRoZW4gaGFs dmUgdGhlIGludGVydmFsLgotICAgIHRpbWVyLT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1Rp bWUoaW50ZXJ2YWwgKiAzKTsKKyAgICB0aW1lci0+c2V0TW9ub3RvbmljVGltZU5vdyhpbnRlcnZh bCAqIDMpOwogICAgIHRocmVhZC5ydW5QZW5kaW5nVGFzaygpOwogCiAgICAgRVhQRUNUX0VRKDMz LCB0aHJlYWQucGVuZGluZ0RlbGF5TXMoKSk7CkBAIC0zMzIsOCArMzMyLDggQEAgVEVTVChDQ0Rl bGF5QmFzZWRUaW1lU291cmNlVGVzdCwgQWNoaWV2ZXNUYXJnZXRSYXRlV2l0aE5vTm9pc2UpCiAg ICAgICAgIHRvdGFsRnJhbWVUaW1lICs9IGRlbGF5TXMgLyAxMDAwLjA7CiAKICAgICAgICAgLy8g UnVuIHRoZSBjYWxsYmFjayBleGFjdGx5IHdoZW4gYXNrZWQKLSAgICAgICAgZG91YmxlIG5vdyA9 IHRpbWVyLT5tb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSArIGRlbGF5TXMgLyAxMDAwLjA7 Ci0gICAgICAgIHRpbWVyLT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUobm93KTsKKyAg ICAgICAgZG91YmxlIG5vdyA9IHRpbWVyLT5tb25vdG9uaWNUaW1lTm93KCkgKyBkZWxheU1zIC8g MTAwMC4wOworICAgICAgICB0aW1lci0+c2V0TW9ub3RvbmljVGltZU5vdyhub3cpOwogICAgICAg ICB0aHJlYWQucnVuUGVuZGluZ1Rhc2soKTsKICAgICB9CiAgICAgZG91YmxlIGF2ZXJhZ2VJbnRl cnZhbCA9IHRvdGFsRnJhbWVUaW1lIC8gc3RhdGljX2Nhc3Q8ZG91YmxlPihudW1JdGVyYXRpb25z KTsKQEAgLTM2MSw3ICszNjEsNyBAQCBURVNUKENDRGVsYXlCYXNlZFRpbWVTb3VyY2UsIFRlc3RE ZWFjdGl2YXRlQW5kUmVhY3RpdmF0ZUJlZm9yZU5leHRUaWNrVGltZSkKIAogICAgIC8vIFNob3Vs ZCBydW4gdGhlIGFjdGl2YXRlIHRhc2ssIGFuZCBwaWNrIHVwIGEgbmV3IHRpbWViYXNlLgogICAg IHRpbWVyLT5zZXRBY3RpdmUodHJ1ZSk7Ci0gICAgdGltZXItPnNldE1vbm90b25pY2FsbHlJbmNy ZWFzaW5nVGltZSgwKTsKKyAgICB0aW1lci0+c2V0TW9ub3RvbmljVGltZU5vdygwKTsKICAgICB0 aHJlYWQucnVuUGVuZGluZ1Rhc2soKTsKIAogICAgIC8vIFN0b3AgdGhlIHRpbWVyCkBAIC0zNzIs NyArMzcyLDcgQEAgVEVTVChDQ0RlbGF5QmFzZWRUaW1lU291cmNlLCBUZXN0RGVhY3RpdmF0ZUFu ZFJlYWN0aXZhdGVCZWZvcmVOZXh0VGlja1RpbWUpCiAKICAgICAvLyBTdGFydCB0aGUgdGltZXIg YWdhaW4sIGJ1dCBiZWZvcmUgdGhlIG5leHQgdGljayB0aW1lIHRoZSB0aW1lciBwcmV2aW91c2x5 CiAgICAgLy8gcGxhbm5lZCBvbiB1c2luZy4gVGhhdCBzYW1lIHRpY2sgdGltZSBzaG91bGQgc3Rp bGwgYmUgdGFyZ2V0ZWQuCi0gICAgdGltZXItPnNldE1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGlt ZSgwLjAwNCk7CisgICAgdGltZXItPnNldE1vbm90b25pY1RpbWVOb3coMC4wMDQpOwogICAgIHRp bWVyLT5zZXRBY3RpdmUodHJ1ZSk7CiAgICAgRVhQRUNUX0VRKDEyLCB0aHJlYWQucGVuZGluZ0Rl bGF5TXMoKSk7CiB9CkBAIC0zODYsNyArMzg2LDcgQEAgVEVTVChDQ0RlbGF5QmFzZWRUaW1lU291 cmNlLCBUZXN0RGVhY3RpdmF0ZUFuZFJlYWN0aXZhdGVBZnRlck5leHRUaWNrVGltZSkKIAogICAg IC8vIFNob3VsZCBydW4gdGhlIGFjdGl2YXRlIHRhc2ssIGFuZCBwaWNrIHVwIGEgbmV3IHRpbWVi YXNlLgogICAgIHRpbWVyLT5zZXRBY3RpdmUodHJ1ZSk7Ci0gICAgdGltZXItPnNldE1vbm90b25p Y2FsbHlJbmNyZWFzaW5nVGltZSgwKTsKKyAgICB0aW1lci0+c2V0TW9ub3RvbmljVGltZU5vdygw KTsKICAgICB0aHJlYWQucnVuUGVuZGluZ1Rhc2soKTsKIAogICAgIC8vIFN0b3AgdGhlIHRpbWVy CkBAIC0zOTcsNyArMzk3LDcgQEAgVEVTVChDQ0RlbGF5QmFzZWRUaW1lU291cmNlLCBUZXN0RGVh Y3RpdmF0ZUFuZFJlYWN0aXZhdGVBZnRlck5leHRUaWNrVGltZSkKIAogICAgIC8vIFN0YXJ0IHRo ZSB0aW1lciBhZ2FpbiwgYnV0IGJlZm9yZSB0aGUgbmV4dCB0aWNrIHRpbWUgdGhlIHRpbWVyIHBy ZXZpb3VzbHkKICAgICAvLyBwbGFubmVkIG9uIHVzaW5nLiBUaGF0IHNhbWUgdGljayB0aW1lIHNo b3VsZCBzdGlsbCBiZSB0YXJnZXRlZC4KLSAgICB0aW1lci0+c2V0TW9ub3RvbmljYWxseUluY3Jl YXNpbmdUaW1lKDAuMDIpOworICAgIHRpbWVyLT5zZXRNb25vdG9uaWNUaW1lTm93KDAuMDIpOwog ICAgIHRpbWVyLT5zZXRBY3RpdmUodHJ1ZSk7CiAgICAgRVhQRUNUX0VRKDEzLCB0aHJlYWQucGVu ZGluZ0RlbGF5TXMoKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rl c3RzL0NDRnJhbWVSYXRlQ29udHJvbGxlclRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS90ZXN0cy9DQ0ZyYW1lUmF0ZUNvbnRyb2xsZXJUZXN0LmNwcAppbmRleCAyMGYyMzc0YTNiODI3 ZjQ2YTZkZjJlM2VkMzYxZjA0NDFjMGYzYzcwLi5hYjM2NWE1MjVmNzFkMzlmNDRiOWNmNGNkZGY1 NmMwYjI5ZWQzOWY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0ND RnJhbWVSYXRlQ29udHJvbGxlclRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v dGVzdHMvQ0NGcmFtZVJhdGVDb250cm9sbGVyVGVzdC5jcHAKQEAgLTYzLDcgKzYzLDcgQEAgVEVT VChDQ0ZyYW1lUmF0ZUNvbnRyb2xsZXJUZXN0LCBUZXN0RnJhbWVUaHJvdHRsaW5nX0ltbWVkaWF0 ZUFjaykKIAogICAgIC8vIFRyaWdnZXIgb25lIGZyYW1lLCBtYWtlIHN1cmUgdGhlIHZzeW5jIGNh bGxiYWNrIGlzIGNhbGxlZAogICAgIGVsYXBzZWQgKz0gdGhyZWFkLnBlbmRpbmdEZWxheU1zKCkg LyAxMDAwLjA7Ci0gICAgdGltZVNvdXJjZS0+c2V0TW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1l KGVsYXBzZWQpOworICAgIHRpbWVTb3VyY2UtPnNldE1vbm90b25pY1RpbWVOb3coZWxhcHNlZCk7 CiAgICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7CiAgICAgRVhQRUNUX1RSVUUoY2xpZW50LnZz eW5jVGlja2VkKCkpOwogICAgIGNsaWVudC5yZXNldCgpOwpAQCAtNzIsMTMgKzcyLDEzIEBAIFRF U1QoQ0NGcmFtZVJhdGVDb250cm9sbGVyVGVzdCwgVGVzdEZyYW1lVGhyb3R0bGluZ19JbW1lZGlh dGVBY2spCiAgICAgY29udHJvbGxlci5kaWRCZWdpbkZyYW1lKCk7CiAKICAgICAvLyBUZWxsIHRo ZSBjb250cm9sbGVyIHRoZSBmcmFtZSBlbmRlZCA1bXMgbGF0ZXIKLSAgICB0aW1lU291cmNlLT5z ZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUodGltZVNvdXJjZS0+bW9ub3RvbmljYWxseUlu Y3JlYXNpbmdUaW1lKCkgKyAwLjAwNSk7CisgICAgdGltZVNvdXJjZS0+c2V0TW9ub3RvbmljVGlt ZU5vdyh0aW1lU291cmNlLT5tb25vdG9uaWNUaW1lTm93KCkgKyAwLjAwNSk7CiAgICAgY29udHJv bGxlci5kaWRGaW5pc2hGcmFtZSgpOwogCiAgICAgLy8gVHJpZ2dlciBhbm90aGVyIGZyYW1lLCBt YWtlIHN1cmUgdnN5bmMgcnVucyBhZ2FpbgogICAgIGVsYXBzZWQgKz0gdGhyZWFkLnBlbmRpbmdE ZWxheU1zKCkgLyAxMDAwLjA7Ci0gICAgRVhQRUNUX1RSVUUoZWxhcHNlZCA+PSB0aW1lU291cmNl LT5tb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSk7IC8vIFNhbml0eSBjaGVjayB0aGF0IHBy ZXZpb3VzIGNvZGUgZGlkbid0IG1vdmUgdGltZSBiYWNrd2FyZC4KLSAgICB0aW1lU291cmNlLT5z ZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoZWxhcHNlZCk7CisgICAgRVhQRUNUX1RSVUUo ZWxhcHNlZCA+PSB0aW1lU291cmNlLT5tb25vdG9uaWNUaW1lTm93KCkpOyAvLyBTYW5pdHkgY2hl Y2sgdGhhdCBwcmV2aW91cyBjb2RlIGRpZG4ndCBtb3ZlIHRpbWUgYmFja3dhcmQuCisgICAgdGlt ZVNvdXJjZS0+c2V0TW9ub3RvbmljVGltZU5vdyhlbGFwc2VkKTsKICAgICB0aHJlYWQucnVuUGVu ZGluZ1Rhc2soKTsKICAgICBFWFBFQ1RfVFJVRShjbGllbnQudnN5bmNUaWNrZWQoKSk7CiB9CkBA IC05OCw3ICs5OCw3IEBAIFRFU1QoQ0NGcmFtZVJhdGVDb250cm9sbGVyVGVzdCwgVGVzdEZyYW1l VGhyb3R0bGluZ19Ud29GcmFtZXNJbkZsaWdodCkKIAogICAgIC8vIFRyaWdnZXIgb25lIGZyYW1l LCBtYWtlIHN1cmUgdGhlIHZzeW5jIGNhbGxiYWNrIGlzIGNhbGxlZAogICAgIGVsYXBzZWQgKz0g dGhyZWFkLnBlbmRpbmdEZWxheU1zKCkgLyAxMDAwLjA7Ci0gICAgdGltZVNvdXJjZS0+c2V0TW9u b3RvbmljYWxseUluY3JlYXNpbmdUaW1lKGVsYXBzZWQpOworICAgIHRpbWVTb3VyY2UtPnNldE1v bm90b25pY1RpbWVOb3coZWxhcHNlZCk7CiAgICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7CiAg ICAgRVhQRUNUX1RSVUUoY2xpZW50LnZzeW5jVGlja2VkKCkpOwogICAgIGNsaWVudC5yZXNldCgp OwpAQCAtMTA4LDggKzEwOCw4IEBAIFRFU1QoQ0NGcmFtZVJhdGVDb250cm9sbGVyVGVzdCwgVGVz dEZyYW1lVGhyb3R0bGluZ19Ud29GcmFtZXNJbkZsaWdodCkKIAogICAgIC8vIFRyaWdnZXIgYW5v dGhlciBmcmFtZSwgbWFrZSBzdXJlIHZzeW5jIGNhbGxiYWNrIHJ1bnMgYWdhaW4KICAgICBlbGFw c2VkICs9IHRocmVhZC5wZW5kaW5nRGVsYXlNcygpIC8gMTAwMC4wOwotICAgIEVYUEVDVF9UUlVF KGVsYXBzZWQgPj0gdGltZVNvdXJjZS0+bW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCkpOyAv LyBTYW5pdHkgY2hlY2sgdGhhdCBwcmV2aW91cyBjb2RlIGRpZG4ndCBtb3ZlIHRpbWUgYmFja3dh cmQuCi0gICAgdGltZVNvdXJjZS0+c2V0TW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKGVsYXBz ZWQpOworICAgIEVYUEVDVF9UUlVFKGVsYXBzZWQgPj0gdGltZVNvdXJjZS0+bW9ub3RvbmljVGlt ZU5vdygpKTsgLy8gU2FuaXR5IGNoZWNrIHRoYXQgcHJldmlvdXMgY29kZSBkaWRuJ3QgbW92ZSB0 aW1lIGJhY2t3YXJkLgorICAgIHRpbWVTb3VyY2UtPnNldE1vbm90b25pY1RpbWVOb3coZWxhcHNl ZCk7CiAgICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7CiAgICAgRVhQRUNUX1RSVUUoY2xpZW50 LnZzeW5jVGlja2VkKCkpOwogICAgIGNsaWVudC5yZXNldCgpOwpAQCAtMTE5LDEzICsxMTksMTMg QEAgVEVTVChDQ0ZyYW1lUmF0ZUNvbnRyb2xsZXJUZXN0LCBUZXN0RnJhbWVUaHJvdHRsaW5nX1R3 b0ZyYW1lc0luRmxpZ2h0KQogCiAgICAgLy8gVHJpZ2dlciBhbm90aGVyIGZyYW1lLiBTaW5jZSB0 d28gZnJhbWVzIGFyZSBwZW5kaW5nLCB3ZSBzaG91bGQgbm90IGRyYXcuCiAgICAgZWxhcHNlZCAr PSB0aHJlYWQucGVuZGluZ0RlbGF5TXMoKSAvIDEwMDAuMDsKLSAgICBFWFBFQ1RfVFJVRShlbGFw c2VkID49IHRpbWVTb3VyY2UtPm1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpKTsgLy8gU2Fu aXR5IGNoZWNrIHRoYXQgcHJldmlvdXMgY29kZSBkaWRuJ3QgbW92ZSB0aW1lIGJhY2t3YXJkLgot ICAgIHRpbWVTb3VyY2UtPnNldE1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZShlbGFwc2VkKTsK KyAgICBFWFBFQ1RfVFJVRShlbGFwc2VkID49IHRpbWVTb3VyY2UtPm1vbm90b25pY1RpbWVOb3co KSk7IC8vIFNhbml0eSBjaGVjayB0aGF0IHByZXZpb3VzIGNvZGUgZGlkbid0IG1vdmUgdGltZSBi YWNrd2FyZC4KKyAgICB0aW1lU291cmNlLT5zZXRNb25vdG9uaWNUaW1lTm93KGVsYXBzZWQpOwog ICAgIHRocmVhZC5ydW5QZW5kaW5nVGFzaygpOwogICAgIEVYUEVDVF9GQUxTRShjbGllbnQudnN5 bmNUaWNrZWQoKSk7CiAKICAgICAvLyBUZWxsIHRoZSBjb250cm9sbGVyIHRoZSBmaXJzdCBmcmFt ZSBlbmRlZCA1bXMgbGF0ZXIKLSAgICB0aW1lU291cmNlLT5zZXRNb25vdG9uaWNhbGx5SW5jcmVh c2luZ1RpbWUodGltZVNvdXJjZS0+bW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCkgKyAwLjAw NSk7CisgICAgdGltZVNvdXJjZS0+c2V0TW9ub3RvbmljVGltZU5vdyh0aW1lU291cmNlLT5tb25v dG9uaWNUaW1lTm93KCkgKyAwLjAwNSk7CiAgICAgY29udHJvbGxlci5kaWRGaW5pc2hGcmFtZSgp OwogCiAgICAgLy8gVGljayBzaG91bGQgbm90IGhhdmUgYmVlbiBjYWxsZWQKQEAgLTEzMyw4ICsx MzMsOCBAQCBURVNUKENDRnJhbWVSYXRlQ29udHJvbGxlclRlc3QsIFRlc3RGcmFtZVRocm90dGxp bmdfVHdvRnJhbWVzSW5GbGlnaHQpCiAKICAgICAvLyBUcmlnZ2VyIHlldCBhbm90aGVyIGZyYW1l LiBTaW5jZSBvbmUgZnJhbWVzIGlzIHBlbmRpbmcsIGFub3RoZXIgdnN5bmMgY2FsbGJhY2sgc2hv dWxkIHJ1bi4KICAgICBlbGFwc2VkICs9IHRocmVhZC5wZW5kaW5nRGVsYXlNcygpIC8gMTAwMC4w OwotICAgIEVYUEVDVF9UUlVFKGVsYXBzZWQgPj0gdGltZVNvdXJjZS0+bW9ub3RvbmljYWxseUlu Y3JlYXNpbmdUaW1lKCkpOyAvLyBTYW5pdHkgY2hlY2sgdGhhdCBwcmV2aW91cyBjb2RlIGRpZG4n dCBtb3ZlIHRpbWUgYmFja3dhcmQuCi0gICAgdGltZVNvdXJjZS0+c2V0TW9ub3RvbmljYWxseUlu Y3JlYXNpbmdUaW1lKGVsYXBzZWQpOworICAgIEVYUEVDVF9UUlVFKGVsYXBzZWQgPj0gdGltZVNv dXJjZS0+bW9ub3RvbmljVGltZU5vdygpKTsgLy8gU2FuaXR5IGNoZWNrIHRoYXQgcHJldmlvdXMg Y29kZSBkaWRuJ3QgbW92ZSB0aW1lIGJhY2t3YXJkLgorICAgIHRpbWVTb3VyY2UtPnNldE1vbm90 b25pY1RpbWVOb3coZWxhcHNlZCk7CiAgICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7CiAgICAg RVhQRUNUX1RSVUUoY2xpZW50LnZzeW5jVGlja2VkKCkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ1NjaGVkdWxlclRlc3RDb21tb24uaCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NTY2hlZHVsZXJUZXN0Q29tbW9uLmgKaW5kZXggYmViMTY1 NTRkMTczYTE5YjI2OWI1MzVhN2Y5MzAwN2MxNjdlMmZkOS4uOGJkZmRlYjMzMTYzNDlkZTNhMTFk YzJkYjk4MzFkZmNhNTFjMTU2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90 ZXN0cy9DQ1NjaGVkdWxlclRlc3RDb21tb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3Rlc3RzL0NDU2NoZWR1bGVyVGVzdENvbW1vbi5oCkBAIC0xMjYsMTUgKzEyNiwxNSBAQCBwdWJs aWM6CiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgRmFrZUNDRGVsYXlCYXNlZFRpbWVTb3Vy Y2UoaW50ZXJ2YWwsIHRocmVhZCkpOwogICAgIH0KIAotICAgIHZvaWQgc2V0TW9ub3RvbmljYWxs eUluY3JlYXNpbmdUaW1lKGRvdWJsZSB0aW1lKSB7IG1fbW9ub3RvbmljYWxseUluY3JlYXNpbmdU aW1lID0gdGltZTsgfQotICAgIHZpcnR1YWwgZG91YmxlIG1vbm90b25pY2FsbHlJbmNyZWFzaW5n VGltZSgpIGNvbnN0IHsgcmV0dXJuIG1fbW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lOyB9Cisg ICAgdm9pZCBzZXRNb25vdG9uaWNUaW1lTm93KGRvdWJsZSB0aW1lKSB7IG1fbW9ub3RvbmljVGlt ZU5vdyA9IHRpbWU7IH0KKyAgICB2aXJ0dWFsIGRvdWJsZSBtb25vdG9uaWNUaW1lTm93KCkgY29u c3QgeyByZXR1cm4gbV9tb25vdG9uaWNUaW1lTm93OyB9CiAKIHByb3RlY3RlZDoKICAgICBGYWtl Q0NEZWxheUJhc2VkVGltZVNvdXJjZShkb3VibGUgaW50ZXJ2YWwsIFdlYkNvcmU6OkNDVGhyZWFk KiB0aHJlYWQpCiAgICAgICAgIDogQ0NEZWxheUJhc2VkVGltZVNvdXJjZShpbnRlcnZhbCwgdGhy ZWFkKQotICAgICAgICAsIG1fbW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKDApIHsgfQorICAg ICAgICAsIG1fbW9ub3RvbmljVGltZU5vdygwKSB7IH0KIAotICAgIGRvdWJsZSBtX21vbm90b25p Y2FsbHlJbmNyZWFzaW5nVGltZTsKKyAgICBkb3VibGUgbV9tb25vdG9uaWNUaW1lTm93OwogfTsK IAogY2xhc3MgRmFrZUNDRnJhbWVSYXRlQ29udHJvbGxlciA6IHB1YmxpYyBXZWJDb3JlOjpDQ0Zy YW1lUmF0ZUNvbnRyb2xsZXIgewo= 158865 2012-08-16 11:38:09 -0700 2012-08-16 12:54:16 -0700 Patch bug-94233-20120816143734.patch text/plain 16654 reveman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2RmYTJiY2FhYmU0ODc0 YWFlZGI2MWMzNTE5MmI5ZDYyMTk1YWJiZi4uZjY0MTA4OWNjMzNiMDUyZGFiMzE2ZDhmYTU0MGVk NjZlN2Q1ZDNlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA4LTE2ICBEYXZp ZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBB dm9pZCBhbGlhc2luZyBnbG9iYWwgc3ltYm9sIG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgp LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQyMzMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUg dmlydHVhbCBmdW5jdGlvbiBDQ0RlbGF5QmFzZWRUaW1lU291cmNlOjptb25vdG9uaWNhbGx5SW5j cmVhc2luZ1RpbWUoKQorICAgICAgICB0aGF0IGV4aXN0IGZvciB0ZXN0aW5nIHB1cnBvc2VzIHRv IENDRGVsYXlCYXNlZFRpbWVTb3VyY2U6Om1vbm90b25pY1RpbWVOb3coKS4KKworICAgICAgICBO byBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0RlbGF5QmFzZWRUaW1lU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDRGVsYXlCYXNl ZFRpbWVTb3VyY2U6OnNldEFjdGl2ZSk6CisgICAgICAgIChXZWJDb3JlOjpDQ0RlbGF5QmFzZWRU aW1lU291cmNlOjpvblRpbWVyRmlyZWQpOgorICAgICAgICAoV2ViQ29yZTo6Q0NEZWxheUJhc2Vk VGltZVNvdXJjZTo6bW9ub3RvbmljVGltZU5vdyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vY2MvQ0NEZWxheUJhc2VkVGltZVNvdXJjZS5oOgorCiAyMDEyLTA4LTE2ICBT ZXJnZXkgUm9ndWxlbmtvICA8cm9ndWxlbmtvQGdvb2dsZS5jb20+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogYWRkZWQgUGFpbnQgZXZlbnRzIGZvciBJbWFnZXMgdG8gVGltZWxpbmVBZ2VudApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA1NTYwMzJlZTFlMTA2NDYwNjM2OTMxM2QzZmQ2 ODk0M2QyYzQzYjQzLi43N2YwMTU0NzlkZTBkOTdkNDdlMDk4YTk3YTY0MDA4YWQ3ODZiNDE3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTE2ICBE YXZpZCBSZXZlbWFuICA8cmV2ZW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVt XSBBdm9pZCBhbGlhc2luZyBnbG9iYWwgc3ltYm9sIG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGlt ZSgpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQy MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRl c3RzL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2VUZXN0LmNwcDoKKyAgICAgICAgKFdlYktpdFRlc3Rz OjpURVNUKToKKyAgICAgICAgKiB0ZXN0cy9DQ0ZyYW1lUmF0ZUNvbnRyb2xsZXJUZXN0LmNwcDoK KyAgICAgICAgKFdlYktpdFRlc3RzOjpURVNUKToKKyAgICAgICAgKiB0ZXN0cy9DQ1NjaGVkdWxl clRlc3RDb21tb24uaDoKKyAgICAgICAgKFdlYktpdFRlc3RzOjpGYWtlQ0NEZWxheUJhc2VkVGlt ZVNvdXJjZTo6c2V0TW9ub3RvbmljVGltZU5vdyk6CisgICAgICAgIChXZWJLaXRUZXN0czo6RmFr ZUNDRGVsYXlCYXNlZFRpbWVTb3VyY2U6OkZha2VDQ0RlbGF5QmFzZWRUaW1lU291cmNlKToKKyAg ICAgICAgKEZha2VDQ0RlbGF5QmFzZWRUaW1lU291cmNlKToKKwogMjAxMi0wOC0xNiAgSmFtZXMg Um9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gUmVt b3ZlIGFsd2F5c1Jlc2VydmVUZXh0dXJlcyBjb2RlIC0gaXQgZG9lc24ndCBkbyBhbnl0aGluZwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NEZWxheUJhc2VkVGltZVNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlLmNwcAppbmRleCAzZjBkN2M0 NDgwNWNmZjA3OGZlMjhhZTFkZDQ3YzQ0NzdhMWJkOTYwLi5iZjUwOTk0YjQzZjQ5NWU5MmI2ZTll NDcwNGMzMWMwYjBlMTRlZTRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0RlbGF5QmFzZWRUaW1l U291cmNlLmNwcApAQCAtODgsNyArODgsNyBAQCB2b2lkIENDRGVsYXlCYXNlZFRpbWVTb3VyY2U6 OnNldEFjdGl2ZShib29sIGFjdGl2ZSkKIAogICAgIG1fc3RhdGUgPSBTVEFURV9BQ1RJVkU7CiAK LSAgICBkb3VibGUgbm93ID0gbW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCk7CisgICAgZG91 YmxlIG5vdyA9IG1vbm90b25pY1RpbWVOb3coKTsKICAgICBwb3N0TmV4dFRpY2tUYXNrKG5vdyk7 CiB9CiAKQEAgLTEwNiw3ICsxMDYsNyBAQCB2b2lkIENDRGVsYXlCYXNlZFRpbWVTb3VyY2U6Om9u VGltZXJGaXJlZCgpCiB7CiAgICAgQVNTRVJUKG1fc3RhdGUgIT0gU1RBVEVfSU5BQ1RJVkUpOwog Ci0gICAgZG91YmxlIG5vdyA9IG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpOworICAgIGRv dWJsZSBub3cgPSBtb25vdG9uaWNUaW1lTm93KCk7CiAgICAgbV9sYXN0VGlja1RpbWUgPSBub3c7 CiAKICAgICBpZiAobV9zdGF0ZSA9PSBTVEFURV9TVEFSVElORykgewpAQCAtMTU3LDkgKzE1Nyw5 IEBAIHZvaWQgQ0NEZWxheUJhc2VkVGltZVNvdXJjZTo6c2V0VGltZWJhc2VBbmRJbnRlcnZhbChk b3VibGUgdGltZWJhc2UsIGRvdWJsZSBpbnRlCiAgICAgfQogfQogCi1kb3VibGUgQ0NEZWxheUJh c2VkVGltZVNvdXJjZTo6bW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCkgY29uc3QKK2RvdWJs ZSBDQ0RlbGF5QmFzZWRUaW1lU291cmNlOjptb25vdG9uaWNUaW1lTm93KCkgY29uc3QKIHsKLSAg ICByZXR1cm4gV1RGOjptb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKTsKKyAgICByZXR1cm4g bW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCk7CiB9CiAKIC8vIFRoaXMgY29kZSB0cmllcyB0 byBhY2hpZXZlIGFuIGF2ZXJhZ2UgdGljayByYXRlIGFzIGNsb3NlIHRvIG1faW50ZXJ2YWxNcyBh cyBwb3NzaWJsZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2UuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2UuaAppbmRl eCA2MWY2MzdhZDcxZjljNzk4NTY4MWUxMGJmZTZmMDg3MzY3NDU1ZGRkLi5iZjQ2Mzc4YzdlMDIz ZjY0MzhiNGExMTg2ZjBiYzZjNWM5NDc3ZjFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NEZWxheUJh c2VkVGltZVNvdXJjZS5oCkBAIC01OSw3ICs1OSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZv aWQgb25UaW1lckZpcmVkKCkgT1ZFUlJJREU7CiAKICAgICAvLyBWaXJ0dWFsIGZvciB0ZXN0aW5n LgotICAgIHZpcnR1YWwgZG91YmxlIG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpIGNvbnN0 OworICAgIHZpcnR1YWwgZG91YmxlIG1vbm90b25pY1RpbWVOb3coKSBjb25zdDsKIAogcHJvdGVj dGVkOgogICAgIENDRGVsYXlCYXNlZFRpbWVTb3VyY2UoZG91YmxlIGludGVydmFsLCBDQ1RocmVh ZCopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0RlbGF5QmFz ZWRUaW1lU291cmNlVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDRGVs YXlCYXNlZFRpbWVTb3VyY2VUZXN0LmNwcAppbmRleCAwOGI1ZDgyMDJlNGFlMDczMzZiODEzOGFi YjBiM2E1ZjQ0OTNiNjBmLi45MzA0MzlmZjk4NmQyNTgyMzViNWU3M2Y1ODg5MDM0YzEwYzFhNjIz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDRGVsYXlCYXNlZFRp bWVTb3VyY2VUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDRGVs YXlCYXNlZFRpbWVTb3VyY2VUZXN0LmNwcApAQCAtNDQsMTIgKzQ0LDEyIEBAIFRFU1QoQ0NEZWxh eUJhc2VkVGltZVNvdXJjZVRlc3QsIFRhc2tQb3N0ZWRBbmRUaWNrQ2FsbGVkKQogICAgIFJlZlB0 cjxGYWtlQ0NEZWxheUJhc2VkVGltZVNvdXJjZT4gdGltZXIgPSBGYWtlQ0NEZWxheUJhc2VkVGlt ZVNvdXJjZTo6Y3JlYXRlKDEuMCAvIDYwLjAsICZ0aHJlYWQpOwogICAgIHRpbWVyLT5zZXRDbGll bnQoJmNsaWVudCk7CiAKLSAgICB0aW1lci0+c2V0TW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1l KDApOworICAgIHRpbWVyLT5zZXRNb25vdG9uaWNUaW1lTm93KDApOwogICAgIHRpbWVyLT5zZXRB Y3RpdmUodHJ1ZSk7CiAgICAgRVhQRUNUX1RSVUUodGltZXItPmFjdGl2ZSgpKTsKICAgICBFWFBF Q1RfVFJVRSh0aHJlYWQuaGFzUGVuZGluZ1Rhc2soKSk7CiAKLSAgICB0aW1lci0+c2V0TW9ub3Rv bmljYWxseUluY3JlYXNpbmdUaW1lKDAuMDE2KTsKKyAgICB0aW1lci0+c2V0TW9ub3RvbmljVGlt ZU5vdygwLjAxNik7CiAgICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7CiAgICAgRVhQRUNUX1RS VUUodGltZXItPmFjdGl2ZSgpKTsKICAgICBFWFBFQ1RfVFJVRShjbGllbnQudGlja0NhbGxlZCgp KTsKQEAgLTEwOSw3ICsxMDksNyBAQCBURVNUKENDRGVsYXlCYXNlZFRpbWVTb3VyY2UsIE5leHRE ZWxheVNhbmVXaGVuRXhhY3RseU9uUmVxdWVzdGVkVGltZSkKIAogICAgIEVYUEVDVF9FUSgxNiwg dGhyZWFkLnBlbmRpbmdEZWxheU1zKCkpOwogCi0gICAgdGltZXItPnNldE1vbm90b25pY2FsbHlJ bmNyZWFzaW5nVGltZShpbnRlcnZhbCk7CisgICAgdGltZXItPnNldE1vbm90b25pY1RpbWVOb3co aW50ZXJ2YWwpOwogICAgIHRocmVhZC5ydW5QZW5kaW5nVGFzaygpOwogCiAgICAgRVhQRUNUX0VR KDE2LCB0aHJlYWQucGVuZGluZ0RlbGF5TXMoKSk7CkBAIC0xMzAsNyArMTMwLDcgQEAgVEVTVChD Q0RlbGF5QmFzZWRUaW1lU291cmNlLCBOZXh0RGVsYXlTYW5lV2hlblNsaWdodGx5QWZ0ZXJSZXF1 ZXN0ZWRUaW1lKQogCiAgICAgRVhQRUNUX0VRKDE2LCB0aHJlYWQucGVuZGluZ0RlbGF5TXMoKSk7 CiAKLSAgICB0aW1lci0+c2V0TW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKGludGVydmFsICsg MC4wMDAwMDAxKTsKKyAgICB0aW1lci0+c2V0TW9ub3RvbmljVGltZU5vdyhpbnRlcnZhbCArIDAu MDAwMDAwMSk7CiAgICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7CiAKICAgICBFWFBFQ1RfRVEo MTYsIHRocmVhZC5wZW5kaW5nRGVsYXlNcygpKTsKQEAgLTE1MSw3ICsxNTEsNyBAQCBURVNUKEND RGVsYXlCYXNlZFRpbWVTb3VyY2UsIE5leHREZWxheVNhbmVXaGVuRXhhY3RseVR3aWNlQWZ0ZXJS ZXF1ZXN0ZWRUaW1lKQogCiAgICAgRVhQRUNUX0VRKDE2LCB0aHJlYWQucGVuZGluZ0RlbGF5TXMo KSk7CiAKLSAgICB0aW1lci0+c2V0TW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKDIqaW50ZXJ2 YWwpOworICAgIHRpbWVyLT5zZXRNb25vdG9uaWNUaW1lTm93KDIqaW50ZXJ2YWwpOwogICAgIHRo cmVhZC5ydW5QZW5kaW5nVGFzaygpOwogCiAgICAgRVhQRUNUX0VRKDE2LCB0aHJlYWQucGVuZGlu Z0RlbGF5TXMoKSk7CkBAIC0xNzIsNyArMTcyLDcgQEAgVEVTVChDQ0RlbGF5QmFzZWRUaW1lU291 cmNlLCBOZXh0RGVsYXlTYW5lV2hlblNsaWdodGx5QWZ0ZXJUd2ljZVJlcXVlc3RlZFRpbWUpCiAK ICAgICBFWFBFQ1RfRVEoMTYsIHRocmVhZC5wZW5kaW5nRGVsYXlNcygpKTsKIAotICAgIHRpbWVy LT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoMippbnRlcnZhbCArIDAuMDAwMDAwMSk7 CisgICAgdGltZXItPnNldE1vbm90b25pY1RpbWVOb3coMippbnRlcnZhbCArIDAuMDAwMDAwMSk7 CiAgICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7CiAKICAgICBFWFBFQ1RfRVEoMTYsIHRocmVh ZC5wZW5kaW5nRGVsYXlNcygpKTsKQEAgLTE5Myw3ICsxOTMsNyBAQCBURVNUKENDRGVsYXlCYXNl ZFRpbWVTb3VyY2UsIE5leHREZWxheVNhbmVXaGVuSGFsZkFmdGVyUmVxdWVzdGVkVGltZSkKIAog ICAgIEVYUEVDVF9FUSgxNiwgdGhyZWFkLnBlbmRpbmdEZWxheU1zKCkpOwogCi0gICAgdGltZXIt PnNldE1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZShpbnRlcnZhbCArIGludGVydmFsICogMC41 KTsKKyAgICB0aW1lci0+c2V0TW9ub3RvbmljVGltZU5vdyhpbnRlcnZhbCArIGludGVydmFsICog MC41KTsKICAgICB0aHJlYWQucnVuUGVuZGluZ1Rhc2soKTsKIAogICAgIEVYUEVDVF9FUSg4LCB0 aHJlYWQucGVuZGluZ0RlbGF5TXMoKSk7CkBAIC0yMTYsNyArMjE2LDcgQEAgVEVTVChDQ0RlbGF5 QmFzZWRUaW1lU291cmNlLCBTYW5lSGFuZGxpbmdPZkppdHRlcnlUaW1lYmFzZSkKIAogICAgIC8v IEppdHRlciB0aW1lYmFzZSB+MW1zIGxhdGUKICAgICB0aW1lci0+c2V0VGltZWJhc2VBbmRJbnRl cnZhbChpbnRlcnZhbCArIDAuMDAxLCBpbnRlcnZhbCk7Ci0gICAgdGltZXItPnNldE1vbm90b25p Y2FsbHlJbmNyZWFzaW5nVGltZShpbnRlcnZhbCk7CisgICAgdGltZXItPnNldE1vbm90b25pY1Rp bWVOb3coaW50ZXJ2YWwpOwogICAgIHRocmVhZC5ydW5QZW5kaW5nVGFzaygpOwogCiAgICAgLy8g V2l0aG91dCBkb3VibGUgdGljayBwcmV2ZW50aW9uLCBwZW5kaW5nRGVsYXlNcyB3b3VsZCBiZSAx LgpAQCAtMjI0LDcgKzIyNCw3IEBAIFRFU1QoQ0NEZWxheUJhc2VkVGltZVNvdXJjZSwgU2FuZUhh bmRsaW5nT2ZKaXR0ZXJ5VGltZWJhc2UpCiAKICAgICAvLyBKaXR0ZXIgdGltZWJhc2UgfjFtcyBl YXJseQogICAgIHRpbWVyLT5zZXRUaW1lYmFzZUFuZEludGVydmFsKGludGVydmFsICogMiAtIDAu MDAxLCBpbnRlcnZhbCk7Ci0gICAgdGltZXItPnNldE1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGlt ZShpbnRlcnZhbCAqIDIpOworICAgIHRpbWVyLT5zZXRNb25vdG9uaWNUaW1lTm93KGludGVydmFs ICogMik7CiAgICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7CiAKICAgICBFWFBFQ1RfRVEoMTUs IHRocmVhZC5wZW5kaW5nRGVsYXlNcygpKTsKQEAgLTI0NCw3ICsyNDQsNyBAQCBURVNUKENDRGVs YXlCYXNlZFRpbWVTb3VyY2UsIEhhbmxkbGVzU2lnbmlmaWNhbnRUaW1lYmFzZUNoYW5nZXNJbW1l ZGlhdGVseSkKICAgICBFWFBFQ1RfRVEoMTYsIHRocmVhZC5wZW5kaW5nRGVsYXlNcygpKTsKIAog ICAgIC8vIFRpY2ssIHRoZW4gc2hpZnQgdGltZWJhc2UgYnkgKzdtcy4KLSAgICB0aW1lci0+c2V0 TW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKGludGVydmFsKTsKKyAgICB0aW1lci0+c2V0TW9u b3RvbmljVGltZU5vdyhpbnRlcnZhbCk7CiAgICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7CiAK ICAgICBFWFBFQ1RfRVEoMTYsIHRocmVhZC5wZW5kaW5nRGVsYXlNcygpKTsKQEAgLTI1OCw3ICsy NTgsNyBAQCBURVNUKENDRGVsYXlCYXNlZFRpbWVTb3VyY2UsIEhhbmxkbGVzU2lnbmlmaWNhbnRU aW1lYmFzZUNoYW5nZXNJbW1lZGlhdGVseSkKICAgICBFWFBFQ1RfRVEoNywgdGhyZWFkLnBlbmRp bmdEZWxheU1zKCkpOwogCiAgICAgLy8gVGljaywgdGhlbiBzaGlmdCB0aW1lYmFzZSBieSAtN21z LgotICAgIHRpbWVyLT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoaW50ZXJ2YWwgKyAw LjAwNzAwMDEpOworICAgIHRpbWVyLT5zZXRNb25vdG9uaWNUaW1lTm93KGludGVydmFsICsgMC4w MDcwMDAxKTsKICAgICB0aHJlYWQucnVuUGVuZGluZ1Rhc2soKTsKIAogICAgIEVYUEVDVF9FUSgx NiwgdGhyZWFkLnBlbmRpbmdEZWxheU1zKCkpOwpAQCAtMjg2LDcgKzI4Niw3IEBAIFRFU1QoQ0NE ZWxheUJhc2VkVGltZVNvdXJjZSwgSGFubGRsZXNTaWduaWZpY2FudEludGVydmFsQ2hhbmdlc0lt bWVkaWF0ZWx5KQogICAgIEVYUEVDVF9FUSgxNiwgdGhyZWFkLnBlbmRpbmdEZWxheU1zKCkpOwog CiAgICAgLy8gVGljaywgdGhlbiBkb3VibGUgdGhlIGludGVydmFsLgotICAgIHRpbWVyLT5zZXRN b25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoaW50ZXJ2YWwpOworICAgIHRpbWVyLT5zZXRNb25v dG9uaWNUaW1lTm93KGludGVydmFsKTsKICAgICB0aHJlYWQucnVuUGVuZGluZ1Rhc2soKTsKIAog ICAgIEVYUEVDVF9FUSgxNiwgdGhyZWFkLnBlbmRpbmdEZWxheU1zKCkpOwpAQCAtMzAwLDcgKzMw MCw3IEBAIFRFU1QoQ0NEZWxheUJhc2VkVGltZVNvdXJjZSwgSGFubGRsZXNTaWduaWZpY2FudElu dGVydmFsQ2hhbmdlc0ltbWVkaWF0ZWx5KQogICAgIEVYUEVDVF9FUSgzMywgdGhyZWFkLnBlbmRp bmdEZWxheU1zKCkpOwogCiAgICAgLy8gVGljaywgdGhlbiBoYWx2ZSB0aGUgaW50ZXJ2YWwuCi0g ICAgdGltZXItPnNldE1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZShpbnRlcnZhbCAqIDMpOwor ICAgIHRpbWVyLT5zZXRNb25vdG9uaWNUaW1lTm93KGludGVydmFsICogMyk7CiAgICAgdGhyZWFk LnJ1blBlbmRpbmdUYXNrKCk7CiAKICAgICBFWFBFQ1RfRVEoMzMsIHRocmVhZC5wZW5kaW5nRGVs YXlNcygpKTsKQEAgLTMzMiw4ICszMzIsOCBAQCBURVNUKENDRGVsYXlCYXNlZFRpbWVTb3VyY2VU ZXN0LCBBY2hpZXZlc1RhcmdldFJhdGVXaXRoTm9Ob2lzZSkKICAgICAgICAgdG90YWxGcmFtZVRp bWUgKz0gZGVsYXlNcyAvIDEwMDAuMDsKIAogICAgICAgICAvLyBSdW4gdGhlIGNhbGxiYWNrIGV4 YWN0bHkgd2hlbiBhc2tlZAotICAgICAgICBkb3VibGUgbm93ID0gdGltZXItPm1vbm90b25pY2Fs bHlJbmNyZWFzaW5nVGltZSgpICsgZGVsYXlNcyAvIDEwMDAuMDsKLSAgICAgICAgdGltZXItPnNl dE1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZShub3cpOworICAgICAgICBkb3VibGUgbm93ID0g dGltZXItPm1vbm90b25pY1RpbWVOb3coKSArIGRlbGF5TXMgLyAxMDAwLjA7CisgICAgICAgIHRp bWVyLT5zZXRNb25vdG9uaWNUaW1lTm93KG5vdyk7CiAgICAgICAgIHRocmVhZC5ydW5QZW5kaW5n VGFzaygpOwogICAgIH0KICAgICBkb3VibGUgYXZlcmFnZUludGVydmFsID0gdG90YWxGcmFtZVRp bWUgLyBzdGF0aWNfY2FzdDxkb3VibGU+KG51bUl0ZXJhdGlvbnMpOwpAQCAtMzYxLDcgKzM2MSw3 IEBAIFRFU1QoQ0NEZWxheUJhc2VkVGltZVNvdXJjZSwgVGVzdERlYWN0aXZhdGVBbmRSZWFjdGl2 YXRlQmVmb3JlTmV4dFRpY2tUaW1lKQogCiAgICAgLy8gU2hvdWxkIHJ1biB0aGUgYWN0aXZhdGUg dGFzaywgYW5kIHBpY2sgdXAgYSBuZXcgdGltZWJhc2UuCiAgICAgdGltZXItPnNldEFjdGl2ZSh0 cnVlKTsKLSAgICB0aW1lci0+c2V0TW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKDApOworICAg IHRpbWVyLT5zZXRNb25vdG9uaWNUaW1lTm93KDApOwogICAgIHRocmVhZC5ydW5QZW5kaW5nVGFz aygpOwogCiAgICAgLy8gU3RvcCB0aGUgdGltZXIKQEAgLTM3Miw3ICszNzIsNyBAQCBURVNUKEND RGVsYXlCYXNlZFRpbWVTb3VyY2UsIFRlc3REZWFjdGl2YXRlQW5kUmVhY3RpdmF0ZUJlZm9yZU5l eHRUaWNrVGltZSkKIAogICAgIC8vIFN0YXJ0IHRoZSB0aW1lciBhZ2FpbiwgYnV0IGJlZm9yZSB0 aGUgbmV4dCB0aWNrIHRpbWUgdGhlIHRpbWVyIHByZXZpb3VzbHkKICAgICAvLyBwbGFubmVkIG9u IHVzaW5nLiBUaGF0IHNhbWUgdGljayB0aW1lIHNob3VsZCBzdGlsbCBiZSB0YXJnZXRlZC4KLSAg ICB0aW1lci0+c2V0TW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKDAuMDA0KTsKKyAgICB0aW1l ci0+c2V0TW9ub3RvbmljVGltZU5vdygwLjAwNCk7CiAgICAgdGltZXItPnNldEFjdGl2ZSh0cnVl KTsKICAgICBFWFBFQ1RfRVEoMTIsIHRocmVhZC5wZW5kaW5nRGVsYXlNcygpKTsKIH0KQEAgLTM4 Niw3ICszODYsNyBAQCBURVNUKENDRGVsYXlCYXNlZFRpbWVTb3VyY2UsIFRlc3REZWFjdGl2YXRl QW5kUmVhY3RpdmF0ZUFmdGVyTmV4dFRpY2tUaW1lKQogCiAgICAgLy8gU2hvdWxkIHJ1biB0aGUg YWN0aXZhdGUgdGFzaywgYW5kIHBpY2sgdXAgYSBuZXcgdGltZWJhc2UuCiAgICAgdGltZXItPnNl dEFjdGl2ZSh0cnVlKTsKLSAgICB0aW1lci0+c2V0TW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1l KDApOworICAgIHRpbWVyLT5zZXRNb25vdG9uaWNUaW1lTm93KDApOwogICAgIHRocmVhZC5ydW5Q ZW5kaW5nVGFzaygpOwogCiAgICAgLy8gU3RvcCB0aGUgdGltZXIKQEAgLTM5Nyw3ICszOTcsNyBA QCBURVNUKENDRGVsYXlCYXNlZFRpbWVTb3VyY2UsIFRlc3REZWFjdGl2YXRlQW5kUmVhY3RpdmF0 ZUFmdGVyTmV4dFRpY2tUaW1lKQogCiAgICAgLy8gU3RhcnQgdGhlIHRpbWVyIGFnYWluLCBidXQg YmVmb3JlIHRoZSBuZXh0IHRpY2sgdGltZSB0aGUgdGltZXIgcHJldmlvdXNseQogICAgIC8vIHBs YW5uZWQgb24gdXNpbmcuIFRoYXQgc2FtZSB0aWNrIHRpbWUgc2hvdWxkIHN0aWxsIGJlIHRhcmdl dGVkLgotICAgIHRpbWVyLT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoMC4wMik7Cisg ICAgdGltZXItPnNldE1vbm90b25pY1RpbWVOb3coMC4wMik7CiAgICAgdGltZXItPnNldEFjdGl2 ZSh0cnVlKTsKICAgICBFWFBFQ1RfRVEoMTMsIHRocmVhZC5wZW5kaW5nRGVsYXlNcygpKTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NGcmFtZVJhdGVDb250 cm9sbGVyVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDRnJhbWVSYXRl Q29udHJvbGxlclRlc3QuY3BwCmluZGV4IDIwZjIzNzRhM2I4MjdmNDZhNmRmMmUzZWQzNjFmMDQ0 MWMwZjNjNzAuLmFiMzY1YTUyNWY3MWQzOWY0NGI5Y2Y0Y2RkZjU2YzBiMjllZDM5ZjYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NGcmFtZVJhdGVDb250cm9sbGVy VGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0ZyYW1lUmF0ZUNv bnRyb2xsZXJUZXN0LmNwcApAQCAtNjMsNyArNjMsNyBAQCBURVNUKENDRnJhbWVSYXRlQ29udHJv bGxlclRlc3QsIFRlc3RGcmFtZVRocm90dGxpbmdfSW1tZWRpYXRlQWNrKQogCiAgICAgLy8gVHJp Z2dlciBvbmUgZnJhbWUsIG1ha2Ugc3VyZSB0aGUgdnN5bmMgY2FsbGJhY2sgaXMgY2FsbGVkCiAg ICAgZWxhcHNlZCArPSB0aHJlYWQucGVuZGluZ0RlbGF5TXMoKSAvIDEwMDAuMDsKLSAgICB0aW1l U291cmNlLT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoZWxhcHNlZCk7CisgICAgdGlt ZVNvdXJjZS0+c2V0TW9ub3RvbmljVGltZU5vdyhlbGFwc2VkKTsKICAgICB0aHJlYWQucnVuUGVu ZGluZ1Rhc2soKTsKICAgICBFWFBFQ1RfVFJVRShjbGllbnQudnN5bmNUaWNrZWQoKSk7CiAgICAg Y2xpZW50LnJlc2V0KCk7CkBAIC03MiwxMyArNzIsMTMgQEAgVEVTVChDQ0ZyYW1lUmF0ZUNvbnRy b2xsZXJUZXN0LCBUZXN0RnJhbWVUaHJvdHRsaW5nX0ltbWVkaWF0ZUFjaykKICAgICBjb250cm9s bGVyLmRpZEJlZ2luRnJhbWUoKTsKIAogICAgIC8vIFRlbGwgdGhlIGNvbnRyb2xsZXIgdGhlIGZy YW1lIGVuZGVkIDVtcyBsYXRlcgotICAgIHRpbWVTb3VyY2UtPnNldE1vbm90b25pY2FsbHlJbmNy ZWFzaW5nVGltZSh0aW1lU291cmNlLT5tb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSArIDAu MDA1KTsKKyAgICB0aW1lU291cmNlLT5zZXRNb25vdG9uaWNUaW1lTm93KHRpbWVTb3VyY2UtPm1v bm90b25pY1RpbWVOb3coKSArIDAuMDA1KTsKICAgICBjb250cm9sbGVyLmRpZEZpbmlzaEZyYW1l KCk7CiAKICAgICAvLyBUcmlnZ2VyIGFub3RoZXIgZnJhbWUsIG1ha2Ugc3VyZSB2c3luYyBydW5z IGFnYWluCiAgICAgZWxhcHNlZCArPSB0aHJlYWQucGVuZGluZ0RlbGF5TXMoKSAvIDEwMDAuMDsK LSAgICBFWFBFQ1RfVFJVRShlbGFwc2VkID49IHRpbWVTb3VyY2UtPm1vbm90b25pY2FsbHlJbmNy ZWFzaW5nVGltZSgpKTsgLy8gU2FuaXR5IGNoZWNrIHRoYXQgcHJldmlvdXMgY29kZSBkaWRuJ3Qg bW92ZSB0aW1lIGJhY2t3YXJkLgotICAgIHRpbWVTb3VyY2UtPnNldE1vbm90b25pY2FsbHlJbmNy ZWFzaW5nVGltZShlbGFwc2VkKTsKKyAgICBFWFBFQ1RfVFJVRShlbGFwc2VkID49IHRpbWVTb3Vy Y2UtPm1vbm90b25pY1RpbWVOb3coKSk7IC8vIFNhbml0eSBjaGVjayB0aGF0IHByZXZpb3VzIGNv ZGUgZGlkbid0IG1vdmUgdGltZSBiYWNrd2FyZC4KKyAgICB0aW1lU291cmNlLT5zZXRNb25vdG9u aWNUaW1lTm93KGVsYXBzZWQpOwogICAgIHRocmVhZC5ydW5QZW5kaW5nVGFzaygpOwogICAgIEVY UEVDVF9UUlVFKGNsaWVudC52c3luY1RpY2tlZCgpKTsKIH0KQEAgLTk4LDcgKzk4LDcgQEAgVEVT VChDQ0ZyYW1lUmF0ZUNvbnRyb2xsZXJUZXN0LCBUZXN0RnJhbWVUaHJvdHRsaW5nX1R3b0ZyYW1l c0luRmxpZ2h0KQogCiAgICAgLy8gVHJpZ2dlciBvbmUgZnJhbWUsIG1ha2Ugc3VyZSB0aGUgdnN5 bmMgY2FsbGJhY2sgaXMgY2FsbGVkCiAgICAgZWxhcHNlZCArPSB0aHJlYWQucGVuZGluZ0RlbGF5 TXMoKSAvIDEwMDAuMDsKLSAgICB0aW1lU291cmNlLT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2lu Z1RpbWUoZWxhcHNlZCk7CisgICAgdGltZVNvdXJjZS0+c2V0TW9ub3RvbmljVGltZU5vdyhlbGFw c2VkKTsKICAgICB0aHJlYWQucnVuUGVuZGluZ1Rhc2soKTsKICAgICBFWFBFQ1RfVFJVRShjbGll bnQudnN5bmNUaWNrZWQoKSk7CiAgICAgY2xpZW50LnJlc2V0KCk7CkBAIC0xMDgsOCArMTA4LDgg QEAgVEVTVChDQ0ZyYW1lUmF0ZUNvbnRyb2xsZXJUZXN0LCBUZXN0RnJhbWVUaHJvdHRsaW5nX1R3 b0ZyYW1lc0luRmxpZ2h0KQogCiAgICAgLy8gVHJpZ2dlciBhbm90aGVyIGZyYW1lLCBtYWtlIHN1 cmUgdnN5bmMgY2FsbGJhY2sgcnVucyBhZ2FpbgogICAgIGVsYXBzZWQgKz0gdGhyZWFkLnBlbmRp bmdEZWxheU1zKCkgLyAxMDAwLjA7Ci0gICAgRVhQRUNUX1RSVUUoZWxhcHNlZCA+PSB0aW1lU291 cmNlLT5tb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSk7IC8vIFNhbml0eSBjaGVjayB0aGF0 IHByZXZpb3VzIGNvZGUgZGlkbid0IG1vdmUgdGltZSBiYWNrd2FyZC4KLSAgICB0aW1lU291cmNl LT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoZWxhcHNlZCk7CisgICAgRVhQRUNUX1RS VUUoZWxhcHNlZCA+PSB0aW1lU291cmNlLT5tb25vdG9uaWNUaW1lTm93KCkpOyAvLyBTYW5pdHkg Y2hlY2sgdGhhdCBwcmV2aW91cyBjb2RlIGRpZG4ndCBtb3ZlIHRpbWUgYmFja3dhcmQuCisgICAg dGltZVNvdXJjZS0+c2V0TW9ub3RvbmljVGltZU5vdyhlbGFwc2VkKTsKICAgICB0aHJlYWQucnVu UGVuZGluZ1Rhc2soKTsKICAgICBFWFBFQ1RfVFJVRShjbGllbnQudnN5bmNUaWNrZWQoKSk7CiAg ICAgY2xpZW50LnJlc2V0KCk7CkBAIC0xMTksMTMgKzExOSwxMyBAQCBURVNUKENDRnJhbWVSYXRl Q29udHJvbGxlclRlc3QsIFRlc3RGcmFtZVRocm90dGxpbmdfVHdvRnJhbWVzSW5GbGlnaHQpCiAK ICAgICAvLyBUcmlnZ2VyIGFub3RoZXIgZnJhbWUuIFNpbmNlIHR3byBmcmFtZXMgYXJlIHBlbmRp bmcsIHdlIHNob3VsZCBub3QgZHJhdy4KICAgICBlbGFwc2VkICs9IHRocmVhZC5wZW5kaW5nRGVs YXlNcygpIC8gMTAwMC4wOwotICAgIEVYUEVDVF9UUlVFKGVsYXBzZWQgPj0gdGltZVNvdXJjZS0+ bW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCkpOyAvLyBTYW5pdHkgY2hlY2sgdGhhdCBwcmV2 aW91cyBjb2RlIGRpZG4ndCBtb3ZlIHRpbWUgYmFja3dhcmQuCi0gICAgdGltZVNvdXJjZS0+c2V0 TW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKGVsYXBzZWQpOworICAgIEVYUEVDVF9UUlVFKGVs YXBzZWQgPj0gdGltZVNvdXJjZS0+bW9ub3RvbmljVGltZU5vdygpKTsgLy8gU2FuaXR5IGNoZWNr IHRoYXQgcHJldmlvdXMgY29kZSBkaWRuJ3QgbW92ZSB0aW1lIGJhY2t3YXJkLgorICAgIHRpbWVT b3VyY2UtPnNldE1vbm90b25pY1RpbWVOb3coZWxhcHNlZCk7CiAgICAgdGhyZWFkLnJ1blBlbmRp bmdUYXNrKCk7CiAgICAgRVhQRUNUX0ZBTFNFKGNsaWVudC52c3luY1RpY2tlZCgpKTsKIAogICAg IC8vIFRlbGwgdGhlIGNvbnRyb2xsZXIgdGhlIGZpcnN0IGZyYW1lIGVuZGVkIDVtcyBsYXRlcgot ICAgIHRpbWVTb3VyY2UtPnNldE1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSh0aW1lU291cmNl LT5tb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSArIDAuMDA1KTsKKyAgICB0aW1lU291cmNl LT5zZXRNb25vdG9uaWNUaW1lTm93KHRpbWVTb3VyY2UtPm1vbm90b25pY1RpbWVOb3coKSArIDAu MDA1KTsKICAgICBjb250cm9sbGVyLmRpZEZpbmlzaEZyYW1lKCk7CiAKICAgICAvLyBUaWNrIHNo b3VsZCBub3QgaGF2ZSBiZWVuIGNhbGxlZApAQCAtMTMzLDggKzEzMyw4IEBAIFRFU1QoQ0NGcmFt ZVJhdGVDb250cm9sbGVyVGVzdCwgVGVzdEZyYW1lVGhyb3R0bGluZ19Ud29GcmFtZXNJbkZsaWdo dCkKIAogICAgIC8vIFRyaWdnZXIgeWV0IGFub3RoZXIgZnJhbWUuIFNpbmNlIG9uZSBmcmFtZXMg aXMgcGVuZGluZywgYW5vdGhlciB2c3luYyBjYWxsYmFjayBzaG91bGQgcnVuLgogICAgIGVsYXBz ZWQgKz0gdGhyZWFkLnBlbmRpbmdEZWxheU1zKCkgLyAxMDAwLjA7Ci0gICAgRVhQRUNUX1RSVUUo ZWxhcHNlZCA+PSB0aW1lU291cmNlLT5tb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSk7IC8v IFNhbml0eSBjaGVjayB0aGF0IHByZXZpb3VzIGNvZGUgZGlkbid0IG1vdmUgdGltZSBiYWNrd2Fy ZC4KLSAgICB0aW1lU291cmNlLT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoZWxhcHNl ZCk7CisgICAgRVhQRUNUX1RSVUUoZWxhcHNlZCA+PSB0aW1lU291cmNlLT5tb25vdG9uaWNUaW1l Tm93KCkpOyAvLyBTYW5pdHkgY2hlY2sgdGhhdCBwcmV2aW91cyBjb2RlIGRpZG4ndCBtb3ZlIHRp bWUgYmFja3dhcmQuCisgICAgdGltZVNvdXJjZS0+c2V0TW9ub3RvbmljVGltZU5vdyhlbGFwc2Vk KTsKICAgICB0aHJlYWQucnVuUGVuZGluZ1Rhc2soKTsKICAgICBFWFBFQ1RfVFJVRShjbGllbnQu dnN5bmNUaWNrZWQoKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rl c3RzL0NDU2NoZWR1bGVyVGVzdENvbW1vbi5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0 cy9DQ1NjaGVkdWxlclRlc3RDb21tb24uaAppbmRleCBiZWIxNjU1NGQxNzNhMTliMjY5YjUzNWE3 ZjkzMDA3YzE2N2UyZmQ5Li4yZjM5MzI0NmMxYzY0NWVkMTA4MTI2MjU3NmYwMzVjYmIzNTU2YjRj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDU2NoZWR1bGVyVGVz dENvbW1vbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NTY2hlZHVsZXJU ZXN0Q29tbW9uLmgKQEAgLTEyNiwxNSArMTI2LDE1IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJu IGFkb3B0UmVmKG5ldyBGYWtlQ0NEZWxheUJhc2VkVGltZVNvdXJjZShpbnRlcnZhbCwgdGhyZWFk KSk7CiAgICAgfQogCi0gICAgdm9pZCBzZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoZG91 YmxlIHRpbWUpIHsgbV9tb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUgPSB0aW1lOyB9Ci0gICAg dmlydHVhbCBkb3VibGUgbW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCkgY29uc3QgeyByZXR1 cm4gbV9tb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWU7IH0KKyAgICB2b2lkIHNldE1vbm90b25p Y1RpbWVOb3coZG91YmxlIHRpbWUpIHsgbV9tb25vdG9uaWNUaW1lTm93ID0gdGltZTsgfQorICAg IHZpcnR1YWwgZG91YmxlIG1vbm90b25pY1RpbWVOb3coKSBjb25zdCBPVkVSUklERSB7IHJldHVy biBtX21vbm90b25pY1RpbWVOb3c7IH0KIAogcHJvdGVjdGVkOgogICAgIEZha2VDQ0RlbGF5QmFz ZWRUaW1lU291cmNlKGRvdWJsZSBpbnRlcnZhbCwgV2ViQ29yZTo6Q0NUaHJlYWQqIHRocmVhZCkK ICAgICAgICAgOiBDQ0RlbGF5QmFzZWRUaW1lU291cmNlKGludGVydmFsLCB0aHJlYWQpCi0gICAg ICAgICwgbV9tb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoMCkgeyB9CisgICAgICAgICwgbV9t b25vdG9uaWNUaW1lTm93KDApIHsgfQogCi0gICAgZG91YmxlIG1fbW9ub3RvbmljYWxseUluY3Jl YXNpbmdUaW1lOworICAgIGRvdWJsZSBtX21vbm90b25pY1RpbWVOb3c7CiB9OwogCiBjbGFzcyBG YWtlQ0NGcmFtZVJhdGVDb250cm9sbGVyIDogcHVibGljIFdlYkNvcmU6OkNDRnJhbWVSYXRlQ29u dHJvbGxlciB7Cg==