100791 2012-10-30 15:04:05 -0700 ResourceLoader can start itself in cancel() 2014-02-05 11:02:41 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 1 yong.li.webkit webkit-unassigned beidson japhet webkit.review.bot oldest_to_newest 754686 0 yong.li.webkit 2012-10-30 15:04:05 -0700 I've seen ResourceLoader starting itself in when cancelling. The sequence is like: DocumentLoader::stopLoading() cancels a ResourceLoader for a subresource which hasn't been started yet. ResourceLoader::cancel() calls releaseResources() which is a virtual function SubresourceLoader::releaseResources() triggers CachedResourceLoader::loadDone() CachedResourceLoader::loadDone() triggers ResourceLoadScheduler::servePendingRequests() which starts the same job ResourceLoader::start() is called.. ... SubresourceLoader::releaseResources() calls ResourceLoader::releaseResources() at the end ResourceLoader::releaseResources() removes itself from ResourceLoadScheduler's list, however, it is too late! ResourceLoader::releaseResources() clears ResourceHandle's client but it doesn't cancel the job. So the real networking job could still be performed, depending on the implementation. Initial thought, move "resourceLoadScheduler()->remove(this)" out of releaseResources(), so make sure it is called before SubresourceLoader triggering "servePendingRequests" 755271 1 171648 yong.li.webkit 2012-10-31 07:14:06 -0700 Created attachment 171648 the patch 755283 2 171648 webkit-ews 2012-10-31 07:21:22 -0700 Comment on attachment 171648 the patch Attachment 171648 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/14677168 755284 3 beidson 2012-10-31 07:24:19 -0700 > I've seen ResourceLoader starting itself in when cancelling. > > The sequence is like: > > DocumentLoader::stopLoading() cancels a ResourceLoader for a subresource which hasn't been started yet. > ResourceLoader::cancel() calls releaseResources() which is a virtual function > SubresourceLoader::releaseResources() triggers CachedResourceLoader::loadDone() > CachedResourceLoader::loadDone() triggers ResourceLoadScheduler::servePendingRequests() which starts the same job > ResourceLoader::start() is called.. > ... > SubresourceLoader::releaseResources() calls ResourceLoader::releaseResources() at the end > ResourceLoader::releaseResources() removes itself from ResourceLoadScheduler's list, however, it is too late! > ResourceLoader::releaseResources() clears ResourceHandle's client but it doesn't cancel the job. So the real networking job could still be performed, depending on the implementation. > To be absolutely clear - This backtrace is the *same* ResourceLoader in ::cancel() as it is in ::start()? And not a different ResourceLoader start()ing as a result of a different one cancel()ing? 755285 4 beidson 2012-10-31 07:24:58 -0700 (In reply to comment #3) > > I've seen ResourceLoader starting itself in when cancelling. > > > > The sequence is like: > > > > DocumentLoader::stopLoading() cancels a ResourceLoader for a subresource which hasn't been started yet. > > ResourceLoader::cancel() calls releaseResources() which is a virtual function > > SubresourceLoader::releaseResources() triggers CachedResourceLoader::loadDone() > > CachedResourceLoader::loadDone() triggers ResourceLoadScheduler::servePendingRequests() which starts the same job > > ResourceLoader::start() is called.. > > ... > > SubresourceLoader::releaseResources() calls ResourceLoader::releaseResources() at the end > > ResourceLoader::releaseResources() removes itself from ResourceLoadScheduler's list, however, it is too late! > > ResourceLoader::releaseResources() clears ResourceHandle's client but it doesn't cancel the job. So the real networking job could still be performed, depending on the implementation. > > > > To be absolutely clear - This backtrace is the *same* ResourceLoader in ::cancel() as it is in ::start()? And not a different ResourceLoader start()ing as a result of a different one cancel()ing? I know that's the premise of the bug, but I just want to make it crystal clear that actually debugging has shown these are one-and-the-same. 755287 5 171654 yong.li.webkit 2012-10-31 07:25:55 -0700 Created attachment 171654 second 755290 6 yong.li.webkit 2012-10-31 07:29:36 -0700 (In reply to comment #3) > > I've seen ResourceLoader starting itself in when cancelling. > > > > The sequence is like: > > > > DocumentLoader::stopLoading() cancels a ResourceLoader for a subresource which hasn't been started yet. > > ResourceLoader::cancel() calls releaseResources() which is a virtual function > > SubresourceLoader::releaseResources() triggers CachedResourceLoader::loadDone() > > CachedResourceLoader::loadDone() triggers ResourceLoadScheduler::servePendingRequests() which starts the same job > > ResourceLoader::start() is called.. > > ... > > SubresourceLoader::releaseResources() calls ResourceLoader::releaseResources() at the end > > ResourceLoader::releaseResources() removes itself from ResourceLoadScheduler's list, however, it is too late! > > ResourceLoader::releaseResources() clears ResourceHandle's client but it doesn't cancel the job. So the real networking job could still be performed, depending on the implementation. > > > > To be absolutely clear - This backtrace is the *same* ResourceLoader in ::cancel() as it is in ::start()? And not a different ResourceLoader start()ing as a result of a different one cancel()ing? Yes. It is exactly same ResourceLoader... 755369 7 japhet 2012-10-31 09:23:35 -0700 FYI, https://bugs.webkit.org/show_bug.cgi?id=87743 would probably also resolve this by having us do much less in SubresourceLoader::releaseResources(). 757355 8 yong.li.webkit 2012-11-02 11:08:01 -0700 Actually I don't like the way how CachedResourceLoader::loadDone() triggers ResourceLoadScheduler::servePendingRequests(). In the case user just closes a page or stops loading by clicking on stop button, this just kicks off network jobs that will soon be cancelled (or give bigger troubles if not). Should we just make CachedResourceLoader::loadDone() schedule a timer in ResourceLoadScheduler rather than serving the requests right away? 757364 9 japhet 2012-11-02 11:17:51 -0700 (In reply to comment #8) > Actually I don't like the way how CachedResourceLoader::loadDone() triggers ResourceLoadScheduler::servePendingRequests(). In the case user just closes a page or stops loading by clicking on stop button, this just kicks off network jobs that will soon be cancelled (or give bigger troubles if not). > > Should we just make CachedResourceLoader::loadDone() schedule a timer in ResourceLoadScheduler rather than serving the requests right away? It may actually be unnecessary. ResourceLoader::releaseResources() calls ResourceLoadScheduler::remove(), which if I'm reading it correctly should start a timer for servePendingRequests(). 757403 10 yong.li.webkit 2012-11-02 11:39:46 -0700 (In reply to comment #9) > (In reply to comment #8) > > Actually I don't like the way how CachedResourceLoader::loadDone() triggers ResourceLoadScheduler::servePendingRequests(). In the case user just closes a page or stops loading by clicking on stop button, this just kicks off network jobs that will soon be cancelled (or give bigger troubles if not). > > > > Should we just make CachedResourceLoader::loadDone() schedule a timer in ResourceLoadScheduler rather than serving the requests right away? > > It may actually be unnecessary. ResourceLoader::releaseResources() calls ResourceLoadScheduler::remove(), which if I'm reading it correctly should start a timer for servePendingRequests(). The problem is here: void CachedResourceLoader::loadDone() { RefPtr<Document> protect(m_document); if (frame()) frame()->loader()->loadDone(); performPostLoadActions(); if (!m_garbageCollectDocumentResourcesTimer.isActive()) m_garbageCollectDocumentResourcesTimer.startOneShot(0); } void CachedResourceLoader::performPostLoadActions() { checkForPendingPreloads(); resourceLoadScheduler()->servePendingRequests(); } I would like to see performPostLoadActions() being removed, as it shouldn't be responsible to push ResourceLoadScheduler. 757408 11 japhet 2012-11-02 11:44:29 -0700 (In reply to comment #10) > (In reply to comment #9) > > (In reply to comment #8) > > > Actually I don't like the way how CachedResourceLoader::loadDone() triggers ResourceLoadScheduler::servePendingRequests(). In the case user just closes a page or stops loading by clicking on stop button, this just kicks off network jobs that will soon be cancelled (or give bigger troubles if not). > > > > > > Should we just make CachedResourceLoader::loadDone() schedule a timer in ResourceLoadScheduler rather than serving the requests right away? > > > > It may actually be unnecessary. ResourceLoader::releaseResources() calls ResourceLoadScheduler::remove(), which if I'm reading it correctly should start a timer for servePendingRequests(). > > The problem is here: > > void CachedResourceLoader::loadDone() > { > RefPtr<Document> protect(m_document); > if (frame()) > frame()->loader()->loadDone(); > performPostLoadActions(); > > if (!m_garbageCollectDocumentResourcesTimer.isActive()) > m_garbageCollectDocumentResourcesTimer.startOneShot(0); > } > > void CachedResourceLoader::performPostLoadActions() > { > checkForPendingPreloads(); > resourceLoadScheduler()->servePendingRequests(); > } > > I would like to see performPostLoadActions() being removed, as it shouldn't be responsible to push ResourceLoadScheduler. Right. We might not be able to get rid of the checkForPendingPreloads() call, but I *think* servePendingRequests() is redundant in every useful case, and detrimental in the case you're describing. 768243 12 171654 yong.li.webkit 2012-11-15 10:16:58 -0800 Comment on attachment 171654 second cancel the request, as the right solution is probably to make CachedResource not push ResourceLoadSecheduler. 787718 13 171654 yong.li.webkit 2012-12-10 14:24:31 -0800 Comment on attachment 171654 second When page is loading, it is good to start next job immediately when it finishes one. Also the patch for Bug 87743 doesn't solve this issue. Raising review request again. 976890 14 171654 andersca 2014-02-05 11:02:41 -0800 Comment on attachment 171654 second Clearing review flag on patches from before 2014. If this patch is still relevant, please reset the r? flag. 171648 2012-10-31 07:14:06 -0700 2012-10-31 07:25:11 -0700 the patch 100791.patch text/plain 4252 yong.li.webkit ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhZmZhODYwLi5kYTk0OTViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTItMTAtMzEgIFlvbmcgTGkgIDx5b2xpQHJpbS5jb20+CisKKyAgICAgICAgUmVzb3Vy Y2VMb2FkZXIgY2FuIHN0YXJ0IGl0c2VsZiBpbiBjYW5jZWwoKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNzkxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbmV3IG1ldGhvZCB0aGF0IHVucmVn aXN0ZXJzIHRoZSBsb2FkZXIgZnJvbSBzY2hlZHVsZXIncyB3YWl0IGxpc3QsIGFuZCBjYWxsIGl0 IGF0IHN1aXRhYmxlIHBsYWNlcy4KKyAgICAgICAgMS4gV2UgZG9uJ3QgbmVlZCB0byBjYWxsIGl0 IGluIGluaXQoKSBhcyBpdCBpcyBub3QgeWV0IGluIHNjaGVkdWxlcidzIGxpc3QgYXQgdGhhdCBw b2ludC4KKyAgICAgICAgMi4gQ2FsbCBpdCBpbiBjYW5jZWwoKSBlYXJsaWVyIHRvIGF2b2lkIHRo ZSBzY2hlZHVsZXIgZnJvbSBzdGFydGluZyB0aGlzIGxvYWRlciBhZ2FpbiBpbiBzdWJzZXF1ZW50 IGNhbGxzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gSSBkb24ndCBrbm93IGhvdyB0byBtYWtl IGEgdGVzdCBmb3IgdGhpcy4gV2l0aCBBU1NFUlQoIW1fY2FuY2VsbGVkKSBpbiBSZXNvdXJjZUxv YWRlcjo6c3RhcnQoKSwKKyAgICAgICAgaXQgaXMgbm90IGhhcmQgdG8gcmVwcm9kdWNlIGl0IGJ5 IHN3aXRjaGluZyBiZXR3ZWVuIHNvbWUgaGVhdmUgd2ViIHBhZ2VzLgorCisgICAgICAgICogbG9h ZGVyL1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZGVy Ojp1bnJlZ2lzdGVyRnJvbUxvYWRTY2hlZHVsZXIpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAg ICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6cmVsZWFzZVJlc291cmNlcyk6CisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6c3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VMb2FkZXI6OmRpZEZpbmlzaExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VMb2FkZXI6OmRpZEZhaWwpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXI6OmNh bmNlbCk6CisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZGVyLmg6CisgICAgICAgIChSZXNv dXJjZUxvYWRlcik6CisKIDIwMTItMTAtMzEgIE1pa2UgV2VzdCAgPG1rd3N0QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBYLUZyYW1lLU9wdGlvbnMgY29uc29sZSBtZXNzYWdlIHNob3VsZCBiZSBh c3NvY2lhdGVkIHdpdGggYSByZXF1ZXN0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1Jlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxv YWRlci5jcHAKaW5kZXggMGRhZDg3Zi4uZTFlMjRkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UmVzb3VyY2VMb2FkZXIuY3BwCkBAIC03NCw2ICs3NCwxNSBAQCBSZXNvdXJjZUxvYWRlcjo6flJl c291cmNlTG9hZGVyKCkKICAgICBBU1NFUlQobV9yZWFjaGVkVGVybWluYWxTdGF0ZSk7CiB9CiAK K3ZvaWQgUmVzb3VyY2VMb2FkZXI6OnVucmVnaXN0ZXJGcm9tTG9hZFNjaGVkdWxlcigpIGNvbnN0 Cit7CisjaWYgVVNFKFBMQVRGT1JNX1NUUkFURUdJRVMpCisgICAgcGxhdGZvcm1TdHJhdGVnaWVz KCktPmxvYWRlclN0cmF0ZWd5KCktPnJlc291cmNlTG9hZFNjaGVkdWxlcigpLT5yZW1vdmUodGhp cyk7CisjZWxzZQorICAgIHJlc291cmNlTG9hZFNjaGVkdWxlcigpLT5yZW1vdmUodGhpcyk7Cisj ZW5kaWYKK30KKwogdm9pZCBSZXNvdXJjZUxvYWRlcjo6cmVsZWFzZVJlc291cmNlcygpCiB7CiAg ICAgQVNTRVJUKCFtX3JlYWNoZWRUZXJtaW5hbFN0YXRlKTsKQEAgLTkxLDEzICsxMDAsNyBAQCB2 b2lkIFJlc291cmNlTG9hZGVyOjpyZWxlYXNlUmVzb3VyY2VzKCkKICAgICAvLyB0aGUgcmVzb3Vy Y2VzIHRvIHByZXZlbnQgYSBkb3VibGUgZGVhbGxvYyBvZiBXZWJWaWV3IDxyZGFyOi8vcHJvYmxl bS80MzcyNjI4PgogICAgIG1fcmVhY2hlZFRlcm1pbmFsU3RhdGUgPSB0cnVlOwogCi0jaWYgVVNF KFBMQVRGT1JNX1NUUkFURUdJRVMpCi0gICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPmxvYWRlclN0 cmF0ZWd5KCktPnJlc291cmNlTG9hZFNjaGVkdWxlcigpLT5yZW1vdmUodGhpcyk7Ci0jZW5kaWYK ICAgICBtX2lkZW50aWZpZXIgPSAwOwotI2lmICFVU0UoUExBVEZPUk1fU1RSQVRFR0lFUykKLSAg ICByZXNvdXJjZUxvYWRTY2hlZHVsZXIoKS0+cmVtb3ZlKHRoaXMpOwotI2VuZGlmCiAKICAgICBp ZiAobV9oYW5kbGUpIHsKICAgICAgICAgLy8gQ2xlYXIgb3V0IHRoZSBSZXNvdXJjZUhhbmRsZSdz IGNsaWVudCBzbyB0aGF0IGl0IGRvZXNuJ3QgdHJ5IHRvIGNhbGwKQEAgLTE0OSw2ICsxNTIsNyBA QCBib29sIFJlc291cmNlTG9hZGVyOjppbml0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcikKIAog dm9pZCBSZXNvdXJjZUxvYWRlcjo6c3RhcnQoKQogeworICAgIEFTU0VSVCghbV9jYW5jZWxsZWQp OwogICAgIEFTU0VSVCghbV9oYW5kbGUpOwogICAgIEFTU0VSVCghbV9yZXF1ZXN0LmlzTnVsbCgp KTsKICAgICBBU1NFUlQobV9kZWZlcnJlZFJlcXVlc3QuaXNOdWxsKCkpOwpAQCAtMzExLDYgKzMx NSw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkZXI6OmRpZEZpbmlzaExvYWRpbmcoZG91YmxlIGZpbmlz aFRpbWUpCiAgICAgLy8gdGhlIHJlc291cmNlcyBhIHNlY29uZCB0aW1lLCB0aGV5IGhhdmUgYmVl biByZWxlYXNlZCBieSBjYW5jZWwuCiAgICAgaWYgKG1fY2FuY2VsbGVkKQogICAgICAgICByZXR1 cm47CisgICAgdW5yZWdpc3RlckZyb21Mb2FkU2NoZWR1bGVyKCk7CiAgICAgcmVsZWFzZVJlc291 cmNlcygpOwogfQogCkBAIC0zNDgsNiArMzUzLDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6ZGlk RmFpbChjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKICAgICAgICAgICAgIGZyYW1lTG9hZGVy KCktPm5vdGlmaWVyKCktPmRpZEZhaWxUb0xvYWQodGhpcywgZXJyb3IpOwogICAgIH0KIAorICAg IHVucmVnaXN0ZXJGcm9tTG9hZFNjaGVkdWxlcigpOwogICAgIHJlbGVhc2VSZXNvdXJjZXMoKTsK IH0KIApAQCAtMzgwLDYgKzM4Niw4IEBAIHZvaWQgUmVzb3VyY2VMb2FkZXI6OmNhbmNlbChjb25z dCBSZXNvdXJjZUVycm9yJiBlcnJvcikKICAgICAvLyBsZWZ0IG9mZiB3aXRob3V0IHJlZG9pbmcg YW55IG9mIHRoaXMgd29yay4KICAgICBpZiAoIW1fY2FuY2VsbGVkKSB7CiAgICAgICAgIG1fY2Fu Y2VsbGVkID0gdHJ1ZTsKKyAgICAgICAgLy8gVW5yZWdpc3RlciBmcm9tIFJlc291cmNlTG9hZFNj aGVkdWxlcidzIHdhaXQgbGlzdCBub3cgc28gaXQgd2lsbCBub3Qgc3RhcnQgdGhpcyBsb2FkZXIu CisgICAgICAgIHVucmVnaXN0ZXJGcm9tTG9hZFNjaGVkdWxlcigpOwogICAgICAgICAKICAgICAg ICAgaWYgKEZvcm1EYXRhKiBkYXRhID0gbV9yZXF1ZXN0Lmh0dHBCb2R5KCkpCiAgICAgICAgICAg ICBkYXRhLT5yZW1vdmVHZW5lcmF0ZWRGaWxlc0lmTmVlZGVkKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9SZXNvdXJjZUxvYWRlci5oCmluZGV4IDA2NDJiYWMuLjE5YTE1ZDAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9SZXNvdXJjZUxvYWRlci5oCkBAIC0xNzcsNiArMTc3LDcgQEAgcHJvdGVjdGVkOgog cHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgd2lsbENhbmNlbChjb25zdCBSZXNvdXJjZUVycm9y JikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDYW5jZWwoY29uc3QgUmVzb3VyY2VFcnJvciYp ID0gMDsKKyAgICB2b2lkIHVucmVnaXN0ZXJGcm9tTG9hZFNjaGVkdWxlcigpIGNvbnN0OwogCiAg ICAgUmVzb3VyY2VSZXF1ZXN0IG1fcmVxdWVzdDsKICAgICBSZXNvdXJjZVJlcXVlc3QgbV9vcmln aW5hbFJlcXVlc3Q7IC8vIEJlZm9yZSByZWRpcmVjdHMuCg== 171654 2012-10-31 07:25:55 -0700 2014-02-05 11:02:41 -0800 second 100791.patch text/plain 4240 yong.li.webkit ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhZmZhODYwLi5kYTk0OTViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTItMTAtMzEgIFlvbmcgTGkgIDx5b2xpQHJpbS5jb20+CisKKyAgICAgICAgUmVzb3Vy Y2VMb2FkZXIgY2FuIHN0YXJ0IGl0c2VsZiBpbiBjYW5jZWwoKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNzkxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbmV3IG1ldGhvZCB0aGF0IHVucmVn aXN0ZXJzIHRoZSBsb2FkZXIgZnJvbSBzY2hlZHVsZXIncyB3YWl0IGxpc3QsIGFuZCBjYWxsIGl0 IGF0IHN1aXRhYmxlIHBsYWNlcy4KKyAgICAgICAgMS4gV2UgZG9uJ3QgbmVlZCB0byBjYWxsIGl0 IGluIGluaXQoKSBhcyBpdCBpcyBub3QgeWV0IGluIHNjaGVkdWxlcidzIGxpc3QgYXQgdGhhdCBw b2ludC4KKyAgICAgICAgMi4gQ2FsbCBpdCBpbiBjYW5jZWwoKSBlYXJsaWVyIHRvIGF2b2lkIHRo ZSBzY2hlZHVsZXIgZnJvbSBzdGFydGluZyB0aGlzIGxvYWRlciBhZ2FpbiBpbiBzdWJzZXF1ZW50 IGNhbGxzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gSSBkb24ndCBrbm93IGhvdyB0byBtYWtl IGEgdGVzdCBmb3IgdGhpcy4gV2l0aCBBU1NFUlQoIW1fY2FuY2VsbGVkKSBpbiBSZXNvdXJjZUxv YWRlcjo6c3RhcnQoKSwKKyAgICAgICAgaXQgaXMgbm90IGhhcmQgdG8gcmVwcm9kdWNlIGl0IGJ5 IHN3aXRjaGluZyBiZXR3ZWVuIHNvbWUgaGVhdmUgd2ViIHBhZ2VzLgorCisgICAgICAgICogbG9h ZGVyL1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZGVy Ojp1bnJlZ2lzdGVyRnJvbUxvYWRTY2hlZHVsZXIpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAg ICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6cmVsZWFzZVJlc291cmNlcyk6CisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6c3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VMb2FkZXI6OmRpZEZpbmlzaExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VMb2FkZXI6OmRpZEZhaWwpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXI6OmNh bmNlbCk6CisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZGVyLmg6CisgICAgICAgIChSZXNv dXJjZUxvYWRlcik6CisKIDIwMTItMTAtMzEgIE1pa2UgV2VzdCAgPG1rd3N0QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBYLUZyYW1lLU9wdGlvbnMgY29uc29sZSBtZXNzYWdlIHNob3VsZCBiZSBh c3NvY2lhdGVkIHdpdGggYSByZXF1ZXN0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1Jlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxv YWRlci5jcHAKaW5kZXggMGRhZDg3Zi4uZTFlMjRkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UmVzb3VyY2VMb2FkZXIuY3BwCkBAIC03NCw2ICs3NCwxNSBAQCBSZXNvdXJjZUxvYWRlcjo6flJl c291cmNlTG9hZGVyKCkKICAgICBBU1NFUlQobV9yZWFjaGVkVGVybWluYWxTdGF0ZSk7CiB9CiAK K3ZvaWQgUmVzb3VyY2VMb2FkZXI6OnVucmVnaXN0ZXJGcm9tTG9hZFNjaGVkdWxlcigpCit7Cisj aWYgVVNFKFBMQVRGT1JNX1NUUkFURUdJRVMpCisgICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPmxv YWRlclN0cmF0ZWd5KCktPnJlc291cmNlTG9hZFNjaGVkdWxlcigpLT5yZW1vdmUodGhpcyk7Cisj ZWxzZQorICAgIHJlc291cmNlTG9hZFNjaGVkdWxlcigpLT5yZW1vdmUodGhpcyk7CisjZW5kaWYK K30KKwogdm9pZCBSZXNvdXJjZUxvYWRlcjo6cmVsZWFzZVJlc291cmNlcygpCiB7CiAgICAgQVNT RVJUKCFtX3JlYWNoZWRUZXJtaW5hbFN0YXRlKTsKQEAgLTkxLDEzICsxMDAsNyBAQCB2b2lkIFJl c291cmNlTG9hZGVyOjpyZWxlYXNlUmVzb3VyY2VzKCkKICAgICAvLyB0aGUgcmVzb3VyY2VzIHRv IHByZXZlbnQgYSBkb3VibGUgZGVhbGxvYyBvZiBXZWJWaWV3IDxyZGFyOi8vcHJvYmxlbS80Mzcy NjI4PgogICAgIG1fcmVhY2hlZFRlcm1pbmFsU3RhdGUgPSB0cnVlOwogCi0jaWYgVVNFKFBMQVRG T1JNX1NUUkFURUdJRVMpCi0gICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPmxvYWRlclN0cmF0ZWd5 KCktPnJlc291cmNlTG9hZFNjaGVkdWxlcigpLT5yZW1vdmUodGhpcyk7Ci0jZW5kaWYKICAgICBt X2lkZW50aWZpZXIgPSAwOwotI2lmICFVU0UoUExBVEZPUk1fU1RSQVRFR0lFUykKLSAgICByZXNv dXJjZUxvYWRTY2hlZHVsZXIoKS0+cmVtb3ZlKHRoaXMpOwotI2VuZGlmCiAKICAgICBpZiAobV9o YW5kbGUpIHsKICAgICAgICAgLy8gQ2xlYXIgb3V0IHRoZSBSZXNvdXJjZUhhbmRsZSdzIGNsaWVu dCBzbyB0aGF0IGl0IGRvZXNuJ3QgdHJ5IHRvIGNhbGwKQEAgLTE0OSw2ICsxNTIsNyBAQCBib29s IFJlc291cmNlTG9hZGVyOjppbml0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcikKIAogdm9pZCBS ZXNvdXJjZUxvYWRlcjo6c3RhcnQoKQogeworICAgIEFTU0VSVCghbV9jYW5jZWxsZWQpOwogICAg IEFTU0VSVCghbV9oYW5kbGUpOwogICAgIEFTU0VSVCghbV9yZXF1ZXN0LmlzTnVsbCgpKTsKICAg ICBBU1NFUlQobV9kZWZlcnJlZFJlcXVlc3QuaXNOdWxsKCkpOwpAQCAtMzExLDYgKzMxNSw3IEBA IHZvaWQgUmVzb3VyY2VMb2FkZXI6OmRpZEZpbmlzaExvYWRpbmcoZG91YmxlIGZpbmlzaFRpbWUp CiAgICAgLy8gdGhlIHJlc291cmNlcyBhIHNlY29uZCB0aW1lLCB0aGV5IGhhdmUgYmVlbiByZWxl YXNlZCBieSBjYW5jZWwuCiAgICAgaWYgKG1fY2FuY2VsbGVkKQogICAgICAgICByZXR1cm47Cisg ICAgdW5yZWdpc3RlckZyb21Mb2FkU2NoZWR1bGVyKCk7CiAgICAgcmVsZWFzZVJlc291cmNlcygp OwogfQogCkBAIC0zNDgsNiArMzUzLDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbChj b25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKICAgICAgICAgICAgIGZyYW1lTG9hZGVyKCktPm5v dGlmaWVyKCktPmRpZEZhaWxUb0xvYWQodGhpcywgZXJyb3IpOwogICAgIH0KIAorICAgIHVucmVn aXN0ZXJGcm9tTG9hZFNjaGVkdWxlcigpOwogICAgIHJlbGVhc2VSZXNvdXJjZXMoKTsKIH0KIApA QCAtMzgwLDYgKzM4Niw4IEBAIHZvaWQgUmVzb3VyY2VMb2FkZXI6OmNhbmNlbChjb25zdCBSZXNv dXJjZUVycm9yJiBlcnJvcikKICAgICAvLyBsZWZ0IG9mZiB3aXRob3V0IHJlZG9pbmcgYW55IG9m IHRoaXMgd29yay4KICAgICBpZiAoIW1fY2FuY2VsbGVkKSB7CiAgICAgICAgIG1fY2FuY2VsbGVk ID0gdHJ1ZTsKKyAgICAgICAgLy8gVW5yZWdpc3RlciBmcm9tIFJlc291cmNlTG9hZFNjaGVkdWxl cidzIHdhaXQgbGlzdCBub3cgc28gaXQgd2lsbCBub3Qgc3RhcnQgdGhpcyBsb2FkZXIuCisgICAg ICAgIHVucmVnaXN0ZXJGcm9tTG9hZFNjaGVkdWxlcigpOwogICAgICAgICAKICAgICAgICAgaWYg KEZvcm1EYXRhKiBkYXRhID0gbV9yZXF1ZXN0Lmh0dHBCb2R5KCkpCiAgICAgICAgICAgICBkYXRh LT5yZW1vdmVHZW5lcmF0ZWRGaWxlc0lmTmVlZGVkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNv dXJjZUxvYWRlci5oCmluZGV4IDA2NDJiYWMuLjE5YTE1ZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9SZXNvdXJjZUxvYWRlci5oCkBAIC0xNzcsNiArMTc3LDcgQEAgcHJvdGVjdGVkOgogcHJpdmF0 ZToKICAgICB2aXJ0dWFsIHZvaWQgd2lsbENhbmNlbChjb25zdCBSZXNvdXJjZUVycm9yJikgPSAw OwogICAgIHZpcnR1YWwgdm9pZCBkaWRDYW5jZWwoY29uc3QgUmVzb3VyY2VFcnJvciYpID0gMDsK KyAgICB2b2lkIHVucmVnaXN0ZXJGcm9tTG9hZFNjaGVkdWxlcigpOwogCiAgICAgUmVzb3VyY2VS ZXF1ZXN0IG1fcmVxdWVzdDsKICAgICBSZXNvdXJjZVJlcXVlc3QgbV9vcmlnaW5hbFJlcXVlc3Q7 IC8vIEJlZm9yZSByZWRpcmVjdHMuCg==