39337 2010-05-18 18:28:22 -0700 Move Attr pointer from Attribute to an out of band HashMap 2010-05-19 17:25:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 sam webkit-unassigned ap webkit-ews oldest_to_newest 227602 0 sam 2010-05-18 18:28:22 -0700 Attrs are rare enough that it does not make sense to keep them in the Attribute itself. We should move them to a global rare data HashMap. 227603 1 sam 2010-05-18 18:29:50 -0700 <rdar://problem/8001168> 227604 2 56437 sam 2010-05-18 18:31:40 -0700 Created attachment 56437 patch 227607 3 webkit-ews 2010-05-18 18:43:52 -0700 Attachment 56437 did not build on qt: Build output: http://webkit-commit-queue.appspot.com/results/2321307 227608 4 sam 2010-05-18 18:46:28 -0700 This patch doesn't build it seems due to a stupid merging issue. The fix is removing initialization of m_impl(0). Will make a new patch. 227609 5 56438 sam 2010-05-18 18:47:05 -0700 Created attachment 56438 patch 2 227612 6 56438 mjs 2010-05-18 18:52:54 -0700 Comment on attachment 56438 patch 2 r=me 227614 7 sam 2010-05-18 18:57:08 -0700 Landed in r59731. 227894 8 ap 2010-05-19 11:00:21 -0700 What effect does it have on XPath performance? One test to try would be <http://ejohn.org/apps/classname/xpath.html>. 228099 9 sam 2010-05-19 17:25:44 -0700 (In reply to comment #8) > What effect does it have on XPath performance? One test to try would be <http://ejohn.org/apps/classname/xpath.html>. It is around 0.2-0.3% loss, which should be acceptable given the big win on memory. 56437 2010-05-18 18:31:40 -0700 2010-05-18 18:47:05 -0700 patch patch.diff text/plain 5309 sam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTcyOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDUtMTggIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIEF0 dHIgcG9pbnRlciBmcm9tIEF0dHJpYnV0ZSB0byBhIGdsb2JhbCBIYXNoTWFwLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkzMzcKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzgwMDExNjg+CisKKyAgICAgICAgU2hhdmVzIGFub3RoZXIgd29yZCBvZmYg b2YgQXR0cmlidXRlLgorCisgICAgICAgICogZG9tL0F0dHIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QXR0cjo6QXR0cik6CisgICAgICAgIChXZWJDb3JlOjpBdHRyOjp+QXR0cik6CisgICAgICAg ICogZG9tL0F0dHJpYnV0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjphdHRyaWJ1dGVBdHRyTWFw KToKKyAgICAgICAgKFdlYkNvcmU6OkF0dHJpYnV0ZTo6YXR0cik6CisgICAgICAgIChXZWJDb3Jl OjpBdHRyaWJ1dGU6OmNyZWF0ZUF0dHJJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpBdHRy aWJ1dGU6OmJpbmRBdHRyKToKKyAgICAgICAgKFdlYkNvcmU6OkF0dHJpYnV0ZTo6dW5iaW5kQXR0 cik6CisgICAgICAgICogZG9tL0F0dHJpYnV0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6QXR0cmli dXRlOjpBdHRyaWJ1dGUpOgorCiAyMDEwLTA1LTE4ICBZYWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI1OTY5My4KSW5k ZXg6IFdlYkNvcmUvZG9tL0F0dHIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL0F0dHIu Y3BwCShyZXZpc2lvbiA1OTcyNikKKysrIFdlYkNvcmUvZG9tL0F0dHIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zOCwxMCArMzgsMTAgQEAgaW5saW5lIEF0dHI6OkF0dHIoRWxlbWVudCogZWxlbWVu dCwgRG9jdQogICAgICwgbV9lbGVtZW50KGVsZW1lbnQpCiAgICAgLCBtX2F0dHJpYnV0ZShhdHRy aWJ1dGUpCiAgICAgLCBtX2lnbm9yZUNoaWxkcmVuQ2hhbmdlZCgwKQotICAgICwgbV9zcGVjaWZp ZWQodHJ1ZSkgIAorICAgICwgbV9zcGVjaWZpZWQodHJ1ZSkKIHsKICAgICBBU1NFUlQoIW1fYXR0 cmlidXRlLT5hdHRyKCkpOwotICAgIG1fYXR0cmlidXRlLT5tX2ltcGwgPSB0aGlzOworICAgIG1f YXR0cmlidXRlLT5iaW5kQXR0cih0aGlzKTsKIH0KIAogUGFzc1JlZlB0cjxBdHRyPiBBdHRyOjpj cmVhdGUoRWxlbWVudCogZWxlbWVudCwgRG9jdW1lbnQqIGRvY3VtZW50LCBQYXNzUmVmUHRyPEF0 dHJpYnV0ZT4gYXR0cmlidXRlKQpAQCAtNTQsNyArNTQsNyBAQCBQYXNzUmVmUHRyPEF0dHI+IEF0 dHI6OmNyZWF0ZShFbGVtZW50KiBlCiBBdHRyOjp+QXR0cigpCiB7CiAgICAgQVNTRVJUKG1fYXR0 cmlidXRlLT5hdHRyKCkgPT0gdGhpcyk7Ci0gICAgbV9hdHRyaWJ1dGUtPm1faW1wbCA9IDA7Cisg ICAgbV9hdHRyaWJ1dGUtPnVuYmluZEF0dHIodGhpcyk7CiB9CiAKIHZvaWQgQXR0cjo6Y3JlYXRl VGV4dENoaWxkKCkKSW5kZXg6IFdlYkNvcmUvZG9tL0F0dHJpYnV0ZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9kb20vQXR0cmlidXRlLmNwcAkocmV2aXNpb24gNTk3MjYpCisrKyBXZWJDb3Jl L2RvbS9BdHRyaWJ1dGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiwyMCArMjYsNjMgQEAKIAog I2luY2x1ZGUgIkF0dHIuaCIKICNpbmNsdWRlICJFbGVtZW50LmgiCisjaW5jbHVkZSA8d3RmL0hh c2hNYXAuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCit0eXBlZGVmIEhhc2hNYXA8QXR0cmli dXRlKiwgQXR0cio+IEF0dHJpYnV0ZUF0dHJNYXA7CitzdGF0aWMgQXR0cmlidXRlQXR0ck1hcCYg YXR0cmlidXRlQXR0ck1hcCgpCit7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChBdHRyaWJ1dGVB dHRyTWFwLCBtYXAsICgpKTsKKyAgICByZXR1cm4gbWFwOworfQorCiBQYXNzUmVmUHRyPEF0dHJp YnV0ZT4gQXR0cmlidXRlOjpjbG9uZSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5l dyBBdHRyaWJ1dGUobV9uYW1lLCBtX3ZhbHVlLCBtX2lzTWFwcGVkQXR0cmlidXRlLCBtX3N0eWxl RGVjbC5nZXQoKSkpOwogfQogCitBdHRyKiBBdHRyaWJ1dGU6OmF0dHIoKSBjb25zdAoreworICAg IGlmIChtX2hhc0F0dHIpIHsKKyAgICAgICAgQVNTRVJUKGF0dHJpYnV0ZUF0dHJNYXAoKS5jb250 YWlucyhjb25zdF9jYXN0PEF0dHJpYnV0ZSo+KHRoaXMpKSk7CisgICAgICAgIHJldHVybiBhdHRy aWJ1dGVBdHRyTWFwKCkuZ2V0KGNvbnN0X2Nhc3Q8QXR0cmlidXRlKj4odGhpcykpOworICAgIH0K KworICAgIEFTU0VSVCghYXR0cmlidXRlQXR0ck1hcCgpLmNvbnRhaW5zKGNvbnN0X2Nhc3Q8QXR0 cmlidXRlKj4odGhpcykpKTsKKyAgICByZXR1cm4gMDsKK30KKwogUGFzc1JlZlB0cjxBdHRyPiBB dHRyaWJ1dGU6OmNyZWF0ZUF0dHJJZk5lZWRlZChFbGVtZW50KiBlKQogewotICAgIFJlZlB0cjxB dHRyPiByID0gbV9pbXBsOwotICAgIGlmICghcikKLSAgICAgICAgciA9IEF0dHI6OmNyZWF0ZShl LCBlLT5kb2N1bWVudCgpLCB0aGlzKTsKKyAgICBSZWZQdHI8QXR0cj4gcjsKKyAgICBpZiAobV9o YXNBdHRyKSB7CisgICAgICAgIEFTU0VSVChhdHRyaWJ1dGVBdHRyTWFwKCkuY29udGFpbnModGhp cykpOworICAgICAgICByID0gYXR0cmlidXRlQXR0ck1hcCgpLmdldCh0aGlzKTsKKyAgICB9IGVs c2UgeworICAgICAgICBBU1NFUlQoIWF0dHJpYnV0ZUF0dHJNYXAoKS5jb250YWlucyh0aGlzKSk7 CisgICAgICAgIHIgPSBBdHRyOjpjcmVhdGUoZSwgZS0+ZG9jdW1lbnQoKSwgdGhpcyk7IC8vIFRo aXMgd2lsbCBlbmQgdXAgY2FsbGluZyBBdHRyaWJ1dGU6OmJpbmRBdHRyLgorICAgICAgICBBU1NF UlQoYXR0cmlidXRlQXR0ck1hcCgpLmNvbnRhaW5zKHRoaXMpKTsKKyAgICB9CisKICAgICByZXR1 cm4gci5yZWxlYXNlKCk7CiB9CiAKK3ZvaWQgQXR0cmlidXRlOjpiaW5kQXR0cihBdHRyKiBhdHRy KQoreworICAgIEFTU0VSVCghbV9oYXNBdHRyKTsKKyAgICBBU1NFUlQoIWF0dHJpYnV0ZUF0dHJN YXAoKS5jb250YWlucyh0aGlzKSk7CisgICAgYXR0cmlidXRlQXR0ck1hcCgpLnNldCh0aGlzLCBh dHRyKTsKKyAgICBtX2hhc0F0dHIgPSB0cnVlOworfQorCit2b2lkIEF0dHJpYnV0ZTo6dW5iaW5k QXR0cihBdHRyKiBhdHRyKQoreworICAgIEFTU0VSVChtX2hhc0F0dHIpOworICAgIEFTU0VSVChh dHRyaWJ1dGVBdHRyTWFwKCkuY29udGFpbnModGhpcykpOworICAgIEFTU0VSVChhdHRyaWJ1dGVB dHRyTWFwKCkuZ2V0KHRoaXMpID09IGF0dHIpOworICAgIGF0dHJpYnV0ZUF0dHJNYXAoKS5yZW1v dmUodGhpcyk7CisgICAgbV9oYXNBdHRyID0gZmFsc2U7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKSW5kZXg6IFdlYkNvcmUvZG9tL0F0dHJpYnV0ZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvZG9tL0F0dHJpYnV0ZS5oCShyZXZpc2lvbiA1OTcyNikKKysrIFdlYkNvcmUvZG9tL0F0dHJp YnV0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01NCw3ICs1NCw3IEBAIHB1YmxpYzoKICAgICAKICAg ICBjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lKCkgY29uc3QgeyByZXR1cm4gbV9uYW1lOyB9CiAg ICAgCi0gICAgQXR0ciogYXR0cigpIGNvbnN0IHsgcmV0dXJuIG1faW1wbDsgfQorICAgIEF0dHIq IGF0dHIoKSBjb25zdDsKICAgICBQYXNzUmVmUHRyPEF0dHI+IGNyZWF0ZUF0dHJJZk5lZWRlZChF bGVtZW50Kik7CiAKICAgICBib29sIGlzTnVsbCgpIGNvbnN0IHsgcmV0dXJuIG1fdmFsdWUuaXNO dWxsKCk7IH0KQEAgLTc1LDYgKzc1LDcgQEAgcHVibGljOgogcHJvdGVjdGVkOgogICAgIEF0dHJp YnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lLCBjb25zdCBBdG9taWNTdHJpbmcmIHZhbHVl LCBib29sIGlzTWFwcGVkQXR0cmlidXRlLCBDU1NNYXBwZWRBdHRyaWJ1dGVEZWNsYXJhdGlvbiog c3R5bGVEZWNsKQogICAgICAgICA6IG1faXNNYXBwZWRBdHRyaWJ1dGUoaXNNYXBwZWRBdHRyaWJ1 dGUpCisgICAgICAgICwgbV9oYXNBdHRyKGZhbHNlKQogICAgICAgICAsIG1fbmFtZShuYW1lKQog ICAgICAgICAsIG1fdmFsdWUodmFsdWUpCiAgICAgICAgICwgbV9pbXBsKDApCkBAIC04NCw2ICs4 NSw3IEBAIHByb3RlY3RlZDoKIAogICAgIEF0dHJpYnV0ZShjb25zdCBBdG9taWNTdHJpbmcmIG5h bWUsIGNvbnN0IEF0b21pY1N0cmluZyYgdmFsdWUsIGJvb2wgaXNNYXBwZWRBdHRyaWJ1dGUsIENT U01hcHBlZEF0dHJpYnV0ZURlY2xhcmF0aW9uKiBzdHlsZURlY2wpCiAgICAgICAgIDogbV9pc01h cHBlZEF0dHJpYnV0ZShpc01hcHBlZEF0dHJpYnV0ZSkKKyAgICAgICAgLCBtX2hhc0F0dHIoZmFs c2UpCiAgICAgICAgICwgbV9uYW1lKG51bGxBdG9tLCBuYW1lLCBudWxsQXRvbSkKICAgICAgICAg LCBtX3ZhbHVlKHZhbHVlKQogICAgICAgICAsIG1faW1wbCgwKQpAQCAtOTIsMTIgKzk0LDE1IEBA IHByb3RlY3RlZDoKICAgICB9CiAKIHByaXZhdGU6Ci0gICAgLy8gVGhpcyBib29sZWFuIHdpbGwg Z28gaW50byB0aGUgc3BhcmUgMzItYml0cyBvZiBwYWRkaW5nIGZyb20gUmVmQ291bnRlZCBpbiA2 NC1iaXQuCisgICAgdm9pZCBiaW5kQXR0cihBdHRyKik7CisgICAgdm9pZCB1bmJpbmRBdHRyKEF0 dHIqKTsKKworICAgIC8vIFRoZXNlIGJvb2xlYW5zIHdpbGwgZ28gaW50byB0aGUgc3BhcmUgMzIt Yml0cyBvZiBwYWRkaW5nIGZyb20gUmVmQ291bnRlZCBpbiA2NC1iaXQuCiAgICAgYm9vbCBtX2lz TWFwcGVkQXR0cmlidXRlOworICAgIGJvb2wgbV9oYXNBdHRyOwogICAgIAogICAgIFF1YWxpZmll ZE5hbWUgbV9uYW1lOwogICAgIEF0b21pY1N0cmluZyBtX3ZhbHVlOwotICAgIEF0dHIqIG1faW1w bDsKICAgICBSZWZQdHI8Q1NTTWFwcGVkQXR0cmlidXRlRGVjbGFyYXRpb24+IG1fc3R5bGVEZWNs OwogfTsKIAo= 56438 2010-05-18 18:47:05 -0700 2010-05-18 18:52:53 -0700 patch 2 patch.diff text/plain 5412 sam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTcyOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDUtMTggIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIEF0 dHIgcG9pbnRlciBmcm9tIEF0dHJpYnV0ZSB0byBhIGdsb2JhbCBIYXNoTWFwLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkzMzcKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzgwMDExNjg+CisKKyAgICAgICAgU2hhdmVzIGFub3RoZXIgd29yZCBvZmYg b2YgQXR0cmlidXRlLgorCisgICAgICAgICogZG9tL0F0dHIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QXR0cjo6QXR0cik6CisgICAgICAgIChXZWJDb3JlOjpBdHRyOjp+QXR0cik6CisgICAgICAg ICogZG9tL0F0dHJpYnV0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjphdHRyaWJ1dGVBdHRyTWFw KToKKyAgICAgICAgKFdlYkNvcmU6OkF0dHJpYnV0ZTo6YXR0cik6CisgICAgICAgIChXZWJDb3Jl OjpBdHRyaWJ1dGU6OmNyZWF0ZUF0dHJJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpBdHRy aWJ1dGU6OmJpbmRBdHRyKToKKyAgICAgICAgKFdlYkNvcmU6OkF0dHJpYnV0ZTo6dW5iaW5kQXR0 cik6CisgICAgICAgICogZG9tL0F0dHJpYnV0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6QXR0cmli dXRlOjpBdHRyaWJ1dGUpOgorCiAyMDEwLTA1LTE4ICBZYWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI1OTY5My4KSW5k ZXg6IFdlYkNvcmUvZG9tL0F0dHIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL0F0dHIu Y3BwCShyZXZpc2lvbiA1OTcyNikKKysrIFdlYkNvcmUvZG9tL0F0dHIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zOCwxMCArMzgsMTAgQEAgaW5saW5lIEF0dHI6OkF0dHIoRWxlbWVudCogZWxlbWVu dCwgRG9jdQogICAgICwgbV9lbGVtZW50KGVsZW1lbnQpCiAgICAgLCBtX2F0dHJpYnV0ZShhdHRy aWJ1dGUpCiAgICAgLCBtX2lnbm9yZUNoaWxkcmVuQ2hhbmdlZCgwKQotICAgICwgbV9zcGVjaWZp ZWQodHJ1ZSkgIAorICAgICwgbV9zcGVjaWZpZWQodHJ1ZSkKIHsKICAgICBBU1NFUlQoIW1fYXR0 cmlidXRlLT5hdHRyKCkpOwotICAgIG1fYXR0cmlidXRlLT5tX2ltcGwgPSB0aGlzOworICAgIG1f YXR0cmlidXRlLT5iaW5kQXR0cih0aGlzKTsKIH0KIAogUGFzc1JlZlB0cjxBdHRyPiBBdHRyOjpj cmVhdGUoRWxlbWVudCogZWxlbWVudCwgRG9jdW1lbnQqIGRvY3VtZW50LCBQYXNzUmVmUHRyPEF0 dHJpYnV0ZT4gYXR0cmlidXRlKQpAQCAtNTQsNyArNTQsNyBAQCBQYXNzUmVmUHRyPEF0dHI+IEF0 dHI6OmNyZWF0ZShFbGVtZW50KiBlCiBBdHRyOjp+QXR0cigpCiB7CiAgICAgQVNTRVJUKG1fYXR0 cmlidXRlLT5hdHRyKCkgPT0gdGhpcyk7Ci0gICAgbV9hdHRyaWJ1dGUtPm1faW1wbCA9IDA7Cisg ICAgbV9hdHRyaWJ1dGUtPnVuYmluZEF0dHIodGhpcyk7CiB9CiAKIHZvaWQgQXR0cjo6Y3JlYXRl VGV4dENoaWxkKCkKSW5kZXg6IFdlYkNvcmUvZG9tL0F0dHJpYnV0ZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9kb20vQXR0cmlidXRlLmNwcAkocmV2aXNpb24gNTk3MjYpCisrKyBXZWJDb3Jl L2RvbS9BdHRyaWJ1dGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiwyMCArMjYsNjMgQEAKIAog I2luY2x1ZGUgIkF0dHIuaCIKICNpbmNsdWRlICJFbGVtZW50LmgiCisjaW5jbHVkZSA8d3RmL0hh c2hNYXAuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCit0eXBlZGVmIEhhc2hNYXA8QXR0cmli dXRlKiwgQXR0cio+IEF0dHJpYnV0ZUF0dHJNYXA7CitzdGF0aWMgQXR0cmlidXRlQXR0ck1hcCYg YXR0cmlidXRlQXR0ck1hcCgpCit7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChBdHRyaWJ1dGVB dHRyTWFwLCBtYXAsICgpKTsKKyAgICByZXR1cm4gbWFwOworfQorCiBQYXNzUmVmUHRyPEF0dHJp YnV0ZT4gQXR0cmlidXRlOjpjbG9uZSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5l dyBBdHRyaWJ1dGUobV9uYW1lLCBtX3ZhbHVlLCBtX2lzTWFwcGVkQXR0cmlidXRlLCBtX3N0eWxl RGVjbC5nZXQoKSkpOwogfQogCitBdHRyKiBBdHRyaWJ1dGU6OmF0dHIoKSBjb25zdAoreworICAg IGlmIChtX2hhc0F0dHIpIHsKKyAgICAgICAgQVNTRVJUKGF0dHJpYnV0ZUF0dHJNYXAoKS5jb250 YWlucyhjb25zdF9jYXN0PEF0dHJpYnV0ZSo+KHRoaXMpKSk7CisgICAgICAgIHJldHVybiBhdHRy aWJ1dGVBdHRyTWFwKCkuZ2V0KGNvbnN0X2Nhc3Q8QXR0cmlidXRlKj4odGhpcykpOworICAgIH0K KworICAgIEFTU0VSVCghYXR0cmlidXRlQXR0ck1hcCgpLmNvbnRhaW5zKGNvbnN0X2Nhc3Q8QXR0 cmlidXRlKj4odGhpcykpKTsKKyAgICByZXR1cm4gMDsKK30KKwogUGFzc1JlZlB0cjxBdHRyPiBB dHRyaWJ1dGU6OmNyZWF0ZUF0dHJJZk5lZWRlZChFbGVtZW50KiBlKQogewotICAgIFJlZlB0cjxB dHRyPiByID0gbV9pbXBsOwotICAgIGlmICghcikKLSAgICAgICAgciA9IEF0dHI6OmNyZWF0ZShl LCBlLT5kb2N1bWVudCgpLCB0aGlzKTsKKyAgICBSZWZQdHI8QXR0cj4gcjsKKyAgICBpZiAobV9o YXNBdHRyKSB7CisgICAgICAgIEFTU0VSVChhdHRyaWJ1dGVBdHRyTWFwKCkuY29udGFpbnModGhp cykpOworICAgICAgICByID0gYXR0cmlidXRlQXR0ck1hcCgpLmdldCh0aGlzKTsKKyAgICB9IGVs c2UgeworICAgICAgICBBU1NFUlQoIWF0dHJpYnV0ZUF0dHJNYXAoKS5jb250YWlucyh0aGlzKSk7 CisgICAgICAgIHIgPSBBdHRyOjpjcmVhdGUoZSwgZS0+ZG9jdW1lbnQoKSwgdGhpcyk7IC8vIFRo aXMgd2lsbCBlbmQgdXAgY2FsbGluZyBBdHRyaWJ1dGU6OmJpbmRBdHRyLgorICAgICAgICBBU1NF UlQoYXR0cmlidXRlQXR0ck1hcCgpLmNvbnRhaW5zKHRoaXMpKTsKKyAgICB9CisKICAgICByZXR1 cm4gci5yZWxlYXNlKCk7CiB9CiAKK3ZvaWQgQXR0cmlidXRlOjpiaW5kQXR0cihBdHRyKiBhdHRy KQoreworICAgIEFTU0VSVCghbV9oYXNBdHRyKTsKKyAgICBBU1NFUlQoIWF0dHJpYnV0ZUF0dHJN YXAoKS5jb250YWlucyh0aGlzKSk7CisgICAgYXR0cmlidXRlQXR0ck1hcCgpLnNldCh0aGlzLCBh dHRyKTsKKyAgICBtX2hhc0F0dHIgPSB0cnVlOworfQorCit2b2lkIEF0dHJpYnV0ZTo6dW5iaW5k QXR0cihBdHRyKiBhdHRyKQoreworICAgIEFTU0VSVChtX2hhc0F0dHIpOworICAgIEFTU0VSVChh dHRyaWJ1dGVBdHRyTWFwKCkuY29udGFpbnModGhpcykpOworICAgIEFTU0VSVChhdHRyaWJ1dGVB dHRyTWFwKCkuZ2V0KHRoaXMpID09IGF0dHIpOworICAgIGF0dHJpYnV0ZUF0dHJNYXAoKS5yZW1v dmUodGhpcyk7CisgICAgbV9oYXNBdHRyID0gZmFsc2U7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKSW5kZXg6IFdlYkNvcmUvZG9tL0F0dHJpYnV0ZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvZG9tL0F0dHJpYnV0ZS5oCShyZXZpc2lvbiA1OTcyNikKKysrIFdlYkNvcmUvZG9tL0F0dHJp YnV0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01NCw3ICs1NCw3IEBAIHB1YmxpYzoKICAgICAKICAg ICBjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lKCkgY29uc3QgeyByZXR1cm4gbV9uYW1lOyB9CiAg ICAgCi0gICAgQXR0ciogYXR0cigpIGNvbnN0IHsgcmV0dXJuIG1faW1wbDsgfQorICAgIEF0dHIq IGF0dHIoKSBjb25zdDsKICAgICBQYXNzUmVmUHRyPEF0dHI+IGNyZWF0ZUF0dHJJZk5lZWRlZChF bGVtZW50Kik7CiAKICAgICBib29sIGlzTnVsbCgpIGNvbnN0IHsgcmV0dXJuIG1fdmFsdWUuaXNO dWxsKCk7IH0KQEAgLTc1LDMyICs3NSwzNSBAQCBwdWJsaWM6CiBwcm90ZWN0ZWQ6CiAgICAgQXR0 cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0b21pY1N0cmluZyYgdmFs dWUsIGJvb2wgaXNNYXBwZWRBdHRyaWJ1dGUsIENTU01hcHBlZEF0dHJpYnV0ZURlY2xhcmF0aW9u KiBzdHlsZURlY2wpCiAgICAgICAgIDogbV9pc01hcHBlZEF0dHJpYnV0ZShpc01hcHBlZEF0dHJp YnV0ZSkKKyAgICAgICAgLCBtX2hhc0F0dHIoZmFsc2UpCiAgICAgICAgICwgbV9uYW1lKG5hbWUp CiAgICAgICAgICwgbV92YWx1ZSh2YWx1ZSkKLSAgICAgICAgLCBtX2ltcGwoMCkKICAgICAgICAg LCBtX3N0eWxlRGVjbChzdHlsZURlY2wpCiAgICAgewogICAgIH0KIAogICAgIEF0dHJpYnV0ZShj b25zdCBBdG9taWNTdHJpbmcmIG5hbWUsIGNvbnN0IEF0b21pY1N0cmluZyYgdmFsdWUsIGJvb2wg aXNNYXBwZWRBdHRyaWJ1dGUsIENTU01hcHBlZEF0dHJpYnV0ZURlY2xhcmF0aW9uKiBzdHlsZURl Y2wpCiAgICAgICAgIDogbV9pc01hcHBlZEF0dHJpYnV0ZShpc01hcHBlZEF0dHJpYnV0ZSkKKyAg ICAgICAgLCBtX2hhc0F0dHIoZmFsc2UpCiAgICAgICAgICwgbV9uYW1lKG51bGxBdG9tLCBuYW1l LCBudWxsQXRvbSkKICAgICAgICAgLCBtX3ZhbHVlKHZhbHVlKQotICAgICAgICAsIG1faW1wbCgw KQogICAgICAgICAsIG1fc3R5bGVEZWNsKHN0eWxlRGVjbCkKICAgICB7CiAgICAgfQogCiBwcml2 YXRlOgotICAgIC8vIFRoaXMgYm9vbGVhbiB3aWxsIGdvIGludG8gdGhlIHNwYXJlIDMyLWJpdHMg b2YgcGFkZGluZyBmcm9tIFJlZkNvdW50ZWQgaW4gNjQtYml0LgorICAgIHZvaWQgYmluZEF0dHIo QXR0ciopOworICAgIHZvaWQgdW5iaW5kQXR0cihBdHRyKik7CisKKyAgICAvLyBUaGVzZSBib29s ZWFucyB3aWxsIGdvIGludG8gdGhlIHNwYXJlIDMyLWJpdHMgb2YgcGFkZGluZyBmcm9tIFJlZkNv dW50ZWQgaW4gNjQtYml0LgogICAgIGJvb2wgbV9pc01hcHBlZEF0dHJpYnV0ZTsKKyAgICBib29s IG1faGFzQXR0cjsKICAgICAKICAgICBRdWFsaWZpZWROYW1lIG1fbmFtZTsKICAgICBBdG9taWNT dHJpbmcgbV92YWx1ZTsKLSAgICBBdHRyKiBtX2ltcGw7CiAgICAgUmVmUHRyPENTU01hcHBlZEF0 dHJpYnV0ZURlY2xhcmF0aW9uPiBtX3N0eWxlRGVjbDsKIH07CiAKLX0gLy9uYW1lc3BhY2UKK30g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKIAotI2VuZGlmCisjZW5kaWYgLy8gQXR0cmlidXRlX2gK