223398 2021-03-17 13:40:03 -0700 Reduce maximum HashTable entry size to 250 bytes 2021-03-17 17:17:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen benjamin cdumez cmarcelo ews-watchlist webkit-bug-importer ysuzuki oldest_to_newest 1740880 0 achristensen 2021-03-17 13:40:03 -0700 Reduce maximum HashTable entry size to 250 bytes 1740882 1 423524 achristensen 2021-03-17 13:41:10 -0700 Created attachment 423524 Patch 1740949 2 423524 ysuzuki 2021-03-17 16:35:55 -0700 Comment on attachment 423524 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423524&action=review r=me > Source/WebCore/platform/graphics/SourceBufferPrivate.cpp:74 > + trackBuffer.get().lastFrameTimescale = 0; > + trackBuffer.get().roundedTimestampOffset = MediaTime::invalidTime(); Why not using `->`? 1740953 3 423524 achristensen 2021-03-17 16:45:06 -0700 Comment on attachment 423524 Patch They are equivalent but -> looks the same as dereferencing an unchecked pointer if the type were different. This makes it clearer that null check is needed. 1740961 4 ews-feeder 2021-03-17 17:16:01 -0700 Committed r274603: <https://commits.webkit.org/r274603> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423524. 1740962 5 webkit-bug-importer 2021-03-17 17:17:15 -0700 <rdar://problem/75551716> 423524 2021-03-17 13:41:10 -0700 2021-03-17 17:16:03 -0700 Patch bug-223398-20210317134109.patch text/plain 15917 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDQ3NTE1MTg3ZTZhMWNhNmFlYzZhODJi MjkwYWNkMzVjZWI2MzkxOWYuLjgyZGYyZmYwOGE1YzlhOWE5MTA5NGQwNjQ4ZjdjMDlmOTAzNGMx N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDMtMTcgIEFsZXggQ2hyaXN0ZW5zZW4gIDxh Y2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZWR1Y2UgbWF4aW11bSBIYXNoVGFi bGUgZW50cnkgc2l6ZSB0byAyNTAgYnl0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMzM5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogd3RmL0hhc2hUYWJsZS5oOgorICAgICAgICAoV1RGOjpLZXlU cmFpdHM+OjppbmxpbmVMb29rdXApOgorCiAyMDIxLTAzLTE3ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWxsb3cgVW5pcXVlUmVmIHRvIGJl IHRoZSB2YWx1ZSBvZiBhIEhhc2hNYXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4NzU0MDY5ZTk2MjFkMmFjOGZm MGQwMTY4YjEwYmIyOWRhNzhmM2FjLi41NmJmZTg0ZDA5MDk5NzU3MTU5MDA3YzdiNDVlN2U4Nzkw OWI2Yjk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDMtMTcgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZWR1Y2UgbWF4 aW11bSBIYXNoVGFibGUgZW50cnkgc2l6ZSB0byAyNTAgYnl0ZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzM5OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcmVkdWNlcyBtZW1vcnkgdXNlIGF0 IHJ1bnRpbWUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Tb3VyY2VCdWZmZXJQcml2 YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclByaXZhdGU6OnJlc2V0VGlt ZXN0YW1wT2Zmc2V0SW5UcmFja0J1ZmZlcnMpOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVm ZmVyUHJpdmF0ZTo6cmVzZXRUcmFja0J1ZmZlcnMpOgorICAgICAgICAoV2ViQ29yZTo6U291cmNl QnVmZmVyUHJpdmF0ZTo6dXBkYXRlSGlnaGVzdFByZXNlbnRhdGlvblRpbWVzdGFtcCk6CisgICAg ICAgIChXZWJDb3JlOjpTb3VyY2VCdWZmZXJQcml2YXRlOjp1cGRhdGVCdWZmZXJlZEZyb21UcmFj a0J1ZmZlcnMpOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyUHJpdmF0ZTo6cmVlbnF1 ZVNhbXBsZXMpOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyUHJpdmF0ZTo6Y2xlYXJU cmFja0J1ZmZlcnMpOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyUHJpdmF0ZTo6YnVm ZmVyZWRTYW1wbGVzRm9yVHJhY2tJZCk6CisgICAgICAgIChXZWJDb3JlOjpTb3VyY2VCdWZmZXJQ cml2YXRlOjpmYXN0U2Vla1RpbWVGb3JNZWRpYVRpbWUpOgorICAgICAgICAoV2ViQ29yZTo6U291 cmNlQnVmZmVyUHJpdmF0ZTo6dG90YWxUcmFja0J1ZmZlclNpemVJbkJ5dGVzIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclByaXZhdGU6OmFkZFRyYWNrQnVmZmVyKToKKyAg ICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclByaXZhdGU6OnVwZGF0ZVRyYWNrSWRzKToKKyAg ICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclByaXZhdGU6OnNldEFsbFRyYWNrQnVmZmVyc05l ZWRSYW5kb21BY2Nlc3MpOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyUHJpdmF0ZTo6 ZGlkUmVjZWl2ZVNhbXBsZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvU291cmNlQnVm ZmVyUHJpdmF0ZS5oOgorCiAyMDIxLTAzLTE3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRGVyaXZlIGluZGV4IEVVQy1LUiBmcm9tIElDVQpk aWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvSGFzaFRhYmxlLmggYi9Tb3VyY2UvV1RGL3d0Zi9I YXNoVGFibGUuaAppbmRleCA5ODFmNTdhN2MyNjQ4ZWEyMzcyOWNhODM2YjJlNWMxMzk2Y2UxNmZj Li5hNWU2YjYyZWFkNTlkOTZmMmJlNThkNTM3OGIzZWY5NTk1MjhiMTc0IDEwMDY0NAotLS0gYS9T b3VyY2UvV1RGL3d0Zi9IYXNoVGFibGUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9IYXNoVGFibGUu aApAQCAtNjY4LDcgKzY2OCw3IEBAIERFQ0xBUkVfQUxMT0NBVE9SX1dJVEhfSEVBUF9JREVOVElG SUVSKEhhc2hUYWJsZSk7CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgSGFzaFRyYW5zbGF0b3IsIHR5 cGVuYW1lIFQ+CiAgICAgQUxXQVlTX0lOTElORSBhdXRvIEhhc2hUYWJsZTxLZXksIFZhbHVlLCBF eHRyYWN0b3IsIEhhc2hGdW5jdGlvbnMsIFRyYWl0cywgS2V5VHJhaXRzPjo6aW5saW5lTG9va3Vw KGNvbnN0IFQmIGtleSkgLT4gVmFsdWVUeXBlKgogICAgIHsKLSAgICAgICAgc3RhdGljX2Fzc2Vy dChzaXplb2YoS2V5KSArIHNpemVvZihWYWx1ZSkgPCA0MDAsICJZb3VyIEhhc2hUYWJsZSB0eXBl cyBhcmUgdG9vIGJpZyB0byBlZmZpY2llbnRseSBtb3ZlIHdoZW4gcmVoYXNoaW5nLiAgQ29uc2lk ZXIgdXNpbmcgc3RkOjp1bmlxdWVfcHRyIGluc3RlYWQiKTsKKyAgICAgICAgc3RhdGljX2Fzc2Vy dChzaXplb2YoS2V5KSArIHNpemVvZihWYWx1ZSkgPCAyNTAsICJZb3VyIEhhc2hUYWJsZSB0eXBl cyBhcmUgdG9vIGJpZyB0byBlZmZpY2llbnRseSBtb3ZlIHdoZW4gcmVoYXNoaW5nLiAgQ29uc2lk ZXIgdXNpbmcgVW5pcXVlUmVmIGluc3RlYWQiKTsKIAogICAgICAgICBjaGVja0tleTxIYXNoVHJh bnNsYXRvcj4oa2V5KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvU291cmNlQnVmZmVyUHJpdmF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9Tb3VyY2VCdWZmZXJQcml2YXRlLmNwcAppbmRleCA0YjA1MzM4MzEzZjUxMjRiN2Vm ZGQzNTQzN2MzM2VlMWY2ODM2OTliLi5mYTJhNzJkZTExN2Y1Y2QwNzQxYzM4MmQ4MmVkNjdkYjY5 NjJhODJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Tb3Vy Y2VCdWZmZXJQcml2YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9Tb3VyY2VCdWZmZXJQcml2YXRlLmNwcApAQCAtNzAsOCArNzAsOCBAQCBTb3VyY2VCdWZmZXJQ cml2YXRlOjp+U291cmNlQnVmZmVyUHJpdmF0ZSgpID0gZGVmYXVsdDsKIHZvaWQgU291cmNlQnVm ZmVyUHJpdmF0ZTo6cmVzZXRUaW1lc3RhbXBPZmZzZXRJblRyYWNrQnVmZmVycygpCiB7CiAgICAg Zm9yIChhdXRvJiB0cmFja0J1ZmZlciA6IG1fdHJhY2tCdWZmZXJNYXAudmFsdWVzKCkpIHsKLSAg ICAgICAgdHJhY2tCdWZmZXIubGFzdEZyYW1lVGltZXNjYWxlID0gMDsKLSAgICAgICAgdHJhY2tC dWZmZXIucm91bmRlZFRpbWVzdGFtcE9mZnNldCA9IE1lZGlhVGltZTo6aW52YWxpZFRpbWUoKTsK KyAgICAgICAgdHJhY2tCdWZmZXIuZ2V0KCkubGFzdEZyYW1lVGltZXNjYWxlID0gMDsKKyAgICAg ICAgdHJhY2tCdWZmZXIuZ2V0KCkucm91bmRlZFRpbWVzdGFtcE9mZnNldCA9IE1lZGlhVGltZTo6 aW52YWxpZFRpbWUoKTsKICAgICB9CiB9CiAKQEAgLTg0LDExICs4NCwxMSBAQCB2b2lkIFNvdXJj ZUJ1ZmZlclByaXZhdGU6OnNldEJ1ZmZlcmVkRGlydHkoYm9vbCBmbGFnKQogdm9pZCBTb3VyY2VC dWZmZXJQcml2YXRlOjpyZXNldFRyYWNrQnVmZmVycygpCiB7CiAgICAgZm9yIChhdXRvJiB0cmFj a0J1ZmZlclBhaXIgOiBtX3RyYWNrQnVmZmVyTWFwLnZhbHVlcygpKSB7Ci0gICAgICAgIHRyYWNr QnVmZmVyUGFpci5sYXN0RGVjb2RlVGltZXN0YW1wID0gTWVkaWFUaW1lOjppbnZhbGlkVGltZSgp OwotICAgICAgICB0cmFja0J1ZmZlclBhaXIuZ3JlYXRlc3REZWNvZGVEdXJhdGlvbiA9IE1lZGlh VGltZTo6aW52YWxpZFRpbWUoKTsKLSAgICAgICAgdHJhY2tCdWZmZXJQYWlyLmxhc3RGcmFtZUR1 cmF0aW9uID0gTWVkaWFUaW1lOjppbnZhbGlkVGltZSgpOwotICAgICAgICB0cmFja0J1ZmZlclBh aXIuaGlnaGVzdFByZXNlbnRhdGlvblRpbWVzdGFtcCA9IE1lZGlhVGltZTo6aW52YWxpZFRpbWUo KTsKLSAgICAgICAgdHJhY2tCdWZmZXJQYWlyLm5lZWRSYW5kb21BY2Nlc3NGbGFnID0gdHJ1ZTsK KyAgICAgICAgdHJhY2tCdWZmZXJQYWlyLmdldCgpLmxhc3REZWNvZGVUaW1lc3RhbXAgPSBNZWRp YVRpbWU6OmludmFsaWRUaW1lKCk7CisgICAgICAgIHRyYWNrQnVmZmVyUGFpci5nZXQoKS5ncmVh dGVzdERlY29kZUR1cmF0aW9uID0gTWVkaWFUaW1lOjppbnZhbGlkVGltZSgpOworICAgICAgICB0 cmFja0J1ZmZlclBhaXIuZ2V0KCkubGFzdEZyYW1lRHVyYXRpb24gPSBNZWRpYVRpbWU6OmludmFs aWRUaW1lKCk7CisgICAgICAgIHRyYWNrQnVmZmVyUGFpci5nZXQoKS5oaWdoZXN0UHJlc2VudGF0 aW9uVGltZXN0YW1wID0gTWVkaWFUaW1lOjppbnZhbGlkVGltZSgpOworICAgICAgICB0cmFja0J1 ZmZlclBhaXIuZ2V0KCkubmVlZFJhbmRvbUFjY2Vzc0ZsYWcgPSB0cnVlOwogICAgIH0KIH0KIApA QCAtOTYsOCArOTYsOCBAQCB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGU6OnVwZGF0ZUhpZ2hlc3RQ cmVzZW50YXRpb25UaW1lc3RhbXAoKQogewogICAgIE1lZGlhVGltZSBoaWdoZXN0VGltZTsKICAg ICBmb3IgKGF1dG8mIHRyYWNrQnVmZmVyIDogbV90cmFja0J1ZmZlck1hcC52YWx1ZXMoKSkgewot ICAgICAgICBhdXRvIGxhc3RTYW1wbGVJdGVyID0gdHJhY2tCdWZmZXIuc2FtcGxlcy5wcmVzZW50 YXRpb25PcmRlcigpLnJiZWdpbigpOwotICAgICAgICBpZiAobGFzdFNhbXBsZUl0ZXIgPT0gdHJh Y2tCdWZmZXIuc2FtcGxlcy5wcmVzZW50YXRpb25PcmRlcigpLnJlbmQoKSkKKyAgICAgICAgYXV0 byBsYXN0U2FtcGxlSXRlciA9IHRyYWNrQnVmZmVyLmdldCgpLnNhbXBsZXMucHJlc2VudGF0aW9u T3JkZXIoKS5yYmVnaW4oKTsKKyAgICAgICAgaWYgKGxhc3RTYW1wbGVJdGVyID09IHRyYWNrQnVm ZmVyLmdldCgpLnNhbXBsZXMucHJlc2VudGF0aW9uT3JkZXIoKS5yZW5kKCkpCiAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgaGlnaGVzdFRpbWUgPSBzdGQ6Om1heChoaWdoZXN0VGltZSwg bGFzdFNhbXBsZUl0ZXItPmZpcnN0KTsKICAgICB9CkBAIC0xMjQsOSArMTI0LDkgQEAgdm9pZCBT b3VyY2VCdWZmZXJQcml2YXRlOjp1cGRhdGVCdWZmZXJlZEZyb21UcmFja0J1ZmZlcnMoYm9vbCBz b3VyY2VJc0VuZGVkKQogICAgIC8vIDIuIExldCBoaWdoZXN0IGVuZCB0aW1lIGJlIHRoZSBsYXJn ZXN0IHRyYWNrIGJ1ZmZlciByYW5nZXMgZW5kIHRpbWUgYWNyb3NzIGFsbCB0aGUgdHJhY2sgYnVm ZmVycyBtYW5hZ2VkIGJ5IHRoaXMgU291cmNlQnVmZmVyIG9iamVjdC4KICAgICBNZWRpYVRpbWUg aGlnaGVzdEVuZFRpbWUgPSBNZWRpYVRpbWU6Om5lZ2F0aXZlSW5maW5pdGVUaW1lKCk7CiAgICAg Zm9yIChhdXRvJiB0cmFja0J1ZmZlciA6IG1fdHJhY2tCdWZmZXJNYXAudmFsdWVzKCkpIHsKLSAg ICAgICAgaWYgKCF0cmFja0J1ZmZlci5idWZmZXJlZC5sZW5ndGgoKSkKKyAgICAgICAgaWYgKCF0 cmFja0J1ZmZlci5nZXQoKS5idWZmZXJlZC5sZW5ndGgoKSkKICAgICAgICAgICAgIGNvbnRpbnVl OwotICAgICAgICBoaWdoZXN0RW5kVGltZSA9IHN0ZDo6bWF4KGhpZ2hlc3RFbmRUaW1lLCB0cmFj a0J1ZmZlci5idWZmZXJlZC5tYXhpbXVtQnVmZmVyZWRUaW1lKCkpOworICAgICAgICBoaWdoZXN0 RW5kVGltZSA9IHN0ZDo6bWF4KGhpZ2hlc3RFbmRUaW1lLCB0cmFja0J1ZmZlci5nZXQoKS5idWZm ZXJlZC5tYXhpbXVtQnVmZmVyZWRUaW1lKCkpOwogICAgIH0KIAogICAgIC8vIE5PVEU6IFNob3J0 IGNpcmN1aXQgdGhlIGZvbGxvd2luZyBpZiBub25lIG9mIHRoZSBUcmFja0J1ZmZlcnMgaGF2ZSBi dWZmZXJlZCByYW5nZXMgdG8gYXZvaWQgZ2VuZXJhdGluZwpAQCAtMTQyLDcgKzE0Miw3IEBAIHZv aWQgU291cmNlQnVmZmVyUHJpdmF0ZTo6dXBkYXRlQnVmZmVyZWRGcm9tVHJhY2tCdWZmZXJzKGJv b2wgc291cmNlSXNFbmRlZCkKICAgICAvLyA0LiBGb3IgZWFjaCBhdWRpbyBhbmQgdmlkZW8gdHJh Y2sgYnVmZmVyIG1hbmFnZWQgYnkgdGhpcyBTb3VyY2VCdWZmZXIsIHJ1biB0aGUgZm9sbG93aW5n IHN0ZXBzOgogICAgIGZvciAoYXV0byYgdHJhY2tCdWZmZXIgOiBtX3RyYWNrQnVmZmVyTWFwLnZh bHVlcygpKSB7CiAgICAgICAgIC8vIDQuMSBMZXQgdHJhY2sgcmFuZ2VzIGVxdWFsIHRoZSB0cmFj ayBidWZmZXIgcmFuZ2VzIGZvciB0aGUgY3VycmVudCB0cmFjayBidWZmZXIuCi0gICAgICAgIFBs YXRmb3JtVGltZVJhbmdlcyB0cmFja1JhbmdlcyA9IHRyYWNrQnVmZmVyLmJ1ZmZlcmVkOworICAg ICAgICBQbGF0Zm9ybVRpbWVSYW5nZXMgdHJhY2tSYW5nZXMgPSB0cmFja0J1ZmZlci5nZXQoKS5i dWZmZXJlZDsKICAgICAgICAgaWYgKCF0cmFja1Jhbmdlcy5sZW5ndGgoKSkKICAgICAgICAgICAg IGNvbnRpbnVlOwogCkBAIC0xNzksMTMgKzE3OSwxMSBAQCB2b2lkIFNvdXJjZUJ1ZmZlclByaXZh dGU6OnJlZW5xdWVTYW1wbGVzKGNvbnN0IEF0b21TdHJpbmcmIHRyYWNrSUQpCiAgICAgaWYgKCFt X2lzQXR0YWNoZWQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGF1dG8gaXQgPSBtX3RyYWNrQnVm ZmVyTWFwLmZpbmQodHJhY2tJRCk7Ci0gICAgaWYgKGl0ID09IG1fdHJhY2tCdWZmZXJNYXAuZW5k KCkpCisgICAgYXV0byogdHJhY2tCdWZmZXIgPSBtX3RyYWNrQnVmZmVyTWFwLmdldCh0cmFja0lE KTsKKyAgICBpZiAoIXRyYWNrQnVmZmVyKQogICAgICAgICByZXR1cm47Ci0KLSAgICBhdXRvJiB0 cmFja0J1ZmZlciA9IGl0LT52YWx1ZTsKLSAgICB0cmFja0J1ZmZlci5uZWVkc1JlZW5xdWV1ZWlu ZyA9IHRydWU7Ci0gICAgcmVlbnF1ZXVlTWVkaWFGb3JUaW1lKHRyYWNrQnVmZmVyLCB0cmFja0lE LCBjdXJyZW50TWVkaWFUaW1lKCkpOworICAgIHRyYWNrQnVmZmVyLT5uZWVkc1JlZW5xdWV1ZWlu ZyA9IHRydWU7CisgICAgcmVlbnF1ZXVlTWVkaWFGb3JUaW1lKCp0cmFja0J1ZmZlciwgdHJhY2tJ RCwgY3VycmVudE1lZGlhVGltZSgpKTsKIH0KIAogdm9pZCBTb3VyY2VCdWZmZXJQcml2YXRlOjpz ZWVrVG9UaW1lKGNvbnN0IE1lZGlhVGltZSYgdGltZSkKQEAgLTIwMiwyMCArMjAwLDE5IEBAIHZv aWQgU291cmNlQnVmZmVyUHJpdmF0ZTo6c2Vla1RvVGltZShjb25zdCBNZWRpYVRpbWUmIHRpbWUp CiB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGU6OmNsZWFyVHJhY2tCdWZmZXJzKCkKIHsKICAgICBm b3IgKGF1dG8mIHRyYWNrQnVmZmVyUGFpciA6IG1fdHJhY2tCdWZmZXJNYXAudmFsdWVzKCkpIHsK LSAgICAgICAgdHJhY2tCdWZmZXJQYWlyLnNhbXBsZXMuY2xlYXIoKTsKLSAgICAgICAgdHJhY2tC dWZmZXJQYWlyLmRlY29kZVF1ZXVlLmNsZWFyKCk7CisgICAgICAgIHRyYWNrQnVmZmVyUGFpci5n ZXQoKS5zYW1wbGVzLmNsZWFyKCk7CisgICAgICAgIHRyYWNrQnVmZmVyUGFpci5nZXQoKS5kZWNv ZGVRdWV1ZS5jbGVhcigpOwogICAgIH0KIH0KIAogdm9pZCBTb3VyY2VCdWZmZXJQcml2YXRlOjpi dWZmZXJlZFNhbXBsZXNGb3JUcmFja0lkKGNvbnN0IEF0b21TdHJpbmcmIHRyYWNrSWQsIENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoVmVjdG9yPFN0cmluZz4mJik+JiYgY29tcGxldGlvbkhhbmRsZXIp CiB7Ci0gICAgYXV0byBpdCA9IG1fdHJhY2tCdWZmZXJNYXAuZmluZCh0cmFja0lkKTsKLSAgICBp ZiAoaXQgPT0gbV90cmFja0J1ZmZlck1hcC5lbmQoKSkKKyAgICBhdXRvKiB0cmFja0J1ZmZlciA9 IG1fdHJhY2tCdWZmZXJNYXAuZ2V0KHRyYWNrSWQpOworICAgIGlmICghdHJhY2tCdWZmZXIpCiAg ICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHsgfSk7CiAKLSAgICBhdXRvJiB0cmFja0J1ZmZlciA9 IGl0LT52YWx1ZTsKICAgICBWZWN0b3I8U3RyaW5nPiBzYW1wbGVEZXNjcmlwdGlvbnM7Ci0gICAg Zm9yIChhdXRvJiBwYWlyIDogdHJhY2tCdWZmZXIuc2FtcGxlcy5kZWNvZGVPcmRlcigpKQorICAg IGZvciAoYXV0byYgcGFpciA6IHRyYWNrQnVmZmVyLT5zYW1wbGVzLmRlY29kZU9yZGVyKCkpCiAg ICAgICAgIHNhbXBsZURlc2NyaXB0aW9ucy5hcHBlbmQodG9TdHJpbmcoKnBhaXIuc2Vjb25kKSk7 CiAKICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKHNhbXBsZURlc2NyaXB0aW9ucykpOwpA QCAtMjMwLDEwICsyMjcsMTAgQEAgTWVkaWFUaW1lIFNvdXJjZUJ1ZmZlclByaXZhdGU6OmZhc3RT ZWVrVGltZUZvck1lZGlhVGltZShjb25zdCBNZWRpYVRpbWUmIHRhcmdldFQKIAogICAgIGZvciAo YXV0byYgdHJhY2tCdWZmZXIgOiBtX3RyYWNrQnVmZmVyTWFwLnZhbHVlcygpKSB7CiAgICAgICAg IC8vIEZpbmQgdGhlIHNhbXBsZSB3aGljaCBjb250YWlucyB0aGUgdGFyZ2V0IHRpbWUgdGltZS4K LSAgICAgICAgYXV0byBmdXR1cmVTeW5jU2FtcGxlSXRlcmF0b3IgPSB0cmFja0J1ZmZlci5zYW1w bGVzLmRlY29kZU9yZGVyKCkuZmluZFN5bmNTYW1wbGVBZnRlclByZXNlbnRhdGlvblRpbWUodGFy Z2V0VGltZSwgcG9zaXRpdmVUaHJlc2hvbGQpOwotICAgICAgICBhdXRvIHBhc3RTeW5jU2FtcGxl SXRlcmF0b3IgPSB0cmFja0J1ZmZlci5zYW1wbGVzLmRlY29kZU9yZGVyKCkuZmluZFN5bmNTYW1w bGVQcmlvclRvUHJlc2VudGF0aW9uVGltZSh0YXJnZXRUaW1lLCBuZWdhdGl2ZVRocmVzaG9sZCk7 Ci0gICAgICAgIGF1dG8gdXBwZXJCb3VuZCA9IHRyYWNrQnVmZmVyLnNhbXBsZXMuZGVjb2RlT3Jk ZXIoKS5lbmQoKTsKLSAgICAgICAgYXV0byBsb3dlckJvdW5kID0gdHJhY2tCdWZmZXIuc2FtcGxl cy5kZWNvZGVPcmRlcigpLnJlbmQoKTsKKyAgICAgICAgYXV0byBmdXR1cmVTeW5jU2FtcGxlSXRl cmF0b3IgPSB0cmFja0J1ZmZlci5nZXQoKS5zYW1wbGVzLmRlY29kZU9yZGVyKCkuZmluZFN5bmNT YW1wbGVBZnRlclByZXNlbnRhdGlvblRpbWUodGFyZ2V0VGltZSwgcG9zaXRpdmVUaHJlc2hvbGQp OworICAgICAgICBhdXRvIHBhc3RTeW5jU2FtcGxlSXRlcmF0b3IgPSB0cmFja0J1ZmZlci5nZXQo KS5zYW1wbGVzLmRlY29kZU9yZGVyKCkuZmluZFN5bmNTYW1wbGVQcmlvclRvUHJlc2VudGF0aW9u VGltZSh0YXJnZXRUaW1lLCBuZWdhdGl2ZVRocmVzaG9sZCk7CisgICAgICAgIGF1dG8gdXBwZXJC b3VuZCA9IHRyYWNrQnVmZmVyLmdldCgpLnNhbXBsZXMuZGVjb2RlT3JkZXIoKS5lbmQoKTsKKyAg ICAgICAgYXV0byBsb3dlckJvdW5kID0gdHJhY2tCdWZmZXIuZ2V0KCkuc2FtcGxlcy5kZWNvZGVP cmRlcigpLnJlbmQoKTsKIAogICAgICAgICBpZiAoZnV0dXJlU3luY1NhbXBsZUl0ZXJhdG9yID09 IHVwcGVyQm91bmQgJiYgcGFzdFN5bmNTYW1wbGVJdGVyYXRvciA9PSBsb3dlckJvdW5kKQogICAg ICAgICAgICAgY29udGludWU7CkBAIC03MzQsNyArNzMxLDcgQEAgdWludDY0X3QgU291cmNlQnVm ZmVyUHJpdmF0ZTo6dG90YWxUcmFja0J1ZmZlclNpemVJbkJ5dGVzKCkgY29uc3QKIHsKICAgICB1 aW50NjRfdCB0b3RhbFNpemVJbkJ5dGVzID0gMDsKICAgICBmb3IgKGF1dG8mIHRyYWNrQnVmZmVy IDogbV90cmFja0J1ZmZlck1hcC52YWx1ZXMoKSkKLSAgICAgICAgdG90YWxTaXplSW5CeXRlcyAr PSB0cmFja0J1ZmZlci5zYW1wbGVzLnNpemVJbkJ5dGVzKCk7CisgICAgICAgIHRvdGFsU2l6ZUlu Qnl0ZXMgKz0gdHJhY2tCdWZmZXIuZ2V0KCkuc2FtcGxlcy5zaXplSW5CeXRlcygpOwogCiAgICAg cmV0dXJuIHRvdGFsU2l6ZUluQnl0ZXM7CiB9CkBAIC03NDIsMTMgKzczOSwxMyBAQCB1aW50NjRf dCBTb3VyY2VCdWZmZXJQcml2YXRlOjp0b3RhbFRyYWNrQnVmZmVyU2l6ZUluQnl0ZXMoKSBjb25z dAogdm9pZCBTb3VyY2VCdWZmZXJQcml2YXRlOjphZGRUcmFja0J1ZmZlcihjb25zdCBBdG9tU3Ry aW5nJiB0cmFja0lkLCBSZWZQdHI8TWVkaWFEZXNjcmlwdGlvbj4mJiBkZXNjcmlwdGlvbikKIHsK ICAgICBBU1NFUlQoIW1fdHJhY2tCdWZmZXJNYXAuY29udGFpbnModHJhY2tJZCkpOwotICAgIGF1 dG8mIHRyYWNrQnVmZmVyID0gbV90cmFja0J1ZmZlck1hcC5hZGQodHJhY2tJZCwgVHJhY2tCdWZm ZXIoKSkuaXRlcmF0b3ItPnZhbHVlOworICAgIGF1dG8mIHRyYWNrQnVmZmVyID0gbV90cmFja0J1 ZmZlck1hcC5hZGQodHJhY2tJZCwgbWFrZVVuaXF1ZVJlZjxUcmFja0J1ZmZlcj4oKSkuaXRlcmF0 b3ItPnZhbHVlOwogCiAgICAgLy8gNS4yLjkgQWRkIHRoZSB0cmFjayBkZXNjcmlwdGlvbiBmb3Ig dGhpcyB0cmFjayB0byB0aGUgdHJhY2sgYnVmZmVyLgotICAgIHRyYWNrQnVmZmVyLmRlc2NyaXB0 aW9uID0gZGVzY3JpcHRpb247CisgICAgdHJhY2tCdWZmZXIuZ2V0KCkuZGVzY3JpcHRpb24gPSBk ZXNjcmlwdGlvbjsKIAotICAgIG1faGFzQXVkaW8gPSBtX2hhc0F1ZGlvIHx8IHRyYWNrQnVmZmVy LmRlc2NyaXB0aW9uLT5pc0F1ZGlvKCk7Ci0gICAgbV9oYXNWaWRlbyA9IG1faGFzVmlkZW8gfHwg dHJhY2tCdWZmZXIuZGVzY3JpcHRpb24tPmlzVmlkZW8oKTsKKyAgICBtX2hhc0F1ZGlvID0gbV9o YXNBdWRpbyB8fCB0cmFja0J1ZmZlci5nZXQoKS5kZXNjcmlwdGlvbi0+aXNBdWRpbygpOworICAg IG1faGFzVmlkZW8gPSBtX2hhc1ZpZGVvIHx8IHRyYWNrQnVmZmVyLmdldCgpLmRlc2NyaXB0aW9u LT5pc1ZpZGVvKCk7CiB9CiAKIHZvaWQgU291cmNlQnVmZmVyUHJpdmF0ZTo6dXBkYXRlVHJhY2tJ ZHMoVmVjdG9yPHN0ZDo6cGFpcjxBdG9tU3RyaW5nLCBBdG9tU3RyaW5nPj4mJiB0cmFja0lkUGFp cnMpCkBAIC03NTgsMTQgKzc1NSwxNiBAQCB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGU6OnVwZGF0 ZVRyYWNrSWRzKFZlY3RvcjxzdGQ6OnBhaXI8QXRvbVN0cmluZywgQXRvbVN0cmluZwogICAgICAg ICBhdXRvIG5ld0lkID0gdHJhY2tJZFBhaXIuc2Vjb25kOwogICAgICAgICBBU1NFUlQob2xkSWQg IT0gbmV3SWQpOwogICAgICAgICBhdXRvIHRyYWNrQnVmZmVyID0gbV90cmFja0J1ZmZlck1hcC50 YWtlKG9sZElkKTsKLSAgICAgICAgbV90cmFja0J1ZmZlck1hcC5hZGQobmV3SWQsIFdURk1vdmUo dHJhY2tCdWZmZXIpKTsKKyAgICAgICAgaWYgKCF0cmFja0J1ZmZlcikKKyAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICBtX3RyYWNrQnVmZmVyTWFwLmFkZChuZXdJZCwgbWFrZVVuaXF1ZVJl ZkZyb21Ob25OdWxsVW5pcXVlUHRyKFdURk1vdmUodHJhY2tCdWZmZXIpKSk7CiAgICAgfQogfQog CiB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGU6OnNldEFsbFRyYWNrQnVmZmVyc05lZWRSYW5kb21B Y2Nlc3MoKQogewogICAgIGZvciAoYXV0byYgdHJhY2tCdWZmZXIgOiBtX3RyYWNrQnVmZmVyTWFw LnZhbHVlcygpKQotICAgICAgICB0cmFja0J1ZmZlci5uZWVkUmFuZG9tQWNjZXNzRmxhZyA9IHRy dWU7CisgICAgICAgIHRyYWNrQnVmZmVyLmdldCgpLm5lZWRSYW5kb21BY2Nlc3NGbGFnID0gdHJ1 ZTsKIH0KIAogdm9pZCBTb3VyY2VCdWZmZXJQcml2YXRlOjpkaWRSZWNlaXZlSW5pdGlhbGl6YXRp b25TZWdtZW50KFNvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQ6OkluaXRpYWxpemF0aW9uU2VnbWVu dCYmIHNlZ21lbnQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxl cikKQEAgLTg3OSw4ICs4NzgsOCBAQCB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGU6OmRpZFJlY2Vp dmVTYW1wbGUoUmVmPE1lZGlhU2FtcGxlPiYmIG9yaWdpbmFsU2FtcGxlKQogICAgICAgICAgICAg bV90aW1lc3RhbXBPZmZzZXQgPSBtX2dyb3VwU3RhcnRUaW1lc3RhbXA7CiAKICAgICAgICAgICAg IGZvciAoYXV0byYgdHJhY2tCdWZmZXIgOiBtX3RyYWNrQnVmZmVyTWFwLnZhbHVlcygpKSB7Ci0g ICAgICAgICAgICAgICAgdHJhY2tCdWZmZXIubGFzdEZyYW1lVGltZXNjYWxlID0gMDsKLSAgICAg ICAgICAgICAgICB0cmFja0J1ZmZlci5yb3VuZGVkVGltZXN0YW1wT2Zmc2V0ID0gTWVkaWFUaW1l OjppbnZhbGlkVGltZSgpOworICAgICAgICAgICAgICAgIHRyYWNrQnVmZmVyLmdldCgpLmxhc3RG cmFtZVRpbWVzY2FsZSA9IDA7CisgICAgICAgICAgICAgICAgdHJhY2tCdWZmZXIuZ2V0KCkucm91 bmRlZFRpbWVzdGFtcE9mZnNldCA9IE1lZGlhVGltZTo6aW52YWxpZFRpbWUoKTsKICAgICAgICAg ICAgIH0KIAogICAgICAgICAgICAgLy8gMS4zLjIgU2V0IGdyb3VwIGVuZCB0aW1lc3RhbXAgZXF1 YWwgdG8gZ3JvdXAgc3RhcnQgdGltZXN0YW1wLgpAQCAtODg4LDcgKzg4Nyw3IEBAIHZvaWQgU291 cmNlQnVmZmVyUHJpdmF0ZTo6ZGlkUmVjZWl2ZVNhbXBsZShSZWY8TWVkaWFTYW1wbGU+JiYgb3Jp Z2luYWxTYW1wbGUpCiAKICAgICAgICAgICAgIC8vIDEuMy4zIFNldCB0aGUgbmVlZCByYW5kb20g YWNjZXNzIHBvaW50IGZsYWcgb24gYWxsIHRyYWNrIGJ1ZmZlcnMgdG8gdHJ1ZS4KICAgICAgICAg ICAgIGZvciAoYXV0byYgdHJhY2tCdWZmZXIgOiBtX3RyYWNrQnVmZmVyTWFwLnZhbHVlcygpKQot ICAgICAgICAgICAgICAgIHRyYWNrQnVmZmVyLm5lZWRSYW5kb21BY2Nlc3NGbGFnID0gdHJ1ZTsK KyAgICAgICAgICAgICAgICB0cmFja0J1ZmZlci5nZXQoKS5uZWVkUmFuZG9tQWNjZXNzRmxhZyA9 IHRydWU7CiAKICAgICAgICAgICAgIC8vIDEuMy40IFVuc2V0IGdyb3VwIHN0YXJ0IHRpbWVzdGFt cC4KICAgICAgICAgICAgIG1fZ3JvdXBTdGFydFRpbWVzdGFtcCA9IE1lZGlhVGltZTo6aW52YWxp ZFRpbWUoKTsKQEAgLTk2MCwxNCArOTU5LDE0IEBAIHZvaWQgU291cmNlQnVmZmVyUHJpdmF0ZTo6 ZGlkUmVjZWl2ZVNhbXBsZShSZWY8TWVkaWFTYW1wbGU+JiYgb3JpZ2luYWxTYW1wbGUpCiAKICAg ICAgICAgICAgIGZvciAoYXV0byYgdHJhY2tCdWZmZXIgOiBtX3RyYWNrQnVmZmVyTWFwLnZhbHVl cygpKSB7CiAgICAgICAgICAgICAgICAgLy8gMS42LjIgVW5zZXQgdGhlIGxhc3QgZGVjb2RlIHRp bWVzdGFtcCBvbiBhbGwgdHJhY2sgYnVmZmVycy4KLSAgICAgICAgICAgICAgICB0cmFja0J1ZmZl ci5sYXN0RGVjb2RlVGltZXN0YW1wID0gTWVkaWFUaW1lOjppbnZhbGlkVGltZSgpOworICAgICAg ICAgICAgICAgIHRyYWNrQnVmZmVyLmdldCgpLmxhc3REZWNvZGVUaW1lc3RhbXAgPSBNZWRpYVRp bWU6OmludmFsaWRUaW1lKCk7CiAgICAgICAgICAgICAgICAgLy8gMS42LjMgVW5zZXQgdGhlIGxh c3QgZnJhbWUgZHVyYXRpb24gb24gYWxsIHRyYWNrIGJ1ZmZlcnMuCi0gICAgICAgICAgICAgICAg dHJhY2tCdWZmZXIuZ3JlYXRlc3REZWNvZGVEdXJhdGlvbiA9IE1lZGlhVGltZTo6aW52YWxpZFRp bWUoKTsKLSAgICAgICAgICAgICAgICB0cmFja0J1ZmZlci5sYXN0RnJhbWVEdXJhdGlvbiA9IE1l ZGlhVGltZTo6aW52YWxpZFRpbWUoKTsKKyAgICAgICAgICAgICAgICB0cmFja0J1ZmZlci5nZXQo KS5ncmVhdGVzdERlY29kZUR1cmF0aW9uID0gTWVkaWFUaW1lOjppbnZhbGlkVGltZSgpOworICAg ICAgICAgICAgICAgIHRyYWNrQnVmZmVyLmdldCgpLmxhc3RGcmFtZUR1cmF0aW9uID0gTWVkaWFU aW1lOjppbnZhbGlkVGltZSgpOwogICAgICAgICAgICAgICAgIC8vIDEuNi40IFVuc2V0IHRoZSBo aWdoZXN0IHByZXNlbnRhdGlvbiB0aW1lc3RhbXAgb24gYWxsIHRyYWNrIGJ1ZmZlcnMuCi0gICAg ICAgICAgICAgICAgdHJhY2tCdWZmZXIuaGlnaGVzdFByZXNlbnRhdGlvblRpbWVzdGFtcCA9IE1l ZGlhVGltZTo6aW52YWxpZFRpbWUoKTsKKyAgICAgICAgICAgICAgICB0cmFja0J1ZmZlci5nZXQo KS5oaWdoZXN0UHJlc2VudGF0aW9uVGltZXN0YW1wID0gTWVkaWFUaW1lOjppbnZhbGlkVGltZSgp OwogICAgICAgICAgICAgICAgIC8vIDEuNi41IFNldCB0aGUgbmVlZCByYW5kb20gYWNjZXNzIHBv aW50IGZsYWcgb24gYWxsIHRyYWNrIGJ1ZmZlcnMgdG8gdHJ1ZS4KLSAgICAgICAgICAgICAgICB0 cmFja0J1ZmZlci5uZWVkUmFuZG9tQWNjZXNzRmxhZyA9IHRydWU7CisgICAgICAgICAgICAgICAg dHJhY2tCdWZmZXIuZ2V0KCkubmVlZFJhbmRvbUFjY2Vzc0ZsYWcgPSB0cnVlOwogICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICAvLyAxLjYuNiBKdW1wIHRvIHRoZSBMb29wIFRvcCBzdGVwIGFi b3ZlIHRvIHJlc3RhcnQgcHJvY2Vzc2luZyBvZiB0aGUgY3VycmVudCBjb2RlZCBmcmFtZS4KQEAg LTEyNjYsOCArMTI2NSw4IEBAIHZvaWQgU291cmNlQnVmZmVyUHJpdmF0ZTo6ZGlkUmVjZWl2ZVNh bXBsZShSZWY8TWVkaWFTYW1wbGU+JiYgb3JpZ2luYWxTYW1wbGUpCiAgICAgICAgIGlmIChtX3No b3VsZEdlbmVyYXRlVGltZXN0YW1wcykgewogICAgICAgICAgICAgbV90aW1lc3RhbXBPZmZzZXQg PSBmcmFtZUVuZFRpbWVzdGFtcDsKICAgICAgICAgICAgIGZvciAoYXV0byYgdHJhY2tCdWZmZXIg OiBtX3RyYWNrQnVmZmVyTWFwLnZhbHVlcygpKSB7Ci0gICAgICAgICAgICAgICAgdHJhY2tCdWZm ZXIubGFzdEZyYW1lVGltZXNjYWxlID0gMDsKLSAgICAgICAgICAgICAgICB0cmFja0J1ZmZlci5y b3VuZGVkVGltZXN0YW1wT2Zmc2V0ID0gTWVkaWFUaW1lOjppbnZhbGlkVGltZSgpOworICAgICAg ICAgICAgICAgIHRyYWNrQnVmZmVyLmdldCgpLmxhc3RGcmFtZVRpbWVzY2FsZSA9IDA7CisgICAg ICAgICAgICAgICAgdHJhY2tCdWZmZXIuZ2V0KCkucm91bmRlZFRpbWVzdGFtcE9mZnNldCA9IE1l ZGlhVGltZTo6aW52YWxpZFRpbWUoKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Tb3VyY2VCdWZmZXJQcml2 YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Tb3VyY2VCdWZmZXJQcml2 YXRlLmgKaW5kZXggNjk3OGFmMmZmYjM0NTc1NGU0OTA4Nzg2MzQ4ODY0MmY0ZmU0ZDA4Ni4uZDA5 YjJiNDViZTBlNDdmZjRlOWE3ZDEzNThlNWIxMjc4MGQwZDk4NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU291cmNlQnVmZmVyUHJpdmF0ZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NvdXJjZUJ1ZmZlclByaXZhdGUuaApAQCAt MTEwLDYgKzExMCw3IEBAIHB1YmxpYzoKICAgICBNZWRpYVRpbWUgdGltZXN0YW1wT2Zmc2V0KCkg Y29uc3QgeyByZXR1cm4gbV90aW1lc3RhbXBPZmZzZXQ7IH0KIAogICAgIHN0cnVjdCBUcmFja0J1 ZmZlciB7CisgICAgICAgIFdURl9NQUtFX1NUUlVDVF9GQVNUX0FMTE9DQVRFRDsKICAgICAgICAg TWVkaWFUaW1lIGxhc3REZWNvZGVUaW1lc3RhbXA7CiAgICAgICAgIE1lZGlhVGltZSBncmVhdGVz dERlY29kZUR1cmF0aW9uOwogICAgICAgICBNZWRpYVRpbWUgbGFzdEZyYW1lRHVyYXRpb247CkBA IC0xODMsNyArMTg0LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1faGFzQXVkaW8geyBmYWxzZSB9 OwogICAgIGJvb2wgbV9oYXNWaWRlbyB7IGZhbHNlIH07CiAKLSAgICBIYXNoTWFwPEF0b21TdHJp bmcsIFRyYWNrQnVmZmVyPiBtX3RyYWNrQnVmZmVyTWFwOworICAgIEhhc2hNYXA8QXRvbVN0cmlu ZywgVW5pcXVlUmVmPFRyYWNrQnVmZmVyPj4gbV90cmFja0J1ZmZlck1hcDsKIAogICAgIFNvdXJj ZUJ1ZmZlckFwcGVuZE1vZGUgbV9hcHBlbmRNb2RlIHsgU291cmNlQnVmZmVyQXBwZW5kTW9kZTo6 U2VnbWVudHMgfTsKIAo=