81179 2012-03-14 18:25:40 -0700 Add asserts and improve logging in PageCache. 2012-03-16 06:25:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gavinp gavinp beidson webkit.review.bot oldest_to_newest 579011 0 gavinp 2012-03-14 18:25:40 -0700 Add asserts and improve logging in PageCache. 579017 1 131971 gavinp 2012-03-14 18:35:58 -0700 Created attachment 131971 Patch 579019 2 gavinp 2012-03-14 18:39:01 -0700 The early exits from logCanCacheFrameDecision had the potential to skew histogram data. Moving the DocumentLoader check to the top, but eliminating the early exits is a compromise that keeps the logged data mostly accurate. I'm grumpy about making the logging more verbose in some situations, but with the DocumentLoader check moved up top, I couldn't trigger a difference in Chromium. An alternative is to add a bool logging = true; at the top of the f'n, and have the conditions that would have exited early use that to turn logging off? Let me know if you prefer that approach. WDYT? 579637 3 131971 beidson 2012-03-15 12:26:46 -0700 Comment on attachment 131971 Patch This is just the logging method, this is fine. 580423 4 131971 gavinp 2012-03-16 05:46:17 -0700 Comment on attachment 131971 Patch Thanks Brady. I just had minor anxiety about the early exits, now the logic is colour-by-numbers identical to the fast nondebug version. 580446 5 131971 webkit.review.bot 2012-03-16 06:25:47 -0700 Comment on attachment 131971 Patch Clearing flags on attachment: 131971 Committed r110998: <http://trac.webkit.org/changeset/110998> 580447 6 webkit.review.bot 2012-03-16 06:25:52 -0700 All reviewed patches have been landed. Closing bug. 131971 2012-03-14 18:35:58 -0700 2012-03-16 06:25:47 -0700 Patch bug-81179-20120314213555.patch text/plain 9438 gavinp U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmRlMDI5MzBhYTcxYzVk YTQxMjJlOTY5Mzc1M2NmODczZTkzOTBmNi4uYWNkZmRkOTY1NDc5YTIzN2ZjZGFiY2M2OTBiNTFj ZGMyMTU4NTk4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAzLTE0ICBHYXZp biBQZXRlcnMgIDxnYXZpbnBAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFkZCBhc3NlcnRzIGFu ZCBpbXByb3ZlIGxvZ2dpbmcgaW4gUGFnZUNhY2hlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODExNzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZWFybHkgZXhpdHMgZnJvbSBsb2dDYW5DYWNoZUZy YW1lRGVjaXNpb24gaGFkIHRoZSBwb3RlbnRpYWwgdG8gc2tldyBoaXN0b2dyYW0gZGF0YS4gIE1v dmluZworICAgICAgICB0aGUgRG9jdW1lbnRMb2FkZXIgY2hlY2sgdG8gdGhlIHRvcCwgYnV0IGVs aW1pbmF0aW5nIHRoZSBlYXJseSBleGl0cyBpcyBhIGNvbXByb21pc2UgdGhhdCBrZWVwcworICAg ICAgICB0aGUgbG9nZ2VkIGRhdGEgbW9zdGx5IGFjY3VyYXRlLgorCisgICAgICAgICogaGlzdG9y eS9QYWdlQ2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bG9nQ2FuQ2FjaGVGcmFtZURlY2lz aW9uKToKKwogMjAxMi0wMy0xMyAgQWRyaWVubmUgV2Fsa2VyICA8ZW5uZUBnb29nbGUuY29tPgog CiAgICAgICAgIFtjaHJvbWl1bV0gTWFyayByb290IGxheWVyIHNjcm9sbGJhcnMgYXMgYWx3YXlz IG9wYXF1ZSB0byBkaXNhYmxlIGJsZW5kaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o aXN0b3J5L1BhZ2VDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNoZS5j cHAKaW5kZXggZWM1MjUzMzQxNDE0YTUzMzVkZjAzOWE1YWYzOWU2YjI5N2I3ZDRiYi4uM2VhNGFh OTRlNzE3ODJkODQxMDk1ZmIxMjdmMGEwOTY1NDQ2MzAyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3Rvcnkv UGFnZUNhY2hlLmNwcApAQCAtODEsMjAgKzgxLDIwIEBAIGVudW0gUmVhc29uRnJhbWVDYW5ub3RC ZUluUGFnZUNhY2hlIHsKICAgICBDbGllbnREZW5pZXNDYWNoaW5nLAogICAgIE51bWJlck9mUmVh c29uc0ZyYW1lc0Nhbm5vdEJlSW5QYWdlQ2FjaGUsCiB9OworQ09NUElMRV9BU1NFUlQoTnVtYmVy T2ZSZWFzb25zRnJhbWVzQ2Fubm90QmVJblBhZ2VDYWNoZSA8PSBzaXplb2YodW5zaWduZWQpKjgs IFJlYXNvbkZyYW1lQ2Fubm90QmVJblBhZ2VDYWNoZURvZXNOb3RGaXRJbkJpdG1hcCk7CiAKIHN0 YXRpYyB1bnNpZ25lZCBsb2dDYW5DYWNoZUZyYW1lRGVjaXNpb24oRnJhbWUqIGZyYW1lLCBpbnQg aW5kZW50TGV2ZWwpCiB7CiAjaWZkZWYgTkRFQlVHCiAgICAgVU5VU0VEX1BBUkFNKGluZGVudExl dmVsKTsKICNlbmRpZgotICAgIC8vIE9ubHkgYm90aGVyIGxvZ2dpbmcgZm9yIGZyYW1lcyB0aGF0 IGhhdmUgYWN0dWFsbHkgbG9hZGVkIGFuZCBoYXZlIGNvbnRlbnQuCi0gICAgaWYgKGZyYW1lLT5s b2FkZXIoKS0+c3RhdGVNYWNoaW5lKCktPmNyZWF0aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSkK LSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIEtVUkwgY3VycmVudFVSTCA9IGZyYW1lLT5sb2Fk ZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKSA/IGZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIo KS0+dXJsKCkgOiBLVVJMKCk7Ci0gICAgaWYgKGN1cnJlbnRVUkwuaXNFbXB0eSgpKQotICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgCiAgICAgUENMT0coIistLS0iKTsKKyAgICBpZiAoIWZyYW1l LT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKSkgeworICAgICAgICBQQ0xPRygiICAgLVRoZXJl IGlzIG5vIERvY3VtZW50TG9hZGVyIG9iamVjdCIpOworICAgICAgICByZXR1cm4gMSA8PCBOb0Rv Y3VtZW50TG9hZGVyOworICAgIH0KKworICAgIEtVUkwgY3VycmVudFVSTCA9IGZyYW1lLT5sb2Fk ZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+dXJsKCk7CiAgICAgS1VSTCBuZXdVUkwgPSBmcmFtZS0+ bG9hZGVyKCktPnByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKSA/IGZyYW1lLT5sb2FkZXIoKS0+ cHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcigpLT51cmwoKSA6IEtVUkwoKTsKICAgICBpZiAoIW5l d1VSTC5pc0VtcHR5KCkpCiAgICAgICAgIFBDTE9HKCIgRGV0ZXJtaW5pbmcgaWYgZnJhbWUgY2Fu IGJlIGNhY2hlZCBuYXZpZ2F0aW5nIGZyb20gKCIsIGN1cnJlbnRVUkwuc3RyaW5nKCksICIpIHRv ICgiLCBuZXdVUkwuc3RyaW5nKCksICIpOiIpOwpAQCAtMTAyLDczICsxMDIsNjcgQEAgc3RhdGlj IHVuc2lnbmVkIGxvZ0NhbkNhY2hlRnJhbWVEZWNpc2lvbihGcmFtZSogZnJhbWUsIGludCBpbmRl bnRMZXZlbCkKICAgICAgICAgUENMT0coIiBEZXRlcm1pbmluZyBpZiBzdWJmcmFtZSB3aXRoIFVS TCAoIiwgY3VycmVudFVSTC5zdHJpbmcoKSwgIikgY2FuIGJlIGNhY2hlZDoiKTsKICAgICAgCiAg ICAgdW5zaWduZWQgcmVqZWN0UmVhc29ucyA9IDA7Ci0gICAgCi0gICAgaWYgKCFmcmFtZS0+bG9h ZGVyKCktPmRvY3VtZW50TG9hZGVyKCkpIHsKLSAgICAgICAgUENMT0coIiAgIC1UaGVyZSBpcyBu byBEb2N1bWVudExvYWRlciBvYmplY3QiKTsKLSAgICAgICAgcmVqZWN0UmVhc29ucyB8PSAxIDw8 IE5vRG9jdW1lbnRMb2FkZXI7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgaWYgKCFmcmFtZS0+bG9h ZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPm1haW5Eb2N1bWVudEVycm9yKCkuaXNOdWxsKCkpIHsK LSAgICAgICAgICAgIFBDTE9HKCIgICAtTWFpbiBkb2N1bWVudCBoYXMgYW4gZXJyb3IiKTsKLSAg ICAgICAgICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBNYWluRG9jdW1lbnRFcnJvcjsKLSAgICAg ICAgfQotICAgICAgICBpZiAoZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpLT5zdWJz dGl0dXRlRGF0YSgpLmlzVmFsaWQoKSAmJiBmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVy KCktPnN1YnN0aXR1dGVEYXRhKCkuZmFpbGluZ1VSTCgpLmlzRW1wdHkoKSkgewotICAgICAgICAg ICAgUENMT0coIiAgIC1GcmFtZSBpcyBhbiBlcnJvciBwYWdlIik7Ci0gICAgICAgICAgICByZWpl Y3RSZWFzb25zIHw9IDEgPDwgSXNFcnJvclBhZ2U7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKGZy YW1lLT5sb2FkZXIoKS0+c3ViZnJhbWVMb2FkZXIoKS0+Y29udGFpbnNQbHVnaW5zKCkgJiYgIWZy YW1lLT5wYWdlKCktPnNldHRpbmdzKCktPnBhZ2VDYWNoZVN1cHBvcnRzUGx1Z2lucygpKSB7Ci0g ICAgICAgICAgICBQQ0xPRygiICAgLUZyYW1lIGNvbnRhaW5zIHBsdWdpbnMiKTsKLSAgICAgICAg ICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBIYXNQbHVnaW5zOwotICAgICAgICB9Ci0gICAgICAg IGlmIChmcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCkucHJvdG9jb2xJcygiaHR0cHMiKQotICAgICAg ICAgICAgJiYgKGZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+cmVzcG9uc2UoKS5j YWNoZUNvbnRyb2xDb250YWluc05vQ2FjaGUoKQotICAgICAgICAgICAgICAgIHx8IGZyYW1lLT5s b2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+cmVzcG9uc2UoKS5jYWNoZUNvbnRyb2xDb250YWlu c05vU3RvcmUoKSkpIHsKLSAgICAgICAgICAgIFBDTE9HKCIgICAtRnJhbWUgaXMgSFRUUFMsIGFu ZCBjYWNoZSBjb250cm9sIHByb2hpYml0cyBjYWNoaW5nIG9yIHN0b3JpbmciKTsKLSAgICAgICAg ICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBJc0h0dHBzQW5kQ2FjaGVDb250cm9sbGVkOwotICAg ICAgICB9Ci0gICAgICAgIGlmIChmcmFtZS0+ZG9tV2luZG93KCkgJiYgZnJhbWUtPmRvbVdpbmRv dygpLT5oYXNFdmVudExpc3RlbmVycyhldmVudE5hbWVzKCkudW5sb2FkRXZlbnQpKSB7Ci0gICAg ICAgICAgICBQQ0xPRygiICAgLUZyYW1lIGhhcyBhbiB1bmxvYWQgZXZlbnQgbGlzdGVuZXIiKTsK LSAgICAgICAgICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBIYXNVbmxvYWRMaXN0ZW5lcjsKLSAg ICAgICAgfQorICAgIGlmICghZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpLT5tYWlu RG9jdW1lbnRFcnJvcigpLmlzTnVsbCgpKSB7CisgICAgICAgIFBDTE9HKCIgICAtTWFpbiBkb2N1 bWVudCBoYXMgYW4gZXJyb3IiKTsKKyAgICAgICAgcmVqZWN0UmVhc29ucyB8PSAxIDw8IE1haW5E b2N1bWVudEVycm9yOworICAgIH0KKyAgICBpZiAoZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExv YWRlcigpLT5zdWJzdGl0dXRlRGF0YSgpLmlzVmFsaWQoKSAmJiBmcmFtZS0+bG9hZGVyKCktPmRv Y3VtZW50TG9hZGVyKCktPnN1YnN0aXR1dGVEYXRhKCkuZmFpbGluZ1VSTCgpLmlzRW1wdHkoKSkg eworICAgICAgICBQQ0xPRygiICAgLUZyYW1lIGlzIGFuIGVycm9yIHBhZ2UiKTsKKyAgICAgICAg cmVqZWN0UmVhc29ucyB8PSAxIDw8IElzRXJyb3JQYWdlOworICAgIH0KKyAgICBpZiAoZnJhbWUt PmxvYWRlcigpLT5zdWJmcmFtZUxvYWRlcigpLT5jb250YWluc1BsdWdpbnMoKSAmJiAhZnJhbWUt PnBhZ2UoKS0+c2V0dGluZ3MoKS0+cGFnZUNhY2hlU3VwcG9ydHNQbHVnaW5zKCkpIHsKKyAgICAg ICAgUENMT0coIiAgIC1GcmFtZSBjb250YWlucyBwbHVnaW5zIik7CisgICAgICAgIHJlamVjdFJl YXNvbnMgfD0gMSA8PCBIYXNQbHVnaW5zOworICAgIH0KKyAgICBpZiAoZnJhbWUtPmRvY3VtZW50 KCktPnVybCgpLnByb3RvY29sSXMoImh0dHBzIikKKyAgICAgICAgJiYgKGZyYW1lLT5sb2FkZXIo KS0+ZG9jdW1lbnRMb2FkZXIoKS0+cmVzcG9uc2UoKS5jYWNoZUNvbnRyb2xDb250YWluc05vQ2Fj aGUoKQorICAgICAgICAgICAgfHwgZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpLT5y ZXNwb25zZSgpLmNhY2hlQ29udHJvbENvbnRhaW5zTm9TdG9yZSgpKSkgeworICAgICAgICBQQ0xP RygiICAgLUZyYW1lIGlzIEhUVFBTLCBhbmQgY2FjaGUgY29udHJvbCBwcm9oaWJpdHMgY2FjaGlu ZyBvciBzdG9yaW5nIik7CisgICAgICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBJc0h0dHBzQW5k Q2FjaGVDb250cm9sbGVkOworICAgIH0KKyAgICBpZiAoZnJhbWUtPmRvbVdpbmRvdygpICYmIGZy YW1lLT5kb21XaW5kb3coKS0+aGFzRXZlbnRMaXN0ZW5lcnMoZXZlbnROYW1lcygpLnVubG9hZEV2 ZW50KSkgeworICAgICAgICBQQ0xPRygiICAgLUZyYW1lIGhhcyBhbiB1bmxvYWQgZXZlbnQgbGlz dGVuZXIiKTsKKyAgICAgICAgcmVqZWN0UmVhc29ucyB8PSAxIDw8IEhhc1VubG9hZExpc3RlbmVy OworICAgIH0KICNpZiBFTkFCTEUoU1FMX0RBVEFCQVNFKQotICAgICAgICBpZiAoRGF0YWJhc2VD b250ZXh0OjpoYXNPcGVuRGF0YWJhc2VzKGZyYW1lLT5kb2N1bWVudCgpKSkgewotICAgICAgICAg ICAgUENMT0coIiAgIC1GcmFtZSBoYXMgb3BlbiBkYXRhYmFzZSBoYW5kbGVzIik7Ci0gICAgICAg ICAgICByZWplY3RSZWFzb25zIHw9IDEgPDwgSGFzRGF0YWJhc2VIYW5kbGVzOwotICAgICAgICB9 CisgICAgaWYgKERhdGFiYXNlQ29udGV4dDo6aGFzT3BlbkRhdGFiYXNlcyhmcmFtZS0+ZG9jdW1l bnQoKSkpIHsKKyAgICAgICAgUENMT0coIiAgIC1GcmFtZSBoYXMgb3BlbiBkYXRhYmFzZSBoYW5k bGVzIik7CisgICAgICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBIYXNEYXRhYmFzZUhhbmRsZXM7 CisgICAgfQogI2VuZGlmCiAjaWYgRU5BQkxFKFNIQVJFRF9XT1JLRVJTKQotICAgICAgICBpZiAo U2hhcmVkV29ya2VyUmVwb3NpdG9yeTo6aGFzU2hhcmVkV29ya2VycyhmcmFtZS0+ZG9jdW1lbnQo KSkpIHsKLSAgICAgICAgICAgIFBDTE9HKCIgICAtRnJhbWUgaGFzIGFzc29jaWF0ZWQgU2hhcmVk V29ya2VycyIpOwotICAgICAgICAgICAgcmVqZWN0UmVhc29ucyB8PSAxIDw8IEhhc1NoYXJlZFdv cmtlcnM7Ci0gICAgICAgIH0KKyAgICBpZiAoU2hhcmVkV29ya2VyUmVwb3NpdG9yeTo6aGFzU2hh cmVkV29ya2VycyhmcmFtZS0+ZG9jdW1lbnQoKSkpIHsKKyAgICAgICAgUENMT0coIiAgIC1GcmFt ZSBoYXMgYXNzb2NpYXRlZCBTaGFyZWRXb3JrZXJzIik7CisgICAgICAgIHJlamVjdFJlYXNvbnMg fD0gMSA8PCBIYXNTaGFyZWRXb3JrZXJzOworICAgIH0KICNlbmRpZgotICAgICAgICBpZiAoIWZy YW1lLT5sb2FkZXIoKS0+aGlzdG9yeSgpLT5jdXJyZW50SXRlbSgpKSB7Ci0gICAgICAgICAgICBQ Q0xPRygiICAgLU5vIGN1cnJlbnQgaGlzdG9yeSBpdGVtIik7Ci0gICAgICAgICAgICByZWplY3RS ZWFzb25zIHw9IDEgPDwgTm9IaXN0b3J5SXRlbTsKLSAgICAgICAgfQotICAgICAgICBpZiAoZnJh bWUtPmxvYWRlcigpLT5xdWlja1JlZGlyZWN0Q29taW5nKCkpIHsKLSAgICAgICAgICAgIFBDTE9H KCIgICAtUXVpY2sgcmVkaXJlY3QgaXMgY29taW5nIik7Ci0gICAgICAgICAgICByZWplY3RSZWFz b25zIHw9IDEgPDwgUXVpY2tSZWRpcmVjdENvbWluZzsKLSAgICAgICAgfQotICAgICAgICBpZiAo ZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpLT5pc0xvYWRpbmdJbkFQSVNlbnNlKCkp IHsKLSAgICAgICAgICAgIFBDTE9HKCIgICAtRG9jdW1lbnRMb2FkZXIgaXMgc3RpbGwgbG9hZGlu ZyBpbiBBUEkgc2Vuc2UiKTsKLSAgICAgICAgICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBJc0xv YWRpbmdJbkFQSVNlbnNlOwotICAgICAgICB9Ci0gICAgICAgIGlmIChmcmFtZS0+bG9hZGVyKCkt PmRvY3VtZW50TG9hZGVyKCktPmlzU3RvcHBpbmcoKSkgewotICAgICAgICAgICAgUENMT0coIiAg IC1Eb2N1bWVudExvYWRlciBpcyBpbiB0aGUgbWlkZGxlIG9mIHN0b3BwaW5nIik7Ci0gICAgICAg ICAgICByZWplY3RSZWFzb25zIHw9IDEgPDwgSXNTdG9wcGluZzsKLSAgICAgICAgfQotICAgICAg ICBpZiAoIWZyYW1lLT5kb2N1bWVudCgpLT5jYW5TdXNwZW5kQWN0aXZlRE9NT2JqZWN0cygpKSB7 Ci0gICAgICAgICAgICBQQ0xPRygiICAgLVRoZSBkb2N1bWVudCBjYW5ub3Qgc3VzcGVjdCBpdHMg YWN0aXZlIERPTSBPYmplY3RzIik7Ci0gICAgICAgICAgICByZWplY3RSZWFzb25zIHw9IDEgPDwg Q2Fubm90U3VzcGVuZEFjdGl2ZURPTU9iamVjdHM7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKCFm cmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCkt PmNhbkNhY2hlSW5QYWdlQ2FjaGUoKSkgewotICAgICAgICAgICAgUENMT0coIiAgIC1UaGUgRG9j dW1lbnRMb2FkZXIgdXNlcyBhbiBhcHBsaWNhdGlvbiBjYWNoZSIpOwotICAgICAgICAgICAgcmVq ZWN0UmVhc29ucyB8PSAxIDw8IERvY3VtZW50TG9hZGVyVXNlc0FwcGxpY2F0aW9uQ2FjaGU7Ci0g ICAgICAgIH0KLSAgICAgICAgaWYgKCFmcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpLT5jYW5DYWNo ZVBhZ2UoKSkgewotICAgICAgICAgICAgUENMT0coIiAgIC1UaGUgY2xpZW50IHNheXMgdGhpcyBm cmFtZSBjYW5ub3QgYmUgY2FjaGVkIik7Ci0gICAgICAgICAgICByZWplY3RSZWFzb25zIHw9IDEg PDwgQ2xpZW50RGVuaWVzQ2FjaGluZzsKLSAgICAgICAgfQorICAgIGlmICghZnJhbWUtPmxvYWRl cigpLT5oaXN0b3J5KCktPmN1cnJlbnRJdGVtKCkpIHsKKyAgICAgICAgUENMT0coIiAgIC1ObyBj dXJyZW50IGhpc3RvcnkgaXRlbSIpOworICAgICAgICByZWplY3RSZWFzb25zIHw9IDEgPDwgTm9I aXN0b3J5SXRlbTsKKyAgICB9CisgICAgaWYgKGZyYW1lLT5sb2FkZXIoKS0+cXVpY2tSZWRpcmVj dENvbWluZygpKSB7CisgICAgICAgIFBDTE9HKCIgICAtUXVpY2sgcmVkaXJlY3QgaXMgY29taW5n Iik7CisgICAgICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBRdWlja1JlZGlyZWN0Q29taW5nOwor ICAgIH0KKyAgICBpZiAoZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpLT5pc0xvYWRp bmdJbkFQSVNlbnNlKCkpIHsKKyAgICAgICAgUENMT0coIiAgIC1Eb2N1bWVudExvYWRlciBpcyBz dGlsbCBsb2FkaW5nIGluIEFQSSBzZW5zZSIpOworICAgICAgICByZWplY3RSZWFzb25zIHw9IDEg PDwgSXNMb2FkaW5nSW5BUElTZW5zZTsKKyAgICB9CisgICAgaWYgKGZyYW1lLT5sb2FkZXIoKS0+ ZG9jdW1lbnRMb2FkZXIoKS0+aXNTdG9wcGluZygpKSB7CisgICAgICAgIFBDTE9HKCIgICAtRG9j dW1lbnRMb2FkZXIgaXMgaW4gdGhlIG1pZGRsZSBvZiBzdG9wcGluZyIpOworICAgICAgICByZWpl Y3RSZWFzb25zIHw9IDEgPDwgSXNTdG9wcGluZzsKKyAgICB9CisgICAgaWYgKCFmcmFtZS0+ZG9j dW1lbnQoKS0+Y2FuU3VzcGVuZEFjdGl2ZURPTU9iamVjdHMoKSkgeworICAgICAgICBQQ0xPRygi ICAgLVRoZSBkb2N1bWVudCBjYW5ub3Qgc3VzcGVjdCBpdHMgYWN0aXZlIERPTSBPYmplY3RzIik7 CisgICAgICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBDYW5ub3RTdXNwZW5kQWN0aXZlRE9NT2Jq ZWN0czsKKyAgICB9CisgICAgaWYgKCFmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCkt PmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCktPmNhbkNhY2hlSW5QYWdlQ2FjaGUoKSkgeworICAgICAg ICBQQ0xPRygiICAgLVRoZSBEb2N1bWVudExvYWRlciB1c2VzIGFuIGFwcGxpY2F0aW9uIGNhY2hl Iik7CisgICAgICAgIHJlamVjdFJlYXNvbnMgfD0gMSA8PCBEb2N1bWVudExvYWRlclVzZXNBcHBs aWNhdGlvbkNhY2hlOworICAgIH0KKyAgICBpZiAoIWZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkt PmNhbkNhY2hlUGFnZSgpKSB7CisgICAgICAgIFBDTE9HKCIgICAtVGhlIGNsaWVudCBzYXlzIHRo aXMgZnJhbWUgY2Fubm90IGJlIGNhY2hlZCIpOworICAgICAgICByZWplY3RSZWFzb25zIHw9IDEg PDwgQ2xpZW50RGVuaWVzQ2FjaGluZzsKICAgICB9CiAKICAgICBIaXN0b2dyYW1TdXBwb3J0Ojpo aXN0b2dyYW1FbnVtZXJhdGlvbigiUGFnZUNhY2hlLkZyYW1lQ2FjaGVhYmxlIiwgIXJlamVjdFJl YXNvbnMsIDIpOwpAQCAtMjAzLDYgKzE5Nyw3IEBAIGVudW0gUmVhc29uUGFnZUNhbm5vdEJlSW5Q YWdlQ2FjaGUgewogICAgIElzU2FtZUxvYWQsCiAgICAgTnVtYmVyT2ZSZWFzb25zUGFnZXNDYW5u b3RCZUluUGFnZUNhY2hlLAogfTsKK0NPTVBJTEVfQVNTRVJUKE51bWJlck9mUmVhc29uc1BhZ2Vz Q2Fubm90QmVJblBhZ2VDYWNoZSA8PSBzaXplb2YodW5zaWduZWQpKjgsIFJlYXNvblBhZ2VDYW5u b3RCZUluUGFnZUNhY2hlRG9lc05vdEZpdEluQml0bWFwKTsKIAogc3RhdGljIHZvaWQgbG9nQ2Fu Q2FjaGVQYWdlRGVjaXNpb24oUGFnZSogcGFnZSkKIHsK