195013 2019-02-25 13:16:38 -0800 [JSC] Revert r226885 to make SlotVisitor creation lazy 2019-05-28 01:45:08 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 180907 195020 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1509759 0 ysuzuki 2019-02-25 13:16:38 -0800 [JSC] Revert r226885 to make SlotVisitor creation lazy 1509762 1 362922 ysuzuki 2019-02-25 13:27:14 -0800 Created attachment 362922 Patch 1509763 2 362923 ysuzuki 2019-02-25 13:33:06 -0800 Created attachment 362923 Patch 1509764 3 362923 saam 2019-02-25 13:35:31 -0800 Comment on attachment 362923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=362923&action=review > Source/JavaScriptCore/ChangeLog:8 > + We once changed SlotVisitor creation apriori to drop the lock. But it turns out that SlotVisitor is memory-consuming. I don't understand what these two sentences have to do with each other. What does "memory-consuming" here mean? 1509767 4 362923 ysuzuki 2019-02-25 13:40:11 -0800 Comment on attachment 362923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=362923&action=review >> Source/JavaScriptCore/ChangeLog:8 >> + We once changed SlotVisitor creation apriori to drop the lock. But it turns out that SlotVisitor is memory-consuming. > > I don't understand what these two sentences have to do with each other. What does "memory-consuming" here mean? In previous change, we created # of Heap collectors SlotVisitors apriori. But each SlotVisitor takes so much memory (each has two MarkedStack, and each MarkedStack at least has 4KB dirty memory). This patch reverts that apriori creation, and creates SlotVisitors dynamically. 1509779 5 362923 ysuzuki 2019-02-25 14:18:05 -0800 Comment on attachment 362923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=362923&action=review >>> Source/JavaScriptCore/ChangeLog:8 >>> + We once changed SlotVisitor creation apriori to drop the lock. But it turns out that SlotVisitor is memory-consuming. >> >> I don't understand what these two sentences have to do with each other. What does "memory-consuming" here mean? > > In previous change, we created # of Heap collectors SlotVisitors apriori. But each SlotVisitor takes so much memory (each has two MarkedStack, and each MarkedStack at least has 4KB dirty memory). > This patch reverts that apriori creation, and creates SlotVisitors dynamically. And the previous patch removed the lock because we no longer created SlotVisitors dynamically. But this patch attempts to revert that. Then, the lock comes back. I checked `forEachSlotVisitor()` calls in our JSC code base and the passed lambda does not cause dead-lock. 1509908 6 362923 saam 2019-02-25 19:22:10 -0800 Comment on attachment 362923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=362923&action=review >>>> Source/JavaScriptCore/ChangeLog:8 >>>> + We once changed SlotVisitor creation apriori to drop the lock. But it turns out that SlotVisitor is memory-consuming. >>> >>> I don't understand what these two sentences have to do with each other. What does "memory-consuming" here mean? >> >> In previous change, we created # of Heap collectors SlotVisitors apriori. But each SlotVisitor takes so much memory (each has two MarkedStack, and each MarkedStack at least has 4KB dirty memory). >> This patch reverts that apriori creation, and creates SlotVisitors dynamically. > > And the previous patch removed the lock because we no longer created SlotVisitors dynamically. But this patch attempts to revert that. Then, the lock comes back. > I checked `forEachSlotVisitor()` calls in our JSC code base and the passed lambda does not cause dead-lock. "But" => "Also, it turns out..." 1509934 7 362923 ysuzuki 2019-02-25 21:01:56 -0800 Comment on attachment 362923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=362923&action=review Thanks! >>>>> Source/JavaScriptCore/ChangeLog:8 >>>>> + We once changed SlotVisitor creation apriori to drop the lock. But it turns out that SlotVisitor is memory-consuming. >>>> >>>> I don't understand what these two sentences have to do with each other. What does "memory-consuming" here mean? >>> >>> In previous change, we created # of Heap collectors SlotVisitors apriori. But each SlotVisitor takes so much memory (each has two MarkedStack, and each MarkedStack at least has 4KB dirty memory). >>> This patch reverts that apriori creation, and creates SlotVisitors dynamically. >> >> And the previous patch removed the lock because we no longer created SlotVisitors dynamically. But this patch attempts to revert that. Then, the lock comes back. >> I checked `forEachSlotVisitor()` calls in our JSC code base and the passed lambda does not cause dead-lock. > > "But" => "Also, it turns out..." Fixed. 1509939 8 ysuzuki 2019-02-25 21:37:58 -0800 Committed r242070: <https://trac.webkit.org/changeset/242070> 1509940 9 webkit-bug-importer 2019-02-25 21:41:15 -0800 <rdar://problem/48390304> 1539505 10 ysuzuki 2019-05-28 01:45:08 -0700 Committed r245808: <https://trac.webkit.org/changeset/245808> 362922 2019-02-25 13:27:14 -0800 2019-02-25 13:33:05 -0800 Patch bug-195013-20190225132713.patch text/plain 6221 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz ZDlhYjA4ZDhhNjhiMGQ1MWViNzU4Mzg3ZDNlNDA4MmFkYWUzODUwLi5kNGUwMzE4ZmQzNTYzMTg4 Yzg1MTM5Y2U3Y2YxZmI4MTZhNjVlMTE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxOS0wMi0yNSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFJldmVydCByMjI2ODg1IHRvIG1ha2UgU2xvdFZpc2l0b3IgY3Jl YXRpb24gbGF6eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk1MDEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgV2Ugb25jZSBjaGFuZ2VkIFNsb3RWaXNpdG9yIGNyZWF0aW9uIGFwcmlvcmkgdG8gZHJvcCB0 aGUgbG9jay4gQnV0IGl0IHR1cm5zIG91dCB0aGF0IFNsb3RWaXNpdG9yIGlzIG1lbW9yeS1jb25z dW1pbmcuCisgICAgICAgIFdlIHNob3VsZCBkZWZlciBTbG90VmlzaXRvciBjcmVhdGlvbiB1bnRp bCBpdCBpcyBhY3R1YWxseSByZXF1aXJlZC4gVGhpcyBwYXRjaCByZXZlcnRzIHIyMjY4ODUuCisK KyAgICAgICAgKiBoZWFwL0hlYXAuY3BwOgorICAgICAgICAoSlNDOjpIZWFwOjpIZWFwKToKKyAg ICAgICAgKEpTQzo6SGVhcDo6cnVuQmVnaW5QaGFzZSk6CisgICAgICAgICogaGVhcC9IZWFwLmg6 CisgICAgICAgICogaGVhcC9IZWFwSW5saW5lcy5oOgorICAgICAgICAoSlNDOjpIZWFwOjpmb3JF YWNoU2xvdFZpc2l0b3IpOgorICAgICAgICAoSlNDOjpIZWFwOjpudW1iZXJPZlNsb3RWaXNpdG9y cyk6CisgICAgICAgICogaGVhcC9NYXJraW5nQ29uc3RyYWludFNvbHZlci5jcHA6CisgICAgICAg IChKU0M6Ok1hcmtpbmdDb25zdHJhaW50U29sdmVyOjpkaWRWaXNpdFNvbWV0aGluZyBjb25zdCk6 CisgICAgICAgICogaGVhcC9TbG90VmlzaXRvci5oOgorCiAyMDE5LTAyLTI1ICBUYWRldSBaYWdh bGxvICA8dHphZ2FsbG9AYXBwbGUuY29tPgogCiAgICAgICAgIEF2b2lkIGhhc2hpbmcgQ29tcGFj dFZhcmlhYmxlRW52aXJvbm1lbnQgd2hlbiBkZWNvZGluZyBDb21wYWN0VmFyaWFibGVNYXA6Okhh bmRsZQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAppbmRleCAyYWQwZTBhNDc2MGRiNGU3 ZDRkM2Q5NDMyNzU3ZDQ3YTRlYzVlNDJjLi4wOTRhNzg1MmI5NzJlMjE4ZjU5ODcyMzVhYTlhY2I3 NjgxYTc4YzUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNw cAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcApAQCAtMzAwLDE0ICsz MDAsNiBAQCBIZWFwOjpIZWFwKFZNKiB2bSwgSGVhcFR5cGUgaGVhcFR5cGUpCiAgICAgLCBtX3Ro cmVhZENvbmRpdGlvbihBdXRvbWF0aWNUaHJlYWRDb25kaXRpb246OmNyZWF0ZSgpKQogewogICAg IG1fd29ybGRTdGF0ZS5zdG9yZSgwKTsKLQotICAgIGZvciAodW5zaWduZWQgaSA9IDAsIG51bWJl ck9mUGFyYWxsZWxUaHJlYWRzID0gaGVhcEhlbHBlclBvb2woKS5udW1iZXJPZlRocmVhZHMoKTsg aSA8IG51bWJlck9mUGFyYWxsZWxUaHJlYWRzOyArK2kpIHsKLSAgICAgICAgc3RkOjp1bmlxdWVf cHRyPFNsb3RWaXNpdG9yPiB2aXNpdG9yID0gc3RkOjptYWtlX3VuaXF1ZTxTbG90VmlzaXRvcj4o KnRoaXMsIHRvQ1N0cmluZygiUCIsIGkgKyAxKSk7Ci0gICAgICAgIGlmIChPcHRpb25zOjpvcHRp bWl6ZVBhcmFsbGVsU2xvdFZpc2l0b3JzRm9yU3RvcHBlZE11dGF0b3IoKSkKLSAgICAgICAgICAg IHZpc2l0b3ItPm9wdGltaXplRm9yU3RvcHBlZE11dGF0b3IoKTsKLSAgICAgICAgbV9hdmFpbGFi bGVQYXJhbGxlbFNsb3RWaXNpdG9ycy5hcHBlbmQodmlzaXRvci5nZXQoKSk7Ci0gICAgICAgIG1f cGFyYWxsZWxTbG90VmlzaXRvcnMuYXBwZW5kKFdURk1vdmUodmlzaXRvcikpOwotICAgIH0KICAg ICAKICAgICBpZiAoT3B0aW9uczo6dXNlQ29uY3VycmVudEdDKCkpIHsKICAgICAgICAgaWYgKE9w dGlvbnM6OnVzZVN0b2NoYXN0aWNNdXRhdG9yU2NoZWR1bGVyKCkpCkBAIC0xMjYxLDggKzEyNTMs MTkgQEAgTkVWRVJfSU5MSU5FIGJvb2wgSGVhcDo6cnVuQmVnaW5QaGFzZShHQ0NvbmR1Y3RvciBj b25uKQogICAgICAgICAgICAgU2xvdFZpc2l0b3IqIHNsb3RWaXNpdG9yOwogICAgICAgICAgICAg ewogICAgICAgICAgICAgICAgIExvY2tIb2xkZXIgbG9ja2VyKG1fcGFyYWxsZWxTbG90VmlzaXRv ckxvY2spOwotICAgICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUX1dJVEhfTUVTU0FHRSghbV9h dmFpbGFibGVQYXJhbGxlbFNsb3RWaXNpdG9ycy5pc0VtcHR5KCksICJQYXJhbGxlbCBTbG90Vmlz aXRvcnMgYXJlIGFsbG9jYXRlZCBhcHJpb3JpIik7Ci0gICAgICAgICAgICAgICAgc2xvdFZpc2l0 b3IgPSBtX2F2YWlsYWJsZVBhcmFsbGVsU2xvdFZpc2l0b3JzLnRha2VMYXN0KCk7CisgICAgICAg ICAgICAgICAgaWYgKG1fYXZhaWxhYmxlUGFyYWxsZWxTbG90VmlzaXRvcnMuaXNFbXB0eSgpKSB7 CisgICAgICAgICAgICAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxTbG90VmlzaXRvcj4gbmV3Vmlz aXRvciA9IHN0ZDo6bWFrZV91bmlxdWU8U2xvdFZpc2l0b3I+KAorICAgICAgICAgICAgICAgICAg ICAgICAgKnRoaXMsIHRvQ1N0cmluZygiUCIsIG1fcGFyYWxsZWxTbG90VmlzaXRvcnMuc2l6ZSgp ICsgMSkpOworICAgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgaWYgKE9w dGlvbnM6Om9wdGltaXplUGFyYWxsZWxTbG90VmlzaXRvcnNGb3JTdG9wcGVkTXV0YXRvcigpKQor ICAgICAgICAgICAgICAgICAgICAgICAgbmV3VmlzaXRvci0+b3B0aW1pemVGb3JTdG9wcGVkTXV0 YXRvcigpOworICAgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgbmV3Vmlz aXRvci0+ZGlkU3RhcnRNYXJraW5nKCk7CisgICAgICAgICAgICAgICAgICAgIAorICAgICAgICAg ICAgICAgICAgICBzbG90VmlzaXRvciA9IG5ld1Zpc2l0b3IuZ2V0KCk7CisgICAgICAgICAgICAg ICAgICAgIG1fcGFyYWxsZWxTbG90VmlzaXRvcnMuYXBwZW5kKFdURk1vdmUobmV3VmlzaXRvcikp OworICAgICAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgICAgICBzbG90VmlzaXRv ciA9IG1fYXZhaWxhYmxlUGFyYWxsZWxTbG90VmlzaXRvcnMudGFrZUxhc3QoKTsKICAgICAgICAg ICAgIH0KIAogICAgICAgICAgICAgV1RGOjpyZWdpc3RlckdDVGhyZWFkKEdDVGhyZWFkVHlwZTo6 SGVscGVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaAppbmRleCAyNDg4ODFmM2E0Zjg5MTVk MTU5NDIwMTYzYzg3OGQxMWQ4ZmUzMDk5Li41OTEyZjk5MmE0Zjk2NjUxNWMyMTlkYjQyMmVkMWNh Y2EzOGU1YTBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmgK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5oCkBAIC0zOTMsNiArMzkzLDcg QEAgY2xhc3MgSGVhcCB7CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBGdW5jPgogICAgIHZvaWQg Zm9yRWFjaFNsb3RWaXNpdG9yKGNvbnN0IEZ1bmMmKTsKKyAgICB1bnNpZ25lZCBudW1iZXJPZlNs b3RWaXNpdG9ycygpOwogICAgIAogICAgIFNlY29uZHMgdG90YWxHQ1RpbWUoKSBjb25zdCB7IHJl dHVybiBtX3RvdGFsR0NUaW1lOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9oZWFwL0hlYXBJbmxpbmVzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwSW5s aW5lcy5oCmluZGV4IGRlZmE0ZWM5NjM3M2Q3NTYwYTRhOTU2NGFiMmI5Y2E4NjE5OGJhNGIuLmY1 YjBkNDllMjY0NmViNzk5ZmQ1OTZiZjgyOGNjYTk3ZGUyZWNmNmEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXBJbmxpbmVzLmgKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2hlYXAvSGVhcElubGluZXMuaApAQCAtMjc1LDEwICsyNzUsMTcgQEAgaW5saW5lIHZv aWQgSGVhcDo6c3RvcElmTmVjZXNzYXJ5KCkKIHRlbXBsYXRlPHR5cGVuYW1lIEZ1bmM+CiB2b2lk IEhlYXA6OmZvckVhY2hTbG90VmlzaXRvcihjb25zdCBGdW5jJiBmdW5jKQogeworICAgIGF1dG8g bG9ja2VyID0gaG9sZExvY2sobV9wYXJhbGxlbFNsb3RWaXNpdG9yTG9jayk7CiAgICAgZnVuYygq bV9jb2xsZWN0b3JTbG90VmlzaXRvcik7CiAgICAgZnVuYygqbV9tdXRhdG9yU2xvdFZpc2l0b3Ip OwogICAgIGZvciAoYXV0byYgc2xvdFZpc2l0b3IgOiBtX3BhcmFsbGVsU2xvdFZpc2l0b3JzKQog ICAgICAgICBmdW5jKCpzbG90VmlzaXRvcik7CiB9CiAKK2lubGluZSB1bnNpZ25lZCBIZWFwOjpu dW1iZXJPZlNsb3RWaXNpdG9ycygpCit7CisgICAgYXV0byBsb2NrZXIgPSBob2xkTG9jayhtX3Bh cmFsbGVsU2xvdFZpc2l0b3JMb2NrKTsKKyAgICByZXR1cm4gbV9wYXJhbGxlbFNsb3RWaXNpdG9y cy5zaXplKCkgKyAyOyAvLyBtX2NvbGxlY3RvclNsb3RWaXNpdG9yIGFuZCBtX211dGF0b3JTbG90 VmlzaXRvcgorfQorCiB9IC8vIG5hbWVzcGFjZSBKU0MKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9oZWFwL01hcmtpbmdDb25zdHJhaW50U29sdmVyLmNwcCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9oZWFwL01hcmtpbmdDb25zdHJhaW50U29sdmVyLmNwcAppbmRleCBhN2ZmMDQ2 ZTU5Zjg0NDY4NTBkNTM2OTdmYzNhYjVmYzlkNzUzOWE2Li40Y2ZmNDk5YjRhNjM3M2U0NDk1MTMw NGE3MzRhOWEyMGZkNjc5MjM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVh cC9NYXJraW5nQ29uc3RyYWludFNvbHZlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2hlYXAvTWFya2luZ0NvbnN0cmFpbnRTb2x2ZXIuY3BwCkBAIC01MSw2ICs1MSwxMCBAQCBib29s IE1hcmtpbmdDb25zdHJhaW50U29sdmVyOjpkaWRWaXNpdFNvbWV0aGluZygpIGNvbnN0CiAgICAg ICAgIGlmICh2aXNpdENvdW50ZXIudmlzaXRDb3VudCgpKQogICAgICAgICAgICAgcmV0dXJuIHRy dWU7CiAgICAgfQorICAgIC8vIElmIHRoZSBudW1iZXIgb2YgU2xvdFZpc2l0b3JzIGluY3JlYXNl cyBhZnRlciBjcmVhdGluZyBtX3Zpc2l0Q291bnRlcnMsCisgICAgLy8gd2UgY29uc2VydmF0aXZl bHkgc2F5IHRoZXJlIGNvdWxkIGJlIHNvbWV0aGluZyB2aXNpdGVkIGJ5IGFkZGVkIFNsb3RWaXNp dG9ycy4KKyAgICBpZiAobV9oZWFwLm51bWJlck9mU2xvdFZpc2l0b3JzKCkgPiBtX3Zpc2l0Q291 bnRlcnMuc2l6ZSgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICByZXR1cm4gZmFsc2U7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL1Nsb3RWaXNpdG9yLmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9TbG90VmlzaXRvci5oCmluZGV4IDc3MTE4ZDE4 NGNhODE2N2MwNDY2NmNjMjA3ODAyNTk5ZWM0ZDM4NGEuLjc4MmZhNDRiNWY5M2ZmYjAwYzVjMTI2 MDAwNjhmZDI4YWZhMzk3ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L1Nsb3RWaXNpdG9yLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvU2xvdFZpc2l0 b3IuaApAQCAtMjU5LDggKzI1OSw2IEBAIGNsYXNzIFNsb3RWaXNpdG9yIHsKICAgICBNYXJraW5n Q29uc3RyYWludCogbV9jdXJyZW50Q29uc3RyYWludCB7IG51bGxwdHIgfTsKICAgICBNYXJraW5n Q29uc3RyYWludFNvbHZlciogbV9jdXJyZW50U29sdmVyIHsgbnVsbHB0ciB9OwogICAgIAotICAg IC8vIFB1dCBwYWRkaW5nIGhlcmUgdG8gbWl0aWdhdGUgZmFsc2Ugc2hhcmluZyBiZXR3ZWVuIG11 bHRpcGxlIFNsb3RWaXNpdG9ycy4KLSAgICBjaGFyIHBhZGRpbmdbNjRdOwogcHVibGljOgogI2lm ICFBU1NFUlRfRElTQUJMRUQKICAgICBib29sIG1faXNDaGVja2luZ0ZvckRlZmF1bHRNYXJrVmlv bGF0aW9uOwo= 362923 2019-02-25 13:33:06 -0800 2019-02-25 19:22:10 -0800 Patch bug-195013-20190225133306.patch text/plain 6462 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz ZDlhYjA4ZDhhNjhiMGQ1MWViNzU4Mzg3ZDNlNDA4MmFkYWUzODUwLi5iZDZkMzkwNDU1ZmUzYTAw OTMwNjczYmI3MDJkZjE5NWUyY2YzNWJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxOS0wMi0yNSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFJldmVydCByMjI2ODg1IHRvIG1ha2UgU2xvdFZpc2l0b3IgY3Jl YXRpb24gbGF6eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk1MDEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgV2Ugb25jZSBjaGFuZ2VkIFNsb3RWaXNpdG9yIGNyZWF0aW9uIGFwcmlvcmkgdG8gZHJvcCB0 aGUgbG9jay4gQnV0IGl0IHR1cm5zIG91dCB0aGF0IFNsb3RWaXNpdG9yIGlzIG1lbW9yeS1jb25z dW1pbmcuCisgICAgICAgIFdlIHNob3VsZCBkZWZlciBTbG90VmlzaXRvciBjcmVhdGlvbiB1bnRp bCBpdCBpcyBhY3R1YWxseSByZXF1aXJlZC4gVGhpcyBwYXRjaCByZXZlcnRzIHIyMjY4ODUuIEV2 ZW4gd2l0aCB0aGlzIHBhdGNoLAorICAgICAgICB3ZSBzdGlsbCBob2xkIG1hbnkgU2xvdFZpc2l0 b3JzIGFmdGVyIHdlIGV4ZWN1dGUgbWFueSBwYXJhbGxlbCBtYXJrZXJzIGF0IGxlYXN0IG9uY2Uu IEJ1dCByZWNvdmVyaW5nIHRoZSBmZWF0dXJlIG9mCisgICAgICAgIGR5bmFtaWNhbGx5IGFsbG9j YXRpbmcgU2xvdFZpc2l0b3JzIGhlbHBzIGZ1cnRoZXIgbWVtb3J5IG9wdGltaXphdGlvbnMgaW4g dGhpcyBhcmVhLgorCisgICAgICAgICogaGVhcC9IZWFwLmNwcDoKKyAgICAgICAgKEpTQzo6SGVh cDo6SGVhcCk6CisgICAgICAgIChKU0M6OkhlYXA6OnJ1bkJlZ2luUGhhc2UpOgorICAgICAgICAq IGhlYXAvSGVhcC5oOgorICAgICAgICAqIGhlYXAvSGVhcElubGluZXMuaDoKKyAgICAgICAgKEpT Qzo6SGVhcDo6Zm9yRWFjaFNsb3RWaXNpdG9yKToKKyAgICAgICAgKEpTQzo6SGVhcDo6bnVtYmVy T2ZTbG90VmlzaXRvcnMpOgorICAgICAgICAqIGhlYXAvTWFya2luZ0NvbnN0cmFpbnRTb2x2ZXIu Y3BwOgorICAgICAgICAoSlNDOjpNYXJraW5nQ29uc3RyYWludFNvbHZlcjo6ZGlkVmlzaXRTb21l dGhpbmcgY29uc3QpOgorICAgICAgICAqIGhlYXAvU2xvdFZpc2l0b3IuaDoKKwogMjAxOS0wMi0y NSAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNvbT4KIAogICAgICAgICBBdm9pZCBo YXNoaW5nIENvbXBhY3RWYXJpYWJsZUVudmlyb25tZW50IHdoZW4gZGVjb2RpbmcgQ29tcGFjdFZh cmlhYmxlTWFwOjpIYW5kbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L0hlYXAuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAKaW5kZXggMmFk MGUwYTQ3NjBkYjRlN2Q0ZDNkOTQzMjc1N2Q0N2E0ZWM1ZTQyYy4uMDk0YTc4NTJiOTcyZTIxOGY1 OTg3MjM1YWE5YWNiNzY4MWE3OGM1MCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2hlYXAvSGVhcC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAK QEAgLTMwMCwxNCArMzAwLDYgQEAgSGVhcDo6SGVhcChWTSogdm0sIEhlYXBUeXBlIGhlYXBUeXBl KQogICAgICwgbV90aHJlYWRDb25kaXRpb24oQXV0b21hdGljVGhyZWFkQ29uZGl0aW9uOjpjcmVh dGUoKSkKIHsKICAgICBtX3dvcmxkU3RhdGUuc3RvcmUoMCk7Ci0KLSAgICBmb3IgKHVuc2lnbmVk IGkgPSAwLCBudW1iZXJPZlBhcmFsbGVsVGhyZWFkcyA9IGhlYXBIZWxwZXJQb29sKCkubnVtYmVy T2ZUaHJlYWRzKCk7IGkgPCBudW1iZXJPZlBhcmFsbGVsVGhyZWFkczsgKytpKSB7Ci0gICAgICAg IHN0ZDo6dW5pcXVlX3B0cjxTbG90VmlzaXRvcj4gdmlzaXRvciA9IHN0ZDo6bWFrZV91bmlxdWU8 U2xvdFZpc2l0b3I+KCp0aGlzLCB0b0NTdHJpbmcoIlAiLCBpICsgMSkpOwotICAgICAgICBpZiAo T3B0aW9uczo6b3B0aW1pemVQYXJhbGxlbFNsb3RWaXNpdG9yc0ZvclN0b3BwZWRNdXRhdG9yKCkp Ci0gICAgICAgICAgICB2aXNpdG9yLT5vcHRpbWl6ZUZvclN0b3BwZWRNdXRhdG9yKCk7Ci0gICAg ICAgIG1fYXZhaWxhYmxlUGFyYWxsZWxTbG90VmlzaXRvcnMuYXBwZW5kKHZpc2l0b3IuZ2V0KCkp OwotICAgICAgICBtX3BhcmFsbGVsU2xvdFZpc2l0b3JzLmFwcGVuZChXVEZNb3ZlKHZpc2l0b3Ip KTsKLSAgICB9CiAgICAgCiAgICAgaWYgKE9wdGlvbnM6OnVzZUNvbmN1cnJlbnRHQygpKSB7CiAg ICAgICAgIGlmIChPcHRpb25zOjp1c2VTdG9jaGFzdGljTXV0YXRvclNjaGVkdWxlcigpKQpAQCAt MTI2MSw4ICsxMjUzLDE5IEBAIE5FVkVSX0lOTElORSBib29sIEhlYXA6OnJ1bkJlZ2luUGhhc2Uo R0NDb25kdWN0b3IgY29ubikKICAgICAgICAgICAgIFNsb3RWaXNpdG9yKiBzbG90VmlzaXRvcjsK ICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBMb2NrSG9sZGVyIGxvY2tlcihtX3BhcmFs bGVsU2xvdFZpc2l0b3JMb2NrKTsKLSAgICAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVF9XSVRI X01FU1NBR0UoIW1fYXZhaWxhYmxlUGFyYWxsZWxTbG90VmlzaXRvcnMuaXNFbXB0eSgpLCAiUGFy YWxsZWwgU2xvdFZpc2l0b3JzIGFyZSBhbGxvY2F0ZWQgYXByaW9yaSIpOwotICAgICAgICAgICAg ICAgIHNsb3RWaXNpdG9yID0gbV9hdmFpbGFibGVQYXJhbGxlbFNsb3RWaXNpdG9ycy50YWtlTGFz dCgpOworICAgICAgICAgICAgICAgIGlmIChtX2F2YWlsYWJsZVBhcmFsbGVsU2xvdFZpc2l0b3Jz LmlzRW1wdHkoKSkgeworICAgICAgICAgICAgICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8U2xvdFZp c2l0b3I+IG5ld1Zpc2l0b3IgPSBzdGQ6Om1ha2VfdW5pcXVlPFNsb3RWaXNpdG9yPigKKyAgICAg ICAgICAgICAgICAgICAgICAgICp0aGlzLCB0b0NTdHJpbmcoIlAiLCBtX3BhcmFsbGVsU2xvdFZp c2l0b3JzLnNpemUoKSArIDEpKTsKKyAgICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAg ICAgICAgIGlmIChPcHRpb25zOjpvcHRpbWl6ZVBhcmFsbGVsU2xvdFZpc2l0b3JzRm9yU3RvcHBl ZE11dGF0b3IoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIG5ld1Zpc2l0b3ItPm9wdGltaXpl Rm9yU3RvcHBlZE11dGF0b3IoKTsKKyAgICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAg ICAgICAgIG5ld1Zpc2l0b3ItPmRpZFN0YXJ0TWFya2luZygpOworICAgICAgICAgICAgICAgICAg ICAKKyAgICAgICAgICAgICAgICAgICAgc2xvdFZpc2l0b3IgPSBuZXdWaXNpdG9yLmdldCgpOwor ICAgICAgICAgICAgICAgICAgICBtX3BhcmFsbGVsU2xvdFZpc2l0b3JzLmFwcGVuZChXVEZNb3Zl KG5ld1Zpc2l0b3IpKTsKKyAgICAgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICAg ICAgc2xvdFZpc2l0b3IgPSBtX2F2YWlsYWJsZVBhcmFsbGVsU2xvdFZpc2l0b3JzLnRha2VMYXN0 KCk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIFdURjo6cmVnaXN0ZXJHQ1RocmVhZChH Q1RocmVhZFR5cGU6OkhlbHBlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aGVhcC9IZWFwLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmgKaW5kZXggMjQ4 ODgxZjNhNGY4OTE1ZDE1OTQyMDE2M2M4NzhkMTFkOGZlMzA5OS4uNTkxMmY5OTJhNGY5NjY1MTVj MjE5ZGI0MjJlZDFjYWNhMzhlNWEwZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2hlYXAvSGVhcC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuaApAQCAt MzkzLDYgKzM5Myw3IEBAIGNsYXNzIEhlYXAgewogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgRnVu Yz4KICAgICB2b2lkIGZvckVhY2hTbG90VmlzaXRvcihjb25zdCBGdW5jJik7CisgICAgdW5zaWdu ZWQgbnVtYmVyT2ZTbG90VmlzaXRvcnMoKTsKICAgICAKICAgICBTZWNvbmRzIHRvdGFsR0NUaW1l KCkgY29uc3QgeyByZXR1cm4gbV90b3RhbEdDVGltZTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwSW5saW5lcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2hlYXAvSGVhcElubGluZXMuaAppbmRleCBkZWZhNGVjOTYzNzNkNzU2MGE0YTk1NjRhYjJiOWNh ODYxOThiYTRiLi5mNWIwZDQ5ZTI2NDZlYjc5OWZkNTk2YmY4MjhjY2E5N2RlMmVjZjZhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwSW5saW5lcy5oCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXBJbmxpbmVzLmgKQEAgLTI3NSwxMCArMjc1LDE3 IEBAIGlubGluZSB2b2lkIEhlYXA6OnN0b3BJZk5lY2Vzc2FyeSgpCiB0ZW1wbGF0ZTx0eXBlbmFt ZSBGdW5jPgogdm9pZCBIZWFwOjpmb3JFYWNoU2xvdFZpc2l0b3IoY29uc3QgRnVuYyYgZnVuYykK IHsKKyAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKG1fcGFyYWxsZWxTbG90VmlzaXRvckxvY2sp OwogICAgIGZ1bmMoKm1fY29sbGVjdG9yU2xvdFZpc2l0b3IpOwogICAgIGZ1bmMoKm1fbXV0YXRv clNsb3RWaXNpdG9yKTsKICAgICBmb3IgKGF1dG8mIHNsb3RWaXNpdG9yIDogbV9wYXJhbGxlbFNs b3RWaXNpdG9ycykKICAgICAgICAgZnVuYygqc2xvdFZpc2l0b3IpOwogfQogCitpbmxpbmUgdW5z aWduZWQgSGVhcDo6bnVtYmVyT2ZTbG90VmlzaXRvcnMoKQoreworICAgIGF1dG8gbG9ja2VyID0g aG9sZExvY2sobV9wYXJhbGxlbFNsb3RWaXNpdG9yTG9jayk7CisgICAgcmV0dXJuIG1fcGFyYWxs ZWxTbG90VmlzaXRvcnMuc2l6ZSgpICsgMjsgLy8gbV9jb2xsZWN0b3JTbG90VmlzaXRvciBhbmQg bV9tdXRhdG9yU2xvdFZpc2l0b3IKK30KKwogfSAvLyBuYW1lc3BhY2UgSlNDCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJraW5nQ29uc3RyYWludFNvbHZlci5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJraW5nQ29uc3RyYWludFNvbHZlci5jcHAK aW5kZXggYTdmZjA0NmU1OWY4NDQ2ODUwZDUzNjk3ZmMzYWI1ZmM5ZDc1MzlhNi4uNGNmZjQ5OWI0 YTYzNzNlNDQ5NTEzMDRhNzM0YTlhMjBmZDY3OTIzNSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2hlYXAvTWFya2luZ0NvbnN0cmFpbnRTb2x2ZXIuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9oZWFwL01hcmtpbmdDb25zdHJhaW50U29sdmVyLmNwcApAQCAtNTEsNiAr NTEsMTAgQEAgYm9vbCBNYXJraW5nQ29uc3RyYWludFNvbHZlcjo6ZGlkVmlzaXRTb21ldGhpbmco KSBjb25zdAogICAgICAgICBpZiAodmlzaXRDb3VudGVyLnZpc2l0Q291bnQoKSkKICAgICAgICAg ICAgIHJldHVybiB0cnVlOwogICAgIH0KKyAgICAvLyBJZiB0aGUgbnVtYmVyIG9mIFNsb3RWaXNp dG9ycyBpbmNyZWFzZXMgYWZ0ZXIgY3JlYXRpbmcgbV92aXNpdENvdW50ZXJzLAorICAgIC8vIHdl IGNvbnNlcnZhdGl2ZWx5IHNheSB0aGVyZSBjb3VsZCBiZSBzb21ldGhpbmcgdmlzaXRlZCBieSBh ZGRlZCBTbG90VmlzaXRvcnMuCisgICAgaWYgKG1faGVhcC5udW1iZXJPZlNsb3RWaXNpdG9ycygp ID4gbV92aXNpdENvdW50ZXJzLnNpemUoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgcmV0 dXJuIGZhbHNlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9T bG90VmlzaXRvci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvU2xvdFZpc2l0b3IuaApp bmRleCA3NzExOGQxODRjYTgxNjdjMDQ2NjZjYzIwNzgwMjU5OWVjNGQzODRhLi43ODJmYTQ0YjVm OTNmZmIwMGM1YzEyNjAwMDY4ZmQyOGFmYTM5Nzg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaGVhcC9TbG90VmlzaXRvci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9o ZWFwL1Nsb3RWaXNpdG9yLmgKQEAgLTI1OSw4ICsyNTksNiBAQCBjbGFzcyBTbG90VmlzaXRvciB7 CiAgICAgTWFya2luZ0NvbnN0cmFpbnQqIG1fY3VycmVudENvbnN0cmFpbnQgeyBudWxscHRyIH07 CiAgICAgTWFya2luZ0NvbnN0cmFpbnRTb2x2ZXIqIG1fY3VycmVudFNvbHZlciB7IG51bGxwdHIg fTsKICAgICAKLSAgICAvLyBQdXQgcGFkZGluZyBoZXJlIHRvIG1pdGlnYXRlIGZhbHNlIHNoYXJp bmcgYmV0d2VlbiBtdWx0aXBsZSBTbG90VmlzaXRvcnMuCi0gICAgY2hhciBwYWRkaW5nWzY0XTsK IHB1YmxpYzoKICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgYm9vbCBtX2lzQ2hlY2tpbmdGb3JE ZWZhdWx0TWFya1Zpb2xhdGlvbjsK