101916 2012-11-12 03:11:08 -0800 Refactoring: set read-only values on layout in DateTimeEditElement 2012-11-12 07:39:08 -0800 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 101889 1 tkent tkent haraken mifenton webkit.review.bot oldest_to_newest 764192 0 tkent 2012-11-12 03:11:08 -0800 Refactoring: set read-only values on layout in DateTimeEditElement 764211 1 173605 tkent 2012-11-12 03:29:07 -0800 Created attachment 173605 Patch 764220 2 173605 haraken 2012-11-12 03:42:05 -0800 Comment on attachment 173605 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173605&action=review > Source/WebCore/ChangeLog:5 > + Need the bug URL (OOPS!). Remove this. > Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp:163 > +void DateTimeNumericFieldElement::setEmptyValue(EventBehavior eventBehavior) I'm a bit confused by this name. What does 'Empty' mean? setDefaultValue() might sound better. 764345 3 173605 tkent 2012-11-12 06:21:11 -0800 Comment on attachment 173605 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173605&action=review Thank you for the review. >> Source/WebCore/ChangeLog:5 >> + Need the bug URL (OOPS!). > > Remove this. OOPS! >> Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp:163 >> +void DateTimeNumericFieldElement::setEmptyValue(EventBehavior eventBehavior) > > I'm a bit confused by this name. What does 'Empty' mean? setDefaultValue() might sound better. 'Empty' means really empty. This function is something like input.value = "". In the Forms area, "default" means the initial value (<input value="default">). setEmptyValue actually had a confusing role. This patch makes it clearer. 764347 4 173636 tkent 2012-11-12 06:23:32 -0800 Created attachment 173636 Patch for landing 764409 5 173636 webkit.review.bot 2012-11-12 07:39:04 -0800 Comment on attachment 173636 Patch for landing Clearing flags on attachment: 173636 Committed r134239: <http://trac.webkit.org/changeset/134239> 764410 6 webkit.review.bot 2012-11-12 07:39:08 -0800 All reviewed patches have been landed. Closing bug. 173605 2012-11-12 03:29:07 -0800 2012-11-12 06:23:29 -0800 Patch bug-101916-20121112202709.patch text/plain 27503 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQ1YjZlZWM0MjI5ZmFh Y2Q4M2E2Y2E3Y2MwNjFmYzYyMzhmMmNkYS4uZGY4NzExZmNhZGViOGJmNGEzYmRlMmNiMDFmNjZi ZjM2ZWJhMTNiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYxIEBACisyMDEyLTExLTEyICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZWZhY3RvcmluZzogc2V0 IHJlYWQtb25seSB2YWx1ZXMgb24gbGF5b3V0IGluIERhdGVUaW1lRWRpdEVsZW1lbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTkxNgorICAgICAg ICBOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2UgaGF2ZSBhbHdheXMgdXBkYXRlZCByZWFkLW9ubHkgdmFs dWVzIHdoZW4gd2Ugc2V0IGFuIGVtcHR5IHZhbHVlIG9yCisgICAgICAgIERhdGVUaW1lRmllbGRz U3RhdGUuIEl0IGhhcyB3YXN0ZWQgQ1BVIHRpbWUgYmVjYXVzZSBzdWNoIHJlYWQtb25seQorICAg ICAgICB2YWx1ZXMgYXJlIG5ldmVyIHVwZGF0ZWQgYWZ0ZXIgbGF5b3V0KCkgZXNzZW50aWFsbHku IFNvLCB3ZSBzZXQKKyAgICAgICAgcmVhZC1vbmx5IHZhbHVlcyBpbiBEYXRlVGltZUVkaXRCdWls ZGVyIHVzZWQgYnkgbGF5b3V0KCksIGFuZCByZW1vdmUKKyAgICAgICAgZGF0ZUZvclJlYWRPbmx5 RmllbGQgYXJndW1lbnRzIG9mIHNldEVtcHR5VmFsdWUgYW5kCisgICAgICAgIHNldFZhbHVlQXNE YXRlVGltZUZpZWxkc1N0YXRlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBzaG91bGQg bm90IG1ha2UgYmVoYXZpb3IgY2hhbmdlcy4KKworICAgICAgICAqIGh0bWwvQmFzZU11bHRpcGxl RmllbGRzRGF0ZUFuZFRpbWVJbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QmFzZU11 bHRpcGxlRmllbGRzRGF0ZUFuZFRpbWVJbnB1dFR5cGU6OnJlc3RvcmVGb3JtQ29udHJvbFN0YXRl KToKKyAgICAgICAgV2UgcmVtb3ZlZCBkYXRlRm9yUmVhZE9ubHlGaWVsZCBhcmd1bWVudCBiZWNh dXNlIHJlYWQtb25seSB2YWx1ZXMgYXJlCisgICAgICAgIGFscmVhZHkgc2V0IGluIERhdGVUaW1l RmllbGRFbGVtZW50OjpsYXlvdXQoKS4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9EYXRlVGltZUVk aXRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lRWRpdEJ1aWxkZXI6OnZp c2l0RmllbGQpOgorICAgICAgICBTZXQgYSB2YWx1ZSB0byBhIHJlYWQtb25seSBtaW51dGUvc2Vj b25kL21pbGxpc2Vjb25kIGZpZWxkIHdoaWxlCisgICAgICAgIGJ1aWxkaW5nIFVJIGVsZW1lbnRz LgorICAgICAgICBBbHNvLCBjaGFuZ2VkIHZhcmlhYmxlIHR5cGVzIGZvciBtaWxsaXNlY29uZCBh bmQgc2Vjb25kIGZpZWxkcyB0bworICAgICAgICBSZWZQdHI8RGF0ZVRpbWVOdW1lcmljRmllbGRF bGVtZW50PiBiZWNhdXNlIHdlJ2QgbGlrZSB0byBjYWxsCisgICAgICAgIHNldFZhbHVlQXNEYXRl LCB3aGljaCBpcyBwcml2YXRlIGluIERhdGVUaW1lTWlsbGlzZWNvbmRGaWVsZEVsZW1lbnQgYW5k CisgICAgICAgIERhdGVUaW1lU2Vjb25kRmllbGRFbGVtZW50CisgICAgICAgIChXZWJDb3JlOjpE YXRlVGltZUVkaXRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZSk6CisgICAg ICAgIFdlIHJlbW92ZWQgZGF0ZUZvclJlYWRPbmx5RmllbGQgYXJndW1lbnQgYmVjYXVzZSByZWFk LW9ubHkgdmFsdWVzIGFyZQorICAgICAgICBhbHJlYWR5IHNldCBpbiBEYXRlVGltZUZpZWxkRWxl bWVudDo6bGF5b3V0KCkuCisgICAgICAgIChXZWJDb3JlOjpEYXRlVGltZUVkaXRFbGVtZW50Ojpz ZXRFbXB0eVZhbHVlKTogRGl0dG8uCisgICAgICAgICogaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0 RWxlbWVudC5oOgorICAgICAgICAoRGF0ZVRpbWVFZGl0RWxlbWVudCk6CisgICAgICAgIFJlbW92 ZWQgZGF0ZUZvclJlYWRPbmx5RmllbGQgYXJndW1lbnQgZm9yIHNldFZhbHVlQXNEYXRlVGltZUZp ZWxkc1N0YXRlLgorCisgICAgICAgICogaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RGF0ZVRpbWVGaWVsZEVsZW1lbnQ6OmRlZmF1bHRLZXli b2FyZEV2ZW50SGFuZGxlcik6CisgICAgICAgIFdlIHJlbW92ZWQgZGF0ZUZvclJlYWRPbmx5Rmll bGQgYXJndW1lbnQgYmVjYXVzZSByZWFkLW9ubHkgdmFsdWVzIGFyZQorICAgICAgICBhbHJlYWR5 IHNldCBpbiBEYXRlVGltZUZpZWxkRWxlbWVudDo6bGF5b3V0KCkuCisgICAgICAgICogaHRtbC9z aGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnQuaDoKKyAgICAgICAgKERhdGVUaW1lRmllbGRFbGVt ZW50KTogRGl0dG8uCisKKyAgICAgICAgKiBodG1sL3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVu dHMuY3BwOiBEaXR0by4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVu dHMuaDogRGl0dG8uCisgICAgICAgICogaHRtbC9zaGFkb3cvRGF0ZVRpbWVOdW1lcmljRmllbGRF bGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVu dDo6c2V0RW1wdHlWYWx1ZSk6CisgICAgICAgIEl0IHNob3VsZCBkbyBub3RoaW5nIGlmIGl0IGlz IHJlYWQtb25seSBiZWNhdXNlIGEgcmVhZC1vbmx5IHZhbHVlIHdhcworICAgICAgICBhbHJlYWR5 IHNldCBqdXN0IGFmdGVyIGNvbnN0cnVjdGlvbi4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9EYXRl VGltZU51bWVyaWNGaWVsZEVsZW1lbnQuaDoKKyAgICAgICAgKERhdGVUaW1lTnVtZXJpY0ZpZWxk RWxlbWVudCk6CisgICAgICAgIFJlbW92ZWQgZGF0ZUZvclJlYWRPbmx5RmllbGQgYXJndW1lbnQg b2Ygc2V0RW1wdHlWYWx1ZS4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9EYXRlVGltZVN5bWJvbGlj RmllbGRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lU3ltYm9saWNGaWVs ZEVsZW1lbnQ6OnNldEVtcHR5VmFsdWUpOiBEaXR0by4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9E YXRlVGltZVN5bWJvbGljRmllbGRFbGVtZW50Lmg6CisgICAgICAgIChEYXRlVGltZVN5bWJvbGlj RmllbGRFbGVtZW50KTogRGl0dG8uCisKIDIwMTItMTEtMTIgIFBhdmVsIEZlbGRtYW4gIDxwZmVs ZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjogd2FzU2hvd24gaXMg Y2FsbGVkIHR3aWNlIHdoZW4gc2hvdygpIGlzIGNhbGxlZCBmcm9tIHdpdGhpbiB3YXNTaG93bgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9CYXNlTXVsdGlwbGVGaWVsZHNEYXRlQW5k VGltZUlucHV0VHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0Jhc2VNdWx0aXBsZUZpZWxk c0RhdGVBbmRUaW1lSW5wdXRUeXBlLmNwcAppbmRleCBlNzBkMDBhODFhZjViMTk5YzBhMjgwZjg2 OWVhYjhmZTQ0NmM3NDg3Li4wYzg0NTAwZjJjMmJkOTI5YWY4OWYzZTgxOWI0ZTY1YjAzZWQzMzdl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0Jhc2VNdWx0aXBsZUZpZWxkc0RhdGVB bmRUaW1lSW5wdXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0Jhc2VNdWx0aXBs ZUZpZWxkc0RhdGVBbmRUaW1lSW5wdXRUeXBlLmNwcApAQCAtMjc4LDEwICsyNzgsOCBAQCB2b2lk IEJhc2VNdWx0aXBsZUZpZWxkc0RhdGVBbmRUaW1lSW5wdXRUeXBlOjpyZXN0b3JlRm9ybUNvbnRy b2xTdGF0ZShjb25zdCBGb3JtQwogewogICAgIGlmICghbV9kYXRlVGltZUVkaXRFbGVtZW50KQog ICAgICAgICByZXR1cm47Ci0gICAgRGF0ZUNvbXBvbmVudHMgZGF0ZTsKLSAgICBzZXRNaWxsaXNl Y29uZFRvRGF0ZUNvbXBvbmVudHMoY3JlYXRlU3RlcFJhbmdlKEFueUlzRGVmYXVsdFN0ZXApLm1p bmltdW0oKS50b0RvdWJsZSgpLCAmZGF0ZSk7CiAgICAgRGF0ZVRpbWVGaWVsZHNTdGF0ZSBkYXRl VGltZUZpZWxkc1N0YXRlID0gRGF0ZVRpbWVGaWVsZHNTdGF0ZTo6cmVzdG9yZUZvcm1Db250cm9s U3RhdGUoc3RhdGUpOwotICAgIG1fZGF0ZVRpbWVFZGl0RWxlbWVudC0+c2V0VmFsdWVBc0RhdGVU aW1lRmllbGRzU3RhdGUoZGF0ZVRpbWVGaWVsZHNTdGF0ZSwgZGF0ZSk7CisgICAgbV9kYXRlVGlt ZUVkaXRFbGVtZW50LT5zZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShkYXRlVGltZUZpZWxk c1N0YXRlKTsKICAgICBlbGVtZW50KCktPnNldFZhbHVlSW50ZXJuYWwoc2FuaXRpemVWYWx1ZSht X2RhdGVUaW1lRWRpdEVsZW1lbnQtPnZhbHVlKCkpLCBEaXNwYXRjaE5vRXZlbnQpOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUVkaXRFbGVtZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRWRpdEVsZW1lbnQuY3Bw CmluZGV4IGRjNmIyNTc2MTBjMGE4MzQ5MDVmYzZhODQ5ZGZlZTc3ZjQxOGQ2MmMuLmRiYWE0ZDNk YzVlNWFhYmEwZjZkOGFmMzBkNWRjODQxY2I4ODYwMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRWRpdEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRWRpdEVsZW1lbnQuY3BwCkBAIC0xMjEsOCArMTIxLDEw IEBAIHZvaWQgRGF0ZVRpbWVFZGl0QnVpbGRlcjo6dmlzaXRGaWVsZChEYXRlVGltZUZvcm1hdDo6 RmllbGRUeXBlIGZpZWxkVHlwZSwgaW50IGNvCiAgICAgY2FzZSBEYXRlVGltZUZvcm1hdDo6Rmll bGRUeXBlTWludXRlOiB7CiAgICAgICAgIFJlZlB0cjxEYXRlVGltZU51bWVyaWNGaWVsZEVsZW1l bnQ+IGZpZWxkID0gRGF0ZVRpbWVNaW51dGVGaWVsZEVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCwg bV9lZGl0RWxlbWVudCk7CiAgICAgICAgIG1fZWRpdEVsZW1lbnQuYWRkRmllbGQoZmllbGQpOwot ICAgICAgICBpZiAoc2hvdWxkTWludXRlRmllbGRSZWFkT25seSgpKQorICAgICAgICBpZiAoc2hv dWxkTWludXRlRmllbGRSZWFkT25seSgpKSB7CisgICAgICAgICAgICBmaWVsZC0+c2V0VmFsdWVB c0RhdGUobV9kYXRlVmFsdWUpOwogICAgICAgICAgICAgZmllbGQtPnNldFJlYWRPbmx5KCk7Cisg ICAgICAgIH0KICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTYxLDEwICsxNjMsMTIgQEAg dm9pZCBEYXRlVGltZUVkaXRCdWlsZGVyOjp2aXNpdEZpZWxkKERhdGVUaW1lRm9ybWF0OjpGaWVs ZFR5cGUgZmllbGRUeXBlLCBpbnQgY28KICAgICAgICAgcmV0dXJuOwogCiAgICAgY2FzZSBEYXRl VGltZUZvcm1hdDo6RmllbGRUeXBlU2Vjb25kOiB7Ci0gICAgICAgIFJlZlB0cjxEYXRlVGltZVNl Y29uZEZpZWxkRWxlbWVudD4gZmllbGQgPSBEYXRlVGltZVNlY29uZEZpZWxkRWxlbWVudDo6Y3Jl YXRlKGRvY3VtZW50LCBtX2VkaXRFbGVtZW50KTsKKyAgICAgICAgUmVmUHRyPERhdGVUaW1lTnVt ZXJpY0ZpZWxkRWxlbWVudD4gZmllbGQgPSBEYXRlVGltZVNlY29uZEZpZWxkRWxlbWVudDo6Y3Jl YXRlKGRvY3VtZW50LCBtX2VkaXRFbGVtZW50KTsKICAgICAgICAgbV9lZGl0RWxlbWVudC5hZGRG aWVsZChmaWVsZCk7Ci0gICAgICAgIGlmIChzaG91bGRTZWNvbmRGaWVsZFJlYWRPbmx5KCkpCisg ICAgICAgIGlmIChzaG91bGRTZWNvbmRGaWVsZFJlYWRPbmx5KCkpIHsKKyAgICAgICAgICAgIGZp ZWxkLT5zZXRWYWx1ZUFzRGF0ZShtX2RhdGVWYWx1ZSk7CiAgICAgICAgICAgICBmaWVsZC0+c2V0 UmVhZE9ubHkoKTsKKyAgICAgICAgfQogCiAgICAgICAgIGlmIChuZWVkTWlsbGlzZWNvbmRGaWVs ZCgpKSB7CiAgICAgICAgICAgICB2aXNpdExpdGVyYWwobV9wYXJhbWV0ZXJzLmxvY2FsZS5sb2Nh bGl6ZWREZWNpbWFsU2VwYXJhdG9yKCkpOwpAQCAtMTc0LDEwICsxNzgsMTIgQEAgdm9pZCBEYXRl VGltZUVkaXRCdWlsZGVyOjp2aXNpdEZpZWxkKERhdGVUaW1lRm9ybWF0OjpGaWVsZFR5cGUgZmll bGRUeXBlLCBpbnQgY28KICAgICB9CiAKICAgICBjYXNlIERhdGVUaW1lRm9ybWF0OjpGaWVsZFR5 cGVGcmFjdGlvbmFsU2Vjb25kOiB7Ci0gICAgICAgIFJlZlB0cjxEYXRlVGltZU1pbGxpc2Vjb25k RmllbGRFbGVtZW50PiBmaWVsZCA9IERhdGVUaW1lTWlsbGlzZWNvbmRGaWVsZEVsZW1lbnQ6OmNy ZWF0ZShkb2N1bWVudCwgbV9lZGl0RWxlbWVudCk7CisgICAgICAgIFJlZlB0cjxEYXRlVGltZU51 bWVyaWNGaWVsZEVsZW1lbnQ+IGZpZWxkID0gRGF0ZVRpbWVNaWxsaXNlY29uZEZpZWxkRWxlbWVu dDo6Y3JlYXRlKGRvY3VtZW50LCBtX2VkaXRFbGVtZW50KTsKICAgICAgICAgbV9lZGl0RWxlbWVu dC5hZGRGaWVsZChmaWVsZCk7Ci0gICAgICAgIGlmIChzaG91bGRNaWxsaXNlY29uZEZpZWxkUmVh ZE9ubHkoKSkKKyAgICAgICAgaWYgKHNob3VsZE1pbGxpc2Vjb25kRmllbGRSZWFkT25seSgpKSB7 CisgICAgICAgICAgICBmaWVsZC0+c2V0VmFsdWVBc0RhdGUobV9kYXRlVmFsdWUpOwogICAgICAg ICAgICAgZmllbGQtPnNldFJlYWRPbmx5KCk7CisgICAgICAgIH0KICAgICAgICAgcmV0dXJuOwog ICAgIH0KIApAQCAtNDYyLDE3ICs0NjgsMTcgQEAgdm9pZCBEYXRlVGltZUVkaXRFbGVtZW50Ojpz ZXRWYWx1ZUFzRGF0ZShjb25zdCBMYXlvdXRQYXJhbWV0ZXJzJiBsYXlvdXRQYXJhbWV0ZXIKICAg ICAgICAgbV9maWVsZHNbZmllbGRJbmRleF0tPnNldFZhbHVlQXNEYXRlKGRhdGUpOwogfQogCi12 b2lkIERhdGVUaW1lRWRpdEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNv bnN0IERhdGVUaW1lRmllbGRzU3RhdGUmIGRhdGVUaW1lRmllbGRzU3RhdGUsIGNvbnN0IERhdGVD b21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCkKK3ZvaWQgRGF0ZVRpbWVFZGl0RWxlbWVu dDo6c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0 ZSYgZGF0ZVRpbWVGaWVsZHNTdGF0ZSkKIHsKICAgICBmb3IgKHNpemVfdCBmaWVsZEluZGV4ID0g MDsgZmllbGRJbmRleCA8IG1fZmllbGRzLnNpemUoKTsgKytmaWVsZEluZGV4KQotICAgICAgICBt X2ZpZWxkc1tmaWVsZEluZGV4XS0+c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoZGF0ZVRp bWVGaWVsZHNTdGF0ZSwgZGF0ZUZvclJlYWRPbmx5RmllbGQpOworICAgICAgICBtX2ZpZWxkc1tm aWVsZEluZGV4XS0+c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoZGF0ZVRpbWVGaWVsZHNT dGF0ZSk7CiB9CiAKIHZvaWQgRGF0ZVRpbWVFZGl0RWxlbWVudDo6c2V0RW1wdHlWYWx1ZShjb25z dCBMYXlvdXRQYXJhbWV0ZXJzJiBsYXlvdXRQYXJhbWV0ZXJzLCBjb25zdCBEYXRlQ29tcG9uZW50 cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQpCiB7CiAgICAgbGF5b3V0KGxheW91dFBhcmFtZXRlcnMs IGRhdGVGb3JSZWFkT25seUZpZWxkKTsKICAgICBmb3IgKHNpemVfdCBmaWVsZEluZGV4ID0gMDsg ZmllbGRJbmRleCA8IG1fZmllbGRzLnNpemUoKTsgKytmaWVsZEluZGV4KQotICAgICAgICBtX2Zp ZWxkc1tmaWVsZEluZGV4XS0+c2V0RW1wdHlWYWx1ZShkYXRlRm9yUmVhZE9ubHlGaWVsZCwgRGF0 ZVRpbWVGaWVsZEVsZW1lbnQ6OkRpc3BhdGNoTm9FdmVudCk7CisgICAgICAgIG1fZmllbGRzW2Zp ZWxkSW5kZXhdLT5zZXRFbXB0eVZhbHVlKERhdGVUaW1lRmllbGRFbGVtZW50OjpEaXNwYXRjaE5v RXZlbnQpOwogfQogCiBib29sIERhdGVUaW1lRWRpdEVsZW1lbnQ6Omhhc0ZvY3VzZWRGaWVsZCgp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUVkaXRFbGVt ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUVkaXRFbGVtZW50LmgK aW5kZXggMzVjNWJjN2U4ZWYyZGM4M2ExZTRmZTcyZjkxYzhmYzRlMTE2YmI1My4uMzJiMWIyMzNm ZjEwMjAzZTc4YTRjMTFmMDgxZDZhN2U5ZTM1MjVlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvc2hhZG93L0RhdGVUaW1lRWRpdEVsZW1lbnQuaApAQCAtOTcsNyArOTcsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCByZXNldEZpZWxkcygpOwogICAgIHZvaWQgc2V0RW1wdHlWYWx1ZShjb25z dCBMYXlvdXRQYXJhbWV0ZXJzJiwgY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVGb3JSZWFkT25s eUZpZWxkKTsKICAgICB2b2lkIHNldFZhbHVlQXNEYXRlKGNvbnN0IExheW91dFBhcmFtZXRlcnMm LCBjb25zdCBEYXRlQ29tcG9uZW50cyYpOwotICAgIHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1lRmll bGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYsIGNvbnN0IERhdGVDb21wb25lbnRz JiBkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CisgICAgdm9pZCBzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVs ZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJik7CiAgICAgdm9pZCBzdGVwRG93bigp OwogICAgIHZvaWQgc3RlcFVwKCk7CiAgICAgU3RyaW5nIHZhbHVlKCkgY29uc3Q7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudC5jcHAKaW5k ZXggODVhNmU3OGNhMTUyMjllZjBhMzU2NzM3Nzk3MDI1NmNjNDE2Yzc5Ny4uNDgyYTk3ZDg3MDg5 ODY2YmUxOGZlM2QxZTg3YzdjMTljMjVjNTdiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvc2hhZG93L0RhdGVUaW1lRmllbGRFbGVtZW50LmNwcApAQCAtMTExLDcgKzExMSw3IEBA IHZvaWQgRGF0ZVRpbWVGaWVsZEVsZW1lbnQ6OmRlZmF1bHRLZXlib2FyZEV2ZW50SGFuZGxlcihL ZXlib2FyZEV2ZW50KiBrZXlib2FyZEV2CiAKICAgICBpZiAoa2V5SWRlbnRpZmllciA9PSAiVSsw MDA4IiB8fCBrZXlJZGVudGlmaWVyID09ICJVKzAwN0YiKSB7CiAgICAgICAgIGtleWJvYXJkRXZl bnQtPnNldERlZmF1bHRIYW5kbGVkKCk7Ci0gICAgICAgIHNldEVtcHR5VmFsdWUoRGF0ZUNvbXBv bmVudHMoKSwgRGlzcGF0Y2hFdmVudCk7CisgICAgICAgIHNldEVtcHR5VmFsdWUoRGlzcGF0Y2hF dmVudCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnQuaAppbmRleCA2NDk3MzQ1NzNhYTFlMzQ5 ZGRhYjkwZDVlMDY1MTA5NDA2MTIzODBhLi41MGViYzY3MDM1MTI0YTIyZmEwNTQwZTJmZTg3MTZh YmM2ODZlNzA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGlt ZUZpZWxkRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1l RmllbGRFbGVtZW50LmgKQEAgLTY1LDkgKzY1LDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9p ZCBwb3B1bGF0ZURhdGVUaW1lRmllbGRzU3RhdGUoRGF0ZVRpbWVGaWVsZHNTdGF0ZSYpID0gMDsK ICAgICB2b2lkIHJlbW92ZUV2ZW50SGFuZGxlcigpIHsgbV9maWVsZE93bmVyID0gMDsgfQogICAg IHZvaWQgc2V0UmVhZE9ubHkoKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0RW1wdHlWYWx1ZShjb25z dCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQsIEV2ZW50QmVoYXZpb3IgPSBE aXNwYXRjaE5vRXZlbnQpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0RW1wdHlWYWx1ZShFdmVu dEJlaGF2aW9yID0gRGlzcGF0Y2hOb0V2ZW50KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldFZh bHVlQXNEYXRlKGNvbnN0IERhdGVDb21wb25lbnRzJikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBz ZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiwg Y29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVGb3JSZWFkT25seUZpZWxkKSA9IDA7CisgICAgdmly dHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmll bGRzU3RhdGUmKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNJbnRlZ2VyKGludCwg RXZlbnRCZWhhdmlvciA9IERpc3BhdGNoTm9FdmVudCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBz dGVwRG93bigpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc3RlcFVwKCkgPSAwOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnRzLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRmllbGRFbGVtZW50cy5jcHAKaW5k ZXggODRkYzUyZGEzYjcxYTg2ODUxN2RlNmY2ZjU2MzQ1MWZlM2FiZDhiNS4uOWZmZGNlMDdmODUw MGYwMWVkZDlkZTUzODE1NTVmNDZkMmYwN2M0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudHMuY3BwCkBAIC02MSwxMiArNjEsMTIg QEAgdm9pZCBEYXRlVGltZUFNUE1GaWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlKGNvbnN0IERh dGVDb21wb25lbnRzJiBkYXRlKQogICAgIHNldFZhbHVlQXNJbnRlZ2VyKGRhdGUuaG91cigpID49 IDEyID8gMSA6IDApOwogfQogCi12b2lkIERhdGVUaW1lQU1QTUZpZWxkRWxlbWVudDo6c2V0VmFs dWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYgZGF0ZVRp bWVGaWVsZHNTdGF0ZSwgY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVGb3JSZWFkT25seUZpZWxk KQordm9pZCBEYXRlVGltZUFNUE1GaWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxk c1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmIGRhdGVUaW1lRmllbGRzU3RhdGUpCiB7 CiAgICAgaWYgKGRhdGVUaW1lRmllbGRzU3RhdGUuaGFzQU1QTSgpKQogICAgICAgICBzZXRWYWx1 ZUFzSW50ZWdlcihkYXRlVGltZUZpZWxkc1N0YXRlLmFtcG0oKSk7CiAgICAgZWxzZQotICAgICAg ICBzZXRFbXB0eVZhbHVlKGRhdGVGb3JSZWFkT25seUZpZWxkKTsKKyAgICAgICAgc2V0RW1wdHlW YWx1ZSgpOwogfQogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkBAIC05NCwxMCAr OTQsMTAgQEAgdm9pZCBEYXRlVGltZURheUZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGUoY29u c3QgRGF0ZUNvbXBvbmVudHMmIGRhdGUpCiAgICAgc2V0VmFsdWVBc0ludGVnZXIoZGF0ZS5tb250 aERheSgpKTsKIH0KIAotdm9pZCBEYXRlVGltZURheUZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0Rh dGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYgZGF0ZVRpbWVGaWVs ZHNTdGF0ZSwgY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVGb3JSZWFkT25seUZpZWxkKQordm9p ZCBEYXRlVGltZURheUZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUo Y29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYgZGF0ZVRpbWVGaWVsZHNTdGF0ZSkKIHsKICAgICBp ZiAoIWRhdGVUaW1lRmllbGRzU3RhdGUuaGFzRGF5T2ZNb250aCgpKSB7Ci0gICAgICAgIHNldEVt cHR5VmFsdWUoZGF0ZUZvclJlYWRPbmx5RmllbGQpOworICAgICAgICBzZXRFbXB0eVZhbHVlKCk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTEwNyw3ICsxMDcsNyBAQCB2b2lkIERhdGVU aW1lRGF5RmllbGRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBE YXRlVGltZUZpZWxkcwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgc2V0RW1wdHlWYWx1 ZShkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CisgICAgc2V0RW1wdHlWYWx1ZSgpOwogfQogCiAvLyAt LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkBAIC0xNjYsMTcgKzE2NiwxNyBAQCB2b2lkIERh dGVUaW1lSG91ckZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGUoY29uc3QgRGF0ZUNvbXBvbmVu dHMmIGRhdGUpCiAgICAgc2V0VmFsdWVBc0ludGVnZXIoZGF0ZS5ob3VyKCkpOwogfQogCi12b2lk IERhdGVUaW1lSG91ckZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUo Y29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYgZGF0ZVRpbWVGaWVsZHNTdGF0ZSwgY29uc3QgRGF0 ZUNvbXBvbmVudHMmIGRhdGVGb3JSZWFkT25seUZpZWxkKQordm9pZCBEYXRlVGltZUhvdXJGaWVs ZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmll bGRzU3RhdGUmIGRhdGVUaW1lRmllbGRzU3RhdGUpCiB7CiAgICAgaWYgKCFkYXRlVGltZUZpZWxk c1N0YXRlLmhhc0hvdXIoKSkgewotICAgICAgICBzZXRFbXB0eVZhbHVlKGRhdGVGb3JSZWFkT25s eUZpZWxkKTsKKyAgICAgICAgc2V0RW1wdHlWYWx1ZSgpOwogICAgICAgICByZXR1cm47CiAgICAg fQogCiAgICAgY29uc3QgaW50IGhvdXIxMiA9IGRhdGVUaW1lRmllbGRzU3RhdGUuaG91cigpOwog CiAgICAgaWYgKGhvdXIxMiA8IDEgfHwgaG91cjEyID4gMTIpIHsKLSAgICAgICAgc2V0RW1wdHlW YWx1ZShkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CisgICAgICAgIHNldEVtcHR5VmFsdWUoKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMjQwLDE2ICsyNDAsMTYgQEAgdm9pZCBEYXRlVGlt ZU1pbGxpc2Vjb25kRmllbGRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0ZShjb25zdCBEYXRlQ29tcG9u ZW50cyYgZGF0ZSkKICAgICBzZXRWYWx1ZUFzSW50ZWdlcihkYXRlLm1pbGxpc2Vjb25kKCkpOwog fQogCi12b2lkIERhdGVUaW1lTWlsbGlzZWNvbmRGaWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRl VGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmIGRhdGVUaW1lRmllbGRz U3RhdGUsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCkKK3ZvaWQg RGF0ZVRpbWVNaWxsaXNlY29uZEZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRz U3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYgZGF0ZVRpbWVGaWVsZHNTdGF0ZSkKIHsK ICAgICBpZiAoIWRhdGVUaW1lRmllbGRzU3RhdGUuaGFzTWlsbGlzZWNvbmQoKSkgewotICAgICAg ICBzZXRFbXB0eVZhbHVlKGRhdGVGb3JSZWFkT25seUZpZWxkKTsKKyAgICAgICAgc2V0RW1wdHlW YWx1ZSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgY29uc3QgdW5zaWduZWQgdmFs dWUgPSBkYXRlVGltZUZpZWxkc1N0YXRlLm1pbGxpc2Vjb25kKCk7CiAgICAgaWYgKHZhbHVlID4g c3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG1heGltdW0oKSkpIHsKLSAgICAgICAgc2V0RW1wdHlWYWx1 ZShkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CisgICAgICAgIHNldEVtcHR5VmFsdWUoKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIApAQCAtMjgxLDE2ICsyODEsMTYgQEAgdm9pZCBEYXRlVGltZU1p bnV0ZUZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGUoY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRh dGUpCiAgICAgc2V0VmFsdWVBc0ludGVnZXIoZGF0ZS5taW51dGUoKSk7CiB9CiAKLXZvaWQgRGF0 ZVRpbWVNaW51dGVGaWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNv bnN0IERhdGVUaW1lRmllbGRzU3RhdGUmIGRhdGVUaW1lRmllbGRzU3RhdGUsIGNvbnN0IERhdGVD b21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCkKK3ZvaWQgRGF0ZVRpbWVNaW51dGVGaWVs ZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmll bGRzU3RhdGUmIGRhdGVUaW1lRmllbGRzU3RhdGUpCiB7CiAgICAgaWYgKCFkYXRlVGltZUZpZWxk c1N0YXRlLmhhc01pbnV0ZSgpKSB7Ci0gICAgICAgIHNldEVtcHR5VmFsdWUoZGF0ZUZvclJlYWRP bmx5RmllbGQpOworICAgICAgICBzZXRFbXB0eVZhbHVlKCk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKICAgICBjb25zdCB1bnNpZ25lZCB2YWx1ZSA9IGRhdGVUaW1lRmllbGRzU3RhdGUubWlu dXRlKCk7CiAgICAgaWYgKHZhbHVlID4gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG1heGltdW0oKSkp IHsKLSAgICAgICAgc2V0RW1wdHlWYWx1ZShkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CisgICAgICAg IHNldEVtcHR5VmFsdWUoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMzIyLDEwICsz MjIsMTAgQEAgdm9pZCBEYXRlVGltZU1vbnRoRmllbGRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0ZShj b25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZSkKICAgICBzZXRWYWx1ZUFzSW50ZWdlcihkYXRlLm1v bnRoKCkgKyAxKTsKIH0KIAotdm9pZCBEYXRlVGltZU1vbnRoRmllbGRFbGVtZW50OjpzZXRWYWx1 ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiBkYXRlVGlt ZUZpZWxkc1N0YXRlLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQp Cit2b2lkIERhdGVUaW1lTW9udGhGaWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxk c1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmIGRhdGVUaW1lRmllbGRzU3RhdGUpCiB7 CiAgICAgaWYgKCFkYXRlVGltZUZpZWxkc1N0YXRlLmhhc01vbnRoKCkpIHsKLSAgICAgICAgc2V0 RW1wdHlWYWx1ZShkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CisgICAgICAgIHNldEVtcHR5VmFsdWUo KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMzM1LDcgKzMzNSw3IEBAIHZvaWQgRGF0 ZVRpbWVNb250aEZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29u c3QgRGF0ZVRpbWVGaWVsCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBzZXRFbXB0eVZh bHVlKGRhdGVGb3JSZWFkT25seUZpZWxkKTsKKyAgICBzZXRFbXB0eVZhbHVlKCk7CiB9CiAKIC8v IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTM2MywxNiArMzYzLDE2IEBAIHZvaWQg RGF0ZVRpbWVTZWNvbmRGaWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlKGNvbnN0IERhdGVDb21w b25lbnRzJiBkYXRlKQogICAgIHNldFZhbHVlQXNJbnRlZ2VyKGRhdGUuc2Vjb25kKCkpOwogfQog Ci12b2lkIERhdGVUaW1lU2Vjb25kRmllbGRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVs ZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiBkYXRlVGltZUZpZWxkc1N0YXRlLCBj b25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQpCit2b2lkIERhdGVUaW1l U2Vjb25kRmllbGRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBE YXRlVGltZUZpZWxkc1N0YXRlJiBkYXRlVGltZUZpZWxkc1N0YXRlKQogewogICAgIGlmICghZGF0 ZVRpbWVGaWVsZHNTdGF0ZS5oYXNTZWNvbmQoKSkgewotICAgICAgICBzZXRFbXB0eVZhbHVlKGRh dGVGb3JSZWFkT25seUZpZWxkKTsKKyAgICAgICAgc2V0RW1wdHlWYWx1ZSgpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCiAgICAgY29uc3QgdW5zaWduZWQgdmFsdWUgPSBkYXRlVGltZUZpZWxk c1N0YXRlLnNlY29uZCgpOwogICAgIGlmICh2YWx1ZSA+IHN0YXRpY19jYXN0PHVuc2lnbmVkPiht YXhpbXVtKCkpKSB7Ci0gICAgICAgIHNldEVtcHR5VmFsdWUoZGF0ZUZvclJlYWRPbmx5RmllbGQp OworICAgICAgICBzZXRFbXB0eVZhbHVlKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAg LTQwNywxNiArNDA3LDE2IEBAIHZvaWQgRGF0ZVRpbWVTeW1ib2xpY01vbnRoRmllbGRFbGVtZW50 OjpzZXRWYWx1ZUFzRGF0ZShjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0CiAgICAgc2V0VmFsdWVB c0ludGVnZXIoZGF0ZS5tb250aCgpKTsKIH0KIAotdm9pZCBEYXRlVGltZVN5bWJvbGljTW9udGhG aWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1l RmllbGRzU3RhdGUmIGRhdGVUaW1lRmllbGRzU3RhdGUsIGNvbnN0IERhdGVDb21wb25lbnRzJiBk YXRlRm9yUmVhZE9ubHlGaWVsZCkKK3ZvaWQgRGF0ZVRpbWVTeW1ib2xpY01vbnRoRmllbGRFbGVt ZW50OjpzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0 YXRlJiBkYXRlVGltZUZpZWxkc1N0YXRlKQogewogICAgIGlmICghZGF0ZVRpbWVGaWVsZHNTdGF0 ZS5oYXNNb250aCgpKSB7Ci0gICAgICAgIHNldEVtcHR5VmFsdWUoZGF0ZUZvclJlYWRPbmx5Rmll bGQpOworICAgICAgICBzZXRFbXB0eVZhbHVlKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK ICAgICBjb25zdCB1bnNpZ25lZCB2YWx1ZSA9IGRhdGVUaW1lRmllbGRzU3RhdGUubW9udGgoKSAt IDE7CiAgICAgaWYgKHZhbHVlID49IHN5bWJvbHNTaXplKCkpIHsKLSAgICAgICAgc2V0RW1wdHlW YWx1ZShkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CisgICAgICAgIHNldEVtcHR5VmFsdWUoKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNDQ4LDEwICs0NDgsMTAgQEAgdm9pZCBEYXRlVGlt ZVdlZWtGaWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlKGNvbnN0IERhdGVDb21wb25lbnRzJiBk YXRlKQogICAgIHNldFZhbHVlQXNJbnRlZ2VyKGRhdGUud2VlaygpKTsKIH0KIAotdm9pZCBEYXRl VGltZVdlZWtGaWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0 IERhdGVUaW1lRmllbGRzU3RhdGUmIGRhdGVUaW1lRmllbGRzU3RhdGUsIGNvbnN0IERhdGVDb21w b25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCkKK3ZvaWQgRGF0ZVRpbWVXZWVrRmllbGRFbGVt ZW50OjpzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0 YXRlJiBkYXRlVGltZUZpZWxkc1N0YXRlKQogewogICAgIGlmICghZGF0ZVRpbWVGaWVsZHNTdGF0 ZS5oYXNXZWVrT2ZZZWFyKCkpIHsKLSAgICAgICAgc2V0RW1wdHlWYWx1ZShkYXRlRm9yUmVhZE9u bHlGaWVsZCk7CisgICAgICAgIHNldEVtcHR5VmFsdWUoKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KIApAQCAtNDYxLDcgKzQ2MSw3IEBAIHZvaWQgRGF0ZVRpbWVXZWVrRmllbGRFbGVtZW50Ojpz ZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkCiAgICAgICAg IHJldHVybjsKICAgICB9CiAKLSAgICBzZXRFbXB0eVZhbHVlKGRhdGVGb3JSZWFkT25seUZpZWxk KTsKKyAgICBzZXRFbXB0eVZhbHVlKCk7CiB9CiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KQEAgLTUyMSwxMCArNTIxLDEwIEBAIHZvaWQgRGF0ZVRpbWVZZWFyRmllbGRFbGVtZW50 OjpzZXRWYWx1ZUFzRGF0ZShjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZSkKICAgICBzZXRWYWx1 ZUFzSW50ZWdlcihkYXRlLmZ1bGxZZWFyKCkpOwogfQogCi12b2lkIERhdGVUaW1lWWVhckZpZWxk RWxlbWVudDo6c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVs ZHNTdGF0ZSYgZGF0ZVRpbWVGaWVsZHNTdGF0ZSwgY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVG b3JSZWFkT25seUZpZWxkKQordm9pZCBEYXRlVGltZVllYXJGaWVsZEVsZW1lbnQ6OnNldFZhbHVl QXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmIGRhdGVUaW1l RmllbGRzU3RhdGUpCiB7CiAgICAgaWYgKCFkYXRlVGltZUZpZWxkc1N0YXRlLmhhc1llYXIoKSkg ewotICAgICAgICBzZXRFbXB0eVZhbHVlKGRhdGVGb3JSZWFkT25seUZpZWxkKTsKKyAgICAgICAg c2V0RW1wdHlWYWx1ZSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC01MzQsNyArNTM0 LDcgQEAgdm9pZCBEYXRlVGltZVllYXJGaWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZp ZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGQKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAot ICAgIHNldEVtcHR5VmFsdWUoZGF0ZUZvclJlYWRPbmx5RmllbGQpOworICAgIHNldEVtcHR5VmFs dWUoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnRzLmggYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudHMuaAppbmRleCBjNWIxMjQxMTMyN2Rh NGQ3MGRiOGIyM2Y5Y2VkM2RhNTNhZjIzNjU1Li4wMDUzYTRhMzkxZjNiZjhlNmY0NjczN2RiYmVl YjE4NTFhOWUwZTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRl VGltZUZpZWxkRWxlbWVudHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRl VGltZUZpZWxkRWxlbWVudHMuaApAQCAtNDQsNyArNDQsNyBAQCBwcml2YXRlOgogICAgIC8vIERh dGVUaW1lRmllbGRFbGVtZW50IGZ1bmN0aW9ucy4KICAgICB2aXJ0dWFsIHZvaWQgcG9wdWxhdGVE YXRlVGltZUZpZWxkc1N0YXRlKERhdGVUaW1lRmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5BTDsK ICAgICB2aXJ0dWFsIHZvaWQgc2V0VmFsdWVBc0RhdGUoY29uc3QgRGF0ZUNvbXBvbmVudHMmKSBP VkVSUklERSBGSU5BTDsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRz U3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYsIGNvbnN0IERhdGVDb21wb25lbnRzJiBk YXRlRm9yUmVhZE9ubHlGaWVsZCkgT1ZFUlJJREUgRklOQUw7CisgICAgdmlydHVhbCB2b2lkIHNl dFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmKSBP VkVSUklERSBGSU5BTDsKIH07CiAKIGNsYXNzIERhdGVUaW1lRGF5RmllbGRFbGVtZW50IDogcHVi bGljIERhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudCB7CkBAIC01OSw3ICs1OSw3IEBAIHByaXZh dGU6CiAgICAgLy8gRGF0ZVRpbWVGaWVsZEVsZW1lbnQgZnVuY3Rpb25zLgogICAgIHZpcnR1YWwg dm9pZCBwb3B1bGF0ZURhdGVUaW1lRmllbGRzU3RhdGUoRGF0ZVRpbWVGaWVsZHNTdGF0ZSYpIE9W RVJSSURFIEZJTkFMOwogICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZShjb25zdCBEYXRl Q29tcG9uZW50cyYpIE9WRVJSSURFIEZJTkFMOwotICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFz RGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiwgY29uc3QgRGF0 ZUNvbXBvbmVudHMmIGRhdGVGb3JSZWFkT25seUZpZWxkKSBPVkVSUklERSBGSU5BTDsKKyAgICB2 aXJ0dWFsIHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVG aWVsZHNTdGF0ZSYpIE9WRVJSSURFIEZJTkFMOwogfTsKIAogLy8gRGF0ZVRpbWVIb3VyRmllbGRF bGVtZW50IGlzIHVzZWQgZm9yIGhvdXIgZmllbGQgb2YgZGF0ZSB0aW1lIGZvcm1hdApAQCAtODAs NyArODAsNyBAQCBwcml2YXRlOgogICAgIC8vIERhdGVUaW1lRmllbGRFbGVtZW50IGZ1bmN0aW9u cy4KICAgICB2aXJ0dWFsIHZvaWQgcG9wdWxhdGVEYXRlVGltZUZpZWxkc1N0YXRlKERhdGVUaW1l RmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5BTDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0VmFsdWVB c0RhdGUoY29uc3QgRGF0ZUNvbXBvbmVudHMmKSBPVkVSUklERSBGSU5BTDsKLSAgICB2aXJ0dWFs IHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNT dGF0ZSYsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCkgT1ZFUlJJ REUgRklOQUw7CisgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRl KGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5BTDsKICAgICB2aXJ0dWFs IHZvaWQgc2V0VmFsdWVBc0ludGVnZXIoaW50LCBFdmVudEJlaGF2aW9yID0gRGlzcGF0Y2hOb0V2 ZW50KSBPVkVSUklERSBGSU5BTDsKICAgICB2aXJ0dWFsIGludCB2YWx1ZUFzSW50ZWdlcigpIGNv bnN0IE9WRVJSSURFIEZJTkFMOwogCkBAIC05OSw3ICs5OSw3IEBAIHByaXZhdGU6CiAgICAgLy8g RGF0ZVRpbWVGaWVsZEVsZW1lbnQgZnVuY3Rpb25zLgogICAgIHZpcnR1YWwgdm9pZCBwb3B1bGF0 ZURhdGVUaW1lRmllbGRzU3RhdGUoRGF0ZVRpbWVGaWVsZHNTdGF0ZSYpIE9WRVJSSURFIEZJTkFM OwogICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZShjb25zdCBEYXRlQ29tcG9uZW50cyYp IE9WRVJSSURFIEZJTkFMOwotICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVs ZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiwgY29uc3QgRGF0ZUNvbXBvbmVudHMm IGRhdGVGb3JSZWFkT25seUZpZWxkKSBPVkVSUklERSBGSU5BTDsKKyAgICB2aXJ0dWFsIHZvaWQg c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYp IE9WRVJSSURFIEZJTkFMOwogfTsKIAogY2xhc3MgRGF0ZVRpbWVNaW51dGVGaWVsZEVsZW1lbnQg OiBwdWJsaWMgRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50IHsKQEAgLTExNCw3ICsxMTQsNyBA QCBwcml2YXRlOgogICAgIC8vIERhdGVUaW1lRmllbGRFbGVtZW50IGZ1bmN0aW9ucy4KICAgICB2 aXJ0dWFsIHZvaWQgcG9wdWxhdGVEYXRlVGltZUZpZWxkc1N0YXRlKERhdGVUaW1lRmllbGRzU3Rh dGUmKSBPVkVSUklERSBGSU5BTDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0VmFsdWVBc0RhdGUoY29u c3QgRGF0ZUNvbXBvbmVudHMmKSBPVkVSUklERSBGSU5BTDsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0 VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYsIGNv bnN0IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCkgT1ZFUlJJREUgRklOQUw7 CisgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERh dGVUaW1lRmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5BTDsKIH07CiAKIGNsYXNzIERhdGVUaW1l TW9udGhGaWVsZEVsZW1lbnQgOiBwdWJsaWMgRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50IHsK QEAgLTEyOSw3ICsxMjksNyBAQCBwcml2YXRlOgogICAgIC8vIERhdGVUaW1lRmllbGRFbGVtZW50 IGZ1bmN0aW9ucy4KICAgICB2aXJ0dWFsIHZvaWQgcG9wdWxhdGVEYXRlVGltZUZpZWxkc1N0YXRl KERhdGVUaW1lRmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5BTDsKICAgICB2aXJ0dWFsIHZvaWQg c2V0VmFsdWVBc0RhdGUoY29uc3QgRGF0ZUNvbXBvbmVudHMmKSBPVkVSUklERSBGSU5BTDsKLSAg ICB2aXJ0dWFsIHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRp bWVGaWVsZHNTdGF0ZSYsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVs ZCkgT1ZFUlJJREUgRklOQUw7CisgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlVGltZUZp ZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5BTDsKIH07 CiAKIGNsYXNzIERhdGVUaW1lU2Vjb25kRmllbGRFbGVtZW50IDogcHVibGljIERhdGVUaW1lTnVt ZXJpY0ZpZWxkRWxlbWVudCB7CkBAIC0xNDQsNyArMTQ0LDcgQEAgcHJpdmF0ZToKICAgICAvLyBE YXRlVGltZUZpZWxkRWxlbWVudCBmdW5jdGlvbnMuCiAgICAgdmlydHVhbCB2b2lkIHBvcHVsYXRl RGF0ZVRpbWVGaWVsZHNTdGF0ZShEYXRlVGltZUZpZWxkc1N0YXRlJikgT1ZFUlJJREUgRklOQUw7 CiAgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlKGNvbnN0IERhdGVDb21wb25lbnRzJikg T1ZFUlJJREUgRklOQUw7Ci0gICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlVGltZUZpZWxk c1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmLCBjb25zdCBEYXRlQ29tcG9uZW50cyYg ZGF0ZUZvclJlYWRPbmx5RmllbGQpIE9WRVJSSURFIEZJTkFMOworICAgIHZpcnR1YWwgdm9pZCBz ZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJikg T1ZFUlJJREUgRklOQUw7CiB9OwogCiBjbGFzcyBEYXRlVGltZVN5bWJvbGljTW9udGhGaWVsZEVs ZW1lbnQgOiBwdWJsaWMgRGF0ZVRpbWVTeW1ib2xpY0ZpZWxkRWxlbWVudCB7CkBAIC0xNTksNyAr MTU5LDcgQEAgcHJpdmF0ZToKICAgICAvLyBEYXRlVGltZUZpZWxkRWxlbWVudCBmdW5jdGlvbnMu CiAgICAgdmlydHVhbCB2b2lkIHBvcHVsYXRlRGF0ZVRpbWVGaWVsZHNTdGF0ZShEYXRlVGltZUZp ZWxkc1N0YXRlJikgT1ZFUlJJREUgRklOQUw7CiAgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNE YXRlKGNvbnN0IERhdGVDb21wb25lbnRzJikgT1ZFUlJJREUgRklOQUw7Ci0gICAgdmlydHVhbCB2 b2lkIHNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3Rh dGUmLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQpIE9WRVJSSURF IEZJTkFMOworICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShj b25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJikgT1ZFUlJJREUgRklOQUw7CiB9OwogCiBjbGFzcyBE YXRlVGltZVdlZWtGaWVsZEVsZW1lbnQgOiBwdWJsaWMgRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVt ZW50IHsKQEAgLTE3NCw3ICsxNzQsNyBAQCBwcml2YXRlOgogICAgIC8vIERhdGVUaW1lRmllbGRF bGVtZW50IGZ1bmN0aW9ucy4KICAgICB2aXJ0dWFsIHZvaWQgcG9wdWxhdGVEYXRlVGltZUZpZWxk c1N0YXRlKERhdGVUaW1lRmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5BTDsKICAgICB2aXJ0dWFs IHZvaWQgc2V0VmFsdWVBc0RhdGUoY29uc3QgRGF0ZUNvbXBvbmVudHMmKSBPVkVSUklERSBGSU5B TDsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3Qg RGF0ZVRpbWVGaWVsZHNTdGF0ZSYsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9u bHlGaWVsZCkgT1ZFUlJJREUgRklOQUw7CisgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRl VGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5B TDsKIH07CiAKIGNsYXNzIERhdGVUaW1lWWVhckZpZWxkRWxlbWVudCA6IHB1YmxpYyBEYXRlVGlt ZU51bWVyaWNGaWVsZEVsZW1lbnQgewpAQCAtMjA1LDcgKzIwNSw3IEBAIHByaXZhdGU6CiAgICAg Ly8gRGF0ZVRpbWVGaWVsZEVsZW1lbnQgZnVuY3Rpb25zLgogICAgIHZpcnR1YWwgdm9pZCBwb3B1 bGF0ZURhdGVUaW1lRmllbGRzU3RhdGUoRGF0ZVRpbWVGaWVsZHNTdGF0ZSYpIE9WRVJSSURFIEZJ TkFMOwogICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZShjb25zdCBEYXRlQ29tcG9uZW50 cyYpIE9WRVJSSURFIEZJTkFMOwotICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZVRpbWVG aWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiwgY29uc3QgRGF0ZUNvbXBvbmVu dHMmIGRhdGVGb3JSZWFkT25seUZpZWxkKSBPVkVSUklERSBGSU5BTDsKKyAgICB2aXJ0dWFsIHZv aWQgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0 ZSYpIE9WRVJSSURFIEZJTkFMOwogCiAgICAgLy8gRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50 IGZ1bmN0aW9ucy4KICAgICB2aXJ0dWFsIGludCBjbGFtcFZhbHVlRm9ySGFyZExpbWl0cyhpbnQp IGNvbnN0IE9WRVJSSURFIEZJTkFMOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L0RhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudC5jcHAKaW5kZXggYTkyZmU4MjJl YWMzZmFhNzE5ODU5N2U2YjU5ZmQ5NjU1ZTFhM2MwMi4uZWI2OTQzMjJkZjBmMmQxZWI1Y2JlZjQw YzczMjU5NjFlZDM3MjY4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cv RGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9EYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQuY3BwCkBAIC0xNjAsMTQgKzE2MCwx MiBAQCBpbnQgRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50OjptaW5pbXVtKCkgY29uc3QKICAg ICByZXR1cm4gbV9yYW5nZS5taW5pbXVtOwogfQogCi12b2lkIERhdGVUaW1lTnVtZXJpY0ZpZWxk RWxlbWVudDo6c2V0RW1wdHlWYWx1ZShjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRP bmx5RmllbGQsIEV2ZW50QmVoYXZpb3IgZXZlbnRCZWhhdmlvcikKK3ZvaWQgRGF0ZVRpbWVOdW1l cmljRmllbGRFbGVtZW50OjpzZXRFbXB0eVZhbHVlKEV2ZW50QmVoYXZpb3IgZXZlbnRCZWhhdmlv cikKIHsKICAgICBtX2xhc3REaWdpdENoYXJUaW1lID0gMDsKIAotICAgIGlmIChpc1JlYWRPbmx5 KCkpIHsKLSAgICAgICAgc2V0VmFsdWVBc0RhdGUoZGF0ZUZvclJlYWRPbmx5RmllbGQpOworICAg IGlmIChpc1JlYWRPbmx5KCkpCiAgICAgICAgIHJldHVybjsKLSAgICB9CiAKICAgICBtX2hhc1Zh bHVlID0gZmFsc2U7CiAgICAgbV92YWx1ZSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9EYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQuaCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudC5oCmluZGV4IDc4MTFl YmFkY2ZlNGUyYmM5Mjc2NzdhNjE4MWVmNjYxOGYwOTY1OGIuLmE5YWUyNjhlNjUwZTE1ZDA2ODgw YWQ4ZmU3N2Q1N2Q3ZDJjMzY1NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L0RhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L0RhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudC5oCkBAIC02Miw3ICs2Miw3IEBA IHByb3RlY3RlZDoKICAgICAvLyBEYXRlVGltZUZpZWxkRWxlbWVudCBmdW5jdGlvbnMuCiAgICAg dmlydHVhbCBib29sIGhhc1ZhbHVlKCkgY29uc3QgT1ZFUlJJREUgRklOQUw7CiAgICAgdmlydHVh bCBpbnQgbWF4aW11bSgpIGNvbnN0IE9WRVJSSURFIEZJTkFMOwotICAgIHZpcnR1YWwgdm9pZCBz ZXRFbXB0eVZhbHVlKGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCwg RXZlbnRCZWhhdmlvciA9IERpc3BhdGNoTm9FdmVudCkgT1ZFUlJJREUgRklOQUw7CisgICAgdmly dHVhbCB2b2lkIHNldEVtcHR5VmFsdWUoRXZlbnRCZWhhdmlvciA9IERpc3BhdGNoTm9FdmVudCkg T1ZFUlJJREUgRklOQUw7CiAgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNJbnRlZ2VyKGludCwg RXZlbnRCZWhhdmlvciA9IERpc3BhdGNoTm9FdmVudCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBp bnQgdmFsdWVBc0ludGVnZXIoKSBjb25zdCBPVkVSUklERTsKICAgICB2aXJ0dWFsIFN0cmluZyB2 aXNpYmxlVmFsdWUoKSBjb25zdCBPVkVSUklERSBGSU5BTDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lU3ltYm9saWNGaWVsZEVsZW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVTeW1ib2xpY0ZpZWxkRWxlbWVudC5jcHAK aW5kZXggZjhhYWU3YTZkNDc5NTgyYmI3ZWZjOGViNDE4Zjg3YmE0OTExMWUyYy4uOGVmNGRhYzJm ZTc5MTgyMWMwNmUwZDFiNGU5MTBmNjdkNTg2ZTcyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVTeW1ib2xpY0ZpZWxkRWxlbWVudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVTeW1ib2xpY0ZpZWxkRWxlbWVudC5jcHAK QEAgLTEwNSw3ICsxMDUsNyBAQCBpbnQgRGF0ZVRpbWVTeW1ib2xpY0ZpZWxkRWxlbWVudDo6bWlu aW11bSgpIGNvbnN0CiAgICAgcmV0dXJuIDE7CiB9CiAKLXZvaWQgRGF0ZVRpbWVTeW1ib2xpY0Zp ZWxkRWxlbWVudDo6c2V0RW1wdHlWYWx1ZShjb25zdCBEYXRlQ29tcG9uZW50cyYsIEV2ZW50QmVo YXZpb3IgZXZlbnRCZWhhdmlvcikKK3ZvaWQgRGF0ZVRpbWVTeW1ib2xpY0ZpZWxkRWxlbWVudDo6 c2V0RW1wdHlWYWx1ZShFdmVudEJlaGF2aW9yIGV2ZW50QmVoYXZpb3IpCiB7CiAgICAgbV9zZWxl Y3RlZEluZGV4ID0gaW52YWxpZEluZGV4OwogICAgIHVwZGF0ZVZpc2libGVWYWx1ZShldmVudEJl aGF2aW9yKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1l U3ltYm9saWNGaWVsZEVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVU aW1lU3ltYm9saWNGaWVsZEVsZW1lbnQuaAppbmRleCA0ZDkyNmVjMDIwZjE4NmU5MmFmMjE2OWMz M2RhYTc0ZTUzOWQxYzkxLi41YzZiMDVhY2JhZjQ3YmNkNGQ1MGM0MTU0YzZiNzdhOGEyZGZiMmZk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZVN5bWJvbGlj RmllbGRFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVT eW1ib2xpY0ZpZWxkRWxlbWVudC5oCkBAIC00MCw3ICs0MCw3IEBAIHByb3RlY3RlZDoKICAgICBE YXRlVGltZVN5bWJvbGljRmllbGRFbGVtZW50KERvY3VtZW50KiwgRmllbGRPd25lciYsIGNvbnN0 IFZlY3RvcjxTdHJpbmc+Jik7CiAgICAgc2l6ZV90IHN5bWJvbHNTaXplKCkgY29uc3QgeyByZXR1 cm4gbV9zeW1ib2xzLnNpemUoKTsgfQogICAgIHZpcnR1YWwgYm9vbCBoYXNWYWx1ZSgpIGNvbnN0 IE9WRVJSSURFIEZJTkFMOwotICAgIHZpcnR1YWwgdm9pZCBzZXRFbXB0eVZhbHVlKGNvbnN0IERh dGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCwgRXZlbnRCZWhhdmlvciA9IERpc3Bh dGNoTm9FdmVudCkgT1ZFUlJJREUgRklOQUw7CisgICAgdmlydHVhbCB2b2lkIHNldEVtcHR5VmFs dWUoRXZlbnRCZWhhdmlvciA9IERpc3BhdGNoTm9FdmVudCkgT1ZFUlJJREUgRklOQUw7CiAgICAg dmlydHVhbCB2b2lkIHNldFZhbHVlQXNJbnRlZ2VyKGludCwgRXZlbnRCZWhhdmlvciA9IERpc3Bh dGNoTm9FdmVudCkgT1ZFUlJJREUgRklOQUw7CiAgICAgdmlydHVhbCBpbnQgdmFsdWVBc0ludGVn ZXIoKSBjb25zdCBPVkVSUklERSBGSU5BTDsKIAo= 173636 2012-11-12 06:23:32 -0800 2012-11-12 07:39:04 -0800 Patch for landing bug-101916-20121112232134.patch text/plain 27477 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTdhYjViNTc0Y2U4MDg5 YzllYjg2Y2EyYjcwOGQ1Yjg1YTBhZWJmYy4uMmQxNDQ3MWI0NWI5MGVkNWIwYWIyOWM0YjUzZjQw Nzg0YzkxYTM3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYwIEBACisyMDEyLTExLTEyICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZWZhY3RvcmluZzogc2V0 IHJlYWQtb25seSB2YWx1ZXMgb24gbGF5b3V0IGluIERhdGVUaW1lRWRpdEVsZW1lbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTkxNgorCisgICAg ICAgIFJldmlld2VkIGJ5IEtlbnRhcm8gSGFyYS4KKworICAgICAgICBXZSBoYXZlIGFsd2F5cyB1 cGRhdGVkIHJlYWQtb25seSB2YWx1ZXMgd2hlbiB3ZSBzZXQgYW4gZW1wdHkgdmFsdWUgb3IKKyAg ICAgICAgRGF0ZVRpbWVGaWVsZHNTdGF0ZS4gSXQgaGFzIHdhc3RlZCBDUFUgdGltZSBiZWNhdXNl IHN1Y2ggcmVhZC1vbmx5CisgICAgICAgIHZhbHVlcyBhcmUgbmV2ZXIgdXBkYXRlZCBhZnRlciBs YXlvdXQoKSBlc3NlbnRpYWxseS4gU28sIHdlIHNldAorICAgICAgICByZWFkLW9ubHkgdmFsdWVz IGluIERhdGVUaW1lRWRpdEJ1aWxkZXIgdXNlZCBieSBsYXlvdXQoKSwgYW5kIHJlbW92ZQorICAg ICAgICBkYXRlRm9yUmVhZE9ubHlGaWVsZCBhcmd1bWVudHMgb2Ygc2V0RW1wdHlWYWx1ZSBhbmQK KyAgICAgICAgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLiBUaGlzIHNob3VsZCBub3QgbWFrZSBiZWhhdmlvciBjaGFuZ2VzLgorCisgICAgICAg ICogaHRtbC9CYXNlTXVsdGlwbGVGaWVsZHNEYXRlQW5kVGltZUlucHV0VHlwZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpCYXNlTXVsdGlwbGVGaWVsZHNEYXRlQW5kVGltZUlucHV0VHlwZTo6cmVz dG9yZUZvcm1Db250cm9sU3RhdGUpOgorICAgICAgICBXZSByZW1vdmVkIGRhdGVGb3JSZWFkT25s eUZpZWxkIGFyZ3VtZW50IGJlY2F1c2UgcmVhZC1vbmx5IHZhbHVlcyBhcmUKKyAgICAgICAgYWxy ZWFkeSBzZXQgaW4gRGF0ZVRpbWVGaWVsZEVsZW1lbnQ6OmxheW91dCgpLgorICAgICAgICAqIGh0 bWwvc2hhZG93L0RhdGVUaW1lRWRpdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGF0 ZVRpbWVFZGl0QnVpbGRlcjo6dmlzaXRGaWVsZCk6CisgICAgICAgIFNldCBhIHZhbHVlIHRvIGEg cmVhZC1vbmx5IG1pbnV0ZS9zZWNvbmQvbWlsbGlzZWNvbmQgZmllbGQgd2hpbGUKKyAgICAgICAg YnVpbGRpbmcgVUkgZWxlbWVudHMuCisgICAgICAgIEFsc28sIGNoYW5nZWQgdmFyaWFibGUgdHlw ZXMgZm9yIG1pbGxpc2Vjb25kIGFuZCBzZWNvbmQgZmllbGRzIHRvCisgICAgICAgIFJlZlB0cjxE YXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQ+IGJlY2F1c2Ugd2UnZCBsaWtlIHRvIGNhbGwKKyAg ICAgICAgc2V0VmFsdWVBc0RhdGUsIHdoaWNoIGlzIHByaXZhdGUgaW4gRGF0ZVRpbWVNaWxsaXNl Y29uZEZpZWxkRWxlbWVudCBhbmQKKyAgICAgICAgRGF0ZVRpbWVTZWNvbmRGaWVsZEVsZW1lbnQK KyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lRWRpdEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGlt ZUZpZWxkc1N0YXRlKToKKyAgICAgICAgV2UgcmVtb3ZlZCBkYXRlRm9yUmVhZE9ubHlGaWVsZCBh cmd1bWVudCBiZWNhdXNlIHJlYWQtb25seSB2YWx1ZXMgYXJlCisgICAgICAgIGFscmVhZHkgc2V0 IGluIERhdGVUaW1lRmllbGRFbGVtZW50OjpsYXlvdXQoKS4KKyAgICAgICAgKFdlYkNvcmU6OkRh dGVUaW1lRWRpdEVsZW1lbnQ6OnNldEVtcHR5VmFsdWUpOiBEaXR0by4KKyAgICAgICAgKiBodG1s L3NoYWRvdy9EYXRlVGltZUVkaXRFbGVtZW50Lmg6CisgICAgICAgIChEYXRlVGltZUVkaXRFbGVt ZW50KToKKyAgICAgICAgUmVtb3ZlZCBkYXRlRm9yUmVhZE9ubHlGaWVsZCBhcmd1bWVudCBmb3Ig c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUuCisKKyAgICAgICAgKiBodG1sL3NoYWRvdy9E YXRlVGltZUZpZWxkRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEYXRlVGltZUZpZWxk RWxlbWVudDo6ZGVmYXVsdEtleWJvYXJkRXZlbnRIYW5kbGVyKToKKyAgICAgICAgV2UgcmVtb3Zl ZCBkYXRlRm9yUmVhZE9ubHlGaWVsZCBhcmd1bWVudCBiZWNhdXNlIHJlYWQtb25seSB2YWx1ZXMg YXJlCisgICAgICAgIGFscmVhZHkgc2V0IGluIERhdGVUaW1lRmllbGRFbGVtZW50OjpsYXlvdXQo KS4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudC5oOgorICAgICAg ICAoRGF0ZVRpbWVGaWVsZEVsZW1lbnQpOiBEaXR0by4KKworICAgICAgICAqIGh0bWwvc2hhZG93 L0RhdGVUaW1lRmllbGRFbGVtZW50cy5jcHA6IERpdHRvLgorICAgICAgICAqIGh0bWwvc2hhZG93 L0RhdGVUaW1lRmllbGRFbGVtZW50cy5oOiBEaXR0by4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9E YXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGF0ZVRp bWVOdW1lcmljRmllbGRFbGVtZW50OjpzZXRFbXB0eVZhbHVlKToKKyAgICAgICAgSXQgc2hvdWxk IGRvIG5vdGhpbmcgaWYgaXQgaXMgcmVhZC1vbmx5IGJlY2F1c2UgYSByZWFkLW9ubHkgdmFsdWUg d2FzCisgICAgICAgIGFscmVhZHkgc2V0IGp1c3QgYWZ0ZXIgY29uc3RydWN0aW9uLgorICAgICAg ICAqIGh0bWwvc2hhZG93L0RhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudC5oOgorICAgICAgICAo RGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50KToKKyAgICAgICAgUmVtb3ZlZCBkYXRlRm9yUmVh ZE9ubHlGaWVsZCBhcmd1bWVudCBvZiBzZXRFbXB0eVZhbHVlLgorICAgICAgICAqIGh0bWwvc2hh ZG93L0RhdGVUaW1lU3ltYm9saWNGaWVsZEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RGF0ZVRpbWVTeW1ib2xpY0ZpZWxkRWxlbWVudDo6c2V0RW1wdHlWYWx1ZSk6IERpdHRvLgorICAg ICAgICAqIGh0bWwvc2hhZG93L0RhdGVUaW1lU3ltYm9saWNGaWVsZEVsZW1lbnQuaDoKKyAgICAg ICAgKERhdGVUaW1lU3ltYm9saWNGaWVsZEVsZW1lbnQpOiBEaXR0by4KKwogMjAxMi0xMS0xMiAg U2hpbnlhIEthd2FuYWthICA8c2hpbnlha0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1JlZmFj dG9yaW5nXSBDcmVhdGUgU2VsZWN0UnVsZUZlYXR1cmVTZXQgZm9yIGNvbGxlY3RpbmcgUnVsZUZl YXR1cmVTZXQgZm9yIHNlbGVjdCBhdHRyaWJ1dGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvQmFzZU11bHRpcGxlRmllbGRzRGF0ZUFuZFRpbWVJbnB1dFR5cGUuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9CYXNlTXVsdGlwbGVGaWVsZHNEYXRlQW5kVGltZUlucHV0VHlwZS5jcHAK aW5kZXggZGYwZGY5NmM3YTU3MzEzNjY0YjQxOWNjMzhhYjkxYmE2MzFkMTcwNS4uY2Y3NmEzN2Uy NzM3NDY5ZTM0ODdjY2U1OTJiY2FlZGFmMGE1MjdmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaHRtbC9CYXNlTXVsdGlwbGVGaWVsZHNEYXRlQW5kVGltZUlucHV0VHlwZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9CYXNlTXVsdGlwbGVGaWVsZHNEYXRlQW5kVGltZUlucHV0VHlw ZS5jcHAKQEAgLTI5OSwxMCArMjk5LDggQEAgdm9pZCBCYXNlTXVsdGlwbGVGaWVsZHNEYXRlQW5k VGltZUlucHV0VHlwZTo6cmVzdG9yZUZvcm1Db250cm9sU3RhdGUoY29uc3QgRm9ybUMKIHsKICAg ICBpZiAoIW1fZGF0ZVRpbWVFZGl0RWxlbWVudCkKICAgICAgICAgcmV0dXJuOwotICAgIERhdGVD b21wb25lbnRzIGRhdGU7Ci0gICAgc2V0TWlsbGlzZWNvbmRUb0RhdGVDb21wb25lbnRzKGNyZWF0 ZVN0ZXBSYW5nZShBbnlJc0RlZmF1bHRTdGVwKS5taW5pbXVtKCkudG9Eb3VibGUoKSwgJmRhdGUp OwogICAgIERhdGVUaW1lRmllbGRzU3RhdGUgZGF0ZVRpbWVGaWVsZHNTdGF0ZSA9IERhdGVUaW1l RmllbGRzU3RhdGU6OnJlc3RvcmVGb3JtQ29udHJvbFN0YXRlKHN0YXRlKTsKLSAgICBtX2RhdGVU aW1lRWRpdEVsZW1lbnQtPnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGRhdGVUaW1lRmll bGRzU3RhdGUsIGRhdGUpOworICAgIG1fZGF0ZVRpbWVFZGl0RWxlbWVudC0+c2V0VmFsdWVBc0Rh dGVUaW1lRmllbGRzU3RhdGUoZGF0ZVRpbWVGaWVsZHNTdGF0ZSk7CiAgICAgZWxlbWVudCgpLT5z ZXRWYWx1ZUludGVybmFsKHNhbml0aXplVmFsdWUobV9kYXRlVGltZUVkaXRFbGVtZW50LT52YWx1 ZSgpKSwgRGlzcGF0Y2hOb0V2ZW50KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9EYXRlVGltZUVkaXRFbGVtZW50LmNwcAppbmRleCBkYzZiMjU3NjEwYzBhODM0OTA1 ZmM2YTg0OWRmZWU3N2Y0MThkNjJjLi5kYmFhNGQzZGM1ZTVhYWJhMGY2ZDhhZjMwZDVkYzg0MWNi ODg2MDI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUVk aXRFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUVk aXRFbGVtZW50LmNwcApAQCAtMTIxLDggKzEyMSwxMCBAQCB2b2lkIERhdGVUaW1lRWRpdEJ1aWxk ZXI6OnZpc2l0RmllbGQoRGF0ZVRpbWVGb3JtYXQ6OkZpZWxkVHlwZSBmaWVsZFR5cGUsIGludCBj bwogICAgIGNhc2UgRGF0ZVRpbWVGb3JtYXQ6OkZpZWxkVHlwZU1pbnV0ZTogewogICAgICAgICBS ZWZQdHI8RGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50PiBmaWVsZCA9IERhdGVUaW1lTWludXRl RmllbGRFbGVtZW50OjpjcmVhdGUoZG9jdW1lbnQsIG1fZWRpdEVsZW1lbnQpOwogICAgICAgICBt X2VkaXRFbGVtZW50LmFkZEZpZWxkKGZpZWxkKTsKLSAgICAgICAgaWYgKHNob3VsZE1pbnV0ZUZp ZWxkUmVhZE9ubHkoKSkKKyAgICAgICAgaWYgKHNob3VsZE1pbnV0ZUZpZWxkUmVhZE9ubHkoKSkg eworICAgICAgICAgICAgZmllbGQtPnNldFZhbHVlQXNEYXRlKG1fZGF0ZVZhbHVlKTsKICAgICAg ICAgICAgIGZpZWxkLT5zZXRSZWFkT25seSgpOworICAgICAgICB9CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKQEAgLTE2MSwxMCArMTYzLDEyIEBAIHZvaWQgRGF0ZVRpbWVFZGl0QnVpbGRlcjo6 dmlzaXRGaWVsZChEYXRlVGltZUZvcm1hdDo6RmllbGRUeXBlIGZpZWxkVHlwZSwgaW50IGNvCiAg ICAgICAgIHJldHVybjsKIAogICAgIGNhc2UgRGF0ZVRpbWVGb3JtYXQ6OkZpZWxkVHlwZVNlY29u ZDogewotICAgICAgICBSZWZQdHI8RGF0ZVRpbWVTZWNvbmRGaWVsZEVsZW1lbnQ+IGZpZWxkID0g RGF0ZVRpbWVTZWNvbmRGaWVsZEVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCwgbV9lZGl0RWxlbWVu dCk7CisgICAgICAgIFJlZlB0cjxEYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQ+IGZpZWxkID0g RGF0ZVRpbWVTZWNvbmRGaWVsZEVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCwgbV9lZGl0RWxlbWVu dCk7CiAgICAgICAgIG1fZWRpdEVsZW1lbnQuYWRkRmllbGQoZmllbGQpOwotICAgICAgICBpZiAo c2hvdWxkU2Vjb25kRmllbGRSZWFkT25seSgpKQorICAgICAgICBpZiAoc2hvdWxkU2Vjb25kRmll bGRSZWFkT25seSgpKSB7CisgICAgICAgICAgICBmaWVsZC0+c2V0VmFsdWVBc0RhdGUobV9kYXRl VmFsdWUpOwogICAgICAgICAgICAgZmllbGQtPnNldFJlYWRPbmx5KCk7CisgICAgICAgIH0KIAog ICAgICAgICBpZiAobmVlZE1pbGxpc2Vjb25kRmllbGQoKSkgewogICAgICAgICAgICAgdmlzaXRM aXRlcmFsKG1fcGFyYW1ldGVycy5sb2NhbGUubG9jYWxpemVkRGVjaW1hbFNlcGFyYXRvcigpKTsK QEAgLTE3NCwxMCArMTc4LDEyIEBAIHZvaWQgRGF0ZVRpbWVFZGl0QnVpbGRlcjo6dmlzaXRGaWVs ZChEYXRlVGltZUZvcm1hdDo6RmllbGRUeXBlIGZpZWxkVHlwZSwgaW50IGNvCiAgICAgfQogCiAg ICAgY2FzZSBEYXRlVGltZUZvcm1hdDo6RmllbGRUeXBlRnJhY3Rpb25hbFNlY29uZDogewotICAg ICAgICBSZWZQdHI8RGF0ZVRpbWVNaWxsaXNlY29uZEZpZWxkRWxlbWVudD4gZmllbGQgPSBEYXRl VGltZU1pbGxpc2Vjb25kRmllbGRFbGVtZW50OjpjcmVhdGUoZG9jdW1lbnQsIG1fZWRpdEVsZW1l bnQpOworICAgICAgICBSZWZQdHI8RGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50PiBmaWVsZCA9 IERhdGVUaW1lTWlsbGlzZWNvbmRGaWVsZEVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCwgbV9lZGl0 RWxlbWVudCk7CiAgICAgICAgIG1fZWRpdEVsZW1lbnQuYWRkRmllbGQoZmllbGQpOwotICAgICAg ICBpZiAoc2hvdWxkTWlsbGlzZWNvbmRGaWVsZFJlYWRPbmx5KCkpCisgICAgICAgIGlmIChzaG91 bGRNaWxsaXNlY29uZEZpZWxkUmVhZE9ubHkoKSkgeworICAgICAgICAgICAgZmllbGQtPnNldFZh bHVlQXNEYXRlKG1fZGF0ZVZhbHVlKTsKICAgICAgICAgICAgIGZpZWxkLT5zZXRSZWFkT25seSgp OworICAgICAgICB9CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTQ2MiwxNyArNDY4LDE3 IEBAIHZvaWQgRGF0ZVRpbWVFZGl0RWxlbWVudDo6c2V0VmFsdWVBc0RhdGUoY29uc3QgTGF5b3V0 UGFyYW1ldGVycyYgbGF5b3V0UGFyYW1ldGVyCiAgICAgICAgIG1fZmllbGRzW2ZpZWxkSW5kZXhd LT5zZXRWYWx1ZUFzRGF0ZShkYXRlKTsKIH0KIAotdm9pZCBEYXRlVGltZUVkaXRFbGVtZW50Ojpz ZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiBk YXRlVGltZUZpZWxkc1N0YXRlLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5 RmllbGQpCit2b2lkIERhdGVUaW1lRWRpdEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxk c1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmIGRhdGVUaW1lRmllbGRzU3RhdGUpCiB7 CiAgICAgZm9yIChzaXplX3QgZmllbGRJbmRleCA9IDA7IGZpZWxkSW5kZXggPCBtX2ZpZWxkcy5z aXplKCk7ICsrZmllbGRJbmRleCkKLSAgICAgICAgbV9maWVsZHNbZmllbGRJbmRleF0tPnNldFZh bHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGRhdGVUaW1lRmllbGRzU3RhdGUsIGRhdGVGb3JSZWFk T25seUZpZWxkKTsKKyAgICAgICAgbV9maWVsZHNbZmllbGRJbmRleF0tPnNldFZhbHVlQXNEYXRl VGltZUZpZWxkc1N0YXRlKGRhdGVUaW1lRmllbGRzU3RhdGUpOwogfQogCiB2b2lkIERhdGVUaW1l RWRpdEVsZW1lbnQ6OnNldEVtcHR5VmFsdWUoY29uc3QgTGF5b3V0UGFyYW1ldGVycyYgbGF5b3V0 UGFyYW1ldGVycywgY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVGb3JSZWFkT25seUZpZWxkKQog ewogICAgIGxheW91dChsYXlvdXRQYXJhbWV0ZXJzLCBkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CiAg ICAgZm9yIChzaXplX3QgZmllbGRJbmRleCA9IDA7IGZpZWxkSW5kZXggPCBtX2ZpZWxkcy5zaXpl KCk7ICsrZmllbGRJbmRleCkKLSAgICAgICAgbV9maWVsZHNbZmllbGRJbmRleF0tPnNldEVtcHR5 VmFsdWUoZGF0ZUZvclJlYWRPbmx5RmllbGQsIERhdGVUaW1lRmllbGRFbGVtZW50OjpEaXNwYXRj aE5vRXZlbnQpOworICAgICAgICBtX2ZpZWxkc1tmaWVsZEluZGV4XS0+c2V0RW1wdHlWYWx1ZShE YXRlVGltZUZpZWxkRWxlbWVudDo6RGlzcGF0Y2hOb0V2ZW50KTsKIH0KIAogYm9vbCBEYXRlVGlt ZUVkaXRFbGVtZW50OjpoYXNGb2N1c2VkRmllbGQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRt bC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5oCmluZGV4IDM1YzViYzdlOGVmMmRjODNhMWU0 ZmU3MmY5MWM4ZmM0ZTExNmJiNTMuLjMyYjFiMjMzZmYxMDIwM2U3OGE0YzExZjA4MWQ2YTdlOWUz NTI1ZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRWRp dEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUVkaXRF bGVtZW50LmgKQEAgLTk3LDcgKzk3LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVzZXRGaWVsZHMo KTsKICAgICB2b2lkIHNldEVtcHR5VmFsdWUoY29uc3QgTGF5b3V0UGFyYW1ldGVycyYsIGNvbnN0 IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CiAgICAgdm9pZCBzZXRWYWx1 ZUFzRGF0ZShjb25zdCBMYXlvdXRQYXJhbWV0ZXJzJiwgY29uc3QgRGF0ZUNvbXBvbmVudHMmKTsK LSAgICB2b2lkIHNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmll bGRzU3RhdGUmLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQpOwor ICAgIHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVs ZHNTdGF0ZSYpOwogICAgIHZvaWQgc3RlcERvd24oKTsKICAgICB2b2lkIHN0ZXBVcCgpOwogICAg IFN0cmluZyB2YWx1ZSgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFk b3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnQuY3BwCmluZGV4IDg1YTZlNzhjYTE1MjI5ZWYwYTM1Njcz Nzc5NzAyNTZjYzQxNmM3OTcuLjQ4MmE5N2Q4NzA4OTg2NmJlMThmZTNkMWU4N2M3YzE5YzI1YzU3 YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRmllbGRF bGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUZpZWxk RWxlbWVudC5jcHAKQEAgLTExMSw3ICsxMTEsNyBAQCB2b2lkIERhdGVUaW1lRmllbGRFbGVtZW50 OjpkZWZhdWx0S2V5Ym9hcmRFdmVudEhhbmRsZXIoS2V5Ym9hcmRFdmVudCoga2V5Ym9hcmRFdgog CiAgICAgaWYgKGtleUlkZW50aWZpZXIgPT0gIlUrMDAwOCIgfHwga2V5SWRlbnRpZmllciA9PSAi VSswMDdGIikgewogICAgICAgICBrZXlib2FyZEV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgpOwot ICAgICAgICBzZXRFbXB0eVZhbHVlKERhdGVDb21wb25lbnRzKCksIERpc3BhdGNoRXZlbnQpOwor ICAgICAgICBzZXRFbXB0eVZhbHVlKERpc3BhdGNoRXZlbnQpOwogICAgICAgICByZXR1cm47CiAg ICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVG aWVsZEVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRmllbGRF bGVtZW50LmgKaW5kZXggNjQ5NzM0NTczYWExZTM0OWRkYWI5MGQ1ZTA2NTEwOTQwNjEyMzgwYS4u NTBlYmM2NzAzNTEyNGEyMmZhMDU0MGUyZmU4NzE2YWJjNjg2ZTcwNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudC5oCkBAIC02NSw5ICs2 NSw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcG9wdWxhdGVEYXRlVGltZUZpZWxkc1N0 YXRlKERhdGVUaW1lRmllbGRzU3RhdGUmKSA9IDA7CiAgICAgdm9pZCByZW1vdmVFdmVudEhhbmRs ZXIoKSB7IG1fZmllbGRPd25lciA9IDA7IH0KICAgICB2b2lkIHNldFJlYWRPbmx5KCk7Ci0gICAg dmlydHVhbCB2b2lkIHNldEVtcHR5VmFsdWUoY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVGb3JS ZWFkT25seUZpZWxkLCBFdmVudEJlaGF2aW9yID0gRGlzcGF0Y2hOb0V2ZW50KSA9IDA7CisgICAg dmlydHVhbCB2b2lkIHNldEVtcHR5VmFsdWUoRXZlbnRCZWhhdmlvciA9IERpc3BhdGNoTm9FdmVu dCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZShjb25zdCBEYXRlQ29tcG9u ZW50cyYpID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3Rh dGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRl Rm9yUmVhZE9ubHlGaWVsZCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZVRp bWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJikgPSAwOwogICAgIHZpcnR1 YWwgdm9pZCBzZXRWYWx1ZUFzSW50ZWdlcihpbnQsIEV2ZW50QmVoYXZpb3IgPSBEaXNwYXRjaE5v RXZlbnQpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc3RlcERvd24oKSA9IDA7CiAgICAgdmlydHVh bCB2b2lkIHN0ZXBVcCgpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L0RhdGVUaW1lRmllbGRFbGVtZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRv dy9EYXRlVGltZUZpZWxkRWxlbWVudHMuY3BwCmluZGV4IDg0ZGM1MmRhM2I3MWE4Njg1MTdkZTZm NmY1NjM0NTFmZTNhYmQ4YjUuLjlmZmRjZTA3Zjg1MDBmMDFlZGQ5ZGU1MzgxNTU1ZjQ2ZDJmMDdj NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRmllbGRF bGVtZW50cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVs ZEVsZW1lbnRzLmNwcApAQCAtNjEsMTIgKzYxLDEyIEBAIHZvaWQgRGF0ZVRpbWVBTVBNRmllbGRF bGVtZW50OjpzZXRWYWx1ZUFzRGF0ZShjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZSkKICAgICBz ZXRWYWx1ZUFzSW50ZWdlcihkYXRlLmhvdXIoKSA+PSAxMiA/IDEgOiAwKTsKIH0KIAotdm9pZCBE YXRlVGltZUFNUE1GaWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNv bnN0IERhdGVUaW1lRmllbGRzU3RhdGUmIGRhdGVUaW1lRmllbGRzU3RhdGUsIGNvbnN0IERhdGVD b21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCkKK3ZvaWQgRGF0ZVRpbWVBTVBNRmllbGRF bGVtZW50OjpzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxk c1N0YXRlJiBkYXRlVGltZUZpZWxkc1N0YXRlKQogewogICAgIGlmIChkYXRlVGltZUZpZWxkc1N0 YXRlLmhhc0FNUE0oKSkKICAgICAgICAgc2V0VmFsdWVBc0ludGVnZXIoZGF0ZVRpbWVGaWVsZHNT dGF0ZS5hbXBtKCkpOwogICAgIGVsc2UKLSAgICAgICAgc2V0RW1wdHlWYWx1ZShkYXRlRm9yUmVh ZE9ubHlGaWVsZCk7CisgICAgICAgIHNldEVtcHR5VmFsdWUoKTsKIH0KIAogLy8gLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQpAQCAtOTQsMTAgKzk0LDEwIEBAIHZvaWQgRGF0ZVRpbWVEYXlG aWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlKGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlKQog ICAgIHNldFZhbHVlQXNJbnRlZ2VyKGRhdGUubW9udGhEYXkoKSk7CiB9CiAKLXZvaWQgRGF0ZVRp bWVEYXlGaWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERh dGVUaW1lRmllbGRzU3RhdGUmIGRhdGVUaW1lRmllbGRzU3RhdGUsIGNvbnN0IERhdGVDb21wb25l bnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCkKK3ZvaWQgRGF0ZVRpbWVEYXlGaWVsZEVsZW1lbnQ6 OnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUm IGRhdGVUaW1lRmllbGRzU3RhdGUpCiB7CiAgICAgaWYgKCFkYXRlVGltZUZpZWxkc1N0YXRlLmhh c0RheU9mTW9udGgoKSkgewotICAgICAgICBzZXRFbXB0eVZhbHVlKGRhdGVGb3JSZWFkT25seUZp ZWxkKTsKKyAgICAgICAgc2V0RW1wdHlWYWx1ZSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQog CkBAIC0xMDcsNyArMTA3LDcgQEAgdm9pZCBEYXRlVGltZURheUZpZWxkRWxlbWVudDo6c2V0VmFs dWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHMKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIAotICAgIHNldEVtcHR5VmFsdWUoZGF0ZUZvclJlYWRPbmx5RmllbGQpOwor ICAgIHNldEVtcHR5VmFsdWUoKTsKIH0KIAogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQpAQCAtMTY2LDE3ICsxNjYsMTcgQEAgdm9pZCBEYXRlVGltZUhvdXJGaWVsZEVsZW1lbnQ6OnNl dFZhbHVlQXNEYXRlKGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlKQogICAgIHNldFZhbHVlQXNJ bnRlZ2VyKGRhdGUuaG91cigpKTsKIH0KIAotdm9pZCBEYXRlVGltZUhvdXJGaWVsZEVsZW1lbnQ6 OnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUm IGRhdGVUaW1lRmllbGRzU3RhdGUsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9u bHlGaWVsZCkKK3ZvaWQgRGF0ZVRpbWVIb3VyRmllbGRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0ZVRp bWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiBkYXRlVGltZUZpZWxkc1N0 YXRlKQogewogICAgIGlmICghZGF0ZVRpbWVGaWVsZHNTdGF0ZS5oYXNIb3VyKCkpIHsKLSAgICAg ICAgc2V0RW1wdHlWYWx1ZShkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CisgICAgICAgIHNldEVtcHR5 VmFsdWUoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGNvbnN0IGludCBob3VyMTIg PSBkYXRlVGltZUZpZWxkc1N0YXRlLmhvdXIoKTsKIAogICAgIGlmIChob3VyMTIgPCAxIHx8IGhv dXIxMiA+IDEyKSB7Ci0gICAgICAgIHNldEVtcHR5VmFsdWUoZGF0ZUZvclJlYWRPbmx5RmllbGQp OworICAgICAgICBzZXRFbXB0eVZhbHVlKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAg LTI0MCwxNiArMjQwLDE2IEBAIHZvaWQgRGF0ZVRpbWVNaWxsaXNlY29uZEZpZWxkRWxlbWVudDo6 c2V0VmFsdWVBc0RhdGUoY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGUpCiAgICAgc2V0VmFsdWVB c0ludGVnZXIoZGF0ZS5taWxsaXNlY29uZCgpKTsKIH0KIAotdm9pZCBEYXRlVGltZU1pbGxpc2Vj b25kRmllbGRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRl VGltZUZpZWxkc1N0YXRlJiBkYXRlVGltZUZpZWxkc1N0YXRlLCBjb25zdCBEYXRlQ29tcG9uZW50 cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQpCit2b2lkIERhdGVUaW1lTWlsbGlzZWNvbmRGaWVsZEVs ZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRz U3RhdGUmIGRhdGVUaW1lRmllbGRzU3RhdGUpCiB7CiAgICAgaWYgKCFkYXRlVGltZUZpZWxkc1N0 YXRlLmhhc01pbGxpc2Vjb25kKCkpIHsKLSAgICAgICAgc2V0RW1wdHlWYWx1ZShkYXRlRm9yUmVh ZE9ubHlGaWVsZCk7CisgICAgICAgIHNldEVtcHR5VmFsdWUoKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAogICAgIGNvbnN0IHVuc2lnbmVkIHZhbHVlID0gZGF0ZVRpbWVGaWVsZHNTdGF0ZS5t aWxsaXNlY29uZCgpOwogICAgIGlmICh2YWx1ZSA+IHN0YXRpY19jYXN0PHVuc2lnbmVkPihtYXhp bXVtKCkpKSB7Ci0gICAgICAgIHNldEVtcHR5VmFsdWUoZGF0ZUZvclJlYWRPbmx5RmllbGQpOwor ICAgICAgICBzZXRFbXB0eVZhbHVlKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTI4 MSwxNiArMjgxLDE2IEBAIHZvaWQgRGF0ZVRpbWVNaW51dGVGaWVsZEVsZW1lbnQ6OnNldFZhbHVl QXNEYXRlKGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlKQogICAgIHNldFZhbHVlQXNJbnRlZ2Vy KGRhdGUubWludXRlKCkpOwogfQogCi12b2lkIERhdGVUaW1lTWludXRlRmllbGRFbGVtZW50Ojpz ZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiBk YXRlVGltZUZpZWxkc1N0YXRlLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5 RmllbGQpCit2b2lkIERhdGVUaW1lTWludXRlRmllbGRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0ZVRp bWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiBkYXRlVGltZUZpZWxkc1N0 YXRlKQogewogICAgIGlmICghZGF0ZVRpbWVGaWVsZHNTdGF0ZS5oYXNNaW51dGUoKSkgewotICAg ICAgICBzZXRFbXB0eVZhbHVlKGRhdGVGb3JSZWFkT25seUZpZWxkKTsKKyAgICAgICAgc2V0RW1w dHlWYWx1ZSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgY29uc3QgdW5zaWduZWQg dmFsdWUgPSBkYXRlVGltZUZpZWxkc1N0YXRlLm1pbnV0ZSgpOwogICAgIGlmICh2YWx1ZSA+IHN0 YXRpY19jYXN0PHVuc2lnbmVkPihtYXhpbXVtKCkpKSB7Ci0gICAgICAgIHNldEVtcHR5VmFsdWUo ZGF0ZUZvclJlYWRPbmx5RmllbGQpOworICAgICAgICBzZXRFbXB0eVZhbHVlKCk7CiAgICAgICAg IHJldHVybjsKICAgICB9CiAKQEAgLTMyMiwxMCArMzIyLDEwIEBAIHZvaWQgRGF0ZVRpbWVNb250 aEZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGUoY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGUp CiAgICAgc2V0VmFsdWVBc0ludGVnZXIoZGF0ZS5tb250aCgpICsgMSk7CiB9CiAKLXZvaWQgRGF0 ZVRpbWVNb250aEZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29u c3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYgZGF0ZVRpbWVGaWVsZHNTdGF0ZSwgY29uc3QgRGF0ZUNv bXBvbmVudHMmIGRhdGVGb3JSZWFkT25seUZpZWxkKQordm9pZCBEYXRlVGltZU1vbnRoRmllbGRF bGVtZW50OjpzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxk c1N0YXRlJiBkYXRlVGltZUZpZWxkc1N0YXRlKQogewogICAgIGlmICghZGF0ZVRpbWVGaWVsZHNT dGF0ZS5oYXNNb250aCgpKSB7Ci0gICAgICAgIHNldEVtcHR5VmFsdWUoZGF0ZUZvclJlYWRPbmx5 RmllbGQpOworICAgICAgICBzZXRFbXB0eVZhbHVlKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKQEAgLTMzNSw3ICszMzUsNyBAQCB2b2lkIERhdGVUaW1lTW9udGhGaWVsZEVsZW1lbnQ6OnNl dFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbAogICAgICAgICBy ZXR1cm47CiAgICAgfQogCi0gICAgc2V0RW1wdHlWYWx1ZShkYXRlRm9yUmVhZE9ubHlGaWVsZCk7 CisgICAgc2V0RW1wdHlWYWx1ZSgpOwogfQogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCkBAIC0zNjMsMTYgKzM2MywxNiBAQCB2b2lkIERhdGVUaW1lU2Vjb25kRmllbGRFbGVtZW50 OjpzZXRWYWx1ZUFzRGF0ZShjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZSkKICAgICBzZXRWYWx1 ZUFzSW50ZWdlcihkYXRlLnNlY29uZCgpKTsKIH0KIAotdm9pZCBEYXRlVGltZVNlY29uZEZpZWxk RWxlbWVudDo6c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVs ZHNTdGF0ZSYgZGF0ZVRpbWVGaWVsZHNTdGF0ZSwgY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVG b3JSZWFkT25seUZpZWxkKQordm9pZCBEYXRlVGltZVNlY29uZEZpZWxkRWxlbWVudDo6c2V0VmFs dWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYgZGF0ZVRp bWVGaWVsZHNTdGF0ZSkKIHsKICAgICBpZiAoIWRhdGVUaW1lRmllbGRzU3RhdGUuaGFzU2Vjb25k KCkpIHsKLSAgICAgICAgc2V0RW1wdHlWYWx1ZShkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CisgICAg ICAgIHNldEVtcHR5VmFsdWUoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGNvbnN0 IHVuc2lnbmVkIHZhbHVlID0gZGF0ZVRpbWVGaWVsZHNTdGF0ZS5zZWNvbmQoKTsKICAgICBpZiAo dmFsdWUgPiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obWF4aW11bSgpKSkgewotICAgICAgICBzZXRF bXB0eVZhbHVlKGRhdGVGb3JSZWFkT25seUZpZWxkKTsKKyAgICAgICAgc2V0RW1wdHlWYWx1ZSgp OwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC00MDcsMTYgKzQwNywxNiBAQCB2b2lkIERh dGVUaW1lU3ltYm9saWNNb250aEZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGUoY29uc3QgRGF0 ZUNvbXBvbmVudHMmIGRhdAogICAgIHNldFZhbHVlQXNJbnRlZ2VyKGRhdGUubW9udGgoKSk7CiB9 CiAKLXZvaWQgRGF0ZVRpbWVTeW1ib2xpY01vbnRoRmllbGRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0 ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiBkYXRlVGltZUZpZWxk c1N0YXRlLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQpCit2b2lk IERhdGVUaW1lU3ltYm9saWNNb250aEZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGVUaW1lRmll bGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYgZGF0ZVRpbWVGaWVsZHNTdGF0ZSkK IHsKICAgICBpZiAoIWRhdGVUaW1lRmllbGRzU3RhdGUuaGFzTW9udGgoKSkgewotICAgICAgICBz ZXRFbXB0eVZhbHVlKGRhdGVGb3JSZWFkT25seUZpZWxkKTsKKyAgICAgICAgc2V0RW1wdHlWYWx1 ZSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgY29uc3QgdW5zaWduZWQgdmFsdWUg PSBkYXRlVGltZUZpZWxkc1N0YXRlLm1vbnRoKCkgLSAxOwogICAgIGlmICh2YWx1ZSA+PSBzeW1i b2xzU2l6ZSgpKSB7Ci0gICAgICAgIHNldEVtcHR5VmFsdWUoZGF0ZUZvclJlYWRPbmx5RmllbGQp OworICAgICAgICBzZXRFbXB0eVZhbHVlKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAg LTQ0OCwxMCArNDQ4LDEwIEBAIHZvaWQgRGF0ZVRpbWVXZWVrRmllbGRFbGVtZW50OjpzZXRWYWx1 ZUFzRGF0ZShjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZSkKICAgICBzZXRWYWx1ZUFzSW50ZWdl cihkYXRlLndlZWsoKSk7CiB9CiAKLXZvaWQgRGF0ZVRpbWVXZWVrRmllbGRFbGVtZW50OjpzZXRW YWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiBkYXRl VGltZUZpZWxkc1N0YXRlLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5Rmll bGQpCit2b2lkIERhdGVUaW1lV2Vla0ZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGVUaW1lRmll bGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYgZGF0ZVRpbWVGaWVsZHNTdGF0ZSkK IHsKICAgICBpZiAoIWRhdGVUaW1lRmllbGRzU3RhdGUuaGFzV2Vla09mWWVhcigpKSB7Ci0gICAg ICAgIHNldEVtcHR5VmFsdWUoZGF0ZUZvclJlYWRPbmx5RmllbGQpOworICAgICAgICBzZXRFbXB0 eVZhbHVlKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTQ2MSw3ICs0NjEsNyBAQCB2 b2lkIERhdGVUaW1lV2Vla0ZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3Rh dGUoY29uc3QgRGF0ZVRpbWVGaWVsZAogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgc2V0 RW1wdHlWYWx1ZShkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CisgICAgc2V0RW1wdHlWYWx1ZSgpOwog fQogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkBAIC01MjEsMTAgKzUyMSwxMCBA QCB2b2lkIERhdGVUaW1lWWVhckZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGUoY29uc3QgRGF0 ZUNvbXBvbmVudHMmIGRhdGUpCiAgICAgc2V0VmFsdWVBc0ludGVnZXIoZGF0ZS5mdWxsWWVhcigp KTsKIH0KIAotdm9pZCBEYXRlVGltZVllYXJGaWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGlt ZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmIGRhdGVUaW1lRmllbGRzU3Rh dGUsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCkKK3ZvaWQgRGF0 ZVRpbWVZZWFyRmllbGRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25z dCBEYXRlVGltZUZpZWxkc1N0YXRlJiBkYXRlVGltZUZpZWxkc1N0YXRlKQogewogICAgIGlmICgh ZGF0ZVRpbWVGaWVsZHNTdGF0ZS5oYXNZZWFyKCkpIHsKLSAgICAgICAgc2V0RW1wdHlWYWx1ZShk YXRlRm9yUmVhZE9ubHlGaWVsZCk7CisgICAgICAgIHNldEVtcHR5VmFsdWUoKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KIApAQCAtNTM0LDcgKzUzNCw3IEBAIHZvaWQgRGF0ZVRpbWVZZWFyRmll bGRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZp ZWxkCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBzZXRFbXB0eVZhbHVlKGRhdGVGb3JS ZWFkT25seUZpZWxkKTsKKyAgICBzZXRFbXB0eVZhbHVlKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1l RmllbGRFbGVtZW50cy5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVs ZEVsZW1lbnRzLmgKaW5kZXggYzViMTI0MTEzMjdkYTRkNzBkYjhiMjNmOWNlZDNkYTUzYWYyMzY1 NS4uMDA1M2E0YTM5MWYzYmY4ZTZmNDY3MzdkYmJlZWIxODUxYTllMGU5ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnRzLmgKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnRzLmgKQEAgLTQ0 LDcgKzQ0LDcgQEAgcHJpdmF0ZToKICAgICAvLyBEYXRlVGltZUZpZWxkRWxlbWVudCBmdW5jdGlv bnMuCiAgICAgdmlydHVhbCB2b2lkIHBvcHVsYXRlRGF0ZVRpbWVGaWVsZHNTdGF0ZShEYXRlVGlt ZUZpZWxkc1N0YXRlJikgT1ZFUlJJREUgRklOQUw7CiAgICAgdmlydHVhbCB2b2lkIHNldFZhbHVl QXNEYXRlKGNvbnN0IERhdGVDb21wb25lbnRzJikgT1ZFUlJJREUgRklOQUw7Ci0gICAgdmlydHVh bCB2b2lkIHNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRz U3RhdGUmLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQpIE9WRVJS SURFIEZJTkFMOworICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0 ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJikgT1ZFUlJJREUgRklOQUw7CiB9OwogCiBjbGFz cyBEYXRlVGltZURheUZpZWxkRWxlbWVudCA6IHB1YmxpYyBEYXRlVGltZU51bWVyaWNGaWVsZEVs ZW1lbnQgewpAQCAtNTksNyArNTksNyBAQCBwcml2YXRlOgogICAgIC8vIERhdGVUaW1lRmllbGRF bGVtZW50IGZ1bmN0aW9ucy4KICAgICB2aXJ0dWFsIHZvaWQgcG9wdWxhdGVEYXRlVGltZUZpZWxk c1N0YXRlKERhdGVUaW1lRmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5BTDsKICAgICB2aXJ0dWFs IHZvaWQgc2V0VmFsdWVBc0RhdGUoY29uc3QgRGF0ZUNvbXBvbmVudHMmKSBPVkVSUklERSBGSU5B TDsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3Qg RGF0ZVRpbWVGaWVsZHNTdGF0ZSYsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9u bHlGaWVsZCkgT1ZFUlJJREUgRklOQUw7CisgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRl VGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5B TDsKIH07CiAKIC8vIERhdGVUaW1lSG91ckZpZWxkRWxlbWVudCBpcyB1c2VkIGZvciBob3VyIGZp ZWxkIG9mIGRhdGUgdGltZSBmb3JtYXQKQEAgLTgwLDcgKzgwLDcgQEAgcHJpdmF0ZToKICAgICAv LyBEYXRlVGltZUZpZWxkRWxlbWVudCBmdW5jdGlvbnMuCiAgICAgdmlydHVhbCB2b2lkIHBvcHVs YXRlRGF0ZVRpbWVGaWVsZHNTdGF0ZShEYXRlVGltZUZpZWxkc1N0YXRlJikgT1ZFUlJJREUgRklO QUw7CiAgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlKGNvbnN0IERhdGVDb21wb25lbnRz JikgT1ZFUlJJREUgRklOQUw7Ci0gICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlVGltZUZp ZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmLCBjb25zdCBEYXRlQ29tcG9uZW50 cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQpIE9WRVJSSURFIEZJTkFMOworICAgIHZpcnR1YWwgdm9p ZCBzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRl JikgT1ZFUlJJREUgRklOQUw7CiAgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNJbnRlZ2VyKGlu dCwgRXZlbnRCZWhhdmlvciA9IERpc3BhdGNoTm9FdmVudCkgT1ZFUlJJREUgRklOQUw7CiAgICAg dmlydHVhbCBpbnQgdmFsdWVBc0ludGVnZXIoKSBjb25zdCBPVkVSUklERSBGSU5BTDsKIApAQCAt OTksNyArOTksNyBAQCBwcml2YXRlOgogICAgIC8vIERhdGVUaW1lRmllbGRFbGVtZW50IGZ1bmN0 aW9ucy4KICAgICB2aXJ0dWFsIHZvaWQgcG9wdWxhdGVEYXRlVGltZUZpZWxkc1N0YXRlKERhdGVU aW1lRmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5BTDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0VmFs dWVBc0RhdGUoY29uc3QgRGF0ZUNvbXBvbmVudHMmKSBPVkVSUklERSBGSU5BTDsKLSAgICB2aXJ0 dWFsIHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVs ZHNTdGF0ZSYsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCkgT1ZF UlJJREUgRklOQUw7CisgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0 YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5BTDsKIH07CiAKIGNs YXNzIERhdGVUaW1lTWludXRlRmllbGRFbGVtZW50IDogcHVibGljIERhdGVUaW1lTnVtZXJpY0Zp ZWxkRWxlbWVudCB7CkBAIC0xMTQsNyArMTE0LDcgQEAgcHJpdmF0ZToKICAgICAvLyBEYXRlVGlt ZUZpZWxkRWxlbWVudCBmdW5jdGlvbnMuCiAgICAgdmlydHVhbCB2b2lkIHBvcHVsYXRlRGF0ZVRp bWVGaWVsZHNTdGF0ZShEYXRlVGltZUZpZWxkc1N0YXRlJikgT1ZFUlJJREUgRklOQUw7CiAgICAg dmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlKGNvbnN0IERhdGVDb21wb25lbnRzJikgT1ZFUlJJ REUgRklOQUw7Ci0gICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRl KGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZv clJlYWRPbmx5RmllbGQpIE9WRVJSSURFIEZJTkFMOworICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1 ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJikgT1ZFUlJJ REUgRklOQUw7CiB9OwogCiBjbGFzcyBEYXRlVGltZU1vbnRoRmllbGRFbGVtZW50IDogcHVibGlj IERhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudCB7CkBAIC0xMjksNyArMTI5LDcgQEAgcHJpdmF0 ZToKICAgICAvLyBEYXRlVGltZUZpZWxkRWxlbWVudCBmdW5jdGlvbnMuCiAgICAgdmlydHVhbCB2 b2lkIHBvcHVsYXRlRGF0ZVRpbWVGaWVsZHNTdGF0ZShEYXRlVGltZUZpZWxkc1N0YXRlJikgT1ZF UlJJREUgRklOQUw7CiAgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlKGNvbnN0IERhdGVD b21wb25lbnRzJikgT1ZFUlJJREUgRklOQUw7Ci0gICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNE YXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmLCBjb25zdCBEYXRl Q29tcG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQpIE9WRVJSSURFIEZJTkFMOworICAgIHZp cnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZp ZWxkc1N0YXRlJikgT1ZFUlJJREUgRklOQUw7CiB9OwogCiBjbGFzcyBEYXRlVGltZVNlY29uZEZp ZWxkRWxlbWVudCA6IHB1YmxpYyBEYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQgewpAQCAtMTQ0 LDcgKzE0NCw3IEBAIHByaXZhdGU6CiAgICAgLy8gRGF0ZVRpbWVGaWVsZEVsZW1lbnQgZnVuY3Rp b25zLgogICAgIHZpcnR1YWwgdm9pZCBwb3B1bGF0ZURhdGVUaW1lRmllbGRzU3RhdGUoRGF0ZVRp bWVGaWVsZHNTdGF0ZSYpIE9WRVJSSURFIEZJTkFMOwogICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1 ZUFzRGF0ZShjb25zdCBEYXRlQ29tcG9uZW50cyYpIE9WRVJSSURFIEZJTkFMOwotICAgIHZpcnR1 YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxk c1N0YXRlJiwgY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVGb3JSZWFkT25seUZpZWxkKSBPVkVS UklERSBGSU5BTDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3Rh dGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYpIE9WRVJSSURFIEZJTkFMOwogfTsKIAogY2xh c3MgRGF0ZVRpbWVTeW1ib2xpY01vbnRoRmllbGRFbGVtZW50IDogcHVibGljIERhdGVUaW1lU3lt Ym9saWNGaWVsZEVsZW1lbnQgewpAQCAtMTU5LDcgKzE1OSw3IEBAIHByaXZhdGU6CiAgICAgLy8g RGF0ZVRpbWVGaWVsZEVsZW1lbnQgZnVuY3Rpb25zLgogICAgIHZpcnR1YWwgdm9pZCBwb3B1bGF0 ZURhdGVUaW1lRmllbGRzU3RhdGUoRGF0ZVRpbWVGaWVsZHNTdGF0ZSYpIE9WRVJSSURFIEZJTkFM OwogICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZShjb25zdCBEYXRlQ29tcG9uZW50cyYp IE9WRVJSSURFIEZJTkFMOwotICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVs ZHNTdGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiwgY29uc3QgRGF0ZUNvbXBvbmVudHMm IGRhdGVGb3JSZWFkT25seUZpZWxkKSBPVkVSUklERSBGSU5BTDsKKyAgICB2aXJ0dWFsIHZvaWQg c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYp IE9WRVJSSURFIEZJTkFMOwogfTsKIAogY2xhc3MgRGF0ZVRpbWVXZWVrRmllbGRFbGVtZW50IDog cHVibGljIERhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudCB7CkBAIC0xNzQsNyArMTc0LDcgQEAg cHJpdmF0ZToKICAgICAvLyBEYXRlVGltZUZpZWxkRWxlbWVudCBmdW5jdGlvbnMuCiAgICAgdmly dHVhbCB2b2lkIHBvcHVsYXRlRGF0ZVRpbWVGaWVsZHNTdGF0ZShEYXRlVGltZUZpZWxkc1N0YXRl JikgT1ZFUlJJREUgRklOQUw7CiAgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlKGNvbnN0 IERhdGVDb21wb25lbnRzJikgT1ZFUlJJREUgRklOQUw7Ci0gICAgdmlydHVhbCB2b2lkIHNldFZh bHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmLCBjb25z dCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQpIE9WRVJSSURFIEZJTkFMOwor ICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShjb25zdCBEYXRl VGltZUZpZWxkc1N0YXRlJikgT1ZFUlJJREUgRklOQUw7CiB9OwogCiBjbGFzcyBEYXRlVGltZVll YXJGaWVsZEVsZW1lbnQgOiBwdWJsaWMgRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50IHsKQEAg LTIwNSw3ICsyMDUsNyBAQCBwcml2YXRlOgogICAgIC8vIERhdGVUaW1lRmllbGRFbGVtZW50IGZ1 bmN0aW9ucy4KICAgICB2aXJ0dWFsIHZvaWQgcG9wdWxhdGVEYXRlVGltZUZpZWxkc1N0YXRlKERh dGVUaW1lRmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5BTDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0 VmFsdWVBc0RhdGUoY29uc3QgRGF0ZUNvbXBvbmVudHMmKSBPVkVSUklERSBGSU5BTDsKLSAgICB2 aXJ0dWFsIHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVG aWVsZHNTdGF0ZSYsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCkg T1ZFUlJJREUgRklOQUw7CisgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlVGltZUZpZWxk c1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3RhdGUmKSBPVkVSUklERSBGSU5BTDsKIAogICAg IC8vIERhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudCBmdW5jdGlvbnMuCiAgICAgdmlydHVhbCBp bnQgY2xhbXBWYWx1ZUZvckhhcmRMaW1pdHMoaW50KSBjb25zdCBPVkVSUklERSBGSU5BTDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lTnVtZXJpY0ZpZWxk RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZU51bWVyaWNG aWVsZEVsZW1lbnQuY3BwCmluZGV4IGE5MmZlODIyZWFjM2ZhYTcxOTg1OTdlNmI1OWZkOTY1NWUx YTNjMDIuLmViNjk0MzIyZGYwZjJkMWViNWNiZWY0MGM3MzI1OTYxZWQzNzI2OGUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVOdW1lcmljRmll bGRFbGVtZW50LmNwcApAQCAtMTYwLDE0ICsxNjAsMTIgQEAgaW50IERhdGVUaW1lTnVtZXJpY0Zp ZWxkRWxlbWVudDo6bWluaW11bSgpIGNvbnN0CiAgICAgcmV0dXJuIG1fcmFuZ2UubWluaW11bTsK IH0KIAotdm9pZCBEYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQ6OnNldEVtcHR5VmFsdWUoY29u c3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVGb3JSZWFkT25seUZpZWxkLCBFdmVudEJlaGF2aW9yIGV2 ZW50QmVoYXZpb3IpCit2b2lkIERhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudDo6c2V0RW1wdHlW YWx1ZShFdmVudEJlaGF2aW9yIGV2ZW50QmVoYXZpb3IpCiB7CiAgICAgbV9sYXN0RGlnaXRDaGFy VGltZSA9IDA7CiAKLSAgICBpZiAoaXNSZWFkT25seSgpKSB7Ci0gICAgICAgIHNldFZhbHVlQXNE YXRlKGRhdGVGb3JSZWFkT25seUZpZWxkKTsKKyAgICBpZiAoaXNSZWFkT25seSgpKQogICAgICAg ICByZXR1cm47Ci0gICAgfQogCiAgICAgbV9oYXNWYWx1ZSA9IGZhbHNlOwogICAgIG1fdmFsdWUg PSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVOdW1l cmljRmllbGRFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZU51 bWVyaWNGaWVsZEVsZW1lbnQuaAppbmRleCA3ODExZWJhZGNmZTRlMmJjOTI3Njc3YTYxODFlZjY2 MThmMDk2NThiLi5hOWFlMjY4ZTY1MGUxNWQwNjg4MGFkOGZlNzdkNTdkN2QyYzM2NTYxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZU51bWVyaWNGaWVsZEVs ZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZU51bWVyaWNG aWVsZEVsZW1lbnQuaApAQCAtNjIsNyArNjIsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgLy8gRGF0ZVRp bWVGaWVsZEVsZW1lbnQgZnVuY3Rpb25zLgogICAgIHZpcnR1YWwgYm9vbCBoYXNWYWx1ZSgpIGNv bnN0IE9WRVJSSURFIEZJTkFMOwogICAgIHZpcnR1YWwgaW50IG1heGltdW0oKSBjb25zdCBPVkVS UklERSBGSU5BTDsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0RW1wdHlWYWx1ZShjb25zdCBEYXRlQ29t cG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQsIEV2ZW50QmVoYXZpb3IgPSBEaXNwYXRjaE5v RXZlbnQpIE9WRVJSSURFIEZJTkFMOworICAgIHZpcnR1YWwgdm9pZCBzZXRFbXB0eVZhbHVlKEV2 ZW50QmVoYXZpb3IgPSBEaXNwYXRjaE5vRXZlbnQpIE9WRVJSSURFIEZJTkFMOwogICAgIHZpcnR1 YWwgdm9pZCBzZXRWYWx1ZUFzSW50ZWdlcihpbnQsIEV2ZW50QmVoYXZpb3IgPSBEaXNwYXRjaE5v RXZlbnQpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgaW50IHZhbHVlQXNJbnRlZ2VyKCkgY29uc3Qg T1ZFUlJJREU7CiAgICAgdmlydHVhbCBTdHJpbmcgdmlzaWJsZVZhbHVlKCkgY29uc3QgT1ZFUlJJ REUgRklOQUw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGlt ZVN5bWJvbGljRmllbGRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0Rh dGVUaW1lU3ltYm9saWNGaWVsZEVsZW1lbnQuY3BwCmluZGV4IGY4YWFlN2E2ZDQ3OTU4MmJiN2Vm YzhlYjQxOGY4N2JhNDkxMTFlMmMuLjhlZjRkYWMyZmU3OTE4MjFjMDZlMGQxYjRlOTEwZjY3ZDU4 NmU3MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lU3lt Ym9saWNGaWVsZEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0Rh dGVUaW1lU3ltYm9saWNGaWVsZEVsZW1lbnQuY3BwCkBAIC0xMDUsNyArMTA1LDcgQEAgaW50IERh dGVUaW1lU3ltYm9saWNGaWVsZEVsZW1lbnQ6Om1pbmltdW0oKSBjb25zdAogICAgIHJldHVybiAx OwogfQogCi12b2lkIERhdGVUaW1lU3ltYm9saWNGaWVsZEVsZW1lbnQ6OnNldEVtcHR5VmFsdWUo Y29uc3QgRGF0ZUNvbXBvbmVudHMmLCBFdmVudEJlaGF2aW9yIGV2ZW50QmVoYXZpb3IpCit2b2lk IERhdGVUaW1lU3ltYm9saWNGaWVsZEVsZW1lbnQ6OnNldEVtcHR5VmFsdWUoRXZlbnRCZWhhdmlv ciBldmVudEJlaGF2aW9yKQogewogICAgIG1fc2VsZWN0ZWRJbmRleCA9IGludmFsaWRJbmRleDsK ICAgICB1cGRhdGVWaXNpYmxlVmFsdWUoZXZlbnRCZWhhdmlvcik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZVN5bWJvbGljRmllbGRFbGVtZW50LmggYi9T b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZVN5bWJvbGljRmllbGRFbGVtZW50LmgK aW5kZXggNGQ5MjZlYzAyMGYxODZlOTJhZjIxNjljMzNkYWE3NGU1MzlkMWM5MS4uNWM2YjA1YWNi YWY0N2JjZDRkNTBjNDE1NGM2Yjc3YThhMmRmYjJmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVTeW1ib2xpY0ZpZWxkRWxlbWVudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lU3ltYm9saWNGaWVsZEVsZW1lbnQuaApAQCAt NDAsNyArNDAsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgRGF0ZVRpbWVTeW1ib2xpY0ZpZWxkRWxlbWVu dChEb2N1bWVudCosIEZpZWxkT3duZXImLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYpOwogICAgIHNp emVfdCBzeW1ib2xzU2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3ltYm9scy5zaXplKCk7IH0KICAg ICB2aXJ0dWFsIGJvb2wgaGFzVmFsdWUoKSBjb25zdCBPVkVSUklERSBGSU5BTDsKLSAgICB2aXJ0 dWFsIHZvaWQgc2V0RW1wdHlWYWx1ZShjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRP bmx5RmllbGQsIEV2ZW50QmVoYXZpb3IgPSBEaXNwYXRjaE5vRXZlbnQpIE9WRVJSSURFIEZJTkFM OworICAgIHZpcnR1YWwgdm9pZCBzZXRFbXB0eVZhbHVlKEV2ZW50QmVoYXZpb3IgPSBEaXNwYXRj aE5vRXZlbnQpIE9WRVJSSURFIEZJTkFMOwogICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzSW50 ZWdlcihpbnQsIEV2ZW50QmVoYXZpb3IgPSBEaXNwYXRjaE5vRXZlbnQpIE9WRVJSSURFIEZJTkFM OwogICAgIHZpcnR1YWwgaW50IHZhbHVlQXNJbnRlZ2VyKCkgY29uc3QgT1ZFUlJJREUgRklOQUw7 CiAK