115986 2013-05-12 10:31:43 -0700 Simplify AutodrainedPool 2013-05-13 10:36:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca ap benjamin cmarcelo commit-queue japhet kling oldest_to_newest 887963 0 andersca 2013-05-12 10:31:43 -0700 Simplify AutodrainedPool 887964 1 201495 andersca 2013-05-12 10:35:55 -0700 Created attachment 201495 Patch 887969 2 201495 kling 2013-05-12 10:46:19 -0700 Comment on attachment 201495 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201495&action=review > Source/WTF/ChangeLog:9 > + Creating and draining pools is fast enough now that we don't need to try to be clever about it. Great! 887971 3 andersca 2013-05-12 10:50:56 -0700 Committed r149965: <http://trac.webkit.org/changeset/149965> 888049 4 201495 ap 2013-05-12 18:30:52 -0700 Comment on attachment 201495 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201495&action=review >> Source/WTF/ChangeLog:9 >> + Remove the ability to cycle an AutodrainedPool, as well as the iteration count. >> + Creating and draining pools is fast enough now that we don't need to try to be clever about it. > > Great! When did it become fast, does that include Lion? 888346 5 andersca 2013-05-13 10:36:02 -0700 (In reply to comment #4) > (From update of attachment 201495 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=201495&action=review > > >> Source/WTF/ChangeLog:9 > >> + Remove the ability to cycle an AutodrainedPool, as well as the iteration count. > >> + Creating and draining pools is fast enough now that we don't need to try to be clever about it. > > > > Great! > > When did it become fast, does that include Lion? It did become fast in Lion. 201495 2013-05-12 10:35:55 -0700 2013-05-12 18:30:52 -0700 Patch bug-115986-20130512103455.patch text/plain 9928 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5OTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDg0NjI0ZjJmMDhiMzM4NzFmMzNmYjc4 NmE2Y2E5OWZkMWU2ZDExZjMuLmIzNzk3M2EwYTIwMTQwODk3ZWFlOGRjNzI0YjkyNjJmMWY3NDZk OTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIwMTMtMDUtMTIgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBTaW1wbGlmeSBBdXRvZHJhaW5lZFBvb2wKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTk4NgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUg YWJpbGl0eSB0byBjeWNsZSBhbiBBdXRvZHJhaW5lZFBvb2wsIGFzIHdlbGwgYXMgdGhlIGl0ZXJh dGlvbiBjb3VudC4KKyAgICAgICAgQ3JlYXRpbmcgYW5kIGRyYWluaW5nIHBvb2xzIGlzIGZhc3Qg ZW5vdWdoIG5vdyB0aGF0IHdlIGRvbid0IG5lZWQgdG8gdHJ5IHRvIGJlIGNsZXZlciBhYm91dCBp dC4KKworICAgICAgICAqIHd0Zi9BdXRvZHJhaW5lZFBvb2wuaDoKKyAgICAgICAgKEF1dG9kcmFp bmVkUG9vbCk6CisgICAgICAgIChXVEY6OkF1dG9kcmFpbmVkUG9vbDo6QXV0b2RyYWluZWRQb29s KToKKyAgICAgICAgKiB3dGYvQXV0b2RyYWluZWRQb29sTWFjLm1tOgorICAgICAgICAoV1RGOjpB dXRvZHJhaW5lZFBvb2w6OkF1dG9kcmFpbmVkUG9vbCk6CisKKzIwMTMtMDUtMTIgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBNb3ZlIFJlbW90ZU1lbW9y eVJlYWRlciBpbnRvIEZhc3RNYWxsb2MuY3BwCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU5ODUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDRkYjFkNmNlNThkMzIx NmMyOGJkNGQ3ZWIxNjFhMDliNzI1MDFhYTYuLjhjZDU0ZTgyYmFmMzk1MWI3NzVhN2Q3ODM4YTcz YWZkNGY1OWM4YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMy0wNS0xMiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFNpbXBsaWZ5IEF1 dG9kcmFpbmVkUG9vbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTE1OTg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIGNhbGxzIHRvIEF1 dG9kcmFpbmVkUG9vbDo6Y3ljbGUgYXMgd2VsbCBhcyB0aGUgaXRlcmF0aW9uIGNvdW50ZXIgcGFz c2VkIHRvIHRoZSBjb25zdHJ1Y3Rvci4KKyAgICAgICAgSW5zdGVhZCwganVzdCBkZWNsYXJlIFJB SUkgcG9vbHMgd2hlcmUgaXQgc2VlbXMgbmVjZXNzYXJ5LgorCisgICAgICAgICogTW9kdWxlcy93 ZWJkYXRhYmFzZS9EYXRhYmFzZVRocmVhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFz ZVRocmVhZDo6ZGF0YWJhc2VUaHJlYWQpOgorICAgICAgICAqIGZpbGVhcGkvRmlsZVRocmVhZC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGaWxlVGhyZWFkOjpydW5Mb29wKToKKyAgICAgICAgKiBs b2FkZXIvaWNvbi9JY29uRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFi YXNlOjpzZXRJY29uRGF0YUZvckljb25VUkwpOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFi YXNlOjpwZXJmb3JtVVJMSW1wb3J0KToKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6 cmVhZEZyb21EYXRhYmFzZSk6CisKIDIwMTMtMDUtMTIgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdA YXBwbGUuY29tPgogCiAgICAgICAgIEFwcGx5IEZJTkFMIHRvIHRoZSBOb2RlIGhpZXJhcmNoeS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0F1dG9kcmFpbmVkUG9vbC5oIGIvU291cmNlL1dU Ri93dGYvQXV0b2RyYWluZWRQb29sLmgKaW5kZXggMGI3ZmJkYTgzYTUyMjVjMGIxNmQ2MWIwZGIz N2YwZDUxZTc3ZWNiNC4uMjQ0OGVlYTExMGNlYWY4OTZjMmYwNjUwODg3MzE1MjM1Y2Y4NmVkNCAx MDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvQXV0b2RyYWluZWRQb29sLmgKKysrIGIvU291cmNl L1dURi93dGYvQXV0b2RyYWluZWRQb29sLmgKQEAgLTM5LDIwICszOSwxNSBAQCBjbGFzcyBBdXRv ZHJhaW5lZFBvb2wgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEF1dG9kcmFpbmVkUG9vbCk7 CiBwdWJsaWM6CiAjaWYgUExBVEZPUk0oTUFDKQotICAgIFdURl9FWFBPUlRfUFJJVkFURSBleHBs aWNpdCBBdXRvZHJhaW5lZFBvb2woaW50IGl0ZXJhdGlvbkxpbWl0ID0gMSk7CisgICAgV1RGX0VY UE9SVF9QUklWQVRFIEF1dG9kcmFpbmVkUG9vbCgpOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSB+ QXV0b2RyYWluZWRQb29sKCk7Ci0KLSAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBjeWNsZSgp OwogI2Vsc2UKLSAgICBleHBsaWNpdCBBdXRvZHJhaW5lZFBvb2woaW50ID0gMSkgeyB9CisgICAg ZXhwbGljaXQgQXV0b2RyYWluZWRQb29sKCkgeyB9CiAgICAgfkF1dG9kcmFpbmVkUG9vbCgpIHsg fQotICAgIHZvaWQgY3ljbGUoKSB7IH0KICNlbmRpZgogICAgIAogcHJpdmF0ZToKICNpZiBQTEFU Rk9STShNQUMpCi0gICAgaW50IG1faXRlcmF0aW9uTGltaXQ7Ci0gICAgaW50IG1faXRlcmF0aW9u Q291bnQ7CiAgICAgTlNBdXRvcmVsZWFzZVBvb2wqIG1fcG9vbDsKICNlbmRpZgogfTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XVEYvd3RmL0F1dG9kcmFpbmVkUG9vbE1hYy5tbSBiL1NvdXJjZS9XVEYv d3RmL0F1dG9kcmFpbmVkUG9vbE1hYy5tbQppbmRleCBlN2YxOTM4YzU1ZGM4NWU2ZmQ0ZjVmNzlh MjdkOTYzYzQ5YzE5ZjFhLi5iMWY0NGFhMTE4ZjNiMDIxYTRlNmFmMzI1ODRkZjRkZGM3NDNiNWNl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9BdXRvZHJhaW5lZFBvb2xNYWMubW0KKysrIGIv U291cmNlL1dURi93dGYvQXV0b2RyYWluZWRQb29sTWFjLm1tCkBAIC0zMywxMCArMzMsOCBAQAog CiBuYW1lc3BhY2UgV1RGIHsKIAotQXV0b2RyYWluZWRQb29sOjpBdXRvZHJhaW5lZFBvb2woaW50 IGl0ZXJhdGlvbkxpbWl0KQotICAgIDogbV9pdGVyYXRpb25MaW1pdChpdGVyYXRpb25MaW1pdCkK LSAgICAsIG1faXRlcmF0aW9uQ291bnQoMCkKLSAgICAsIG1fcG9vbChbW05TQXV0b3JlbGVhc2VQ b29sIGFsbG9jXSBpbml0XSkKK0F1dG9kcmFpbmVkUG9vbDo6QXV0b2RyYWluZWRQb29sKCkKKyAg ICA6IG1fcG9vbChbW05TQXV0b3JlbGVhc2VQb29sIGFsbG9jXSBpbml0XSkKIHsgCiB9CiAKQEAg LTQ1LDEzICs0Myw0IEBAIEF1dG9kcmFpbmVkUG9vbDo6fkF1dG9kcmFpbmVkUG9vbCgpCiAgICAg W21fcG9vbCBkcmFpbl07CiB9CiAKLXZvaWQgQXV0b2RyYWluZWRQb29sOjpjeWNsZSgpCi17Ci0g ICAgaWYgKCsrbV9pdGVyYXRpb25Db3VudCA9PSBtX2l0ZXJhdGlvbkxpbWl0KSB7Ci0gICAgICAg IFttX3Bvb2wgZHJhaW5dOwotICAgICAgICBtX3Bvb2wgPSBbW05TQXV0b3JlbGVhc2VQb29sIGFs bG9jXSBpbml0XTsKLSAgICAgICAgbV9pdGVyYXRpb25Db3VudCA9IDA7Ci0gICAgfQotfQotCiB9 IC8vIG5hbWVzcGFjZSBXVEYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vi ZGF0YWJhc2UvRGF0YWJhc2VUaHJlYWQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJk YXRhYmFzZS9EYXRhYmFzZVRocmVhZC5jcHAKaW5kZXggZTk0NGQ4OTRkNzYyZjE3ODE4YTEyZTMx NzA1ZmFjN2U1MmUyMmUxZC4uODFkYjQzMWI5MGQ2ZTdiYWYwYjJjNzZmZTc2ZjkwNjBjZjgxNzli NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFz ZVRocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRh YmFzZVRocmVhZC5jcHAKQEAgLTEwNywxMCArMTA3LDEwIEBAIHZvaWQgRGF0YWJhc2VUaHJlYWQ6 OmRhdGFiYXNlVGhyZWFkKCkKICAgICAgICAgTE9HKFN0b3JhZ2VBUEksICJTdGFydGVkIERhdGFi YXNlVGhyZWFkICVwIiwgdGhpcyk7CiAgICAgfQogCi0gICAgQXV0b2RyYWluZWRQb29sIHBvb2w7 CiAgICAgd2hpbGUgKE93blB0cjxEYXRhYmFzZVRhc2s+IHRhc2sgPSBtX3F1ZXVlLndhaXRGb3JN ZXNzYWdlKCkpIHsKKyAgICAgICAgQXV0b2RyYWluZWRQb29sIHBvb2w7CisKICAgICAgICAgdGFz ay0+cGVyZm9ybVRhc2soKTsKLSAgICAgICAgcG9vbC5jeWNsZSgpOwogICAgIH0KIAogICAgIC8v IENsZWFuIHVwIHRoZSBsaXN0IG9mIGFsbCBwZW5kaW5nIHRyYW5zYWN0aW9ucyBvbiB0aGlzIGRh dGFiYXNlIHRocmVhZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlVGhy ZWFkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZVRocmVhZC5jcHAKaW5kZXggMThl NjY3OWI1N2QzNTYwZjc4NmNjYzcwY2NhMzJhYzA3Y2U1Nzc0NC4uZWYyODBjOGEzNTQ3NjgwZjdj MzQ4ZDRiZjRjZTljZjk2ZGI2YmE4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZmlsZWFw aS9GaWxlVGhyZWFkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVUaHJlYWQu Y3BwCkBAIC05OCwxMCArOTgsMTAgQEAgdm9pZCBGaWxlVGhyZWFkOjpydW5Mb29wKCkKICAgICAg ICAgTE9HKEZpbGVBUEksICJTdGFydGVkIEZpbGVUaHJlYWQgJXAiLCB0aGlzKTsKICAgICB9CiAK LSAgICBBdXRvZHJhaW5lZFBvb2wgcG9vbDsKICAgICB3aGlsZSAoT3duUHRyPFRhc2s+IHRhc2sg PSBtX3F1ZXVlLndhaXRGb3JNZXNzYWdlKCkpIHsKKyAgICAgICAgQXV0b2RyYWluZWRQb29sIHBv b2w7CisKICAgICAgICAgdGFzay0+cGVyZm9ybVRhc2soKTsKLSAgICAgICAgcG9vbC5jeWNsZSgp OwogICAgIH0KIAogICAgIExPRyhGaWxlQVBJLCAiQWJvdXQgdG8gZGV0YWNoIHRocmVhZCAlaSBh bmQgY2xlYXIgdGhlIHJlZiB0byBGaWxlVGhyZWFkICVwLCB3aGljaCBjdXJyZW50bHkgaGFzICVp IHJlZihzKSIsIG1fdGhyZWFkSUQsIHRoaXMsIHJlZkNvdW50KCkpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5jcHAKaW5kZXggZTgwNTQ1YTQ5ODA4Y2Y4NmZlZWQx ODhlZDc2Y2Y5MmI3ODlhYzZiNy4uZTVmMDFiYmUwNzZiMzlkNzBlNzYwZDMxZTI4YjA1MmZlNTZk ZWQxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJhc2UuY3BwCkBA IC01ODYsMTUgKzU4NiwxMSBAQCB2b2lkIEljb25EYXRhYmFzZTo6c2V0SWNvbkRhdGFGb3JJY29u VVJMKFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBkYXRhT3JpZ2luYWwsCiAgICAgICAgIC8vIFN0 YXJ0IHRoZSB0aW1lciB0byBjb21taXQgdGhpcyBjaGFuZ2UgLSBvciBmdXJ0aGVyIGRlbGF5IHRo ZSB0aW1lciBpZiBpdCB3YXMgYWxyZWFkeSBzdGFydGVkCiAgICAgICAgIHNjaGVkdWxlT3JEZWZl clN5bmNUaW1lcigpOwogCi0gICAgICAgIC8vIEluZm9ybWFsIHRlc3Rpbmcgc2hvd3MgdGhhdCBk cmFpbmluZyB0aGUgYXV0b3JlbGVhc2UgcG9vbCBldmVyeSAyNSBpdGVyYXRpb25zIGlzIGFib3V0 IGFzIGxvdyBhcyB3ZSBjYW4gZ28KLSAgICAgICAgLy8gYmVmb3JlIHBlcmZvcm1hbmNlIHN0YXJ0 cyB0byBkcm9wIG9mZiwgYnV0IHdlIGRvbid0IHdhbnQgdG8gaW5jcmVhc2UgdGhpcyBudW1iZXIg YmVjYXVzZSB0aGVuIGFjY3VtdWxhdGVkIG1lbW9yeSB1c2FnZSB3aWxsIGdvIHVwICAgICAgICAK LSAgICAgICAgQXV0b2RyYWluZWRQb29sIHBvb2woMjUpOwotCiAgICAgICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGkgPCBwYWdlVVJMcy5zaXplKCk7ICsraSkgeworICAgICAgICAgICAgQXV0b2Ry YWluZWRQb29sIHBvb2w7CisKICAgICAgICAgICAgIExPRyhJY29uRGF0YWJhc2UsICJEaXNwYXRj aGluZyBub3RpZmljYXRpb24gdGhhdCByZXRhaW5pbmcgcGFnZVVSTCAlcyBoYXMgYSBuZXcgaWNv biIsIHVybEZvckxvZ2dpbmcocGFnZVVSTHNbaV0pLmFzY2lpKCkuZGF0YSgpKTsKICAgICAgICAg ICAgIG1fY2xpZW50LT5kaWRDaGFuZ2VJY29uRm9yUGFnZVVSTChwYWdlVVJMc1tpXSk7Ci0KLSAg ICAgICAgICAgIHBvb2wuY3ljbGUoKTsKICAgICAgICAgfQogICAgIH0KIH0KQEAgLTEyMzEsMTgg KzEyMjcsMTUgQEAgdm9pZCBJY29uRGF0YWJhc2U6OnBlcmZvcm1VUkxJbXBvcnQoKQogICAgICAg ICByZXR1cm47CiAgICAgfQogICAgIAotICAgIC8vIEluZm9ybWFsIHRlc3Rpbmcgc2hvd3MgdGhh dCBkcmFpbmluZyB0aGUgYXV0b3JlbGVhc2UgcG9vbCBldmVyeSAyNSBpdGVyYXRpb25zIGlzIGFi b3V0IGFzIGxvdyBhcyB3ZSBjYW4gZ28KLSAgICAvLyBiZWZvcmUgcGVyZm9ybWFuY2Ugc3RhcnRz IHRvIGRyb3Agb2ZmLCBidXQgd2UgZG9uJ3Qgd2FudCB0byBpbmNyZWFzZSB0aGlzIG51bWJlciBi ZWNhdXNlIHRoZW4gYWNjdW11bGF0ZWQgbWVtb3J5IHVzYWdlIHdpbGwgZ28gdXAKLSAgICBBdXRv ZHJhaW5lZFBvb2wgcG9vbCgyNSk7Ci0gICAgICAgIAogICAgIGludCByZXN1bHQgPSBxdWVyeS5z dGVwKCk7CiAgICAgd2hpbGUgKHJlc3VsdCA9PSBTUUxSZXN1bHRSb3cpIHsKKyAgICAgICAgQXV0 b2RyYWluZWRQb29sIHBvb2w7CiAgICAgICAgIFN0cmluZyBwYWdlVVJMID0gcXVlcnkuZ2V0Q29s dW1uVGV4dCgwKTsKICAgICAgICAgU3RyaW5nIGljb25VUkwgPSBxdWVyeS5nZXRDb2x1bW5UZXh0 KDEpOwogCiAgICAgICAgIHsKICAgICAgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX3VybEFu ZEljb25Mb2NrKTsKLSAgICAgICAgICAgIAorCiAgICAgICAgICAgICBQYWdlVVJMUmVjb3JkKiBw YWdlUmVjb3JkID0gbV9wYWdlVVJMVG9SZWNvcmRNYXAuZ2V0KHBhZ2VVUkwpOwogICAgICAgICAg ICAgCiAgICAgICAgICAgICAvLyBJZiB0aGUgcGFnZVJlY29yZCBkb2Vzbid0IGV4aXN0IGluIHRo aXMgbWFwLCB0aGVuIG5vIG9uZSBoYXMgcmV0YWluZWQgdGhpcyBwYWdlVVJMCkBAIC0xMjc4LDgg KzEyNzEsNiBAQCB2b2lkIEljb25EYXRhYmFzZTo6cGVyZm9ybVVSTEltcG9ydCgpCiAgICAgICAg ICAgICBpZiAobV9wYWdlVVJMc1BlbmRpbmdJbXBvcnQuY29udGFpbnMocGFnZVVSTCkpIHsKICAg ICAgICAgICAgICAgICBkaXNwYXRjaERpZEltcG9ydEljb25VUkxGb3JQYWdlVVJMT25NYWluVGhy ZWFkKHBhZ2VVUkwpOwogICAgICAgICAgICAgICAgIG1fcGFnZVVSTHNQZW5kaW5nSW1wb3J0LnJl bW92ZShwYWdlVVJMKTsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgICAgIHBvb2wuY3ljbGUo KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICAKQEAgLTEzNTAsMTIgKzEzNDEs MTIgQEAgdm9pZCBJY29uRGF0YWJhc2U6OnBlcmZvcm1VUkxJbXBvcnQoKQogICAgIExPRyhJY29u RGF0YWJhc2UsICJOb3RpZnlpbmcgJWx1IGludGVyZXN0ZWQgcGFnZSBVUkxzIHRoYXQgdGhlaXIg aWNvbiBVUkwgaXMga25vd24gZHVlIHRvIHRoZSBpbXBvcnQiLCBzdGF0aWNfY2FzdDx1bnNpZ25l ZCBsb25nPih1cmxzVG9Ob3RpZnkuc2l6ZSgpKSk7CiAgICAgLy8gTm93IHRoYXQgd2UgZG9uJ3Qg aG9sZCBhbnkgbG9ja3MsIHBlcmZvcm0gdGhlIGFjdHVhbCBub3RpZmljYXRpb25zCiAgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IHVybHNUb05vdGlmeS5zaXplKCk7ICsraSkgeworICAgICAg ICBBdXRvZHJhaW5lZFBvb2wgcG9vbDsKKwogICAgICAgICBMT0coSWNvbkRhdGFiYXNlLCAiTm90 aWZ5aW5nIGljb24gaW5mbyBrbm93biBmb3IgcGFnZVVSTCAlcyIsIHVybHNUb05vdGlmeVtpXS5h c2NpaSgpLmRhdGEoKSk7CiAgICAgICAgIGRpc3BhdGNoRGlkSW1wb3J0SWNvblVSTEZvclBhZ2VV UkxPbk1haW5UaHJlYWQodXJsc1RvTm90aWZ5W2ldKTsKICAgICAgICAgaWYgKHNob3VsZFN0b3BU aHJlYWRBY3Rpdml0eSgpKQogICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHBvb2wuY3lj bGUoKTsKICAgICB9CiAgICAgCiAgICAgLy8gTm90aWZ5IHRoZSBjbGllbnQgdGhhdCB0aGUgVVJM IGltcG9ydCBpcyBjb21wbGV0ZSBpbiBjYXNlIGl0J3MgbWFuYWdpbmcgaXRzIG93biBwZW5kaW5n IG5vdGlmaWNhdGlvbnMuCkBAIC0xNTk5LDIwICsxNTkwLDE0IEBAIGJvb2wgSWNvbkRhdGFiYXNl OjpyZWFkRnJvbURhdGFiYXNlKCkKICAgICAgICAgaWYgKHNob3VsZFN0b3BUaHJlYWRBY3Rpdml0 eSgpKQogICAgICAgICAgICAgcmV0dXJuIGRpZEFueVdvcms7CiAgICAgICAgIAotICAgICAgICAv LyBJbmZvcm1hbCB0ZXN0aW5nIHNob3dzIHRoYXQgZHJhaW5pbmcgdGhlIGF1dG9yZWxlYXNlIHBv b2wgZXZlcnkgMjUgaXRlcmF0aW9ucyBpcyBhYm91dCBhcyBsb3cgYXMgd2UgY2FuIGdvCi0gICAg ICAgIC8vIGJlZm9yZSBwZXJmb3JtYW5jZSBzdGFydHMgdG8gZHJvcCBvZmYsIGJ1dCB3ZSBkb24n dCB3YW50IHRvIGluY3JlYXNlIHRoaXMgbnVtYmVyIGJlY2F1c2UgdGhlbiBhY2N1bXVsYXRlZCBt ZW1vcnkgdXNhZ2Ugd2lsbCBnbyB1cAotICAgICAgICBBdXRvZHJhaW5lZFBvb2wgcG9vbCgyNSk7 Ci0KICAgICAgICAgLy8gTm93IHRoYXQgd2UgZG9uJ3QgaG9sZCBhbnkgbG9ja3MsIHBlcmZvcm0g dGhlIGFjdHVhbCBub3RpZmljYXRpb25zCi0gICAgICAgIEhhc2hTZXQ8U3RyaW5nPjo6aXRlcmF0 b3IgaXRlciA9IHVybHNUb05vdGlmeS5iZWdpbigpOwotICAgICAgICBIYXNoU2V0PFN0cmluZz46 Oml0ZXJhdG9yIGVuZCA9IHVybHNUb05vdGlmeS5lbmQoKTsKLSAgICAgICAgZm9yICh1bnNpZ25l ZCBpdGVyYXRpb24gPSAwOyBpdGVyICE9IGVuZDsgKytpdGVyLCArK2l0ZXJhdGlvbikgewotICAg ICAgICAgICAgTE9HKEljb25EYXRhYmFzZSwgIk5vdGlmeWluZyBpY29uIHJlY2VpdmVkIGZvciBw YWdlVVJMICVzIiwgdXJsRm9yTG9nZ2luZygqaXRlcikuYXNjaWkoKS5kYXRhKCkpOwotICAgICAg ICAgICAgZGlzcGF0Y2hEaWRJbXBvcnRJY29uRGF0YUZvclBhZ2VVUkxPbk1haW5UaHJlYWQoKml0 ZXIpOworICAgICAgICBmb3IgKEhhc2hTZXQ8U3RyaW5nPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSB1 cmxzVG9Ob3RpZnkuYmVnaW4oKSwgZW5kID0gdXJsc1RvTm90aWZ5LmVuZCgpOyBpdCAhPSBlbmQ7 ICsraXQpIHsKKyAgICAgICAgICAgIEF1dG9kcmFpbmVkUG9vbCBwb29sOworCisgICAgICAgICAg ICBMT0coSWNvbkRhdGFiYXNlLCAiTm90aWZ5aW5nIGljb24gcmVjZWl2ZWQgZm9yIHBhZ2VVUkwg JXMiLCB1cmxGb3JMb2dnaW5nKCppdCkuYXNjaWkoKS5kYXRhKCkpOworICAgICAgICAgICAgZGlz cGF0Y2hEaWRJbXBvcnRJY29uRGF0YUZvclBhZ2VVUkxPbk1haW5UaHJlYWQoKml0KTsKICAgICAg ICAgICAgIGlmIChzaG91bGRTdG9wVGhyZWFkQWN0aXZpdHkoKSkKICAgICAgICAgICAgICAgICBy ZXR1cm4gZGlkQW55V29yazsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgcG9vbC5jeWNsZSgp OwogICAgICAgICB9CiAKICAgICAgICAgTE9HKEljb25EYXRhYmFzZSwgIkRvbmUgbm90aWZ5aW5n ICVpIHBhZ2VVUkxzIHdobyBqdXN0IHJlY2VpdmVkIHRoZWlyIGljb25zIiwgdXJsc1RvTm90aWZ5 LnNpemUoKSk7Cg==