208827 2020-03-09 13:07:38 -0700 [MSE] Use CMSampleBufferGetOutputPresentationTime / CMSampleBufferGetOutputDuration for all presentation times and durations 2020-08-24 18:41:34 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=215774 InRadar P2 Normal --- 1 jer.noble jer.noble aboya calvaris commit-queue eric.carlson ews-watchlist glenn hta philipj sergio tommyw webkit-bug-importer oldest_to_newest 1627926 0 jer.noble 2020-03-09 13:07:38 -0700 [MSE] Use CMSampleBufferGetOutputPresentationTime / CMSampleBufferGetOutputDuration for all presentation times and durations 1627942 1 jer.noble 2020-03-09 13:38:58 -0700 <rdar://problem/55271538> 1627943 2 393068 jer.noble 2020-03-09 13:39:18 -0700 Created attachment 393068 Patch 1627946 3 393070 jer.noble 2020-03-09 13:45:02 -0700 Created attachment 393070 Patch 1627954 4 393071 jer.noble 2020-03-09 14:02:29 -0700 Created attachment 393071 Patch 1628308 5 393071 commit-queue 2020-03-10 10:36:31 -0700 Comment on attachment 393071 Patch Clearing flags on attachment: 393071 Committed r258215: <https://trac.webkit.org/changeset/258215> 1628309 6 commit-queue 2020-03-10 10:36:33 -0700 All reviewed patches have been landed. Closing bug. 393068 2020-03-09 13:39:18 -0700 2020-03-09 13:45:00 -0700 Patch bug-208827-20200309133917.patch text/plain 10222 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGU5MGIyOGY3YTI2OTI1 YjM3ZTk2ZjAzMjAzYzU1ZjViMzdkZTQ2ZC4uYjAwMTk5MjcxNDk0MDQyY2ZlMDRiOGRkYjAyMzhj OTIwNDYyMzU0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIwLTAzLTA5ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNU0VdIFVzZSBDTVNhbXBs ZUJ1ZmZlckdldE91dHB1dFByZXNlbnRhdGlvblRpbWVTdGFtcCAvIENNU2FtcGxlQnVmZmVyR2V0 T3V0cHV0RHVyYXRpb24gZm9yIGFsbCBwcmVzZW50YXRpb24gdGltZXMgYW5kIGR1cmF0aW9ucwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4ODI3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ01TYW1wbGVC dWZmZXJHZXRPdXRwdXRQcmVzZW50YXRpb25UaW1lU3RhbXAgdGFrZXMgaW50byBhY2NvdW50IHBy ZS1yb2xsIHRyaW0gZHVyYXRpb25zIGFuZAorICAgICAgICBtb3ZpZSBlZGl0IGxpc3RzLCBhbmQg YXMgc3VjaCwgc2hvdWxkIGJlIHVzZWQgYXMgdGhlICJjb3JyZWN0IiB2YWx1ZSBmb3IgInByZXNl bnRhdGlvbgorICAgICAgICB0aW1lIi4KKworICAgICAgICBvdXRwdXRQcmVzZW50YXRpb25UaW1l KCkgaXMgaW5jb25zaXN0ZW50bHkgdXNlZCwgc28gcmF0aGVyIHRoYW4gcmVwbGFjaW5nIGFsbCBy ZWZlcmVuY2VzIG9mCisgICAgICAgIG91dHB1dFByZXNlbnRhdGlvblRpbWUoKSB3aXRoIHByZXNl bnRhdGlvblRpbWUoKSwgc2ltcGx5IHJlZGVmaW5lIHByZXNldGF0aW9uVGltZSgpIGluIHRlcm1z CisgICAgICAgIG9mIENNU2FtcGxlQnVmZmVyR2V0UHJlc2VudGF0aW9uVGltZVN0YW1wKCkgYW5k IHJlbW92ZSBvdXRwdXRQcmVzZW50YXRpb25UaW1lKCkgZW50aXJlbHkuCisKKyAgICAgICAgKiBN b2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT b3VyY2VCdWZmZXI6OnVwZGF0ZU1pbmltdW1VcGNvbWluZ1ByZXNlbnRhdGlvblRpbWUpOgorICAg ICAgICAqIHBsYXRmb3JtL01lZGlhU2FtcGxlLmg6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNh bXBsZTo6b3V0cHV0UHJlc2VudGF0aW9uVGltZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVNhbXBsZTo6b3V0cHV0RHVyYXRpb24gY29uc3QpOiBEZWxldGVkLgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJp dmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6Y2FsY3VsYXRlVGltZWxpbmVPZmZzZXQpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU2FtcGxlQVZG T2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhU2FtcGxlQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2FtcGxlQVZGT2Jq Qzo6cHJlc2VudGF0aW9uVGltZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNhbXBs ZUFWRk9iakM6OmR1cmF0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2FtcGxl QVZGT2JqQzo6b3V0cHV0RHVyYXRpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFT YW1wbGVBVkZPYmpDOjpkdW1wIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2FtcGxl QVZGT2JqQzo6dG9KU09OU3RyaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Ft cGxlQVZGT2JqQzo6b3V0cHV0UHJlc2VudGF0aW9uVGltZSBjb25zdCk6IERlbGV0ZWQuCisgICAg ICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVWaWRlb0NhcHR1cmVTb3VyY2UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVhbHRpbWVWaWRlb0NhcHR1cmVTb3VyY2U6OmFkYXB0Vmlk ZW9TYW1wbGUpOgorCiAyMDIwLTAyLTA3ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29t PgogCiAgICAgICAgIFJlbmFtZSBNZWRpYUNhcGFiaWxpdGllc0RlY29kaW5nSW5mby5zdXBwb3J0 ZWRDb25maWd1cmF0aW9uIHRvIC5jb25maWd1cmF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKaW5kZXggZGI3MzEwNDc0NDFi NWNkZjk5YzZjOGExMThlMThlMmMxZDhkOTA4Yy4uZTcyMjJhMDY5OGM1MDA5M2EzNDhiYjdiOTUw MzMwNjFiZTk5ZDQwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNv dXJjZS9Tb3VyY2VCdWZmZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz b3VyY2UvU291cmNlQnVmZmVyLmNwcApAQCAtMjA5Nyw3ICsyMDk3LDcgQEAgdm9pZCBTb3VyY2VC dWZmZXI6OnVwZGF0ZU1pbmltdW1VcGNvbWluZ1ByZXNlbnRhdGlvblRpbWUoVHJhY2tCdWZmZXIm IHRyYWNrQnVmZmUKICAgICB9CiAKICAgICBhdXRvIG1pblB0cyA9IHN0ZDo6bWluX2VsZW1lbnQo dHJhY2tCdWZmZXIuZGVjb2RlUXVldWUuYmVnaW4oKSwgdHJhY2tCdWZmZXIuZGVjb2RlUXVldWUu ZW5kKCksIFtdKGF1dG8mIGxlZnQsIGF1dG8mIHJpZ2h0KSAtPiBib29sIHsKLSAgICAgICAgcmV0 dXJuIGxlZnQuc2Vjb25kLT5vdXRwdXRQcmVzZW50YXRpb25UaW1lKCkgPCByaWdodC5zZWNvbmQt Pm91dHB1dFByZXNlbnRhdGlvblRpbWUoKTsKKyAgICAgICAgcmV0dXJuIGxlZnQuc2Vjb25kLT5w cmVzZW50YXRpb25UaW1lKCkgPCByaWdodC5zZWNvbmQtPnByZXNlbnRhdGlvblRpbWUoKTsKICAg ICB9KTsKIAogICAgIGlmIChtaW5QdHMgPT0gdHJhY2tCdWZmZXIuZGVjb2RlUXVldWUuZW5kKCkp IHsKQEAgLTIxMDYsNyArMjEwNiw3IEBAIHZvaWQgU291cmNlQnVmZmVyOjp1cGRhdGVNaW5pbXVt VXBjb21pbmdQcmVzZW50YXRpb25UaW1lKFRyYWNrQnVmZmVyJiB0cmFja0J1ZmZlCiAgICAgICAg IHJldHVybjsKICAgICB9CiAKLSAgICB0cmFja0J1ZmZlci5taW5pbXVtRW5xdWV1ZWRQcmVzZW50 YXRpb25UaW1lID0gbWluUHRzLT5zZWNvbmQtPm91dHB1dFByZXNlbnRhdGlvblRpbWUoKTsKKyAg ICB0cmFja0J1ZmZlci5taW5pbXVtRW5xdWV1ZWRQcmVzZW50YXRpb25UaW1lID0gbWluUHRzLT5z ZWNvbmQtPnByZXNlbnRhdGlvblRpbWUoKTsKICAgICBtX3ByaXZhdGUtPnNldE1pbmltdW1VcGNv bWluZ1ByZXNlbnRhdGlvblRpbWUodHJhY2tJRCwgdHJhY2tCdWZmZXIubWluaW11bUVucXVldWVk UHJlc2VudGF0aW9uVGltZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL01lZGlhU2FtcGxlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZWRpYVNhbXBsZS5o CmluZGV4IDZjNDk1YzY2YmE3MWZjYThmYzk2MTdmMWIxNjY1ZTE3YmZhMjdkN2UuLjdmYzlkZTEx MjdhNmRlOTRlOGQxODAyNzYwYTkyMTNlMDEzYzcxNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL01lZGlhU2FtcGxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v TWVkaWFTYW1wbGUuaApAQCAtNTksMTAgKzU5LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgfk1l ZGlhU2FtcGxlKCkgPSBkZWZhdWx0OwogCiAgICAgdmlydHVhbCBNZWRpYVRpbWUgcHJlc2VudGF0 aW9uVGltZSgpIGNvbnN0ID0gMDsKLSAgICB2aXJ0dWFsIE1lZGlhVGltZSBvdXRwdXRQcmVzZW50 YXRpb25UaW1lKCkgY29uc3QgeyByZXR1cm4gcHJlc2VudGF0aW9uVGltZSgpOyB9CiAgICAgdmly dHVhbCBNZWRpYVRpbWUgZGVjb2RlVGltZSgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIE1lZGlh VGltZSBkdXJhdGlvbigpIGNvbnN0ID0gMDsKLSAgICB2aXJ0dWFsIE1lZGlhVGltZSBvdXRwdXRE dXJhdGlvbigpIGNvbnN0IHsgcmV0dXJuIGR1cmF0aW9uKCk7IH0KICAgICB2aXJ0dWFsIEF0b21T dHJpbmcgdHJhY2tJRCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0VHJhY2tJRChj b25zdCBTdHJpbmcmKSA9IDA7CiAgICAgdmlydHVhbCBzaXplX3Qgc2l6ZUluQnl0ZXMoKSBjb25z dCA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBs YXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0KaW5kZXggMDQ5ZjdhNTRmNTQ1YmI0N2I1 YjBmM2NlNTYwYmI3ZjRhNmE0ZjZjYy4uMjYxMjczYWRkOTMzNzc3YzlmMTViMWEzMjJjOTE0MThk NmIwNTcwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbQpAQCAtMjI5LDkgKzIyOSw3IEBA IE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1B VkZPYmpDOjpzdXBwb3J0c1R5cGUoY29uCiAKIE1lZGlhVGltZSBNZWRpYVBsYXllclByaXZhdGVN ZWRpYVN0cmVhbUFWRk9iakM6OmNhbGN1bGF0ZVRpbWVsaW5lT2Zmc2V0KGNvbnN0IE1lZGlhU2Ft cGxlJiBzYW1wbGUsIGRvdWJsZSBsYXRlbmN5KQogewotICAgIE1lZGlhVGltZSBzYW1wbGVUaW1l ID0gc2FtcGxlLm91dHB1dFByZXNlbnRhdGlvblRpbWUoKTsKLSAgICBpZiAoIXNhbXBsZVRpbWUg fHwgIXNhbXBsZVRpbWUuaXNWYWxpZCgpKQotICAgICAgICBzYW1wbGVUaW1lID0gc2FtcGxlLnBy ZXNlbnRhdGlvblRpbWUoKTsKKyAgICBNZWRpYVRpbWUgc2FtcGxlVGltZSA9IHNhbXBsZS5wcmVz ZW50YXRpb25UaW1lKCk7CiAgICAgTWVkaWFUaW1lIHRpbWVsaW5lT2Zmc2V0ID0gc3RyZWFtVGlt ZSgpIC0gc2FtcGxlVGltZSArIE1lZGlhVGltZTo6Y3JlYXRlV2l0aERvdWJsZShsYXRlbmN5KTsK ICAgICBpZiAodGltZWxpbmVPZmZzZXQudGltZVNjYWxlKCkgIT0gc2FtcGxlVGltZS50aW1lU2Nh bGUoKSkKICAgICAgICAgdGltZWxpbmVPZmZzZXQgPSBQQUw6OnRvTWVkaWFUaW1lKENNVGltZUNv bnZlcnRTY2FsZShQQUw6OnRvQ01UaW1lKHRpbWVsaW5lT2Zmc2V0KSwgc2FtcGxlVGltZS50aW1l U2NhbGUoKSwga0NNVGltZVJvdW5kaW5nTWV0aG9kX0RlZmF1bHQpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU2Ft cGxlQVZGT2JqQy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLmgKaW5kZXggZjg1NWUxOWUwMzE0ZmRiNGE2NmNh YWE3ZjlkODIxMGQ0ZWM1ZWUyYi4uMjQzNjI2ODEyNzc2ZWE4ZTM1YWM1ZjYwYjRhMzM0MThiMDQ1 NzQ2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLmgKQEAg LTQ0LDEwICs0NCw4IEBAIHB1YmxpYzoKICAgICBSZWZQdHI8SlNDOjpVaW50OENsYW1wZWRBcnJh eT4gZ2V0UkdCQUltYWdlRGF0YSgpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgTWVkaWFUaW1lIHBy ZXNlbnRhdGlvblRpbWUoKSBjb25zdCBvdmVycmlkZTsKLSAgICBNZWRpYVRpbWUgb3V0cHV0UHJl c2VudGF0aW9uVGltZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIE1lZGlhVGltZSBkZWNvZGVUaW1l KCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgTWVkaWFUaW1lIGR1cmF0aW9uKCkgY29uc3Qgb3ZlcnJp ZGU7Ci0gICAgTWVkaWFUaW1lIG91dHB1dER1cmF0aW9uKCkgY29uc3Qgb3ZlcnJpZGU7CiAKICAg ICBBdG9tU3RyaW5nIHRyYWNrSUQoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBtX2lkOyB9CiAg ICAgdm9pZCBzZXRUcmFja0lEKGNvbnN0IFN0cmluZyYgaWQpIG92ZXJyaWRlIHsgbV9pZCA9IGlk OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVNhbXBsZUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVNhbXBsZUFWRk9iakMubW0KaW5kZXgg ZTg5NGI5MTRjNzY3MTgxODY0ZDExMDA3MDY4YTgzZmUyODFiNmM1Mi4uOTU2ZTZmZTAzNWExODIy Yjk4OWQ4YjZjMzI5ZDk4NzMzZDNlZTM2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhU2FtcGxlQVZGT2JqQy5tbQpAQCAtNzksMTIgKzc5LDEwIEBAIFJlZlB0cjxNZWRpYVNhbXBs ZUFWRk9iakM+IE1lZGlhU2FtcGxlQVZGT2JqQzo6Y3JlYXRlSW1hZ2VTYW1wbGUoVmVjdG9yPHVp bnQ4X3Q+CiAKIE1lZGlhVGltZSBNZWRpYVNhbXBsZUFWRk9iakM6OnByZXNlbnRhdGlvblRpbWUo KSBjb25zdAogewotICAgIHJldHVybiBQQUw6OnRvTWVkaWFUaW1lKENNU2FtcGxlQnVmZmVyR2V0 UHJlc2VudGF0aW9uVGltZVN0YW1wKG1fc2FtcGxlLmdldCgpKSk7Ci19Ci0KLU1lZGlhVGltZSBN ZWRpYVNhbXBsZUFWRk9iakM6Om91dHB1dFByZXNlbnRhdGlvblRpbWUoKSBjb25zdAotewotICAg IHJldHVybiBQQUw6OnRvTWVkaWFUaW1lKENNU2FtcGxlQnVmZmVyR2V0T3V0cHV0UHJlc2VudGF0 aW9uVGltZVN0YW1wKG1fc2FtcGxlLmdldCgpKSk7CisgICAgYXV0byB0aW1lU3RhbXAgPSBDTVNh bXBsZUJ1ZmZlckdldE91dHB1dFByZXNlbnRhdGlvblRpbWVTdGFtcChtX3NhbXBsZS5nZXQoKSk7 CisgICAgaWYgKHRpbWVTdGFtcCA9PSBrQ01UaW1lSW52YWxpZCkKKyAgICAgICAgdGltZVN0YW1w ID0gQ01TYW1wbGVCdWZmZXJHZXRQcmVzZW50YXRpb25UaW1lU3RhbXAobV9zYW1wbGUuZ2V0KCkp OworICAgIHJldHVybiBQQUw6OnRvTWVkaWFUaW1lKHRpbWVTdGFtcCk7CiB9CiAKIE1lZGlhVGlt ZSBNZWRpYVNhbXBsZUFWRk9iakM6OmRlY29kZVRpbWUoKSBjb25zdApAQCAtOTQsMTIgKzkyLDE1 IEBAIE1lZGlhVGltZSBNZWRpYVNhbXBsZUFWRk9iakM6OmRlY29kZVRpbWUoKSBjb25zdAogCiBN ZWRpYVRpbWUgTWVkaWFTYW1wbGVBVkZPYmpDOjpkdXJhdGlvbigpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIFBBTDo6dG9NZWRpYVRpbWUoQ01TYW1wbGVCdWZmZXJHZXREdXJhdGlvbihtX3NhbXBsZS5n ZXQoKSkpOworICAgIGF1dG8gZHVyYXRpb24gPSBDTVNhbXBsZUJ1ZmZlckdldE91dHB1dER1cmF0 aW9uKG1fc2FtcGxlLmdldCgpKTsKKyAgICBpZiAoZHVyYXRpb24gPT0ga0NNVGltZUludmFsaWQp CisgICAgICAgIGR1cmF0aW9uID0gQ01TYW1wbGVCdWZmZXJHZXREdXJhdGlvbihtX3NhbXBsZS5n ZXQoKSk7CisgICAgcmV0dXJuIFBBTDo6dG9NZWRpYVRpbWUoZHVyYXRpb24pOwogfQogCiBNZWRp YVRpbWUgTWVkaWFTYW1wbGVBVkZPYmpDOjpvdXRwdXREdXJhdGlvbigpIGNvbnN0CiB7Ci0gICAg cmV0dXJuIFBBTDo6dG9NZWRpYVRpbWUoQ01TYW1wbGVCdWZmZXJHZXRPdXRwdXREdXJhdGlvbiht X3NhbXBsZS5nZXQoKSkpOworICAgIHJldHVybiBQQUw6OnRvTWVkaWFUaW1lKCk7CiB9CiAKIHNp emVfdCBNZWRpYVNhbXBsZUFWRk9iakM6OnNpemVJbkJ5dGVzKCkgY29uc3QKQEAgLTE3Miw3ICsx NzMsNyBAQCBGbG9hdFNpemUgTWVkaWFTYW1wbGVBVkZPYmpDOjpwcmVzZW50YXRpb25TaXplKCkg Y29uc3QKIAogdm9pZCBNZWRpYVNhbXBsZUFWRk9iakM6OmR1bXAoUHJpbnRTdHJlYW0mIG91dCkg Y29uc3QKIHsKLSAgICBvdXQucHJpbnQoIntQVFMoIiwgcHJlc2VudGF0aW9uVGltZSgpLCAiKSwg T1BUUygiLCBvdXRwdXRQcmVzZW50YXRpb25UaW1lKCksICIpLCBEVFMoIiwgZGVjb2RlVGltZSgp LCAiKSwgZHVyYXRpb24oIiwgZHVyYXRpb24oKSwgIiksIGZsYWdzKCIsIChpbnQpZmxhZ3MoKSwg IiksIHByZXNlbnRhdGlvblNpemUoIiwgcHJlc2VudGF0aW9uU2l6ZSgpLndpZHRoKCksICJ4Iiwg cHJlc2VudGF0aW9uU2l6ZSgpLmhlaWdodCgpLCAiKX0iKTsKKyAgICBvdXQucHJpbnQoIntQVFMo IiwgcHJlc2VudGF0aW9uVGltZSgpLCAiKSwgRFRTKCIsIGRlY29kZVRpbWUoKSwgIiksIGR1cmF0 aW9uKCIsIGR1cmF0aW9uKCksICIpLCBmbGFncygiLCAoaW50KWZsYWdzKCksICIpLCBwcmVzZW50 YXRpb25TaXplKCIsIHByZXNlbnRhdGlvblNpemUoKS53aWR0aCgpLCAieCIsIHByZXNlbnRhdGlv blNpemUoKS5oZWlnaHQoKSwgIil9Iik7CiB9CiAKIHZvaWQgTWVkaWFTYW1wbGVBVkZPYmpDOjpv ZmZzZXRUaW1lc3RhbXBzQnkoY29uc3QgTWVkaWFUaW1lJiBvZmZzZXQpCkBAIC0zMjUsNyArMzI2 LDYgQEAgU3RyaW5nIE1lZGlhU2FtcGxlQVZGT2JqQzo6dG9KU09OU3RyaW5nKCkgY29uc3QKICAg ICBhdXRvIG9iamVjdCA9IEpTT046Ok9iamVjdDo6Y3JlYXRlKCk7CiAKICAgICBvYmplY3QtPnNl dE9iamVjdCgicHRzIl9zLCBwcmVzZW50YXRpb25UaW1lKCkudG9KU09OT2JqZWN0KCkpOwotICAg IG9iamVjdC0+c2V0T2JqZWN0KCJvcHRzIl9zLCBvdXRwdXRQcmVzZW50YXRpb25UaW1lKCkudG9K U09OT2JqZWN0KCkpOwogICAgIG9iamVjdC0+c2V0T2JqZWN0KCJkdHMiX3MsIGRlY29kZVRpbWUo KS50b0pTT05PYmplY3QoKSk7CiAgICAgb2JqZWN0LT5zZXRPYmplY3QoImR1cmF0aW9uIl9zLCBk dXJhdGlvbigpLnRvSlNPTk9iamVjdCgpKTsKICAgICBvYmplY3QtPnNldEludGVnZXIoImZsYWdz Il9zLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oZmxhZ3MoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVWaWRlb0NhcHR1cmVTb3VyY2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVWaWRlb0Nh cHR1cmVTb3VyY2UuY3BwCmluZGV4IGNmYjA5N2NmYzE3ZDQ5MmU0ZjYzZjZhZDcxNDViYmVjMDg2 MjY5ZDkuLjNkYjc4NzhkMjYxOGVhYzA5MjVmZTRjZTcyZmQ1N2IwN2I0NDY0ODkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lVmlkZW9DYXB0 dXJlU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9S ZWFsdGltZVZpZGVvQ2FwdHVyZVNvdXJjZS5jcHAKQEAgLTM3OCw5ICszNzgsNyBAQCB2b2lkIFJl YWx0aW1lVmlkZW9DYXB0dXJlU291cmNlOjpzZXRTaXplQW5kRnJhbWVSYXRlKE9wdGlvbmFsPGlu dD4gd2lkdGgsIE9wdGlvbgogCiBSZWZQdHI8TWVkaWFTYW1wbGU+IFJlYWx0aW1lVmlkZW9DYXB0 dXJlU291cmNlOjphZGFwdFZpZGVvU2FtcGxlKE1lZGlhU2FtcGxlJiBzYW1wbGUpCiB7Ci0gICAg TWVkaWFUaW1lIHNhbXBsZVRpbWUgPSBzYW1wbGUub3V0cHV0UHJlc2VudGF0aW9uVGltZSgpOwot ICAgIGlmICghc2FtcGxlVGltZSB8fCAhc2FtcGxlVGltZS5pc1ZhbGlkKCkpCi0gICAgICAgIHNh bXBsZVRpbWUgPSBzYW1wbGUucHJlc2VudGF0aW9uVGltZSgpOworICAgIE1lZGlhVGltZSBzYW1w bGVUaW1lID0gc2FtcGxlLnByZXNlbnRhdGlvblRpbWUoKTsKIAogICAgIGF1dG8gZnJhbWVUaW1l ID0gc2FtcGxlVGltZS50b0RvdWJsZSgpOwogICAgIG1fb2JzZXJ2ZWRGcmFtZVRpbWVTdGFtcHMu YXBwZW5kKGZyYW1lVGltZSk7Cg== 393070 2020-03-09 13:45:02 -0700 2020-03-09 14:02:27 -0700 Patch bug-208827-20200309134501.patch text/plain 10224 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGU5MGIyOGY3YTI2OTI1 YjM3ZTk2ZjAzMjAzYzU1ZjViMzdkZTQ2ZC4uYjAwMTk5MjcxNDk0MDQyY2ZlMDRiOGRkYjAyMzhj OTIwNDYyMzU0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIwLTAzLTA5ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNU0VdIFVzZSBDTVNhbXBs ZUJ1ZmZlckdldE91dHB1dFByZXNlbnRhdGlvblRpbWVTdGFtcCAvIENNU2FtcGxlQnVmZmVyR2V0 T3V0cHV0RHVyYXRpb24gZm9yIGFsbCBwcmVzZW50YXRpb24gdGltZXMgYW5kIGR1cmF0aW9ucwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4ODI3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ01TYW1wbGVC dWZmZXJHZXRPdXRwdXRQcmVzZW50YXRpb25UaW1lU3RhbXAgdGFrZXMgaW50byBhY2NvdW50IHBy ZS1yb2xsIHRyaW0gZHVyYXRpb25zIGFuZAorICAgICAgICBtb3ZpZSBlZGl0IGxpc3RzLCBhbmQg YXMgc3VjaCwgc2hvdWxkIGJlIHVzZWQgYXMgdGhlICJjb3JyZWN0IiB2YWx1ZSBmb3IgInByZXNl bnRhdGlvbgorICAgICAgICB0aW1lIi4KKworICAgICAgICBvdXRwdXRQcmVzZW50YXRpb25UaW1l KCkgaXMgaW5jb25zaXN0ZW50bHkgdXNlZCwgc28gcmF0aGVyIHRoYW4gcmVwbGFjaW5nIGFsbCBy ZWZlcmVuY2VzIG9mCisgICAgICAgIG91dHB1dFByZXNlbnRhdGlvblRpbWUoKSB3aXRoIHByZXNl bnRhdGlvblRpbWUoKSwgc2ltcGx5IHJlZGVmaW5lIHByZXNldGF0aW9uVGltZSgpIGluIHRlcm1z CisgICAgICAgIG9mIENNU2FtcGxlQnVmZmVyR2V0UHJlc2VudGF0aW9uVGltZVN0YW1wKCkgYW5k IHJlbW92ZSBvdXRwdXRQcmVzZW50YXRpb25UaW1lKCkgZW50aXJlbHkuCisKKyAgICAgICAgKiBN b2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT b3VyY2VCdWZmZXI6OnVwZGF0ZU1pbmltdW1VcGNvbWluZ1ByZXNlbnRhdGlvblRpbWUpOgorICAg ICAgICAqIHBsYXRmb3JtL01lZGlhU2FtcGxlLmg6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNh bXBsZTo6b3V0cHV0UHJlc2VudGF0aW9uVGltZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVNhbXBsZTo6b3V0cHV0RHVyYXRpb24gY29uc3QpOiBEZWxldGVkLgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJp dmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6Y2FsY3VsYXRlVGltZWxpbmVPZmZzZXQpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU2FtcGxlQVZG T2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhU2FtcGxlQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2FtcGxlQVZGT2Jq Qzo6cHJlc2VudGF0aW9uVGltZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNhbXBs ZUFWRk9iakM6OmR1cmF0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2FtcGxl QVZGT2JqQzo6b3V0cHV0RHVyYXRpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFT YW1wbGVBVkZPYmpDOjpkdW1wIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2FtcGxl QVZGT2JqQzo6dG9KU09OU3RyaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Ft cGxlQVZGT2JqQzo6b3V0cHV0UHJlc2VudGF0aW9uVGltZSBjb25zdCk6IERlbGV0ZWQuCisgICAg ICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVWaWRlb0NhcHR1cmVTb3VyY2UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVhbHRpbWVWaWRlb0NhcHR1cmVTb3VyY2U6OmFkYXB0Vmlk ZW9TYW1wbGUpOgorCiAyMDIwLTAyLTA3ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29t PgogCiAgICAgICAgIFJlbmFtZSBNZWRpYUNhcGFiaWxpdGllc0RlY29kaW5nSW5mby5zdXBwb3J0 ZWRDb25maWd1cmF0aW9uIHRvIC5jb25maWd1cmF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKaW5kZXggZGI3MzEwNDc0NDFi NWNkZjk5YzZjOGExMThlMThlMmMxZDhkOTA4Yy4uZTcyMjJhMDY5OGM1MDA5M2EzNDhiYjdiOTUw MzMwNjFiZTk5ZDQwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNv dXJjZS9Tb3VyY2VCdWZmZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz b3VyY2UvU291cmNlQnVmZmVyLmNwcApAQCAtMjA5Nyw3ICsyMDk3LDcgQEAgdm9pZCBTb3VyY2VC dWZmZXI6OnVwZGF0ZU1pbmltdW1VcGNvbWluZ1ByZXNlbnRhdGlvblRpbWUoVHJhY2tCdWZmZXIm IHRyYWNrQnVmZmUKICAgICB9CiAKICAgICBhdXRvIG1pblB0cyA9IHN0ZDo6bWluX2VsZW1lbnQo dHJhY2tCdWZmZXIuZGVjb2RlUXVldWUuYmVnaW4oKSwgdHJhY2tCdWZmZXIuZGVjb2RlUXVldWUu ZW5kKCksIFtdKGF1dG8mIGxlZnQsIGF1dG8mIHJpZ2h0KSAtPiBib29sIHsKLSAgICAgICAgcmV0 dXJuIGxlZnQuc2Vjb25kLT5vdXRwdXRQcmVzZW50YXRpb25UaW1lKCkgPCByaWdodC5zZWNvbmQt Pm91dHB1dFByZXNlbnRhdGlvblRpbWUoKTsKKyAgICAgICAgcmV0dXJuIGxlZnQuc2Vjb25kLT5w cmVzZW50YXRpb25UaW1lKCkgPCByaWdodC5zZWNvbmQtPnByZXNlbnRhdGlvblRpbWUoKTsKICAg ICB9KTsKIAogICAgIGlmIChtaW5QdHMgPT0gdHJhY2tCdWZmZXIuZGVjb2RlUXVldWUuZW5kKCkp IHsKQEAgLTIxMDYsNyArMjEwNiw3IEBAIHZvaWQgU291cmNlQnVmZmVyOjp1cGRhdGVNaW5pbXVt VXBjb21pbmdQcmVzZW50YXRpb25UaW1lKFRyYWNrQnVmZmVyJiB0cmFja0J1ZmZlCiAgICAgICAg IHJldHVybjsKICAgICB9CiAKLSAgICB0cmFja0J1ZmZlci5taW5pbXVtRW5xdWV1ZWRQcmVzZW50 YXRpb25UaW1lID0gbWluUHRzLT5zZWNvbmQtPm91dHB1dFByZXNlbnRhdGlvblRpbWUoKTsKKyAg ICB0cmFja0J1ZmZlci5taW5pbXVtRW5xdWV1ZWRQcmVzZW50YXRpb25UaW1lID0gbWluUHRzLT5z ZWNvbmQtPnByZXNlbnRhdGlvblRpbWUoKTsKICAgICBtX3ByaXZhdGUtPnNldE1pbmltdW1VcGNv bWluZ1ByZXNlbnRhdGlvblRpbWUodHJhY2tJRCwgdHJhY2tCdWZmZXIubWluaW11bUVucXVldWVk UHJlc2VudGF0aW9uVGltZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL01lZGlhU2FtcGxlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZWRpYVNhbXBsZS5o CmluZGV4IDZjNDk1YzY2YmE3MWZjYThmYzk2MTdmMWIxNjY1ZTE3YmZhMjdkN2UuLjdmYzlkZTEx MjdhNmRlOTRlOGQxODAyNzYwYTkyMTNlMDEzYzcxNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL01lZGlhU2FtcGxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v TWVkaWFTYW1wbGUuaApAQCAtNTksMTAgKzU5LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgfk1l ZGlhU2FtcGxlKCkgPSBkZWZhdWx0OwogCiAgICAgdmlydHVhbCBNZWRpYVRpbWUgcHJlc2VudGF0 aW9uVGltZSgpIGNvbnN0ID0gMDsKLSAgICB2aXJ0dWFsIE1lZGlhVGltZSBvdXRwdXRQcmVzZW50 YXRpb25UaW1lKCkgY29uc3QgeyByZXR1cm4gcHJlc2VudGF0aW9uVGltZSgpOyB9CiAgICAgdmly dHVhbCBNZWRpYVRpbWUgZGVjb2RlVGltZSgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIE1lZGlh VGltZSBkdXJhdGlvbigpIGNvbnN0ID0gMDsKLSAgICB2aXJ0dWFsIE1lZGlhVGltZSBvdXRwdXRE dXJhdGlvbigpIGNvbnN0IHsgcmV0dXJuIGR1cmF0aW9uKCk7IH0KICAgICB2aXJ0dWFsIEF0b21T dHJpbmcgdHJhY2tJRCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0VHJhY2tJRChj b25zdCBTdHJpbmcmKSA9IDA7CiAgICAgdmlydHVhbCBzaXplX3Qgc2l6ZUluQnl0ZXMoKSBjb25z dCA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBs YXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0KaW5kZXggMDQ5ZjdhNTRmNTQ1YmI0N2I1 YjBmM2NlNTYwYmI3ZjRhNmE0ZjZjYy4uMjYxMjczYWRkOTMzNzc3YzlmMTViMWEzMjJjOTE0MThk NmIwNTcwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbQpAQCAtMjI5LDkgKzIyOSw3IEBA IE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1B VkZPYmpDOjpzdXBwb3J0c1R5cGUoY29uCiAKIE1lZGlhVGltZSBNZWRpYVBsYXllclByaXZhdGVN ZWRpYVN0cmVhbUFWRk9iakM6OmNhbGN1bGF0ZVRpbWVsaW5lT2Zmc2V0KGNvbnN0IE1lZGlhU2Ft cGxlJiBzYW1wbGUsIGRvdWJsZSBsYXRlbmN5KQogewotICAgIE1lZGlhVGltZSBzYW1wbGVUaW1l ID0gc2FtcGxlLm91dHB1dFByZXNlbnRhdGlvblRpbWUoKTsKLSAgICBpZiAoIXNhbXBsZVRpbWUg fHwgIXNhbXBsZVRpbWUuaXNWYWxpZCgpKQotICAgICAgICBzYW1wbGVUaW1lID0gc2FtcGxlLnBy ZXNlbnRhdGlvblRpbWUoKTsKKyAgICBNZWRpYVRpbWUgc2FtcGxlVGltZSA9IHNhbXBsZS5wcmVz ZW50YXRpb25UaW1lKCk7CiAgICAgTWVkaWFUaW1lIHRpbWVsaW5lT2Zmc2V0ID0gc3RyZWFtVGlt ZSgpIC0gc2FtcGxlVGltZSArIE1lZGlhVGltZTo6Y3JlYXRlV2l0aERvdWJsZShsYXRlbmN5KTsK ICAgICBpZiAodGltZWxpbmVPZmZzZXQudGltZVNjYWxlKCkgIT0gc2FtcGxlVGltZS50aW1lU2Nh bGUoKSkKICAgICAgICAgdGltZWxpbmVPZmZzZXQgPSBQQUw6OnRvTWVkaWFUaW1lKENNVGltZUNv bnZlcnRTY2FsZShQQUw6OnRvQ01UaW1lKHRpbWVsaW5lT2Zmc2V0KSwgc2FtcGxlVGltZS50aW1l U2NhbGUoKSwga0NNVGltZVJvdW5kaW5nTWV0aG9kX0RlZmF1bHQpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU2Ft cGxlQVZGT2JqQy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLmgKaW5kZXggZjg1NWUxOWUwMzE0ZmRiNGE2NmNh YWE3ZjlkODIxMGQ0ZWM1ZWUyYi4uMjQzNjI2ODEyNzc2ZWE4ZTM1YWM1ZjYwYjRhMzM0MThiMDQ1 NzQ2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLmgKQEAg LTQ0LDEwICs0NCw4IEBAIHB1YmxpYzoKICAgICBSZWZQdHI8SlNDOjpVaW50OENsYW1wZWRBcnJh eT4gZ2V0UkdCQUltYWdlRGF0YSgpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgTWVkaWFUaW1lIHBy ZXNlbnRhdGlvblRpbWUoKSBjb25zdCBvdmVycmlkZTsKLSAgICBNZWRpYVRpbWUgb3V0cHV0UHJl c2VudGF0aW9uVGltZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIE1lZGlhVGltZSBkZWNvZGVUaW1l KCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgTWVkaWFUaW1lIGR1cmF0aW9uKCkgY29uc3Qgb3ZlcnJp ZGU7Ci0gICAgTWVkaWFUaW1lIG91dHB1dER1cmF0aW9uKCkgY29uc3Qgb3ZlcnJpZGU7CiAKICAg ICBBdG9tU3RyaW5nIHRyYWNrSUQoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBtX2lkOyB9CiAg ICAgdm9pZCBzZXRUcmFja0lEKGNvbnN0IFN0cmluZyYgaWQpIG92ZXJyaWRlIHsgbV9pZCA9IGlk OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVNhbXBsZUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVNhbXBsZUFWRk9iakMubW0KaW5kZXgg ZTg5NGI5MTRjNzY3MTgxODY0ZDExMDA3MDY4YTgzZmUyODFiNmM1Mi4uMmYyYTBmZWMwZmNhNGNi Y2YxNzRmODcxY2VhMmJiNjZhMzkxNzkwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhU2FtcGxlQVZGT2JqQy5tbQpAQCAtNzksMTIgKzc5LDEwIEBAIFJlZlB0cjxNZWRpYVNhbXBs ZUFWRk9iakM+IE1lZGlhU2FtcGxlQVZGT2JqQzo6Y3JlYXRlSW1hZ2VTYW1wbGUoVmVjdG9yPHVp bnQ4X3Q+CiAKIE1lZGlhVGltZSBNZWRpYVNhbXBsZUFWRk9iakM6OnByZXNlbnRhdGlvblRpbWUo KSBjb25zdAogewotICAgIHJldHVybiBQQUw6OnRvTWVkaWFUaW1lKENNU2FtcGxlQnVmZmVyR2V0 UHJlc2VudGF0aW9uVGltZVN0YW1wKG1fc2FtcGxlLmdldCgpKSk7Ci19Ci0KLU1lZGlhVGltZSBN ZWRpYVNhbXBsZUFWRk9iakM6Om91dHB1dFByZXNlbnRhdGlvblRpbWUoKSBjb25zdAotewotICAg IHJldHVybiBQQUw6OnRvTWVkaWFUaW1lKENNU2FtcGxlQnVmZmVyR2V0T3V0cHV0UHJlc2VudGF0 aW9uVGltZVN0YW1wKG1fc2FtcGxlLmdldCgpKSk7CisgICAgYXV0byB0aW1lU3RhbXAgPSBDTVNh bXBsZUJ1ZmZlckdldE91dHB1dFByZXNlbnRhdGlvblRpbWVTdGFtcChtX3NhbXBsZS5nZXQoKSk7 CisgICAgaWYgKENNVElNRV9JU19JTlZBTElEKHRpbWVTdGFtcCkpCisgICAgICAgIHRpbWVTdGFt cCA9IENNU2FtcGxlQnVmZmVyR2V0UHJlc2VudGF0aW9uVGltZVN0YW1wKG1fc2FtcGxlLmdldCgp KTsKKyAgICByZXR1cm4gUEFMOjp0b01lZGlhVGltZSh0aW1lU3RhbXApOwogfQogCiBNZWRpYVRp bWUgTWVkaWFTYW1wbGVBVkZPYmpDOjpkZWNvZGVUaW1lKCkgY29uc3QKQEAgLTk0LDEyICs5Miwx NSBAQCBNZWRpYVRpbWUgTWVkaWFTYW1wbGVBVkZPYmpDOjpkZWNvZGVUaW1lKCkgY29uc3QKIAog TWVkaWFUaW1lIE1lZGlhU2FtcGxlQVZGT2JqQzo6ZHVyYXRpb24oKSBjb25zdAogewotICAgIHJl dHVybiBQQUw6OnRvTWVkaWFUaW1lKENNU2FtcGxlQnVmZmVyR2V0RHVyYXRpb24obV9zYW1wbGUu Z2V0KCkpKTsKKyAgICBhdXRvIGR1cmF0aW9uID0gQ01TYW1wbGVCdWZmZXJHZXRPdXRwdXREdXJh dGlvbihtX3NhbXBsZS5nZXQoKSk7CisgICAgaWYgKENNVElNRV9JU19JTlZBTElEKGR1cmF0aW9u KSkKKyAgICAgICAgZHVyYXRpb24gPSBDTVNhbXBsZUJ1ZmZlckdldER1cmF0aW9uKG1fc2FtcGxl LmdldCgpKTsKKyAgICByZXR1cm4gUEFMOjp0b01lZGlhVGltZShkdXJhdGlvbik7CiB9CiAKIE1l ZGlhVGltZSBNZWRpYVNhbXBsZUFWRk9iakM6Om91dHB1dER1cmF0aW9uKCkgY29uc3QKIHsKLSAg ICByZXR1cm4gUEFMOjp0b01lZGlhVGltZShDTVNhbXBsZUJ1ZmZlckdldE91dHB1dER1cmF0aW9u KG1fc2FtcGxlLmdldCgpKSk7CisgICAgcmV0dXJuIFBBTDo6dG9NZWRpYVRpbWUoKTsKIH0KIAog c2l6ZV90IE1lZGlhU2FtcGxlQVZGT2JqQzo6c2l6ZUluQnl0ZXMoKSBjb25zdApAQCAtMTcyLDcg KzE3Myw3IEBAIEZsb2F0U2l6ZSBNZWRpYVNhbXBsZUFWRk9iakM6OnByZXNlbnRhdGlvblNpemUo KSBjb25zdAogCiB2b2lkIE1lZGlhU2FtcGxlQVZGT2JqQzo6ZHVtcChQcmludFN0cmVhbSYgb3V0 KSBjb25zdAogewotICAgIG91dC5wcmludCgie1BUUygiLCBwcmVzZW50YXRpb25UaW1lKCksICIp LCBPUFRTKCIsIG91dHB1dFByZXNlbnRhdGlvblRpbWUoKSwgIiksIERUUygiLCBkZWNvZGVUaW1l KCksICIpLCBkdXJhdGlvbigiLCBkdXJhdGlvbigpLCAiKSwgZmxhZ3MoIiwgKGludClmbGFncygp LCAiKSwgcHJlc2VudGF0aW9uU2l6ZSgiLCBwcmVzZW50YXRpb25TaXplKCkud2lkdGgoKSwgIngi LCBwcmVzZW50YXRpb25TaXplKCkuaGVpZ2h0KCksICIpfSIpOworICAgIG91dC5wcmludCgie1BU UygiLCBwcmVzZW50YXRpb25UaW1lKCksICIpLCBEVFMoIiwgZGVjb2RlVGltZSgpLCAiKSwgZHVy YXRpb24oIiwgZHVyYXRpb24oKSwgIiksIGZsYWdzKCIsIChpbnQpZmxhZ3MoKSwgIiksIHByZXNl bnRhdGlvblNpemUoIiwgcHJlc2VudGF0aW9uU2l6ZSgpLndpZHRoKCksICJ4IiwgcHJlc2VudGF0 aW9uU2l6ZSgpLmhlaWdodCgpLCAiKX0iKTsKIH0KIAogdm9pZCBNZWRpYVNhbXBsZUFWRk9iakM6 Om9mZnNldFRpbWVzdGFtcHNCeShjb25zdCBNZWRpYVRpbWUmIG9mZnNldCkKQEAgLTMyNSw3ICsz MjYsNiBAQCBTdHJpbmcgTWVkaWFTYW1wbGVBVkZPYmpDOjp0b0pTT05TdHJpbmcoKSBjb25zdAog ICAgIGF1dG8gb2JqZWN0ID0gSlNPTjo6T2JqZWN0OjpjcmVhdGUoKTsKIAogICAgIG9iamVjdC0+ c2V0T2JqZWN0KCJwdHMiX3MsIHByZXNlbnRhdGlvblRpbWUoKS50b0pTT05PYmplY3QoKSk7Ci0g ICAgb2JqZWN0LT5zZXRPYmplY3QoIm9wdHMiX3MsIG91dHB1dFByZXNlbnRhdGlvblRpbWUoKS50 b0pTT05PYmplY3QoKSk7CiAgICAgb2JqZWN0LT5zZXRPYmplY3QoImR0cyJfcywgZGVjb2RlVGlt ZSgpLnRvSlNPTk9iamVjdCgpKTsKICAgICBvYmplY3QtPnNldE9iamVjdCgiZHVyYXRpb24iX3Ms IGR1cmF0aW9uKCkudG9KU09OT2JqZWN0KCkpOwogICAgIG9iamVjdC0+c2V0SW50ZWdlcigiZmxh Z3MiX3MsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihmbGFncygpKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZVZpZGVvQ2FwdHVyZVNvdXJj ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZVZpZGVv Q2FwdHVyZVNvdXJjZS5jcHAKaW5kZXggY2ZiMDk3Y2ZjMTdkNDkyZTRmNjNmNmFkNzE0NWJiZWMw ODYyNjlkOS4uM2RiNzg3OGQyNjE4ZWFjMDkyNWZlNGNlNzJmZDU3YjA3YjQ0NjQ4OSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVWaWRlb0Nh cHR1cmVTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt L1JlYWx0aW1lVmlkZW9DYXB0dXJlU291cmNlLmNwcApAQCAtMzc4LDkgKzM3OCw3IEBAIHZvaWQg UmVhbHRpbWVWaWRlb0NhcHR1cmVTb3VyY2U6OnNldFNpemVBbmRGcmFtZVJhdGUoT3B0aW9uYWw8 aW50PiB3aWR0aCwgT3B0aW9uCiAKIFJlZlB0cjxNZWRpYVNhbXBsZT4gUmVhbHRpbWVWaWRlb0Nh cHR1cmVTb3VyY2U6OmFkYXB0VmlkZW9TYW1wbGUoTWVkaWFTYW1wbGUmIHNhbXBsZSkKIHsKLSAg ICBNZWRpYVRpbWUgc2FtcGxlVGltZSA9IHNhbXBsZS5vdXRwdXRQcmVzZW50YXRpb25UaW1lKCk7 Ci0gICAgaWYgKCFzYW1wbGVUaW1lIHx8ICFzYW1wbGVUaW1lLmlzVmFsaWQoKSkKLSAgICAgICAg c2FtcGxlVGltZSA9IHNhbXBsZS5wcmVzZW50YXRpb25UaW1lKCk7CisgICAgTWVkaWFUaW1lIHNh bXBsZVRpbWUgPSBzYW1wbGUucHJlc2VudGF0aW9uVGltZSgpOwogCiAgICAgYXV0byBmcmFtZVRp bWUgPSBzYW1wbGVUaW1lLnRvRG91YmxlKCk7CiAgICAgbV9vYnNlcnZlZEZyYW1lVGltZVN0YW1w cy5hcHBlbmQoZnJhbWVUaW1lKTsK 393071 2020-03-09 14:02:29 -0700 2020-03-10 10:36:31 -0700 Patch bug-208827-20200309140228.patch text/plain 10192 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGU5MGIyOGY3YTI2OTI1 YjM3ZTk2ZjAzMjAzYzU1ZjViMzdkZTQ2ZC4uYjAwMTk5MjcxNDk0MDQyY2ZlMDRiOGRkYjAyMzhj OTIwNDYyMzU0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIwLTAzLTA5ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNU0VdIFVzZSBDTVNhbXBs ZUJ1ZmZlckdldE91dHB1dFByZXNlbnRhdGlvblRpbWVTdGFtcCAvIENNU2FtcGxlQnVmZmVyR2V0 T3V0cHV0RHVyYXRpb24gZm9yIGFsbCBwcmVzZW50YXRpb24gdGltZXMgYW5kIGR1cmF0aW9ucwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4ODI3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ01TYW1wbGVC dWZmZXJHZXRPdXRwdXRQcmVzZW50YXRpb25UaW1lU3RhbXAgdGFrZXMgaW50byBhY2NvdW50IHBy ZS1yb2xsIHRyaW0gZHVyYXRpb25zIGFuZAorICAgICAgICBtb3ZpZSBlZGl0IGxpc3RzLCBhbmQg YXMgc3VjaCwgc2hvdWxkIGJlIHVzZWQgYXMgdGhlICJjb3JyZWN0IiB2YWx1ZSBmb3IgInByZXNl bnRhdGlvbgorICAgICAgICB0aW1lIi4KKworICAgICAgICBvdXRwdXRQcmVzZW50YXRpb25UaW1l KCkgaXMgaW5jb25zaXN0ZW50bHkgdXNlZCwgc28gcmF0aGVyIHRoYW4gcmVwbGFjaW5nIGFsbCBy ZWZlcmVuY2VzIG9mCisgICAgICAgIG91dHB1dFByZXNlbnRhdGlvblRpbWUoKSB3aXRoIHByZXNl bnRhdGlvblRpbWUoKSwgc2ltcGx5IHJlZGVmaW5lIHByZXNldGF0aW9uVGltZSgpIGluIHRlcm1z CisgICAgICAgIG9mIENNU2FtcGxlQnVmZmVyR2V0UHJlc2VudGF0aW9uVGltZVN0YW1wKCkgYW5k IHJlbW92ZSBvdXRwdXRQcmVzZW50YXRpb25UaW1lKCkgZW50aXJlbHkuCisKKyAgICAgICAgKiBN b2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT b3VyY2VCdWZmZXI6OnVwZGF0ZU1pbmltdW1VcGNvbWluZ1ByZXNlbnRhdGlvblRpbWUpOgorICAg ICAgICAqIHBsYXRmb3JtL01lZGlhU2FtcGxlLmg6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNh bXBsZTo6b3V0cHV0UHJlc2VudGF0aW9uVGltZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVNhbXBsZTo6b3V0cHV0RHVyYXRpb24gY29uc3QpOiBEZWxldGVkLgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJp dmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6Y2FsY3VsYXRlVGltZWxpbmVPZmZzZXQpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU2FtcGxlQVZG T2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhU2FtcGxlQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2FtcGxlQVZGT2Jq Qzo6cHJlc2VudGF0aW9uVGltZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNhbXBs ZUFWRk9iakM6OmR1cmF0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2FtcGxl QVZGT2JqQzo6b3V0cHV0RHVyYXRpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFT YW1wbGVBVkZPYmpDOjpkdW1wIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2FtcGxl QVZGT2JqQzo6dG9KU09OU3RyaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Ft cGxlQVZGT2JqQzo6b3V0cHV0UHJlc2VudGF0aW9uVGltZSBjb25zdCk6IERlbGV0ZWQuCisgICAg ICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVWaWRlb0NhcHR1cmVTb3VyY2UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVhbHRpbWVWaWRlb0NhcHR1cmVTb3VyY2U6OmFkYXB0Vmlk ZW9TYW1wbGUpOgorCiAyMDIwLTAyLTA3ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29t PgogCiAgICAgICAgIFJlbmFtZSBNZWRpYUNhcGFiaWxpdGllc0RlY29kaW5nSW5mby5zdXBwb3J0 ZWRDb25maWd1cmF0aW9uIHRvIC5jb25maWd1cmF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKaW5kZXggZGI3MzEwNDc0NDFi NWNkZjk5YzZjOGExMThlMThlMmMxZDhkOTA4Yy4uZTcyMjJhMDY5OGM1MDA5M2EzNDhiYjdiOTUw MzMwNjFiZTk5ZDQwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNv dXJjZS9Tb3VyY2VCdWZmZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz b3VyY2UvU291cmNlQnVmZmVyLmNwcApAQCAtMjA5Nyw3ICsyMDk3LDcgQEAgdm9pZCBTb3VyY2VC dWZmZXI6OnVwZGF0ZU1pbmltdW1VcGNvbWluZ1ByZXNlbnRhdGlvblRpbWUoVHJhY2tCdWZmZXIm IHRyYWNrQnVmZmUKICAgICB9CiAKICAgICBhdXRvIG1pblB0cyA9IHN0ZDo6bWluX2VsZW1lbnQo dHJhY2tCdWZmZXIuZGVjb2RlUXVldWUuYmVnaW4oKSwgdHJhY2tCdWZmZXIuZGVjb2RlUXVldWUu ZW5kKCksIFtdKGF1dG8mIGxlZnQsIGF1dG8mIHJpZ2h0KSAtPiBib29sIHsKLSAgICAgICAgcmV0 dXJuIGxlZnQuc2Vjb25kLT5vdXRwdXRQcmVzZW50YXRpb25UaW1lKCkgPCByaWdodC5zZWNvbmQt Pm91dHB1dFByZXNlbnRhdGlvblRpbWUoKTsKKyAgICAgICAgcmV0dXJuIGxlZnQuc2Vjb25kLT5w cmVzZW50YXRpb25UaW1lKCkgPCByaWdodC5zZWNvbmQtPnByZXNlbnRhdGlvblRpbWUoKTsKICAg ICB9KTsKIAogICAgIGlmIChtaW5QdHMgPT0gdHJhY2tCdWZmZXIuZGVjb2RlUXVldWUuZW5kKCkp IHsKQEAgLTIxMDYsNyArMjEwNiw3IEBAIHZvaWQgU291cmNlQnVmZmVyOjp1cGRhdGVNaW5pbXVt VXBjb21pbmdQcmVzZW50YXRpb25UaW1lKFRyYWNrQnVmZmVyJiB0cmFja0J1ZmZlCiAgICAgICAg IHJldHVybjsKICAgICB9CiAKLSAgICB0cmFja0J1ZmZlci5taW5pbXVtRW5xdWV1ZWRQcmVzZW50 YXRpb25UaW1lID0gbWluUHRzLT5zZWNvbmQtPm91dHB1dFByZXNlbnRhdGlvblRpbWUoKTsKKyAg ICB0cmFja0J1ZmZlci5taW5pbXVtRW5xdWV1ZWRQcmVzZW50YXRpb25UaW1lID0gbWluUHRzLT5z ZWNvbmQtPnByZXNlbnRhdGlvblRpbWUoKTsKICAgICBtX3ByaXZhdGUtPnNldE1pbmltdW1VcGNv bWluZ1ByZXNlbnRhdGlvblRpbWUodHJhY2tJRCwgdHJhY2tCdWZmZXIubWluaW11bUVucXVldWVk UHJlc2VudGF0aW9uVGltZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL01lZGlhU2FtcGxlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZWRpYVNhbXBsZS5o CmluZGV4IDZjNDk1YzY2YmE3MWZjYThmYzk2MTdmMWIxNjY1ZTE3YmZhMjdkN2UuLjdmYzlkZTEx MjdhNmRlOTRlOGQxODAyNzYwYTkyMTNlMDEzYzcxNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL01lZGlhU2FtcGxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v TWVkaWFTYW1wbGUuaApAQCAtNTksMTAgKzU5LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgfk1l ZGlhU2FtcGxlKCkgPSBkZWZhdWx0OwogCiAgICAgdmlydHVhbCBNZWRpYVRpbWUgcHJlc2VudGF0 aW9uVGltZSgpIGNvbnN0ID0gMDsKLSAgICB2aXJ0dWFsIE1lZGlhVGltZSBvdXRwdXRQcmVzZW50 YXRpb25UaW1lKCkgY29uc3QgeyByZXR1cm4gcHJlc2VudGF0aW9uVGltZSgpOyB9CiAgICAgdmly dHVhbCBNZWRpYVRpbWUgZGVjb2RlVGltZSgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIE1lZGlh VGltZSBkdXJhdGlvbigpIGNvbnN0ID0gMDsKLSAgICB2aXJ0dWFsIE1lZGlhVGltZSBvdXRwdXRE dXJhdGlvbigpIGNvbnN0IHsgcmV0dXJuIGR1cmF0aW9uKCk7IH0KICAgICB2aXJ0dWFsIEF0b21T dHJpbmcgdHJhY2tJRCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0VHJhY2tJRChj b25zdCBTdHJpbmcmKSA9IDA7CiAgICAgdmlydHVhbCBzaXplX3Qgc2l6ZUluQnl0ZXMoKSBjb25z dCA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBs YXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0KaW5kZXggMDQ5ZjdhNTRmNTQ1YmI0N2I1 YjBmM2NlNTYwYmI3ZjRhNmE0ZjZjYy4uMjYxMjczYWRkOTMzNzc3YzlmMTViMWEzMjJjOTE0MThk NmIwNTcwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbQpAQCAtMjI5LDkgKzIyOSw3IEBA IE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1B VkZPYmpDOjpzdXBwb3J0c1R5cGUoY29uCiAKIE1lZGlhVGltZSBNZWRpYVBsYXllclByaXZhdGVN ZWRpYVN0cmVhbUFWRk9iakM6OmNhbGN1bGF0ZVRpbWVsaW5lT2Zmc2V0KGNvbnN0IE1lZGlhU2Ft cGxlJiBzYW1wbGUsIGRvdWJsZSBsYXRlbmN5KQogewotICAgIE1lZGlhVGltZSBzYW1wbGVUaW1l ID0gc2FtcGxlLm91dHB1dFByZXNlbnRhdGlvblRpbWUoKTsKLSAgICBpZiAoIXNhbXBsZVRpbWUg fHwgIXNhbXBsZVRpbWUuaXNWYWxpZCgpKQotICAgICAgICBzYW1wbGVUaW1lID0gc2FtcGxlLnBy ZXNlbnRhdGlvblRpbWUoKTsKKyAgICBNZWRpYVRpbWUgc2FtcGxlVGltZSA9IHNhbXBsZS5wcmVz ZW50YXRpb25UaW1lKCk7CiAgICAgTWVkaWFUaW1lIHRpbWVsaW5lT2Zmc2V0ID0gc3RyZWFtVGlt ZSgpIC0gc2FtcGxlVGltZSArIE1lZGlhVGltZTo6Y3JlYXRlV2l0aERvdWJsZShsYXRlbmN5KTsK ICAgICBpZiAodGltZWxpbmVPZmZzZXQudGltZVNjYWxlKCkgIT0gc2FtcGxlVGltZS50aW1lU2Nh bGUoKSkKICAgICAgICAgdGltZWxpbmVPZmZzZXQgPSBQQUw6OnRvTWVkaWFUaW1lKENNVGltZUNv bnZlcnRTY2FsZShQQUw6OnRvQ01UaW1lKHRpbWVsaW5lT2Zmc2V0KSwgc2FtcGxlVGltZS50aW1l U2NhbGUoKSwga0NNVGltZVJvdW5kaW5nTWV0aG9kX0RlZmF1bHQpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU2Ft cGxlQVZGT2JqQy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLmgKaW5kZXggZjg1NWUxOWUwMzE0ZmRiNGE2NmNh YWE3ZjlkODIxMGQ0ZWM1ZWUyYi4uMjQzNjI2ODEyNzc2ZWE4ZTM1YWM1ZjYwYjRhMzM0MThiMDQ1 NzQ2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLmgKQEAg LTQ0LDEwICs0NCw4IEBAIHB1YmxpYzoKICAgICBSZWZQdHI8SlNDOjpVaW50OENsYW1wZWRBcnJh eT4gZ2V0UkdCQUltYWdlRGF0YSgpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgTWVkaWFUaW1lIHBy ZXNlbnRhdGlvblRpbWUoKSBjb25zdCBvdmVycmlkZTsKLSAgICBNZWRpYVRpbWUgb3V0cHV0UHJl c2VudGF0aW9uVGltZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIE1lZGlhVGltZSBkZWNvZGVUaW1l KCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgTWVkaWFUaW1lIGR1cmF0aW9uKCkgY29uc3Qgb3ZlcnJp ZGU7Ci0gICAgTWVkaWFUaW1lIG91dHB1dER1cmF0aW9uKCkgY29uc3Qgb3ZlcnJpZGU7CiAKICAg ICBBdG9tU3RyaW5nIHRyYWNrSUQoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBtX2lkOyB9CiAg ICAgdm9pZCBzZXRUcmFja0lEKGNvbnN0IFN0cmluZyYgaWQpIG92ZXJyaWRlIHsgbV9pZCA9IGlk OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVNhbXBsZUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVNhbXBsZUFWRk9iakMubW0KaW5kZXgg ZTg5NGI5MTRjNzY3MTgxODY0ZDExMDA3MDY4YTgzZmUyODFiNmM1Mi4uNTMwODc5ZDU1OGE5NDdi MmEzNTgzMGQ4ZjBjNTNlNjkwN2I3OTZlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTYW1wbGVBVkZPYmpDLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhU2FtcGxlQVZGT2JqQy5tbQpAQCAtNzksMTIgKzc5LDEwIEBAIFJlZlB0cjxNZWRpYVNhbXBs ZUFWRk9iakM+IE1lZGlhU2FtcGxlQVZGT2JqQzo6Y3JlYXRlSW1hZ2VTYW1wbGUoVmVjdG9yPHVp bnQ4X3Q+CiAKIE1lZGlhVGltZSBNZWRpYVNhbXBsZUFWRk9iakM6OnByZXNlbnRhdGlvblRpbWUo KSBjb25zdAogewotICAgIHJldHVybiBQQUw6OnRvTWVkaWFUaW1lKENNU2FtcGxlQnVmZmVyR2V0 UHJlc2VudGF0aW9uVGltZVN0YW1wKG1fc2FtcGxlLmdldCgpKSk7Ci19Ci0KLU1lZGlhVGltZSBN ZWRpYVNhbXBsZUFWRk9iakM6Om91dHB1dFByZXNlbnRhdGlvblRpbWUoKSBjb25zdAotewotICAg IHJldHVybiBQQUw6OnRvTWVkaWFUaW1lKENNU2FtcGxlQnVmZmVyR2V0T3V0cHV0UHJlc2VudGF0 aW9uVGltZVN0YW1wKG1fc2FtcGxlLmdldCgpKSk7CisgICAgYXV0byB0aW1lU3RhbXAgPSBDTVNh bXBsZUJ1ZmZlckdldE91dHB1dFByZXNlbnRhdGlvblRpbWVTdGFtcChtX3NhbXBsZS5nZXQoKSk7 CisgICAgaWYgKENNVElNRV9JU19JTlZBTElEKHRpbWVTdGFtcCkpCisgICAgICAgIHRpbWVTdGFt cCA9IENNU2FtcGxlQnVmZmVyR2V0UHJlc2VudGF0aW9uVGltZVN0YW1wKG1fc2FtcGxlLmdldCgp KTsKKyAgICByZXR1cm4gUEFMOjp0b01lZGlhVGltZSh0aW1lU3RhbXApOwogfQogCiBNZWRpYVRp bWUgTWVkaWFTYW1wbGVBVkZPYmpDOjpkZWNvZGVUaW1lKCkgY29uc3QKQEAgLTk0LDEyICs5Miwx MCBAQCBNZWRpYVRpbWUgTWVkaWFTYW1wbGVBVkZPYmpDOjpkZWNvZGVUaW1lKCkgY29uc3QKIAog TWVkaWFUaW1lIE1lZGlhU2FtcGxlQVZGT2JqQzo6ZHVyYXRpb24oKSBjb25zdAogewotICAgIHJl dHVybiBQQUw6OnRvTWVkaWFUaW1lKENNU2FtcGxlQnVmZmVyR2V0RHVyYXRpb24obV9zYW1wbGUu Z2V0KCkpKTsKLX0KLQotTWVkaWFUaW1lIE1lZGlhU2FtcGxlQVZGT2JqQzo6b3V0cHV0RHVyYXRp b24oKSBjb25zdAotewotICAgIHJldHVybiBQQUw6OnRvTWVkaWFUaW1lKENNU2FtcGxlQnVmZmVy R2V0T3V0cHV0RHVyYXRpb24obV9zYW1wbGUuZ2V0KCkpKTsKKyAgICBhdXRvIGR1cmF0aW9uID0g Q01TYW1wbGVCdWZmZXJHZXRPdXRwdXREdXJhdGlvbihtX3NhbXBsZS5nZXQoKSk7CisgICAgaWYg KENNVElNRV9JU19JTlZBTElEKGR1cmF0aW9uKSkKKyAgICAgICAgZHVyYXRpb24gPSBDTVNhbXBs ZUJ1ZmZlckdldER1cmF0aW9uKG1fc2FtcGxlLmdldCgpKTsKKyAgICByZXR1cm4gUEFMOjp0b01l ZGlhVGltZShkdXJhdGlvbik7CiB9CiAKIHNpemVfdCBNZWRpYVNhbXBsZUFWRk9iakM6OnNpemVJ bkJ5dGVzKCkgY29uc3QKQEAgLTE3Miw3ICsxNjgsNyBAQCBGbG9hdFNpemUgTWVkaWFTYW1wbGVB VkZPYmpDOjpwcmVzZW50YXRpb25TaXplKCkgY29uc3QKIAogdm9pZCBNZWRpYVNhbXBsZUFWRk9i akM6OmR1bXAoUHJpbnRTdHJlYW0mIG91dCkgY29uc3QKIHsKLSAgICBvdXQucHJpbnQoIntQVFMo IiwgcHJlc2VudGF0aW9uVGltZSgpLCAiKSwgT1BUUygiLCBvdXRwdXRQcmVzZW50YXRpb25UaW1l KCksICIpLCBEVFMoIiwgZGVjb2RlVGltZSgpLCAiKSwgZHVyYXRpb24oIiwgZHVyYXRpb24oKSwg IiksIGZsYWdzKCIsIChpbnQpZmxhZ3MoKSwgIiksIHByZXNlbnRhdGlvblNpemUoIiwgcHJlc2Vu dGF0aW9uU2l6ZSgpLndpZHRoKCksICJ4IiwgcHJlc2VudGF0aW9uU2l6ZSgpLmhlaWdodCgpLCAi KX0iKTsKKyAgICBvdXQucHJpbnQoIntQVFMoIiwgcHJlc2VudGF0aW9uVGltZSgpLCAiKSwgRFRT KCIsIGRlY29kZVRpbWUoKSwgIiksIGR1cmF0aW9uKCIsIGR1cmF0aW9uKCksICIpLCBmbGFncygi LCAoaW50KWZsYWdzKCksICIpLCBwcmVzZW50YXRpb25TaXplKCIsIHByZXNlbnRhdGlvblNpemUo KS53aWR0aCgpLCAieCIsIHByZXNlbnRhdGlvblNpemUoKS5oZWlnaHQoKSwgIil9Iik7CiB9CiAK IHZvaWQgTWVkaWFTYW1wbGVBVkZPYmpDOjpvZmZzZXRUaW1lc3RhbXBzQnkoY29uc3QgTWVkaWFU aW1lJiBvZmZzZXQpCkBAIC0zMjUsNyArMzIxLDYgQEAgU3RyaW5nIE1lZGlhU2FtcGxlQVZGT2Jq Qzo6dG9KU09OU3RyaW5nKCkgY29uc3QKICAgICBhdXRvIG9iamVjdCA9IEpTT046Ok9iamVjdDo6 Y3JlYXRlKCk7CiAKICAgICBvYmplY3QtPnNldE9iamVjdCgicHRzIl9zLCBwcmVzZW50YXRpb25U aW1lKCkudG9KU09OT2JqZWN0KCkpOwotICAgIG9iamVjdC0+c2V0T2JqZWN0KCJvcHRzIl9zLCBv dXRwdXRQcmVzZW50YXRpb25UaW1lKCkudG9KU09OT2JqZWN0KCkpOwogICAgIG9iamVjdC0+c2V0 T2JqZWN0KCJkdHMiX3MsIGRlY29kZVRpbWUoKS50b0pTT05PYmplY3QoKSk7CiAgICAgb2JqZWN0 LT5zZXRPYmplY3QoImR1cmF0aW9uIl9zLCBkdXJhdGlvbigpLnRvSlNPTk9iamVjdCgpKTsKICAg ICBvYmplY3QtPnNldEludGVnZXIoImZsYWdzIl9zLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oZmxh Z3MoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v UmVhbHRpbWVWaWRlb0NhcHR1cmVTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vUmVhbHRpbWVWaWRlb0NhcHR1cmVTb3VyY2UuY3BwCmluZGV4IGNmYjA5N2Nm YzE3ZDQ5MmU0ZjYzZjZhZDcxNDViYmVjMDg2MjY5ZDkuLjNkYjc4NzhkMjYxOGVhYzA5MjVmZTRj ZTcyZmQ1N2IwN2I0NDY0ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21l ZGlhc3RyZWFtL1JlYWx0aW1lVmlkZW9DYXB0dXJlU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZVZpZGVvQ2FwdHVyZVNvdXJjZS5jcHAK QEAgLTM3OCw5ICszNzgsNyBAQCB2b2lkIFJlYWx0aW1lVmlkZW9DYXB0dXJlU291cmNlOjpzZXRT aXplQW5kRnJhbWVSYXRlKE9wdGlvbmFsPGludD4gd2lkdGgsIE9wdGlvbgogCiBSZWZQdHI8TWVk aWFTYW1wbGU+IFJlYWx0aW1lVmlkZW9DYXB0dXJlU291cmNlOjphZGFwdFZpZGVvU2FtcGxlKE1l ZGlhU2FtcGxlJiBzYW1wbGUpCiB7Ci0gICAgTWVkaWFUaW1lIHNhbXBsZVRpbWUgPSBzYW1wbGUu b3V0cHV0UHJlc2VudGF0aW9uVGltZSgpOwotICAgIGlmICghc2FtcGxlVGltZSB8fCAhc2FtcGxl VGltZS5pc1ZhbGlkKCkpCi0gICAgICAgIHNhbXBsZVRpbWUgPSBzYW1wbGUucHJlc2VudGF0aW9u VGltZSgpOworICAgIE1lZGlhVGltZSBzYW1wbGVUaW1lID0gc2FtcGxlLnByZXNlbnRhdGlvblRp bWUoKTsKIAogICAgIGF1dG8gZnJhbWVUaW1lID0gc2FtcGxlVGltZS50b0RvdWJsZSgpOwogICAg IG1fb2JzZXJ2ZWRGcmFtZVRpbWVTdGFtcHMuYXBwZW5kKGZyYW1lVGltZSk7Cg==