63360 2011-06-24 15:24:33 -0700 fix possible race in LinkLoader 2011-06-27 10:11:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gavinp gavinp abarth ap darin tonyg webkit.review.bot oldest_to_newest 427199 0 gavinp 2011-06-24 15:24:33 -0700 fix possible race in LinkLoader 427202 1 98551 gavinp 2011-06-24 15:29:15 -0700 Created attachment 98551 Patch 427206 2 98551 gavinp 2011-06-24 15:34:24 -0700 Comment on attachment 98551 Patch I'm hoping this is the race I'm chasing for bug 80729, and I was hoping this change would find some results in the canary. However, the ASSERT at the top of LinkLoader::notifyFinished gives me some pause. 427213 3 98551 darin 2011-06-24 15:49:08 -0700 Comment on attachment 98551 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98551&action=review > Source/WebCore/loader/LinkLoader.cpp:62 > +void LinkLoader::linkLoadTimerFired(Timer<LinkLoader>* timer) You should either omit the argument name, since it’s unused, or keep the ASSERT_UNUSED. > Source/WebCore/loader/LinkLoader.cpp:-63 > - ASSERT_UNUSED(timer, timer == &m_linkLoadedTimer); Why get rid of this? > Source/WebCore/loader/LinkLoader.cpp:67 > +void LinkLoader::linkLoadingErrorTimerFired(Timer<LinkLoader>* timer) You should either omit the argument name, since it’s unused, or use ASSERT_UNUSED. 427227 4 98559 gavinp 2011-06-24 16:24:06 -0700 Created attachment 98559 Patch 427228 5 98559 gavinp 2011-06-24 16:25:52 -0700 Comment on attachment 98559 Patch Thanks for the review Darin. There was no good reason to be rid of that ASSERT, so I left it in and added another for good measure. Also, I'm keeping the timer parameters just for the assert. 427230 6 gavinp 2011-06-24 16:29:21 -0700 Added reviewers 427262 7 98559 webkit.review.bot 2011-06-24 17:39:46 -0700 Comment on attachment 98559 Patch Clearing flags on attachment: 98559 Committed r89719: <http://trac.webkit.org/changeset/89719> 427263 8 webkit.review.bot 2011-06-24 17:39:51 -0700 All reviewed patches have been landed. Closing bug. 427794 9 98559 tonyg 2011-06-27 02:01:40 -0700 Comment on attachment 98559 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98559&action=review > Source/WebCore/loader/LinkLoader.cpp:83 > + m_cachedLinkResource->removeClient(this); Once the CachedResourceHandle's client is removed, it can purge its internal buffer. Just wanted to make sure that is safe. Perhaps it is since HTMLLinkElement::linkLoaded doesn't actually do anything with the data? 428038 10 gavinp 2011-06-27 10:11:01 -0700 Thanks Tony. You're right, since we ignore the data, we're good. In fact if the current resource is requested again (say, as an image), the cache drops the entire prefetch cachedresource and gets a new one. So we're fine, for now. This summer I hope to allow cached resources to mutate their type. That will mean that this could become a bug, so it's helpful you flagged it. 98551 2011-06-24 15:29:15 -0700 2011-06-24 16:24:02 -0700 Patch bug-63360-20110624182914.patch text/plain 4163 gavinp U3VidmVyc2lvbiBSZXZpc2lvbjogODk3MDkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzMDE3ZTc5MTI1NGE0OTM5 ZTQ3ZWMyNGY2MDdiN2YxM2Y4OGM5NzYzLi4wY2I5MGEyZDM3MDk3NGE3MThkM2YwNzI5ZjUzZWU3 OWI2NDM0NDBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDYtMjQgIEdhdmlu IFBldGVycyAgPGdhdmlucEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgZml4IHBvc3NpYmxlIHJhY2UgaW4gTGlua0xvYWRlcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMzNjAKKwor ICAgICAgICBJbiBjaHJvbWl1bSBidWcgODA3MjkKKyAgICAgICAgaHR0cDovL2NvZGUuZ29vZ2xl LmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9kZXRhaWw/aWQ9ODA3MjkgSSBhbQorICAgICAgICBzZWVp bmcgc29tZSBraW5kIG9mIGRvdWJsZSB0cmlnZ2VyaW5nIG9mIHRoZSB0aW1lcjsgSSBhbSBjb25j ZXJuZWQKKyAgICAgICAgdGhhdCBpdCBpcyBwb3NzaWJsZSB0aGF0IGEgTGluayBlbGVtZW50IGVy cm9ycyBvdXQgb3Igc3VjY2VlZHMsCisgICAgICAgIHNldHMgYSB0aW1lciwgYW5kIHNob3J0bHkg YmVmb3JlIHRoZSB0aW1lciBpcyB0cmlnZ2VyZWQgaXQgaXMKKyAgICAgICAgZWRpdHRlZCwgbGF1 bmNoZXMgYW5vdGhlciByZXF1ZXN0LiAgQWZ0ZXIgdGhhdCwgdGhlIGZpcnN0IHRpbWVyCisgICAg ICAgIHRyaWdnZXJzLCB6ZXJvaW5nIG91dCBtX2NhY2hlZFJlc291cmNlLiAgVGhlbiwgdGhlIHNl Y29uZCBsb2FkCisgICAgICAgIGZpbmlzaGVzLCBhbmQgKmNyYXNoKi4gIElmIHRoaXMgaXMgdGhl IGNhc2UsIHRoaXMgZml4IHNob3VsZCBzdG9wCisgICAgICAgIGl0LgorCisgICAgICAgIE5vIG5l dyB0ZXN0czsgSSBoYXZlbid0IHJlcHJvZHVjZWQgdGhpcy4gIEkgaG9wZSBjaHJvbWUncyBjcmFz aAorICAgICAgICB0ZWxlbWV0cnkgd2lsbCBnaXZlIGdvb2QgZmVlZGJhY2s7IHRoaXMgY3Jhc2gg aXMgb2NjdXJpbmcgbWFueSB0aW1lcyBhCisgICAgICAgIGRheSBzbyB0aGUgZGlmZmVyZW5jZSBz aG91bGQgYmUgb2J2aW91cy4KKworICAgICAgICAqIGxvYWRlci9MaW5rTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxpbmtMb2FkZXI6OkxpbmtMb2FkZXIpOgorICAgICAgICAoV2ViQ29y ZTo6TGlua0xvYWRlcjo6bGlua0xvYWRUaW1lckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6Okxp bmtMb2FkZXI6OmxpbmtMb2FkaW5nRXJyb3JUaW1lckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6 OkxpbmtMb2FkZXI6Om5vdGlmeUZpbmlzaGVkKToKKyAgICAgICAgKiBsb2FkZXIvTGlua0xvYWRl ci5oOgorCiAyMDExLTA2LTI0ICBMdWthc3ogU2xhY2hjaWFrICA8bC5zbGFjaGNpYWtAc2Ftc3Vu Zy5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvTGlua0xvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvTGlua0xvYWRlci5jcHAKaW5kZXggNjNjOWU5MWExNjljYzYzM2YyNzNjNWVjMDM0YzgwYmQ2 OWE1NGUwYi4uMjA4NGM4ZWU0ZDFjOWRhNTY2ODU4YTM3ZDUxN2Y0NTI4M2Q0MjUxNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0xpbmtMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9MaW5rTG9hZGVyLmNwcApAQCAtNDgsNyArNDgsOCBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIExpbmtMb2FkZXI6OkxpbmtMb2FkZXIoTGlua0xvYWRlckNsaWVudCogY2xp ZW50KQogICAgIDogbV9jbGllbnQoY2xpZW50KQotICAgICwgbV9saW5rTG9hZGVkVGltZXIodGhp cywgJkxpbmtMb2FkZXI6OmxpbmtMb2FkZWRUaW1lckZpcmVkKQorICAgICwgbV9saW5rTG9hZFRp bWVyKHRoaXMsICZMaW5rTG9hZGVyOjpsaW5rTG9hZFRpbWVyRmlyZWQpCisgICAgLCBtX2xpbmtM b2FkaW5nRXJyb3JUaW1lcih0aGlzLCAmTGlua0xvYWRlcjo6bGlua0xvYWRpbmdFcnJvclRpbWVy RmlyZWQpCiB7CiB9CiAKQEAgLTU4LDIxICs1OSwyNyBAQCBMaW5rTG9hZGVyOjp+TGlua0xvYWRl cigpCiAgICAgICAgIG1fY2FjaGVkTGlua1Jlc291cmNlLT5yZW1vdmVDbGllbnQodGhpcyk7CiB9 CiAKLXZvaWQgTGlua0xvYWRlcjo6bGlua0xvYWRlZFRpbWVyRmlyZWQoVGltZXI8TGlua0xvYWRl cj4qIHRpbWVyKQordm9pZCBMaW5rTG9hZGVyOjpsaW5rTG9hZFRpbWVyRmlyZWQoVGltZXI8TGlu a0xvYWRlcj4qIHRpbWVyKQogewotICAgIEFTU0VSVF9VTlVTRUQodGltZXIsIHRpbWVyID09ICZt X2xpbmtMb2FkZWRUaW1lcik7Ci0gICAgaWYgKG1fY2FjaGVkTGlua1Jlc291cmNlLT5lcnJvck9j Y3VycmVkKCkpCi0gICAgICAgIG1fY2xpZW50LT5saW5rTG9hZGluZ0Vycm9yZWQoKTsKLSAgICBl bHNlIGlmICghbV9jYWNoZWRMaW5rUmVzb3VyY2UtPndhc0NhbmNlbGVkKCkpCi0gICAgICAgIG1f Y2xpZW50LT5saW5rTG9hZGVkKCk7Ci0gICAgbV9jYWNoZWRMaW5rUmVzb3VyY2UtPnJlbW92ZUNs aWVudCh0aGlzKTsKLSAgICBtX2NhY2hlZExpbmtSZXNvdXJjZSA9IDA7CisgICAgbV9jbGllbnQt PmxpbmtMb2FkZWQoKTsKK30KKwordm9pZCBMaW5rTG9hZGVyOjpsaW5rTG9hZGluZ0Vycm9yVGlt ZXJGaXJlZChUaW1lcjxMaW5rTG9hZGVyPiogdGltZXIpCit7CisgICAgbV9jbGllbnQtPmxpbmtM b2FkaW5nRXJyb3JlZCgpOwogfQogCiB2b2lkIExpbmtMb2FkZXI6Om5vdGlmeUZpbmlzaGVkKENh Y2hlZFJlc291cmNlKiByZXNvdXJjZSkKIHsKICAgICBBU1NFUlRfVU5VU0VEKHJlc291cmNlLCBt X2NhY2hlZExpbmtSZXNvdXJjZS5nZXQoKSA9PSByZXNvdXJjZSk7Ci0gICAgbV9saW5rTG9hZGVk VGltZXIuc3RhcnRPbmVTaG90KDApOworCisgICAgaWYgKG1fY2FjaGVkTGlua1Jlc291cmNlLT5l cnJvck9jY3VycmVkKCkpCisgICAgICAgIG1fbGlua0xvYWRpbmdFcnJvclRpbWVyLnN0YXJ0T25l U2hvdCgwKTsKKyAgICBlbHNlIAorICAgICAgICBtX2xpbmtMb2FkVGltZXIuc3RhcnRPbmVTaG90 KDApOworCisgICAgbV9jYWNoZWRMaW5rUmVzb3VyY2UtPnJlbW92ZUNsaWVudCh0aGlzKTsKKyAg ICBtX2NhY2hlZExpbmtSZXNvdXJjZSA9IDA7CiB9CiAKIGJvb2wgTGlua0xvYWRlcjo6bG9hZExp bmsoY29uc3QgTGlua1JlbEF0dHJpYnV0ZSYgcmVsQXR0cmlidXRlLCBjb25zdCBTdHJpbmcmIHR5 cGUsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTGlua0xvYWRlci5oIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0xpbmtMb2FkZXIuaAppbmRleCBlZTY1ZTk5MzNkYTc3MjkxZTlj MmRmYzY4M2QyMDc3MDViYTJiZWUzLi42YzQ0OGQ4ZjQ0MmI1ZTg1NzU0YjJkYjRiODhlOWE2MjZl ZDhmZTkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTGlua0xvYWRlci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9MaW5rTG9hZGVyLmgKQEAgLTUzLDEyICs1MywxNCBA QCBwdWJsaWM6CiAgICAgYm9vbCBsb2FkTGluayhjb25zdCBMaW5rUmVsQXR0cmlidXRlJiwgY29u c3QgU3RyaW5nJiB0eXBlLCBjb25zdCBLVVJMJiwgRG9jdW1lbnQqKTsKIAogcHJpdmF0ZToKLSAg ICB2b2lkIGxpbmtMb2FkZWRUaW1lckZpcmVkKFRpbWVyPExpbmtMb2FkZXI+Kik7CisgICAgdm9p ZCBsaW5rTG9hZFRpbWVyRmlyZWQoVGltZXI8TGlua0xvYWRlcj4qKTsKKyAgICB2b2lkIGxpbmtM b2FkaW5nRXJyb3JUaW1lckZpcmVkKFRpbWVyPExpbmtMb2FkZXI+Kik7CiAKICAgICBMaW5rTG9h ZGVyQ2xpZW50KiBtX2NsaWVudDsKIAogICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJl c291cmNlPiBtX2NhY2hlZExpbmtSZXNvdXJjZTsKLSAgICBUaW1lcjxMaW5rTG9hZGVyPiBtX2xp bmtMb2FkZWRUaW1lcjsKKyAgICBUaW1lcjxMaW5rTG9hZGVyPiBtX2xpbmtMb2FkVGltZXI7Cisg ICAgVGltZXI8TGlua0xvYWRlcj4gbV9saW5rTG9hZGluZ0Vycm9yVGltZXI7CiB9OwogICAgIAog fQo= 98559 2011-06-24 16:24:06 -0700 2011-06-27 02:01:40 -0700 Patch bug-63360-20110624192405.patch text/plain 4279 gavinp U3VidmVyc2lvbiBSZXZpc2lvbjogODk3MDkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzMDE3ZTc5MTI1NGE0OTM5 ZTQ3ZWMyNGY2MDdiN2YxM2Y4OGM5NzYzLi4wY2I5MGEyZDM3MDk3NGE3MThkM2YwNzI5ZjUzZWU3 OWI2NDM0NDBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDYtMjQgIEdhdmlu IFBldGVycyAgPGdhdmlucEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgZml4IHBvc3NpYmxlIHJhY2UgaW4gTGlua0xvYWRlcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMzNjAKKwor ICAgICAgICBJbiBjaHJvbWl1bSBidWcgODA3MjkKKyAgICAgICAgaHR0cDovL2NvZGUuZ29vZ2xl LmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9kZXRhaWw/aWQ9ODA3MjkgSSBhbQorICAgICAgICBzZWVp bmcgc29tZSBraW5kIG9mIGRvdWJsZSB0cmlnZ2VyaW5nIG9mIHRoZSB0aW1lcjsgSSBhbSBjb25j ZXJuZWQKKyAgICAgICAgdGhhdCBpdCBpcyBwb3NzaWJsZSB0aGF0IGEgTGluayBlbGVtZW50IGVy cm9ycyBvdXQgb3Igc3VjY2VlZHMsCisgICAgICAgIHNldHMgYSB0aW1lciwgYW5kIHNob3J0bHkg YmVmb3JlIHRoZSB0aW1lciBpcyB0cmlnZ2VyZWQgaXQgaXMKKyAgICAgICAgZWRpdHRlZCwgbGF1 bmNoZXMgYW5vdGhlciByZXF1ZXN0LiAgQWZ0ZXIgdGhhdCwgdGhlIGZpcnN0IHRpbWVyCisgICAg ICAgIHRyaWdnZXJzLCB6ZXJvaW5nIG91dCBtX2NhY2hlZFJlc291cmNlLiAgVGhlbiwgdGhlIHNl Y29uZCBsb2FkCisgICAgICAgIGZpbmlzaGVzLCBhbmQgKmNyYXNoKi4gIElmIHRoaXMgaXMgdGhl IGNhc2UsIHRoaXMgZml4IHNob3VsZCBzdG9wCisgICAgICAgIGl0LgorCisgICAgICAgIE5vIG5l dyB0ZXN0czsgSSBoYXZlbid0IHJlcHJvZHVjZWQgdGhpcy4gIEkgaG9wZSBjaHJvbWUncyBjcmFz aAorICAgICAgICB0ZWxlbWV0cnkgd2lsbCBnaXZlIGdvb2QgZmVlZGJhY2s7IHRoaXMgY3Jhc2gg aXMgb2NjdXJpbmcgbWFueSB0aW1lcyBhCisgICAgICAgIGRheSBzbyB0aGUgZGlmZmVyZW5jZSBz aG91bGQgYmUgb2J2aW91cy4KKworICAgICAgICAqIGxvYWRlci9MaW5rTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxpbmtMb2FkZXI6OkxpbmtMb2FkZXIpOgorICAgICAgICAoV2ViQ29y ZTo6TGlua0xvYWRlcjo6bGlua0xvYWRUaW1lckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6Okxp bmtMb2FkZXI6OmxpbmtMb2FkaW5nRXJyb3JUaW1lckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6 OkxpbmtMb2FkZXI6Om5vdGlmeUZpbmlzaGVkKToKKyAgICAgICAgKiBsb2FkZXIvTGlua0xvYWRl ci5oOgorCiAyMDExLTA2LTI0ICBMdWthc3ogU2xhY2hjaWFrICA8bC5zbGFjaGNpYWtAc2Ftc3Vu Zy5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvTGlua0xvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvTGlua0xvYWRlci5jcHAKaW5kZXggNjNjOWU5MWExNjljYzYzM2YyNzNjNWVjMDM0YzgwYmQ2 OWE1NGUwYi4uYjkyNDA4ODA3MWQ4NThmNDEzMTZjM2RiY2M2NGE3ZTMwNDQwMTgzNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0xpbmtMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9MaW5rTG9hZGVyLmNwcApAQCAtNDgsNyArNDgsOCBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIExpbmtMb2FkZXI6OkxpbmtMb2FkZXIoTGlua0xvYWRlckNsaWVudCogY2xp ZW50KQogICAgIDogbV9jbGllbnQoY2xpZW50KQotICAgICwgbV9saW5rTG9hZGVkVGltZXIodGhp cywgJkxpbmtMb2FkZXI6OmxpbmtMb2FkZWRUaW1lckZpcmVkKQorICAgICwgbV9saW5rTG9hZFRp bWVyKHRoaXMsICZMaW5rTG9hZGVyOjpsaW5rTG9hZFRpbWVyRmlyZWQpCisgICAgLCBtX2xpbmtM b2FkaW5nRXJyb3JUaW1lcih0aGlzLCAmTGlua0xvYWRlcjo6bGlua0xvYWRpbmdFcnJvclRpbWVy RmlyZWQpCiB7CiB9CiAKQEAgLTU4LDIxICs1OSwyOSBAQCBMaW5rTG9hZGVyOjp+TGlua0xvYWRl cigpCiAgICAgICAgIG1fY2FjaGVkTGlua1Jlc291cmNlLT5yZW1vdmVDbGllbnQodGhpcyk7CiB9 CiAKLXZvaWQgTGlua0xvYWRlcjo6bGlua0xvYWRlZFRpbWVyRmlyZWQoVGltZXI8TGlua0xvYWRl cj4qIHRpbWVyKQordm9pZCBMaW5rTG9hZGVyOjpsaW5rTG9hZFRpbWVyRmlyZWQoVGltZXI8TGlu a0xvYWRlcj4qIHRpbWVyKQogewotICAgIEFTU0VSVF9VTlVTRUQodGltZXIsIHRpbWVyID09ICZt X2xpbmtMb2FkZWRUaW1lcik7Ci0gICAgaWYgKG1fY2FjaGVkTGlua1Jlc291cmNlLT5lcnJvck9j Y3VycmVkKCkpCi0gICAgICAgIG1fY2xpZW50LT5saW5rTG9hZGluZ0Vycm9yZWQoKTsKLSAgICBl bHNlIGlmICghbV9jYWNoZWRMaW5rUmVzb3VyY2UtPndhc0NhbmNlbGVkKCkpCi0gICAgICAgIG1f Y2xpZW50LT5saW5rTG9hZGVkKCk7Ci0gICAgbV9jYWNoZWRMaW5rUmVzb3VyY2UtPnJlbW92ZUNs aWVudCh0aGlzKTsKLSAgICBtX2NhY2hlZExpbmtSZXNvdXJjZSA9IDA7CisgICAgQVNTRVJUX1VO VVNFRCh0aW1lciwgdGltZXIgPT0gJm1fbGlua0xvYWRUaW1lcik7CisgICAgbV9jbGllbnQtPmxp bmtMb2FkZWQoKTsKK30KKwordm9pZCBMaW5rTG9hZGVyOjpsaW5rTG9hZGluZ0Vycm9yVGltZXJG aXJlZChUaW1lcjxMaW5rTG9hZGVyPiogdGltZXIpCit7CisgICAgQVNTRVJUX1VOVVNFRCh0aW1l ciwgdGltZXIgPT0gJm1fbGlua0xvYWRpbmdFcnJvclRpbWVyKTsKKyAgICBtX2NsaWVudC0+bGlu a0xvYWRpbmdFcnJvcmVkKCk7CiB9CiAKIHZvaWQgTGlua0xvYWRlcjo6bm90aWZ5RmluaXNoZWQo Q2FjaGVkUmVzb3VyY2UqIHJlc291cmNlKQogewogICAgIEFTU0VSVF9VTlVTRUQocmVzb3VyY2Us IG1fY2FjaGVkTGlua1Jlc291cmNlLmdldCgpID09IHJlc291cmNlKTsKLSAgICBtX2xpbmtMb2Fk ZWRUaW1lci5zdGFydE9uZVNob3QoMCk7CisKKyAgICBpZiAobV9jYWNoZWRMaW5rUmVzb3VyY2Ut PmVycm9yT2NjdXJyZWQoKSkKKyAgICAgICAgbV9saW5rTG9hZGluZ0Vycm9yVGltZXIuc3RhcnRP bmVTaG90KDApOworICAgIGVsc2UgCisgICAgICAgIG1fbGlua0xvYWRUaW1lci5zdGFydE9uZVNo b3QoMCk7CisKKyAgICBtX2NhY2hlZExpbmtSZXNvdXJjZS0+cmVtb3ZlQ2xpZW50KHRoaXMpOwor ICAgIG1fY2FjaGVkTGlua1Jlc291cmNlID0gMDsKIH0KIAogYm9vbCBMaW5rTG9hZGVyOjpsb2Fk TGluayhjb25zdCBMaW5rUmVsQXR0cmlidXRlJiByZWxBdHRyaWJ1dGUsIGNvbnN0IFN0cmluZyYg dHlwZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9MaW5rTG9hZGVyLmggYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvTGlua0xvYWRlci5oCmluZGV4IGVlNjVlOTkzM2RhNzcyOTFl OWMyZGZjNjgzZDIwNzcwNWJhMmJlZTMuLjZjNDQ4ZDhmNDQyYjVlODU3NTRiMmRiNGI4OGU5YTYy NmVkOGZlOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9MaW5rTG9hZGVyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0xpbmtMb2FkZXIuaApAQCAtNTMsMTIgKzUzLDE0 IEBAIHB1YmxpYzoKICAgICBib29sIGxvYWRMaW5rKGNvbnN0IExpbmtSZWxBdHRyaWJ1dGUmLCBj b25zdCBTdHJpbmcmIHR5cGUsIGNvbnN0IEtVUkwmLCBEb2N1bWVudCopOwogCiBwcml2YXRlOgot ICAgIHZvaWQgbGlua0xvYWRlZFRpbWVyRmlyZWQoVGltZXI8TGlua0xvYWRlcj4qKTsKKyAgICB2 b2lkIGxpbmtMb2FkVGltZXJGaXJlZChUaW1lcjxMaW5rTG9hZGVyPiopOworICAgIHZvaWQgbGlu a0xvYWRpbmdFcnJvclRpbWVyRmlyZWQoVGltZXI8TGlua0xvYWRlcj4qKTsKIAogICAgIExpbmtM b2FkZXJDbGllbnQqIG1fY2xpZW50OwogCiAgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVk UmVzb3VyY2U+IG1fY2FjaGVkTGlua1Jlc291cmNlOwotICAgIFRpbWVyPExpbmtMb2FkZXI+IG1f bGlua0xvYWRlZFRpbWVyOworICAgIFRpbWVyPExpbmtMb2FkZXI+IG1fbGlua0xvYWRUaW1lcjsK KyAgICBUaW1lcjxMaW5rTG9hZGVyPiBtX2xpbmtMb2FkaW5nRXJyb3JUaW1lcjsKIH07CiAgICAg CiB9Cg==