168646 2017-02-21 00:36:55 -0800 AudioSampleDataSource should not exclusively lock its read and write threads. 2017-02-27 09:07:06 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble oldest_to_newest 1279263 0 jer.noble 2017-02-21 00:36:55 -0800 AudioSampleDataSource should not exclusively lock its read and write threads. 1279264 1 302242 jer.noble 2017-02-21 00:39:01 -0800 Created attachment 302242 Patch 1279401 2 302276 jer.noble 2017-02-21 10:13:48 -0800 Created attachment 302276 Patch 1279537 3 302309 jer.noble 2017-02-21 14:32:15 -0800 Created attachment 302309 Patch 1280773 4 302309 youennf 2017-02-24 08:15:43 -0800 Comment on attachment 302309 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=302309&action=review > Source/WebCore/ChangeLog:11 > + CARingBuffer to safely and simultaneously read and write data. Makes sense to me. I can't find any unit test checking CARingBuffer behavior in multithreading though. Would it be useful to ensure CARingBuffer and/or AudioSampleDataSource are working as expected though some unit tests? 1281395 5 jer.noble 2017-02-27 09:07:06 -0800 Committed r213072: <http://trac.webkit.org/changeset/213072> 302242 2017-02-21 00:39:01 -0800 2017-02-21 10:13:45 -0800 Patch bug-168646-20170221003617.patch text/plain 5909 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyNjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDc0NGVmOTYyMjM2ZWRi ZmQ3NThjN2JiNDk5NmM0NWU3ZmQ3Y2M0Yy4uODdmN2Y1MDYzOThjMTliNTA2OGU2ODRlZDJkMDMy MDY4MTEwNjJhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE3LTAyLTIxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIEF1ZGlvU2FtcGxlRGF0YVNv dXJjZSBzaG91bGQgbm90IGV4Y2x1c2l2ZWx5IGxvY2sgaXRzIHJlYWQgYW5kIHdyaXRlIHRocmVh ZHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjg2 NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMb2Nr aW5nIHRoZSB3cml0ZSB0aHJlYWQgY2F1c2VzIHRoZSByZWFkIHRocmVhZCB0byBkcm9wIGF1ZGlv IHNhbXBsZXMgYW5kIGdlbmVyYXRlcyBhdWRpYmxlCisgICAgICAgIGdsaXRjaGVzLCBhbmQgdGhl IHJlYWx0aW1lIGF1ZGlvIHRocmVhZCBiYWNraW5nIHRoZSByZWFkIHRocmVhZCBzaG91bGQgbmV2 ZXIgYmxvY2suIFRoZXJlJ3MKKyAgICAgICAgbm8gcmVhbCByZWFzb24gdG8gbG9jayB0aGVzZSB0 aHJlYWRzIGFnYWluc3Qgb25lIGFub3RoZXIgaGVyZTsgdGhleSBib3RoIHJlbHkgb24gdGhlCisg ICAgICAgIENBUmluZ0J1ZmZlciB0byBzYWZlbHkgYW5kIHNpbXVsdGFuZW91c2x5IHJlYWQgYW5k IHdyaXRlIGRhdGEuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9tYWMvQXVkaW9TYW1wbGVE YXRhU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6 c2V0UGF1c2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVz aFNhbXBsZXNJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb1NhbXBsZURhdGFTb3Vy Y2U6OnB1c2hTYW1wbGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvU2FtcGxlRGF0YVNvdXJj ZTo6cHVsbFNhbXBsZXNJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb1NhbXBsZURh dGFTb3VyY2U6OnB1bGxBdmFsYWlibGVTYW1wbGVzQXNDaHVua3MpOgorICAgICAgICAoV2ViQ29y ZTo6QXVkaW9TYW1wbGVEYXRhU291cmNlOjpwdWxsU2FtcGxlcyk6CisgICAgICAgICogcGxhdGZv cm0vYXVkaW8vbWFjL0F1ZGlvU2FtcGxlRGF0YVNvdXJjZS5oOgorCisyMDE3LTAyLTIxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCiAgICAgICAgIFB1bGxpbmcgdG9vIHF1aWNr bHkgZnJvbSBhbiBBdWRpb1NhbXBsZURhdGFTb3VyY2Ugc2hvdWxkIGluY3JlYXNlIHRoZSBwcmUt YnVmZmVyIGFtb3VudAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTY4NjQ1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlv L21hYy9BdWRpb1NhbXBsZURhdGFTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v YXVkaW8vbWFjL0F1ZGlvU2FtcGxlRGF0YVNvdXJjZS5jcHAKaW5kZXggZTNjZjZkMGUyMzBkYmNh YzQxMjMyYzBkYzRlZjgxNWExOGMyZTY3NC4uMjMwYmRjNzYwNjVkZjA1YTZkY2EzZDIyMzQyYWM5 MTljY2I3OTg5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFj L0F1ZGlvU2FtcGxlRGF0YVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v YXVkaW8vbWFjL0F1ZGlvU2FtcGxlRGF0YVNvdXJjZS5jcHAKQEAgLTcwLDggKzcwLDYgQEAgQXVk aW9TYW1wbGVEYXRhU291cmNlOjp+QXVkaW9TYW1wbGVEYXRhU291cmNlKCkKIAogdm9pZCBBdWRp b1NhbXBsZURhdGFTb3VyY2U6OnNldFBhdXNlZChib29sIHBhdXNlZCkKIHsKLSAgICBzdGQ6Omxv Y2tfZ3VhcmQ8TG9jaz4gbG9jayhtX2xvY2spOwotCiAgICAgaWYgKHBhdXNlZCA9PSBtX3BhdXNl ZCkKICAgICAgICAgcmV0dXJuOwogCkBAIC0xNDMsOCArMTQxLDYgQEAgTWVkaWFUaW1lIEF1ZGlv U2FtcGxlRGF0YVNvdXJjZTo6aG9zdFRpbWUoKSBjb25zdAogCiB2b2lkIEF1ZGlvU2FtcGxlRGF0 YVNvdXJjZTo6cHVzaFNhbXBsZXNJbnRlcm5hbChjb25zdCBBdWRpb0J1ZmZlckxpc3QmIGJ1ZmZl ckxpc3QsIGNvbnN0IE1lZGlhVGltZSYgcHJlc2VudGF0aW9uVGltZSwgc2l6ZV90IHNhbXBsZUNv dW50KQogewotICAgIEFTU0VSVChtX2xvY2suaXNIZWxkKCkpOwotCiAgICAgY29uc3QgQXVkaW9C dWZmZXJMaXN0KiBzYW1wbGVCdWZmZXJMaXN0OwogICAgIGlmIChtX2NvbnZlcnRlcikgewogICAg ICAgICBtX3NjcmF0Y2hCdWZmZXItPnJlc2V0KCk7CkBAIC0xODksOCArMTg1LDYgQEAgdm9pZCBB dWRpb1NhbXBsZURhdGFTb3VyY2U6OnB1c2hTYW1wbGVzSW50ZXJuYWwoY29uc3QgQXVkaW9CdWZm ZXJMaXN0JiBidWZmZXJMaXMKIAogdm9pZCBBdWRpb1NhbXBsZURhdGFTb3VyY2U6OnB1c2hTYW1w bGVzKGNvbnN0IEF1ZGlvU3RyZWFtQmFzaWNEZXNjcmlwdGlvbiYgc2FtcGxlRGVzY3JpcHRpb24s IENNU2FtcGxlQnVmZmVyUmVmIHNhbXBsZUJ1ZmZlcikKIHsKLSAgICBzdGQ6OmxvY2tfZ3VhcmQ8 TG9jaz4gbG9jayhtX2xvY2spOwotCiAgICAgQVNTRVJUX1VOVVNFRChzYW1wbGVEZXNjcmlwdGlv biwgKm1faW5wdXREZXNjcmlwdGlvbiA9PSBzYW1wbGVEZXNjcmlwdGlvbik7CiAgICAgQVNTRVJU KG1fcmluZ0J1ZmZlcik7CiAgICAgCkBAIC0yMDAsMTQgKzE5NCwxMiBAQCB2b2lkIEF1ZGlvU2Ft cGxlRGF0YVNvdXJjZTo6cHVzaFNhbXBsZXMoY29uc3QgQXVkaW9TdHJlYW1CYXNpY0Rlc2NyaXB0 aW9uJiBzYW1wbAogCiB2b2lkIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVzaFNhbXBsZXMoY29u c3QgTWVkaWFUaW1lJiBzYW1wbGVUaW1lLCBjb25zdCBQbGF0Zm9ybUF1ZGlvRGF0YSYgYXVkaW9E YXRhLCBzaXplX3Qgc2FtcGxlQ291bnQpCiB7Ci0gICAgc3RkOjp1bmlxdWVfbG9jazxMb2NrPiBs b2NrKG1fbG9jaywgc3RkOjp0cnlfdG9fbG9jayk7CiAgICAgQVNTRVJUKGlzPFdlYkF1ZGlvQnVm ZmVyTGlzdD4oYXVkaW9EYXRhKSk7CiAgICAgcHVzaFNhbXBsZXNJbnRlcm5hbCgqZG93bmNhc3Q8 V2ViQXVkaW9CdWZmZXJMaXN0PihhdWRpb0RhdGEpLmxpc3QoKSwgc2FtcGxlVGltZSwgc2FtcGxl Q291bnQpOwogfQogCiBib29sIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVsbFNhbXBsZXNJbnRl cm5hbChBdWRpb0J1ZmZlckxpc3QmIGJ1ZmZlciwgc2l6ZV90JiBzYW1wbGVDb3VudCwgdWludDY0 X3QgdGltZVN0YW1wLCBkb3VibGUgLypob3N0VGltZSovLCBQdWxsTW9kZSBtb2RlKQogewotICAg IEFTU0VSVChtX2xvY2suaXNIZWxkKCkpOwogICAgIHVpbnQ2NF90IGJ5dGVDb3VudCA9IHNhbXBs ZUNvdW50ICogbV9vdXRwdXREZXNjcmlwdGlvbi0+Ynl0ZXNQZXJGcmFtZSgpOwogCiAgICAgQVNT RVJUKGJ1ZmZlci5tTnVtYmVyQnVmZmVycyA9PSBtX3JpbmdCdWZmZXItPmNoYW5uZWxDb3VudCgp KTsKQEAgLTI5Nyw4ICsyODksNyBAQCBib29sIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVsbFNh bXBsZXNJbnRlcm5hbChBdWRpb0J1ZmZlckxpc3QmIGJ1ZmZlciwgc2l6ZV90JgogCiBib29sIEF1 ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVsbEF2YWxhaWJsZVNhbXBsZXNBc0NodW5rcyhBdWRpb0J1 ZmZlckxpc3QmIGJ1ZmZlciwgc2l6ZV90IHNhbXBsZUNvdW50UGVyQ2h1bmssIHVpbnQ2NF90IHRp bWVTdGFtcCwgRnVuY3Rpb248dm9pZCgpPiYmIGNvbnN1bWVGaWxsZWRCdWZmZXIpCiB7Ci0gICAg c3RkOjp1bmlxdWVfbG9jazxMb2NrPiBsb2NrKG1fbG9jaywgc3RkOjp0cnlfdG9fbG9jayk7Ci0g ICAgaWYgKCFsb2NrLm93bnNfbG9jaygpIHx8ICFtX3JpbmdCdWZmZXIpCisgICAgaWYgKCFtX3Jp bmdCdWZmZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIEFTU0VSVChidWZmZXIubU51 bWJlckJ1ZmZlcnMgPT0gbV9yaW5nQnVmZmVyLT5jaGFubmVsQ291bnQoKSk7CkBAIC0zMjMsOCAr MzE0LDcgQEAgYm9vbCBBdWRpb1NhbXBsZURhdGFTb3VyY2U6OnB1bGxBdmFsYWlibGVTYW1wbGVz QXNDaHVua3MoQXVkaW9CdWZmZXJMaXN0JiBidWZmZXIKIAogYm9vbCBBdWRpb1NhbXBsZURhdGFT b3VyY2U6OnB1bGxTYW1wbGVzKEF1ZGlvQnVmZmVyTGlzdCYgYnVmZmVyLCBzaXplX3Qgc2FtcGxl Q291bnQsIHVpbnQ2NF90IHRpbWVTdGFtcCwgZG91YmxlIGhvc3RUaW1lLCBQdWxsTW9kZSBtb2Rl KQogewotICAgIHN0ZDo6dW5pcXVlX2xvY2s8TG9jaz4gbG9jayhtX2xvY2ssIHN0ZDo6dHJ5X3Rv X2xvY2spOwotICAgIGlmICghbG9jay5vd25zX2xvY2soKSB8fCAhbV9yaW5nQnVmZmVyKSB7Cisg ICAgaWYgKCFtX3JpbmdCdWZmZXIpIHsKICAgICAgICAgdWludDY0X3QgYnl0ZUNvdW50ID0gc2Ft cGxlQ291bnQgKiBtX291dHB1dERlc2NyaXB0aW9uLT5ieXRlc1BlckZyYW1lKCk7CiAgICAgICAg IEF1ZGlvU2FtcGxlQnVmZmVyTGlzdDo6emVyb0FCTChidWZmZXIsIGJ5dGVDb3VudCk7CiAgICAg ICAgIHJldHVybiBmYWxzZTsKQEAgLTMzNSw4ICszMjUsNyBAQCBib29sIEF1ZGlvU2FtcGxlRGF0 YVNvdXJjZTo6cHVsbFNhbXBsZXMoQXVkaW9CdWZmZXJMaXN0JiBidWZmZXIsIHNpemVfdCBzYW1w bGVDbwogCiBib29sIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVsbFNhbXBsZXMoQXVkaW9TYW1w bGVCdWZmZXJMaXN0JiBidWZmZXIsIHNpemVfdCBzYW1wbGVDb3VudCwgdWludDY0X3QgdGltZVN0 YW1wLCBkb3VibGUgaG9zdFRpbWUsIFB1bGxNb2RlIG1vZGUpCiB7Ci0gICAgc3RkOjp1bmlxdWVf bG9jazxMb2NrPiBsb2NrKG1fbG9jaywgc3RkOjp0cnlfdG9fbG9jayk7Ci0gICAgaWYgKCFsb2Nr Lm93bnNfbG9jaygpIHx8ICFtX3JpbmdCdWZmZXIpIHsKKyAgICBpZiAoIW1fcmluZ0J1ZmZlcikg ewogICAgICAgICBidWZmZXIuemVybygpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvU2FtcGxl RGF0YVNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvU2Ft cGxlRGF0YVNvdXJjZS5oCmluZGV4IGRmYThjNzUwMjVhMGZmOTI5ZDg3NjMzMjMyY2RmNWZlNjRl OWNlZTkuLjE3YzE2MWVlMzRhNDQ5YzE1NGI0M2RmMmMwYTQxZDJiZTY1Y2Q0ZmYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL21hYy9BdWRpb1NhbXBsZURhdGFTb3Vy Y2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9tYWMvQXVkaW9TYW1wbGVE YXRhU291cmNlLmgKQEAgLTI5LDcgKzI5LDYgQEAKIAogI2luY2x1ZGUgIkF1ZGlvU2FtcGxlQnVm ZmVyTGlzdC5oIgogI2luY2x1ZGUgPENvcmVBdWRpby9Db3JlQXVkaW9UeXBlcy5oPgotI2luY2x1 ZGUgPHd0Zi9Mb2NrLmg+CiAjaW5jbHVkZSA8d3RmL01lZGlhVGltZS5oPgogI2luY2x1ZGUgPHd0 Zi9SZWZDb3VudGVkLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgpAQCAtOTQsNyArOTMsNiBA QCBwcm90ZWN0ZWQ6CiAgICAgc3RkOjp1bmlxdWVfcHRyPENBUmluZ0J1ZmZlcj4gbV9yaW5nQnVm ZmVyOwogICAgIHNpemVfdCBtX21heGltdW1TYW1wbGVDb3VudCB7IDAgfTsKIAotICAgIExvY2sg bV9sb2NrOwogICAgIGZsb2F0IG1fdm9sdW1lIHsgMS4wIH07CiAgICAgYm9vbCBtX211dGVkIHsg ZmFsc2UgfTsKICAgICBib29sIG1fcGF1c2VkIHsgdHJ1ZSB9Owo= 302276 2017-02-21 10:13:48 -0800 2017-02-21 14:32:12 -0800 Patch bug-168646-20170221101103.patch text/plain 5903 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyNzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmNkODVmZWRmZGYzYTE2 NmY3MDFmNDdhM2ZkZDI3NTA4YzA1MzI0Yy4uNTU1Y2FhZjdhYWI4ZDk5NTQ1NDQzOWNjOWE1MDkz OGIyNWEzODQ5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE3LTAyLTIxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIEF1ZGlvU2FtcGxlRGF0YVNv dXJjZSBzaG91bGQgbm90IGV4Y2x1c2l2ZWx5IGxvY2sgaXRzIHJlYWQgYW5kIHdyaXRlIHRocmVh ZHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjg2 NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMb2Nr aW5nIHRoZSB3cml0ZSB0aHJlYWQgY2F1c2VzIHRoZSByZWFkIHRocmVhZCB0byBkcm9wIGF1ZGlv IHNhbXBsZXMgYW5kIGdlbmVyYXRlcyBhdWRpYmxlCisgICAgICAgIGdsaXRjaGVzLCBhbmQgdGhl IHJlYWx0aW1lIGF1ZGlvIHRocmVhZCBiYWNraW5nIHRoZSByZWFkIHRocmVhZCBzaG91bGQgbmV2 ZXIgYmxvY2suIFRoZXJlJ3MKKyAgICAgICAgbm8gcmVhbCByZWFzb24gdG8gbG9jayB0aGVzZSB0 aHJlYWRzIGFnYWluc3Qgb25lIGFub3RoZXIgaGVyZTsgdGhleSBib3RoIHJlbHkgb24gdGhlCisg ICAgICAgIENBUmluZ0J1ZmZlciB0byBzYWZlbHkgYW5kIHNpbXVsdGFuZW91c2x5IHJlYWQgYW5k IHdyaXRlIGRhdGEuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9tYWMvQXVkaW9TYW1wbGVE YXRhU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6 c2V0UGF1c2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVz aFNhbXBsZXNJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb1NhbXBsZURhdGFTb3Vy Y2U6OnB1c2hTYW1wbGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvU2FtcGxlRGF0YVNvdXJj ZTo6cHVsbFNhbXBsZXNJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb1NhbXBsZURh dGFTb3VyY2U6OnB1bGxBdmFsYWlibGVTYW1wbGVzQXNDaHVua3MpOgorICAgICAgICAoV2ViQ29y ZTo6QXVkaW9TYW1wbGVEYXRhU291cmNlOjpwdWxsU2FtcGxlcyk6CisgICAgICAgICogcGxhdGZv cm0vYXVkaW8vbWFjL0F1ZGlvU2FtcGxlRGF0YVNvdXJjZS5oOgorCisyMDE3LTAyLTIxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCiAgICAgICAgIFB1bGxpbmcgbW9yZSBmcmFt ZXMgZnJvbSBBdWRpb1NhbXBsZURhdGFTb3VyY2UgdGhhbiB0aGUgbGFzdCBwdXNoIGFkZGVkIHdp bGwgYWx3YXlzIGZhaWwuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjg2NDQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVk aW8vbWFjL0F1ZGlvU2FtcGxlRGF0YVNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v YXVkaW8vbWFjL0F1ZGlvU2FtcGxlRGF0YVNvdXJjZS5oCmluZGV4IGRmYThjNzUwMjVhMGZmOTI5 ZDg3NjMzMjMyY2RmNWZlNjRlOWNlZTkuLjE3YzE2MWVlMzRhNDQ5YzE1NGI0M2RmMmMwYTQxZDJi ZTY1Y2Q0ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL21hYy9B dWRpb1NhbXBsZURhdGFTb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp by9tYWMvQXVkaW9TYW1wbGVEYXRhU291cmNlLmgKQEAgLTI5LDcgKzI5LDYgQEAKIAogI2luY2x1 ZGUgIkF1ZGlvU2FtcGxlQnVmZmVyTGlzdC5oIgogI2luY2x1ZGUgPENvcmVBdWRpby9Db3JlQXVk aW9UeXBlcy5oPgotI2luY2x1ZGUgPHd0Zi9Mb2NrLmg+CiAjaW5jbHVkZSA8d3RmL01lZGlhVGlt ZS5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5o PgpAQCAtOTQsNyArOTMsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgc3RkOjp1bmlxdWVfcHRyPENBUmlu Z0J1ZmZlcj4gbV9yaW5nQnVmZmVyOwogICAgIHNpemVfdCBtX21heGltdW1TYW1wbGVDb3VudCB7 IDAgfTsKIAotICAgIExvY2sgbV9sb2NrOwogICAgIGZsb2F0IG1fdm9sdW1lIHsgMS4wIH07CiAg ICAgYm9vbCBtX211dGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1fcGF1c2VkIHsgdHJ1ZSB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvU2FtcGxl RGF0YVNvdXJjZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL21hYy9BdWRpb1Nh bXBsZURhdGFTb3VyY2UubW0KaW5kZXggNWRiZDM1ZjkyMWYwNzU0ODEzZmM3ZmYwZTk1M2M1OGUx OGQxNTIxMy4uODRkODNlNGIzNTQ0ZDgxM2Y3YzFjNmFmZGZlZDVkNjdmMDM4OTUyNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvU2FtcGxlRGF0YVNv dXJjZS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9tYWMvQXVkaW9TYW1w bGVEYXRhU291cmNlLm1tCkBAIC03MCw4ICs3MCw2IEBAIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6 fkF1ZGlvU2FtcGxlRGF0YVNvdXJjZSgpCiAKIHZvaWQgQXVkaW9TYW1wbGVEYXRhU291cmNlOjpz ZXRQYXVzZWQoYm9vbCBwYXVzZWQpCiB7Ci0gICAgc3RkOjpsb2NrX2d1YXJkPExvY2s+IGxvY2so bV9sb2NrKTsKLQogICAgIGlmIChwYXVzZWQgPT0gbV9wYXVzZWQpCiAgICAgICAgIHJldHVybjsK IApAQCAtMTQzLDggKzE0MSw2IEBAIE1lZGlhVGltZSBBdWRpb1NhbXBsZURhdGFTb3VyY2U6Omhv c3RUaW1lKCkgY29uc3QKIAogdm9pZCBBdWRpb1NhbXBsZURhdGFTb3VyY2U6OnB1c2hTYW1wbGVz SW50ZXJuYWwoY29uc3QgQXVkaW9CdWZmZXJMaXN0JiBidWZmZXJMaXN0LCBjb25zdCBNZWRpYVRp bWUmIHByZXNlbnRhdGlvblRpbWUsIHNpemVfdCBzYW1wbGVDb3VudCkKIHsKLSAgICBBU1NFUlQo bV9sb2NrLmlzSGVsZCgpKTsKLQogICAgIGNvbnN0IEF1ZGlvQnVmZmVyTGlzdCogc2FtcGxlQnVm ZmVyTGlzdDsKICAgICBpZiAobV9jb252ZXJ0ZXIpIHsKICAgICAgICAgbV9zY3JhdGNoQnVmZmVy LT5yZXNldCgpOwpAQCAtMTg5LDggKzE4NSw2IEBAIHZvaWQgQXVkaW9TYW1wbGVEYXRhU291cmNl OjpwdXNoU2FtcGxlc0ludGVybmFsKGNvbnN0IEF1ZGlvQnVmZmVyTGlzdCYgYnVmZmVyTGlzCiAK IHZvaWQgQXVkaW9TYW1wbGVEYXRhU291cmNlOjpwdXNoU2FtcGxlcyhjb25zdCBBdWRpb1N0cmVh bUJhc2ljRGVzY3JpcHRpb24mIHNhbXBsZURlc2NyaXB0aW9uLCBDTVNhbXBsZUJ1ZmZlclJlZiBz YW1wbGVCdWZmZXIpCiB7Ci0gICAgc3RkOjpsb2NrX2d1YXJkPExvY2s+IGxvY2sobV9sb2NrKTsK LQogICAgIEFTU0VSVF9VTlVTRUQoc2FtcGxlRGVzY3JpcHRpb24sICptX2lucHV0RGVzY3JpcHRp b24gPT0gc2FtcGxlRGVzY3JpcHRpb24pOwogICAgIEFTU0VSVChtX3JpbmdCdWZmZXIpOwogICAg IApAQCAtMjAwLDE0ICsxOTQsMTIgQEAgdm9pZCBBdWRpb1NhbXBsZURhdGFTb3VyY2U6OnB1c2hT YW1wbGVzKGNvbnN0IEF1ZGlvU3RyZWFtQmFzaWNEZXNjcmlwdGlvbiYgc2FtcGwKIAogdm9pZCBB dWRpb1NhbXBsZURhdGFTb3VyY2U6OnB1c2hTYW1wbGVzKGNvbnN0IE1lZGlhVGltZSYgc2FtcGxl VGltZSwgY29uc3QgUGxhdGZvcm1BdWRpb0RhdGEmIGF1ZGlvRGF0YSwgc2l6ZV90IHNhbXBsZUNv dW50KQogewotICAgIHN0ZDo6dW5pcXVlX2xvY2s8TG9jaz4gbG9jayhtX2xvY2ssIHN0ZDo6dHJ5 X3RvX2xvY2spOwogICAgIEFTU0VSVChpczxXZWJBdWRpb0J1ZmZlckxpc3Q+KGF1ZGlvRGF0YSkp OwogICAgIHB1c2hTYW1wbGVzSW50ZXJuYWwoKmRvd25jYXN0PFdlYkF1ZGlvQnVmZmVyTGlzdD4o YXVkaW9EYXRhKS5saXN0KCksIHNhbXBsZVRpbWUsIHNhbXBsZUNvdW50KTsKIH0KIAogYm9vbCBB dWRpb1NhbXBsZURhdGFTb3VyY2U6OnB1bGxTYW1wbGVzSW50ZXJuYWwoQXVkaW9CdWZmZXJMaXN0 JiBidWZmZXIsIHNpemVfdCYgc2FtcGxlQ291bnQsIHVpbnQ2NF90IHRpbWVTdGFtcCwgZG91Ymxl IC8qaG9zdFRpbWUqLywgUHVsbE1vZGUgbW9kZSkKIHsKLSAgICBBU1NFUlQobV9sb2NrLmlzSGVs ZCgpKTsKICAgICBzaXplX3QgYnl0ZUNvdW50ID0gc2FtcGxlQ291bnQgKiBtX291dHB1dERlc2Ny aXB0aW9uLT5ieXRlc1BlckZyYW1lKCk7CiAKICAgICBBU1NFUlQoYnVmZmVyLm1OdW1iZXJCdWZm ZXJzID09IG1fcmluZ0J1ZmZlci0+Y2hhbm5lbENvdW50KCkpOwpAQCAtMjk3LDggKzI4OSw3IEBA IGJvb2wgQXVkaW9TYW1wbGVEYXRhU291cmNlOjpwdWxsU2FtcGxlc0ludGVybmFsKEF1ZGlvQnVm ZmVyTGlzdCYgYnVmZmVyLCBzaXplX3QmCiAKIGJvb2wgQXVkaW9TYW1wbGVEYXRhU291cmNlOjpw dWxsQXZhbGFpYmxlU2FtcGxlc0FzQ2h1bmtzKEF1ZGlvQnVmZmVyTGlzdCYgYnVmZmVyLCBzaXpl X3Qgc2FtcGxlQ291bnRQZXJDaHVuaywgdWludDY0X3QgdGltZVN0YW1wLCBGdW5jdGlvbjx2b2lk KCk+JiYgY29uc3VtZUZpbGxlZEJ1ZmZlcikKIHsKLSAgICBzdGQ6OnVuaXF1ZV9sb2NrPExvY2s+ IGxvY2sobV9sb2NrLCBzdGQ6OnRyeV90b19sb2NrKTsKLSAgICBpZiAoIWxvY2sub3duc19sb2Nr KCkgfHwgIW1fcmluZ0J1ZmZlcikKKyAgICBpZiAoIW1fcmluZ0J1ZmZlcikKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCiAgICAgQVNTRVJUKGJ1ZmZlci5tTnVtYmVyQnVmZmVycyA9PSBtX3JpbmdC dWZmZXItPmNoYW5uZWxDb3VudCgpKTsKQEAgLTMyMyw4ICszMTQsNyBAQCBib29sIEF1ZGlvU2Ft cGxlRGF0YVNvdXJjZTo6cHVsbEF2YWxhaWJsZVNhbXBsZXNBc0NodW5rcyhBdWRpb0J1ZmZlckxp c3QmIGJ1ZmZlcgogCiBib29sIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVsbFNhbXBsZXMoQXVk aW9CdWZmZXJMaXN0JiBidWZmZXIsIHNpemVfdCBzYW1wbGVDb3VudCwgdWludDY0X3QgdGltZVN0 YW1wLCBkb3VibGUgaG9zdFRpbWUsIFB1bGxNb2RlIG1vZGUpCiB7Ci0gICAgc3RkOjp1bmlxdWVf bG9jazxMb2NrPiBsb2NrKG1fbG9jaywgc3RkOjp0cnlfdG9fbG9jayk7Ci0gICAgaWYgKCFsb2Nr Lm93bnNfbG9jaygpIHx8ICFtX3JpbmdCdWZmZXIpIHsKKyAgICBpZiAoIW1fcmluZ0J1ZmZlcikg ewogICAgICAgICBzaXplX3QgYnl0ZUNvdW50ID0gc2FtcGxlQ291bnQgKiBtX291dHB1dERlc2Ny aXB0aW9uLT5ieXRlc1BlckZyYW1lKCk7CiAgICAgICAgIEF1ZGlvU2FtcGxlQnVmZmVyTGlzdDo6 emVyb0FCTChidWZmZXIsIGJ5dGVDb3VudCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTMz NSw4ICszMjUsNyBAQCBib29sIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVsbFNhbXBsZXMoQXVk aW9CdWZmZXJMaXN0JiBidWZmZXIsIHNpemVfdCBzYW1wbGVDbwogCiBib29sIEF1ZGlvU2FtcGxl RGF0YVNvdXJjZTo6cHVsbFNhbXBsZXMoQXVkaW9TYW1wbGVCdWZmZXJMaXN0JiBidWZmZXIsIHNp emVfdCBzYW1wbGVDb3VudCwgdWludDY0X3QgdGltZVN0YW1wLCBkb3VibGUgaG9zdFRpbWUsIFB1 bGxNb2RlIG1vZGUpCiB7Ci0gICAgc3RkOjp1bmlxdWVfbG9jazxMb2NrPiBsb2NrKG1fbG9jaywg c3RkOjp0cnlfdG9fbG9jayk7Ci0gICAgaWYgKCFsb2NrLm93bnNfbG9jaygpIHx8ICFtX3JpbmdC dWZmZXIpIHsKKyAgICBpZiAoIW1fcmluZ0J1ZmZlcikgewogICAgICAgICBidWZmZXIuemVybygp OwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQo= 302309 2017-02-21 14:32:15 -0800 2017-02-27 08:55:27 -0800 Patch bug-168646-20170221142930.patch text/plain 5903 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyNzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDY3ZmZhNTMxM2Q4ZjNk YzI5OWIzZGVhYjBmOGQ1YzIzMzc5MTIxYy4uMmI4NmQyMTNjNjljY2Q1MjgxN2JjZmJmNTgyNDgw MjRmZTUzYjUyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE3LTAyLTIxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIEF1ZGlvU2FtcGxlRGF0YVNv dXJjZSBzaG91bGQgbm90IGV4Y2x1c2l2ZWx5IGxvY2sgaXRzIHJlYWQgYW5kIHdyaXRlIHRocmVh ZHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjg2 NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMb2Nr aW5nIHRoZSB3cml0ZSB0aHJlYWQgY2F1c2VzIHRoZSByZWFkIHRocmVhZCB0byBkcm9wIGF1ZGlv IHNhbXBsZXMgYW5kIGdlbmVyYXRlcyBhdWRpYmxlCisgICAgICAgIGdsaXRjaGVzLCBhbmQgdGhl IHJlYWx0aW1lIGF1ZGlvIHRocmVhZCBiYWNraW5nIHRoZSByZWFkIHRocmVhZCBzaG91bGQgbmV2 ZXIgYmxvY2suIFRoZXJlJ3MKKyAgICAgICAgbm8gcmVhbCByZWFzb24gdG8gbG9jayB0aGVzZSB0 aHJlYWRzIGFnYWluc3Qgb25lIGFub3RoZXIgaGVyZTsgdGhleSBib3RoIHJlbHkgb24gdGhlCisg ICAgICAgIENBUmluZ0J1ZmZlciB0byBzYWZlbHkgYW5kIHNpbXVsdGFuZW91c2x5IHJlYWQgYW5k IHdyaXRlIGRhdGEuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9tYWMvQXVkaW9TYW1wbGVE YXRhU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6 c2V0UGF1c2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVz aFNhbXBsZXNJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb1NhbXBsZURhdGFTb3Vy Y2U6OnB1c2hTYW1wbGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvU2FtcGxlRGF0YVNvdXJj ZTo6cHVsbFNhbXBsZXNJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb1NhbXBsZURh dGFTb3VyY2U6OnB1bGxBdmFsYWlibGVTYW1wbGVzQXNDaHVua3MpOgorICAgICAgICAoV2ViQ29y ZTo6QXVkaW9TYW1wbGVEYXRhU291cmNlOjpwdWxsU2FtcGxlcyk6CisgICAgICAgICogcGxhdGZv cm0vYXVkaW8vbWFjL0F1ZGlvU2FtcGxlRGF0YVNvdXJjZS5oOgorCisyMDE3LTAyLTIxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCiAgICAgICAgIFB1bGxpbmcgbW9yZSBmcmFt ZXMgZnJvbSBBdWRpb1NhbXBsZURhdGFTb3VyY2UgdGhhbiB0aGUgbGFzdCBwdXNoIGFkZGVkIHdp bGwgYWx3YXlzIGZhaWwuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjg2NDQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVk aW8vbWFjL0F1ZGlvU2FtcGxlRGF0YVNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v YXVkaW8vbWFjL0F1ZGlvU2FtcGxlRGF0YVNvdXJjZS5oCmluZGV4IGRmYThjNzUwMjVhMGZmOTI5 ZDg3NjMzMjMyY2RmNWZlNjRlOWNlZTkuLjE3YzE2MWVlMzRhNDQ5YzE1NGI0M2RmMmMwYTQxZDJi ZTY1Y2Q0ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL21hYy9B dWRpb1NhbXBsZURhdGFTb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp by9tYWMvQXVkaW9TYW1wbGVEYXRhU291cmNlLmgKQEAgLTI5LDcgKzI5LDYgQEAKIAogI2luY2x1 ZGUgIkF1ZGlvU2FtcGxlQnVmZmVyTGlzdC5oIgogI2luY2x1ZGUgPENvcmVBdWRpby9Db3JlQXVk aW9UeXBlcy5oPgotI2luY2x1ZGUgPHd0Zi9Mb2NrLmg+CiAjaW5jbHVkZSA8d3RmL01lZGlhVGlt ZS5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5o PgpAQCAtOTQsNyArOTMsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgc3RkOjp1bmlxdWVfcHRyPENBUmlu Z0J1ZmZlcj4gbV9yaW5nQnVmZmVyOwogICAgIHNpemVfdCBtX21heGltdW1TYW1wbGVDb3VudCB7 IDAgfTsKIAotICAgIExvY2sgbV9sb2NrOwogICAgIGZsb2F0IG1fdm9sdW1lIHsgMS4wIH07CiAg ICAgYm9vbCBtX211dGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1fcGF1c2VkIHsgdHJ1ZSB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvU2FtcGxl RGF0YVNvdXJjZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL21hYy9BdWRpb1Nh bXBsZURhdGFTb3VyY2UubW0KaW5kZXggNWRiZDM1ZjkyMWYwNzU0ODEzZmM3ZmYwZTk1M2M1OGUx OGQxNTIxMy4uODRkODNlNGIzNTQ0ZDgxM2Y3YzFjNmFmZGZlZDVkNjdmMDM4OTUyNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvU2FtcGxlRGF0YVNv dXJjZS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9tYWMvQXVkaW9TYW1w bGVEYXRhU291cmNlLm1tCkBAIC03MCw4ICs3MCw2IEBAIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6 fkF1ZGlvU2FtcGxlRGF0YVNvdXJjZSgpCiAKIHZvaWQgQXVkaW9TYW1wbGVEYXRhU291cmNlOjpz ZXRQYXVzZWQoYm9vbCBwYXVzZWQpCiB7Ci0gICAgc3RkOjpsb2NrX2d1YXJkPExvY2s+IGxvY2so bV9sb2NrKTsKLQogICAgIGlmIChwYXVzZWQgPT0gbV9wYXVzZWQpCiAgICAgICAgIHJldHVybjsK IApAQCAtMTQzLDggKzE0MSw2IEBAIE1lZGlhVGltZSBBdWRpb1NhbXBsZURhdGFTb3VyY2U6Omhv c3RUaW1lKCkgY29uc3QKIAogdm9pZCBBdWRpb1NhbXBsZURhdGFTb3VyY2U6OnB1c2hTYW1wbGVz SW50ZXJuYWwoY29uc3QgQXVkaW9CdWZmZXJMaXN0JiBidWZmZXJMaXN0LCBjb25zdCBNZWRpYVRp bWUmIHByZXNlbnRhdGlvblRpbWUsIHNpemVfdCBzYW1wbGVDb3VudCkKIHsKLSAgICBBU1NFUlQo bV9sb2NrLmlzSGVsZCgpKTsKLQogICAgIGNvbnN0IEF1ZGlvQnVmZmVyTGlzdCogc2FtcGxlQnVm ZmVyTGlzdDsKICAgICBpZiAobV9jb252ZXJ0ZXIpIHsKICAgICAgICAgbV9zY3JhdGNoQnVmZmVy LT5yZXNldCgpOwpAQCAtMTg5LDggKzE4NSw2IEBAIHZvaWQgQXVkaW9TYW1wbGVEYXRhU291cmNl OjpwdXNoU2FtcGxlc0ludGVybmFsKGNvbnN0IEF1ZGlvQnVmZmVyTGlzdCYgYnVmZmVyTGlzCiAK IHZvaWQgQXVkaW9TYW1wbGVEYXRhU291cmNlOjpwdXNoU2FtcGxlcyhjb25zdCBBdWRpb1N0cmVh bUJhc2ljRGVzY3JpcHRpb24mIHNhbXBsZURlc2NyaXB0aW9uLCBDTVNhbXBsZUJ1ZmZlclJlZiBz YW1wbGVCdWZmZXIpCiB7Ci0gICAgc3RkOjpsb2NrX2d1YXJkPExvY2s+IGxvY2sobV9sb2NrKTsK LQogICAgIEFTU0VSVF9VTlVTRUQoc2FtcGxlRGVzY3JpcHRpb24sICptX2lucHV0RGVzY3JpcHRp b24gPT0gc2FtcGxlRGVzY3JpcHRpb24pOwogICAgIEFTU0VSVChtX3JpbmdCdWZmZXIpOwogICAg IApAQCAtMjAwLDE0ICsxOTQsMTIgQEAgdm9pZCBBdWRpb1NhbXBsZURhdGFTb3VyY2U6OnB1c2hT YW1wbGVzKGNvbnN0IEF1ZGlvU3RyZWFtQmFzaWNEZXNjcmlwdGlvbiYgc2FtcGwKIAogdm9pZCBB dWRpb1NhbXBsZURhdGFTb3VyY2U6OnB1c2hTYW1wbGVzKGNvbnN0IE1lZGlhVGltZSYgc2FtcGxl VGltZSwgY29uc3QgUGxhdGZvcm1BdWRpb0RhdGEmIGF1ZGlvRGF0YSwgc2l6ZV90IHNhbXBsZUNv dW50KQogewotICAgIHN0ZDo6dW5pcXVlX2xvY2s8TG9jaz4gbG9jayhtX2xvY2ssIHN0ZDo6dHJ5 X3RvX2xvY2spOwogICAgIEFTU0VSVChpczxXZWJBdWRpb0J1ZmZlckxpc3Q+KGF1ZGlvRGF0YSkp OwogICAgIHB1c2hTYW1wbGVzSW50ZXJuYWwoKmRvd25jYXN0PFdlYkF1ZGlvQnVmZmVyTGlzdD4o YXVkaW9EYXRhKS5saXN0KCksIHNhbXBsZVRpbWUsIHNhbXBsZUNvdW50KTsKIH0KIAogYm9vbCBB dWRpb1NhbXBsZURhdGFTb3VyY2U6OnB1bGxTYW1wbGVzSW50ZXJuYWwoQXVkaW9CdWZmZXJMaXN0 JiBidWZmZXIsIHNpemVfdCYgc2FtcGxlQ291bnQsIHVpbnQ2NF90IHRpbWVTdGFtcCwgZG91Ymxl IC8qaG9zdFRpbWUqLywgUHVsbE1vZGUgbW9kZSkKIHsKLSAgICBBU1NFUlQobV9sb2NrLmlzSGVs ZCgpKTsKICAgICBzaXplX3QgYnl0ZUNvdW50ID0gc2FtcGxlQ291bnQgKiBtX291dHB1dERlc2Ny aXB0aW9uLT5ieXRlc1BlckZyYW1lKCk7CiAKICAgICBBU1NFUlQoYnVmZmVyLm1OdW1iZXJCdWZm ZXJzID09IG1fcmluZ0J1ZmZlci0+Y2hhbm5lbENvdW50KCkpOwpAQCAtMjk3LDggKzI4OSw3IEBA IGJvb2wgQXVkaW9TYW1wbGVEYXRhU291cmNlOjpwdWxsU2FtcGxlc0ludGVybmFsKEF1ZGlvQnVm ZmVyTGlzdCYgYnVmZmVyLCBzaXplX3QmCiAKIGJvb2wgQXVkaW9TYW1wbGVEYXRhU291cmNlOjpw dWxsQXZhbGFpYmxlU2FtcGxlc0FzQ2h1bmtzKEF1ZGlvQnVmZmVyTGlzdCYgYnVmZmVyLCBzaXpl X3Qgc2FtcGxlQ291bnRQZXJDaHVuaywgdWludDY0X3QgdGltZVN0YW1wLCBGdW5jdGlvbjx2b2lk KCk+JiYgY29uc3VtZUZpbGxlZEJ1ZmZlcikKIHsKLSAgICBzdGQ6OnVuaXF1ZV9sb2NrPExvY2s+ IGxvY2sobV9sb2NrLCBzdGQ6OnRyeV90b19sb2NrKTsKLSAgICBpZiAoIWxvY2sub3duc19sb2Nr KCkgfHwgIW1fcmluZ0J1ZmZlcikKKyAgICBpZiAoIW1fcmluZ0J1ZmZlcikKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCiAgICAgQVNTRVJUKGJ1ZmZlci5tTnVtYmVyQnVmZmVycyA9PSBtX3JpbmdC dWZmZXItPmNoYW5uZWxDb3VudCgpKTsKQEAgLTMyMyw4ICszMTQsNyBAQCBib29sIEF1ZGlvU2Ft cGxlRGF0YVNvdXJjZTo6cHVsbEF2YWxhaWJsZVNhbXBsZXNBc0NodW5rcyhBdWRpb0J1ZmZlckxp c3QmIGJ1ZmZlcgogCiBib29sIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVsbFNhbXBsZXMoQXVk aW9CdWZmZXJMaXN0JiBidWZmZXIsIHNpemVfdCBzYW1wbGVDb3VudCwgdWludDY0X3QgdGltZVN0 YW1wLCBkb3VibGUgaG9zdFRpbWUsIFB1bGxNb2RlIG1vZGUpCiB7Ci0gICAgc3RkOjp1bmlxdWVf bG9jazxMb2NrPiBsb2NrKG1fbG9jaywgc3RkOjp0cnlfdG9fbG9jayk7Ci0gICAgaWYgKCFsb2Nr Lm93bnNfbG9jaygpIHx8ICFtX3JpbmdCdWZmZXIpIHsKKyAgICBpZiAoIW1fcmluZ0J1ZmZlcikg ewogICAgICAgICBzaXplX3QgYnl0ZUNvdW50ID0gc2FtcGxlQ291bnQgKiBtX291dHB1dERlc2Ny aXB0aW9uLT5ieXRlc1BlckZyYW1lKCk7CiAgICAgICAgIEF1ZGlvU2FtcGxlQnVmZmVyTGlzdDo6 emVyb0FCTChidWZmZXIsIGJ5dGVDb3VudCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTMz NSw4ICszMjUsNyBAQCBib29sIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVsbFNhbXBsZXMoQXVk aW9CdWZmZXJMaXN0JiBidWZmZXIsIHNpemVfdCBzYW1wbGVDbwogCiBib29sIEF1ZGlvU2FtcGxl RGF0YVNvdXJjZTo6cHVsbFNhbXBsZXMoQXVkaW9TYW1wbGVCdWZmZXJMaXN0JiBidWZmZXIsIHNp emVfdCBzYW1wbGVDb3VudCwgdWludDY0X3QgdGltZVN0YW1wLCBkb3VibGUgaG9zdFRpbWUsIFB1 bGxNb2RlIG1vZGUpCiB7Ci0gICAgc3RkOjp1bmlxdWVfbG9jazxMb2NrPiBsb2NrKG1fbG9jaywg c3RkOjp0cnlfdG9fbG9jayk7Ci0gICAgaWYgKCFsb2NrLm93bnNfbG9jaygpIHx8ICFtX3JpbmdC dWZmZXIpIHsKKyAgICBpZiAoIW1fcmluZ0J1ZmZlcikgewogICAgICAgICBidWZmZXIuemVybygp OwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQo=