122495 2013-10-08 00:05:23 -0700 [Mac] WebNetscapePluginView should no longer use deleteAllValues 2013-10-08 09:30:05 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 73757 1 darin darin andersca oldest_to_newest 937408 0 darin 2013-10-08 00:05:23 -0700 WebNetscapePluginView should no longer use deleteAllValues 937411 1 213666 darin 2013-10-08 00:08:09 -0700 Created attachment 213666 Patch 937414 2 213666 kling 2013-10-08 00:11:38 -0700 Comment on attachment 213666 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213666&action=review Too tired to parse this code but here's a comment: > Source/WebKit/mac/Plugins/WebNetscapePluginView.mm:710 > + for (auto it = timers->begin(), end = timers->end(); it != end; ++it) You can use range-based for in WebKit/mac. > Source/WebKit/mac/Plugins/WebNetscapePluginView.mm:725 > + for (auto it = timers->begin(), end = timers->end(); it != end; ++it) { Same here. 937441 3 213673 darin 2013-10-08 01:03:29 -0700 Created attachment 213673 Patch 937502 4 213673 andersca 2013-10-08 07:29:30 -0700 Comment on attachment 213673 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213673&action=review > Source/WebKit/mac/Plugins/WebNetscapePluginView.mm:711 > + for (auto& it: *timers) > + it.value->stop(); Can use timers->values() here to avoid it.value. > Source/WebKit/mac/Plugins/WebNetscapePluginView.mm:725 > + for (auto& it: *timers) { Same thing here. > Source/WebKit/mac/Plugins/WebNetscapePluginView.mm:2165 > + while (timerID == 0 || HashTraits<uint32>::isDeletedValue(timerID) || *(slot = &timers->add(timerID, nullptr).iterator->value)); I think we have HashSet::isGoodValue that you can use here. 937548 5 darin 2013-10-08 09:30:05 -0700 Committed r157109: <http://trac.webkit.org/changeset/157109> 213666 2013-10-08 00:08:09 -0700 2013-10-08 01:03:26 -0700 Patch bug-122495-20131008000808.patch text/plain 5077 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3MDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggNDAwYjU1ZTFl YTM2OWM2MDQyYjViYzQyNDM4NTM5NTk2MTgxZDZlMC4uYjFlODFlMDZjNDA5NmFjYWEzZTgyNDJj NDc1ODEzMDQ3NjBmYWE1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEz LTEwLTA4ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJOZXRz Y2FwZVBsdWdpblZpZXcgc2hvdWxkIG5vIGxvbmdlciB1c2UgZGVsZXRlQWxsVmFsdWVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI0OTUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsdWdpbnMvV2Vi TmV0c2NhcGVQbHVnaW5WaWV3Lmg6IFVzZSB1bmlxdWVfcHRyIGZvciBib3RoIHRoZSBwb2ludGVy IHRvCisgICAgICAgIHRoZSB0aW1lcnMgaGFzaCB0YWJsZSwgYW5kIGZvciB0aGUgdmFsdWVzIGlu IHRoZSBoYXNoIHRhYmxlLgorCisgICAgICAgICogUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblZp ZXcubW06CisgICAgICAgICgtW1dlYk5ldHNjYXBlUGx1Z2luVmlldyBzdG9wVGltZXJzXSk6IFJl d3JvdGUgbG9vcCBzbyBpdCB3b3JrcyB3aXRoIHVuaXF1ZV9wdHIuCisgICAgICAgICgtW1dlYk5l dHNjYXBlUGx1Z2luVmlldyBzdGFydFRpbWVyc10pOiBEaXR0by4KKyAgICAgICAgKC1bV2ViTmV0 c2NhcGVQbHVnaW5WaWV3IGZpbmldKTogUmVtb3ZlZCB1bm5lZWRlZCBjb2RlIHRvIGRlbGV0ZSB0 aW1lcnMuCisgICAgICAgICgtW1dlYk5ldHNjYXBlUGx1Z2luVmlldyBzY2hlZHVsZVRpbWVyV2l0 aEludGVydmFsOnJlcGVhdDp0aW1lckZ1bmM6XSk6IE1ha2UKKyAgICAgICAgdGhlIHRpbWVycyBo YXNoIHRhYmxlIHdpdGggbWFrZS11bmlxdWUuIEZpeGVkIHRoZSBsb29wIHRoYXQgY2hvb3NlcyB0 aGUgdGltZXIKKyAgICAgICAgSUQgc28gaXQgd29uJ3QgZXZlciB0cnkgdG8gdXNlIGEgZGVsZXRl ZCB2YWx1ZSwgYWx0aG91Z2ggdGhhdCBuZXZlciBoYXBwZW5zCisgICAgICAgIGluIHByYWN0aWNl LiBVc2UgSGFzaE1hcDo6YWRkIGluc3RlYWQgb2YgdXNpbmcgYm90aCBjb250YWlucyBhbmQgc2V0 LgorICAgICAgICBSZWFycmFuZ2VkIGNvZGUgc28gd2UgZG9uJ3QgbmVlZCB0byBtYWtlIGEgcmF3 IHBvaW50ZXIgZm9yIHRoZSB0aW1lci4KKyAgICAgICAgKC1bV2ViTmV0c2NhcGVQbHVnaW5WaWV3 IHVuc2NoZWR1bGVUaW1lcjpdKTogVXNlIHJlbW92ZSBpbnN0ZWFkIG9mIHRha2UvZGVsZXRlLAor ICAgICAgICBzaW5jZSByZW1vdmUgdGFrZXMgY2FyZSBvZiB0aGUgZGVsZXRpb24gYXV0b21hdGlj YWxseSBzaW5jZSB3ZSBhcmUgdXNpbmcgdGhlCisgICAgICAgIHVuaXF1ZV9wdHIgY2xhc3MuCisK IDIwMTMtMTAtMDcgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBDVFRF OiBVc2UgcmVmZXJlbmNlcyBpbiBhbmQgYXJvdW5kIERyYWdDb250cm9sbGVyCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luVmlldy5oIGIvU291 cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblZpZXcuaAppbmRleCA2YWYz ZjI1YTc1Nzc0ZTMwZDhjMzI2Y2IzNmM4M2ZmNTk0MDk1ODlkLi40MzQ0MDA4OWE2ZTYwYmJkNTc4 ODY0YjgzNTc3ZTgwZmM1NDk2YWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVn aW5zL1dlYk5ldHNjYXBlUGx1Z2luVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdp bnMvV2ViTmV0c2NhcGVQbHVnaW5WaWV3LmgKQEAgLTg4LDcgKzg4LDcgQEAgdHlwZWRlZiB1bmlv biBQbHVnaW5Qb3J0IHsKICAgICBCT09MIHNob3VsZFN0b3BTb29uOwogCiAgICAgdWludDMyX3Qg Y3VycmVudFRpbWVySUQ7Ci0gICAgSGFzaE1hcDx1aW50MzJfdCwgUGx1Z2luVGltZXIqPiogdGlt ZXJzOworICAgIHN0ZDo6dW5pcXVlX3B0cjxIYXNoTWFwPHVpbnQzMl90LCBzdGQ6OnVuaXF1ZV9w dHI8UGx1Z2luVGltZXI+Pj4gdGltZXJzOwogCiAgICAgdW5zaWduZWQgcGx1Z2luRnVuY3Rpb25D YWxsRGVwdGg7CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL1dl Yk5ldHNjYXBlUGx1Z2luVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0 c2NhcGVQbHVnaW5WaWV3Lm1tCmluZGV4IDBjZjA2NmM5N2JlMDI1YTJlZGYwZWEwMDI4NTMwNzA0 NjhjM2NiOWMuLmM2NzBmOTVjNjliMzI5YzhjNTZkOGVhZTBmNzZjMDhiOTRlMzZmMDYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5WaWV3Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5WaWV3Lm1t CkBAIC03MDcsMTEgKzcwNyw4IEBAIC0gKHZvaWQpc3RvcFRpbWVycwogICAgIGlmICghdGltZXJz KQogICAgICAgICByZXR1cm47CiAKLSAgICBIYXNoTWFwPHVpbnQzMl90LCBQbHVnaW5UaW1lcio+ Ojpjb25zdF9pdGVyYXRvciBlbmQgPSB0aW1lcnMtPmVuZCgpOwotICAgIGZvciAoSGFzaE1hcDx1 aW50MzJfdCwgUGx1Z2luVGltZXIqPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSB0aW1lcnMtPmJlZ2lu KCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICBQbHVnaW5UaW1lciogdGltZXIgPSBpdC0+ dmFsdWU7Ci0gICAgICAgIHRpbWVyLT5zdG9wKCk7Ci0gICAgfSAgICAKKyAgICBmb3IgKGF1dG8g aXQgPSB0aW1lcnMtPmJlZ2luKCksIGVuZCA9IHRpbWVycy0+ZW5kKCk7IGl0ICE9IGVuZDsgKytp dCkKKyAgICAgICAgaXQtPnZhbHVlLT5zdG9wKCk7CiB9CiAKIC0gKHZvaWQpc3RhcnRUaW1lcnMK QEAgLTcyNSwxMSArNzIyLDEwIEBAIC0gKHZvaWQpc3RhcnRUaW1lcnMKICAgICBpZiAoIXRpbWVy cykKICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIEhhc2hNYXA8dWludDMyX3QsIFBsdWdpblRp bWVyKj46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IHRpbWVycy0+ZW5kKCk7Ci0gICAgZm9yIChIYXNo TWFwPHVpbnQzMl90LCBQbHVnaW5UaW1lcio+Ojpjb25zdF9pdGVyYXRvciBpdCA9IHRpbWVycy0+ YmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIFBsdWdpblRpbWVyKiB0aW1lciA9 IGl0LT52YWx1ZTsKLSAgICAgICAgQVNTRVJUKCF0aW1lci0+aXNBY3RpdmUoKSk7Ci0gICAgICAg IHRpbWVyLT5zdGFydChfaXNDb21wbGV0ZWx5T2JzY3VyZWQpOworICAgIGZvciAoYXV0byBpdCA9 IHRpbWVycy0+YmVnaW4oKSwgZW5kID0gdGltZXJzLT5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7 CisgICAgICAgIFBsdWdpblRpbWVyJiB0aW1lciA9ICppdC0+dmFsdWU7CisgICAgICAgIEFTU0VS VCghdGltZXIuaXNBY3RpdmUoKSk7CisgICAgICAgIHRpbWVyLnN0YXJ0KF9pc0NvbXBsZXRlbHlP YnNjdXJlZCk7CiAgICAgfSAgICAKIH0KIApAQCAtMTM2OSwxMSArMTM2NSw2IEBAIC0gKHZvaWQp ZmluaQogICAgIAogICAgIEFTU0VSVCghX2V2ZW50SGFuZGxlcik7CiAgICAgCi0gICAgaWYgKHRp bWVycykgewotICAgICAgICBkZWxldGVBbGxWYWx1ZXMoKnRpbWVycyk7Ci0gICAgICAgIGRlbGV0 ZSB0aW1lcnM7Ci0gICAgfSAgCi0gICAgCiAgICAgW19jb250YWluZXJDaGVja3NJblByb2dyZXNz IHJlbGVhc2VdOwogfQogCkBAIC0yMTY1LDIwICsyMTU2LDIxIEBAIC0gKHVpbnQzMl90KXNjaGVk dWxlVGltZXJXaXRoSW50ZXJ2YWw6KHVpbnQzMl90KWludGVydmFsIHJlcGVhdDooTlBCb29sKXJl cGVhdCB0CiAgICAgICAgIHJldHVybiAwOwogICAgIAogICAgIGlmICghdGltZXJzKQotICAgICAg ICB0aW1lcnMgPSBuZXcgSGFzaE1hcDx1aW50MzJfdCwgUGx1Z2luVGltZXIqPjsKLSAgICAKKyAg ICAgICAgdGltZXJzID0gc3RkOjptYWtlX3VuaXF1ZTxIYXNoTWFwPHVpbnQzMl90LCBzdGQ6OnVu aXF1ZV9wdHI8UGx1Z2luVGltZXI+Pj4oKTsKKworICAgIHN0ZDo6dW5pcXVlX3B0cjxQbHVnaW5U aW1lcj4qIHNsb3Q7CiAgICAgdWludDMyX3QgdGltZXJJRDsKLSAgICAKLSAgICBkbyB7CisgICAg ZG8KICAgICAgICAgdGltZXJJRCA9ICsrY3VycmVudFRpbWVySUQ7Ci0gICAgfSB3aGlsZSAodGlt ZXJzLT5jb250YWlucyh0aW1lcklEKSB8fCB0aW1lcklEID09IDApOwotICAgIAotICAgIFBsdWdp blRpbWVyKiB0aW1lciA9IG5ldyBQbHVnaW5UaW1lcihwbHVnaW4sIHRpbWVySUQsIGludGVydmFs LCByZXBlYXQsIHRpbWVyRnVuYyk7Ci0gICAgdGltZXJzLT5zZXQodGltZXJJRCwgdGltZXIpOwor ICAgIHdoaWxlICh0aW1lcklEID09IDAgfHwgSGFzaFRyYWl0czx1aW50MzI+Ojppc0RlbGV0ZWRW YWx1ZSh0aW1lcklEKSB8fCAqKHNsb3QgPSAmdGltZXJzLT5hZGQodGltZXJJRCwgbnVsbHB0ciku aXRlcmF0b3ItPnZhbHVlKSk7CisKKyAgICBhdXRvIHRpbWVyID0gc3RkOjptYWtlX3VuaXF1ZTxQ bHVnaW5UaW1lcj4ocGx1Z2luLCB0aW1lcklELCBpbnRlcnZhbCwgcmVwZWF0LCB0aW1lckZ1bmMp OwogCiAgICAgaWYgKF9zaG91bGRGaXJlVGltZXJzKQogICAgICAgICB0aW1lci0+c3RhcnQoX2lz Q29tcGxldGVseU9ic2N1cmVkKTsKICAgICAKKyAgICAqc2xvdCA9IHN0ZDo6bW92ZSh0aW1lcik7 CisKICAgICByZXR1cm4gdGltZXJJRDsKIH0KIApAQCAtMjE4Nyw4ICsyMTc5LDcgQEAgLSAodm9p ZCl1bnNjaGVkdWxlVGltZXI6KHVpbnQzMl90KXRpbWVySUQKICAgICBpZiAoIXRpbWVycykKICAg ICAgICAgcmV0dXJuOwogICAgIAotICAgIGlmIChQbHVnaW5UaW1lciogdGltZXIgPSB0aW1lcnMt PnRha2UodGltZXJJRCkpCi0gICAgICAgIGRlbGV0ZSB0aW1lcjsKKyAgICB0aW1lcnMtPnJlbW92 ZSh0aW1lcklEKTsKIH0KIAogLSAoTlBFcnJvcilwb3BVcENvbnRleHRNZW51OihOUE1lbnUgKilt ZW51Cg== 213673 2013-10-08 01:03:29 -0700 2013-10-08 07:29:30 -0700 Patch bug-122495-20131008010328.patch text/plain 5539 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3MDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggOTliMzQ2OGRm NmE0NDEwZDI5ZDI4MjM1YTk1NzA3ZDM3YzUwMmQ1Mi4uMDNkMGM5MDU1ZTBjZTAyZGE3ZmI2MmVh NTA0NDRiYzM4YTViM2I1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEz LTEwLTA4ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWJOZXRz Y2FwZVBsdWdpblZpZXcgc2hvdWxkIG5vIGxvbmdlciB1c2UgZGVsZXRlQWxsVmFsdWVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI0OTUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsdWdpbnMvV2Vi TmV0c2NhcGVQbHVnaW5WaWV3Lmg6IFVzZSB1bmlxdWVfcHRyIGZvciBib3RoIHRoZSBwb2ludGVy IHRvCisgICAgICAgIHRoZSB0aW1lcnMgaGFzaCB0YWJsZSwgYW5kIGZvciB0aGUgdmFsdWVzIGlu IHRoZSBoYXNoIHRhYmxlLgorCisgICAgICAgICogUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblZp ZXcubW06CisgICAgICAgICgtW1dlYk5ldHNjYXBlUGx1Z2luVmlldyBzdG9wVGltZXJzXSk6IFJl d3JvdGUgbG9vcCBzbyBpdCB3b3JrcyB3aXRoIHVuaXF1ZV9wdHIuCisgICAgICAgICgtW1dlYk5l dHNjYXBlUGx1Z2luVmlldyBzdGFydFRpbWVyc10pOiBEaXR0by4KKyAgICAgICAgKC1bV2ViTmV0 c2NhcGVQbHVnaW5WaWV3IGZpbmldKTogUmVtb3ZlZCB1bm5lZWRlZCBjb2RlIHRvIGRlbGV0ZSB0 aW1lcnMuCisgICAgICAgICgtW1dlYk5ldHNjYXBlUGx1Z2luVmlldyBzY2hlZHVsZVRpbWVyV2l0 aEludGVydmFsOnJlcGVhdDp0aW1lckZ1bmM6XSk6IE1ha2UKKyAgICAgICAgdGhlIHRpbWVycyBo YXNoIHRhYmxlIHdpdGggbWFrZS11bmlxdWUuIEZpeGVkIHRoZSBsb29wIHRoYXQgY2hvb3NlcyB0 aGUgdGltZXIKKyAgICAgICAgSUQgc28gaXQgd29uJ3QgZXZlciB0cnkgdG8gdXNlIGEgZGVsZXRl ZCB2YWx1ZSwgYWx0aG91Z2ggdGhhdCBuZXZlciBoYXBwZW5zCisgICAgICAgIGluIHByYWN0aWNl LiBVc2UgSGFzaE1hcDo6YWRkIGluc3RlYWQgb2YgdXNpbmcgYm90aCBjb250YWlucyBhbmQgc2V0 LgorICAgICAgICBSZWFycmFuZ2VkIGNvZGUgc28gd2UgZG9uJ3QgbmVlZCB0byBtYWtlIGEgcmF3 IHBvaW50ZXIgZm9yIHRoZSB0aW1lci4KKyAgICAgICAgKC1bV2ViTmV0c2NhcGVQbHVnaW5WaWV3 IHVuc2NoZWR1bGVUaW1lcjpdKTogVXNlIHJlbW92ZSBpbnN0ZWFkIG9mIHRha2UvZGVsZXRlLAor ICAgICAgICBzaW5jZSByZW1vdmUgdGFrZXMgY2FyZSBvZiB0aGUgZGVsZXRpb24gYXV0b21hdGlj YWxseSBzaW5jZSB3ZSBhcmUgdXNpbmcgdGhlCisgICAgICAgIHVuaXF1ZV9wdHIgY2xhc3MuCisK KzIwMTMtMTAtMDggIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCiAgICAgICAgIENo YW5nZSBOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6Om1fcmVwbGllcyB0byB1c2UgdW5pcXVl X3B0ciBpbnN0ZWFkIG9mIGRlbGV0ZUFsbFZhbHVlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyNDkyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5WaWV3LmggYi9Tb3VyY2UvV2ViS2l0L21h Yy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luVmlldy5oCmluZGV4IDZhZjNmMjVhNzU3NzRlMzBk OGMzMjZjYjM2YzgzZmY1OTQwOTU4OWQuLjQzNDQwMDg5YTZlNjBiYmQ1Nzg4NjRiODM1NzdlODBm YzU0OTZhZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2Nh cGVQbHVnaW5WaWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2Fw ZVBsdWdpblZpZXcuaApAQCAtODgsNyArODgsNyBAQCB0eXBlZGVmIHVuaW9uIFBsdWdpblBvcnQg ewogICAgIEJPT0wgc2hvdWxkU3RvcFNvb247CiAKICAgICB1aW50MzJfdCBjdXJyZW50VGltZXJJ RDsKLSAgICBIYXNoTWFwPHVpbnQzMl90LCBQbHVnaW5UaW1lcio+KiB0aW1lcnM7CisgICAgc3Rk Ojp1bmlxdWVfcHRyPEhhc2hNYXA8dWludDMyX3QsIHN0ZDo6dW5pcXVlX3B0cjxQbHVnaW5UaW1l cj4+PiB0aW1lcnM7CiAKICAgICB1bnNpZ25lZCBwbHVnaW5GdW5jdGlvbkNhbGxEZXB0aDsKICAg ICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVn aW5WaWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblZp ZXcubW0KaW5kZXggMGNmMDY2Yzk3YmUwMjVhMmVkZjBlYTAwMjg1MzA3MDQ2OGMzY2I5Yy4uNjAw YzI1OWQ2YTYzMTUwYzlmZWYwZWQ4OWM4ZDVjN2QzMmY2MjNiMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblZpZXcubW0KKysrIGIvU291cmNl L1dlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblZpZXcubW0KQEAgLTcwNywxMSAr NzA3LDggQEAgLSAodm9pZClzdG9wVGltZXJzCiAgICAgaWYgKCF0aW1lcnMpCiAgICAgICAgIHJl dHVybjsKIAotICAgIEhhc2hNYXA8dWludDMyX3QsIFBsdWdpblRpbWVyKj46OmNvbnN0X2l0ZXJh dG9yIGVuZCA9IHRpbWVycy0+ZW5kKCk7Ci0gICAgZm9yIChIYXNoTWFwPHVpbnQzMl90LCBQbHVn aW5UaW1lcio+Ojpjb25zdF9pdGVyYXRvciBpdCA9IHRpbWVycy0+YmVnaW4oKTsgaXQgIT0gZW5k OyArK2l0KSB7Ci0gICAgICAgIFBsdWdpblRpbWVyKiB0aW1lciA9IGl0LT52YWx1ZTsKLSAgICAg ICAgdGltZXItPnN0b3AoKTsKLSAgICB9ICAgIAorICAgIGZvciAoYXV0byYgaXQ6ICp0aW1lcnMp CisgICAgICAgIGl0LnZhbHVlLT5zdG9wKCk7CiB9CiAKIC0gKHZvaWQpc3RhcnRUaW1lcnMKQEAg LTcyNSwxMSArNzIyLDEwIEBAIC0gKHZvaWQpc3RhcnRUaW1lcnMKICAgICBpZiAoIXRpbWVycykK ICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIEhhc2hNYXA8dWludDMyX3QsIFBsdWdpblRpbWVy Kj46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IHRpbWVycy0+ZW5kKCk7Ci0gICAgZm9yIChIYXNoTWFw PHVpbnQzMl90LCBQbHVnaW5UaW1lcio+Ojpjb25zdF9pdGVyYXRvciBpdCA9IHRpbWVycy0+YmVn aW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIFBsdWdpblRpbWVyKiB0aW1lciA9IGl0 LT52YWx1ZTsKLSAgICAgICAgQVNTRVJUKCF0aW1lci0+aXNBY3RpdmUoKSk7Ci0gICAgICAgIHRp bWVyLT5zdGFydChfaXNDb21wbGV0ZWx5T2JzY3VyZWQpOworICAgIGZvciAoYXV0byYgaXQ6ICp0 aW1lcnMpIHsKKyAgICAgICAgUGx1Z2luVGltZXImIHRpbWVyID0gKml0LnZhbHVlOworICAgICAg ICBBU1NFUlQoIXRpbWVyLmlzQWN0aXZlKCkpOworICAgICAgICB0aW1lci5zdGFydChfaXNDb21w bGV0ZWx5T2JzY3VyZWQpOwogICAgIH0gICAgCiB9CiAKQEAgLTExODUsOCArMTE4MSw4IEBAIC0g KHZvaWQpZGVzdHJveVBsdWdpbgogICAgIC8vIG9mIHJlbW92aW5nIGEgc3RyZWFtIGZyb20gdGhp cyBoYXNoIHNldC4KICAgICBWZWN0b3I8UmVmUHRyPFdlYk5ldHNjYXBlUGx1Z2luU3RyZWFtPiA+ IHN0cmVhbXNDb3B5OwogICAgIGNvcHlUb1ZlY3RvcihzdHJlYW1zLCBzdHJlYW1zQ29weSk7Ci0g ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzdHJlYW1zQ29weS5zaXplKCk7IGkrKykKLSAgICAg ICAgc3RyZWFtc0NvcHlbaV0tPnN0b3AoKTsKKyAgICBmb3IgKGF1dG8mIHN0cmVhbTogc3RyZWFt c0NvcHkpCisgICAgICAgIHN0cmVhbS0+c3RvcCgpOwogCiAgICAgZm9yIChXZWJGcmFtZSAqZnJh bWUgaW4gW19wZW5kaW5nRnJhbWVMb2FkcyBrZXlFbnVtZXJhdG9yXSkKICAgICAgICAgW2ZyYW1l IF9zZXRJbnRlcm5hbExvYWREZWxlZ2F0ZTpuaWxdOwpAQCAtMTM2OSwxMSArMTM2NSw2IEBAIC0g KHZvaWQpZmluaQogICAgIAogICAgIEFTU0VSVCghX2V2ZW50SGFuZGxlcik7CiAgICAgCi0gICAg aWYgKHRpbWVycykgewotICAgICAgICBkZWxldGVBbGxWYWx1ZXMoKnRpbWVycyk7Ci0gICAgICAg IGRlbGV0ZSB0aW1lcnM7Ci0gICAgfSAgCi0gICAgCiAgICAgW19jb250YWluZXJDaGVja3NJblBy b2dyZXNzIHJlbGVhc2VdOwogfQogCkBAIC0yMTY1LDIwICsyMTU2LDIxIEBAIC0gKHVpbnQzMl90 KXNjaGVkdWxlVGltZXJXaXRoSW50ZXJ2YWw6KHVpbnQzMl90KWludGVydmFsIHJlcGVhdDooTlBC b29sKXJlcGVhdCB0CiAgICAgICAgIHJldHVybiAwOwogICAgIAogICAgIGlmICghdGltZXJzKQot ICAgICAgICB0aW1lcnMgPSBuZXcgSGFzaE1hcDx1aW50MzJfdCwgUGx1Z2luVGltZXIqPjsKLSAg ICAKKyAgICAgICAgdGltZXJzID0gc3RkOjptYWtlX3VuaXF1ZTxIYXNoTWFwPHVpbnQzMl90LCBz dGQ6OnVuaXF1ZV9wdHI8UGx1Z2luVGltZXI+Pj4oKTsKKworICAgIHN0ZDo6dW5pcXVlX3B0cjxQ bHVnaW5UaW1lcj4qIHNsb3Q7CiAgICAgdWludDMyX3QgdGltZXJJRDsKLSAgICAKLSAgICBkbyB7 CisgICAgZG8KICAgICAgICAgdGltZXJJRCA9ICsrY3VycmVudFRpbWVySUQ7Ci0gICAgfSB3aGls ZSAodGltZXJzLT5jb250YWlucyh0aW1lcklEKSB8fCB0aW1lcklEID09IDApOwotICAgIAotICAg IFBsdWdpblRpbWVyKiB0aW1lciA9IG5ldyBQbHVnaW5UaW1lcihwbHVnaW4sIHRpbWVySUQsIGlu dGVydmFsLCByZXBlYXQsIHRpbWVyRnVuYyk7Ci0gICAgdGltZXJzLT5zZXQodGltZXJJRCwgdGlt ZXIpOworICAgIHdoaWxlICh0aW1lcklEID09IDAgfHwgSGFzaFRyYWl0czx1aW50MzI+Ojppc0Rl bGV0ZWRWYWx1ZSh0aW1lcklEKSB8fCAqKHNsb3QgPSAmdGltZXJzLT5hZGQodGltZXJJRCwgbnVs bHB0cikuaXRlcmF0b3ItPnZhbHVlKSk7CisKKyAgICBhdXRvIHRpbWVyID0gc3RkOjptYWtlX3Vu aXF1ZTxQbHVnaW5UaW1lcj4ocGx1Z2luLCB0aW1lcklELCBpbnRlcnZhbCwgcmVwZWF0LCB0aW1l ckZ1bmMpOwogCiAgICAgaWYgKF9zaG91bGRGaXJlVGltZXJzKQogICAgICAgICB0aW1lci0+c3Rh cnQoX2lzQ29tcGxldGVseU9ic2N1cmVkKTsKICAgICAKKyAgICAqc2xvdCA9IHN0ZDo6bW92ZSh0 aW1lcik7CisKICAgICByZXR1cm4gdGltZXJJRDsKIH0KIApAQCAtMjE4Nyw4ICsyMTc5LDcgQEAg LSAodm9pZCl1bnNjaGVkdWxlVGltZXI6KHVpbnQzMl90KXRpbWVySUQKICAgICBpZiAoIXRpbWVy cykKICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIGlmIChQbHVnaW5UaW1lciogdGltZXIgPSB0 aW1lcnMtPnRha2UodGltZXJJRCkpCi0gICAgICAgIGRlbGV0ZSB0aW1lcjsKKyAgICB0aW1lcnMt PnJlbW92ZSh0aW1lcklEKTsKIH0KIAogLSAoTlBFcnJvcilwb3BVcENvbnRleHRNZW51OihOUE1l bnUgKiltZW51Cg==