98500 2012-10-05 01:58:57 -0700 Web Inspector: NMI fix String instrumentation the way it was discussed in WK97964 2014-12-12 13:43:00 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED INVALID P2 Normal --- 97964 0 loislo loislo alph apavlov benjamin bweinstein caseq joepeck keishi loislo pfeldman pmuellr rik vsevik webkit.review.bot yurys oldest_to_newest 735505 0 loislo 2012-10-05 01:58:57 -0700 Current instrumentation incorrectly covers the case when StringImpl is created via StringImpl::createWithTerminatingNullCharacter() Looks like the only way to detect the strings that were created from literals is to compare the addresses of buffer and stringImpl + 1. 735512 1 167288 loislo 2012-10-05 02:08:01 -0700 Created attachment 167288 Patch 735879 2 167288 benjamin 2012-10-05 12:29:33 -0700 Comment on attachment 167288 Patch I can't help but wonder why MemoryInstrumentationTest.cpp is in Chromium instead of being cross-port in WebKitTestAPI. Otherwise the change looks good. 735882 3 benjamin 2012-10-05 12:30:29 -0700 Why isn't memory instrumentation behind a feature flag? It looks like an experimental feature to me. 736221 4 167288 webkit.review.bot 2012-10-06 02:26:19 -0700 Comment on attachment 167288 Patch Clearing flags on attachment: 167288 Committed r130581: <http://trac.webkit.org/changeset/130581> 736222 5 webkit.review.bot 2012-10-06 02:26:23 -0700 All reviewed patches have been landed. Closing bug. 739655 6 loislo 2012-10-11 00:12:00 -0700 (In reply to comment #3) > Why isn't memory instrumentation behind a feature flag? It looks like an experimental feature to me. We decided to do the work without a flag because the feature doesn't affects UI, the rendering and the performance. It is quite challenging task by itself because we need to instrument a lot of classes for the better coverage and we would have additional work in case of being behind a flag because WebKit is constantly moving forward. Additional burden on the developers is small because the body of reportMemoryUsage member function for a typical class is very simple in almost all the cases and requires the attention only in the case of removing a member variable. We monitor the quality of the instrumentation with help of tcmalloc profiler. Also we will use clang plugin for the coverage check on the later stage. 739677 7 loislo 2012-10-11 00:55:34 -0700 (In reply to comment #2) > (From update of attachment 167288 [details]) > I can't help but wonder why MemoryInstrumentationTest.cpp is in Chromium instead of being cross-port in WebKitTestAPI. > > Otherwise the change looks good. Good point. I'll move it to to TestWebKitAPI. 1054988 8 burg 2014-12-12 13:40:51 -0800 Closing as invalid, as this bug pertains to the old inspector UI and/or its tests. Please file a new bug (https://www.webkit.org/new-inspector-bug) if the bug/feature/issue is still relevant to WebKit trunk. 167288 2012-10-05 02:08:01 -0700 2012-10-06 02:26:19 -0700 Patch bug-98500-20121005130709.patch text/plain 8255 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDZkZTEzNWU5NDBjYzAyN2NjODdkYmM4 NTYyZWY1YWUxNGZkNDQ5NTAuLjVjMmExZGI5NDhjMjIxYTQzNzE4MzlhMjdiMDM4ZjIxYzY1N2U2 NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMTAtMDUgIElseWEgVGlraG9ub3Zza3kgIDxs b2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5NSSBmaXggU3Ry aW5nIGluc3RydW1lbnRhdGlvbiB0aGUgd2F5IGl0IHdhcyBkaXNjdXNzZWQgaW4gV0s5Nzk2NAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg1MDAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50IGlu c3RydW1lbnRhdGlvbiBpbmNvcnJlY3RseSBjb3ZlcnMgdGhlIGNhc2Ugd2hlbiBTdHJpbmdJbXBs IG9iamVjdCBoYXMgYmVlbiBjcmVhdGVkIHZpYSBTdHJpbmdJbXBsOjpjcmVhdGVXaXRoVGVybWlu YXRpbmdOdWxsQ2hhcmFjdGVyKCkuCisgICAgICAgIExvb2tzIGxpa2UgdGhlIG9ubHkgd2F5IHRv IGRldGVjdCB0aGUgc3RyaW5ncyB0aGF0IGhhcyBiZWVuIGNyZWF0ZWQgZnJvbSBsaXRlcmFscyBp cyB0byBjb21wYXJlIHRoZSBhZGRyZXNzZXMgb2YgYnVmZmVyIGFuZCBzdHJpbmdJbXBsICsgMS4K KworICAgICAgICAqIHd0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25TdHJpbmcuaDoKKyAgICAgICAg KFdURjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgorICAgICAgICAqIHd0Zi90ZXh0L1N0cmluZ0ltcGwu aDoKKyAgICAgICAgKFdURjo6U3RyaW5nSW1wbDo6aGFzSW50ZXJuYWxCdWZmZXIpOgorCiAyMDEy LTEwLTA1ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTMwNDc4LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwppbmRleCBiZTY0NzMzNjdmYTFjY2U5MDZhMDU5Y2FiYjQyNDQ5M2NjMTU4MDUxLi5kMmVi ODVlYmY3NjBhODhjYTk4MTI0NTAzZDNlY2I4MDQxY2IxNDBjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTEwLTA1ICBJbHlhIFRpa2hvbm92c2t5ICA8 bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBOTUkgZml4IFN0 cmluZyBpbnN0cnVtZW50YXRpb24gdGhlIHdheSBpdCB3YXMgZGlzY3Vzc2VkIGluIFdLOTc5NjQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk4NTAwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudCBp bnN0cnVtZW50YXRpb24gaW5jb3JyZWN0bHkgY292ZXJzIHRoZSBjYXNlIHdoZW4gU3RyaW5nSW1w bCBvYmplY3QgaGFzIGJlZW4gY3JlYXRlZCB2aWEgU3RyaW5nSW1wbDo6Y3JlYXRlV2l0aFRlcm1p bmF0aW5nTnVsbENoYXJhY3RlcigpLgorICAgICAgICBMb29rcyBsaWtlIHRoZSBvbmx5IHdheSB0 byBkZXRlY3QgdGhlIHN0cmluZ3MgdGhhdCBoYXMgYmVlbiBjcmVhdGVkIGZyb20gbGl0ZXJhbHMg aXMgdG8gY29tcGFyZSB0aGUgYWRkcmVzc2VzIG9mIGJ1ZmZlciBhbmQgc3RyaW5nSW1wbCArIDEu CisKKyAgICAgICAgKiB0ZXN0cy9NZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LmNwcDoKKwogMjAx Mi0xMC0wNCAgS2VuaWNoaSBJc2hpYmFzaGkgIDxiYXNoaUBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgW1dlYlNvY2tldF0gRXh0ZW5zaW9uUGFyc2VyIHNob3VsZCBoYXZlIGl0cyBvd24gZmlsZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uU3RyaW5nLmgg Yi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25TdHJpbmcuaAppbmRleCA2ZDlj OWM3MTQ4NjJjYmFjZTA2NDZjNTM0N2UzYTEwZDM5YTNlY2M1Li42ZTg4MDBmMjFjZDRhNjVjNDI3 ODU4ODU5OTdjZjk3MDk5MDE3NTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJ bnN0cnVtZW50YXRpb25TdHJpbmcuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVt ZW50YXRpb25TdHJpbmcuaApAQCAtNDMsMjQgKzQzLDI0IEBAIGlubGluZSB2b2lkIHJlcG9ydE1l bW9yeVVzYWdlKGNvbnN0IFN0cmluZ0ltcGwqIGNvbnN0JiBzdHJpbmdJbXBsLCBNZW1vcnlPYmpl Y3RJCiB7CiAgICAgc2l6ZV90IHNlbGZTaXplID0gc2l6ZW9mKFN0cmluZ0ltcGwpOwogCisgICAg c2l6ZV90IGxlbmd0aCA9IHN0cmluZ0ltcGwtPmxlbmd0aCgpICsgKHN0cmluZ0ltcGwtPmhhc1Rl cm1pbmF0aW5nTnVsbENoYXJhY3RlcigpID8gMSA6IDApOworICAgIHNpemVfdCBidWZmZXJTaXpl ID0gbGVuZ3RoICogKHN0cmluZ0ltcGwtPmlzOEJpdCgpID8gc2l6ZW9mKExDaGFyKSA6IHNpemVv ZihVQ2hhcikpOworICAgIGNvbnN0IHZvaWQqIGJ1ZmZlciA9IHN0cmluZ0ltcGwtPmlzOEJpdCgp ID8gc3RhdGljX2Nhc3Q8Y29uc3Qgdm9pZCo+KHN0cmluZ0ltcGwtPmNoYXJhY3RlcnM4KCkpIDog c3RhdGljX2Nhc3Q8Y29uc3Qgdm9pZCo+KHN0cmluZ0ltcGwtPmNoYXJhY3RlcnMxNigpKTsKKwog ICAgIC8vIENvdW50IHNpemUgdXNlZCBieSBpbnRlcm5hbCBidWZmZXIgYnV0IHNraXAgc3RyaW5n cyB0aGF0IHdlcmUgY29uc3RydWN0ZWQgZnJvbSBsaXRlcmFscy4KLSAgICBpZiAoc3RyaW5nSW1w bC0+aGFzSW50ZXJuYWxCdWZmZXIoKSkKLSAgICAgICAgc2VsZlNpemUgKz0gc3RyaW5nSW1wbC0+ bGVuZ3RoKCkgKiAoc3RyaW5nSW1wbC0+aXM4Qml0KCkgPyBzaXplb2YoTENoYXIpIDogc2l6ZW9m KFVDaGFyKSk7CisgICAgaWYgKHN0cmluZ0ltcGwtPmhhc0ludGVybmFsQnVmZmVyKCkgJiYgYnVm ZmVyID09IHN0cmluZ0ltcGwgKyAxKQorICAgICAgICBzZWxmU2l6ZSArPSBidWZmZXJTaXplOwog CiAgICAgTWVtb3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgc3RyaW5nSW1wbCwg MCwgc2VsZlNpemUpOwogCiAgICAgaWYgKFN0cmluZ0ltcGwqIGJhc2VTdHJpbmcgPSBzdHJpbmdJ bXBsLT5iYXNlU3RyaW5nKCkpCiAgICAgICAgIGluZm8uYWRkTWVtYmVyKGJhc2VTdHJpbmcpOwog ICAgIGVsc2UgewotICAgICAgICBpZiAoc3RyaW5nSW1wbC0+aGFzT3duZWRCdWZmZXIoKSkgewot ICAgICAgICAgICAgaWYgKHN0cmluZ0ltcGwtPmlzOEJpdCgpKQotICAgICAgICAgICAgICAgIGlu Zm8uYWRkUmF3QnVmZmVyKHN0cmluZ0ltcGwtPmNoYXJhY3RlcnM4KCksIHN0cmluZ0ltcGwtPmxl bmd0aCgpKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBpbmZvLmFkZFJhd0J1 ZmZlcihzdHJpbmdJbXBsLT5jaGFyYWN0ZXJzMTYoKSwgc3RyaW5nSW1wbC0+bGVuZ3RoKCkgKiAy KTsKLSAgICAgICAgfQorICAgICAgICBpZiAoc3RyaW5nSW1wbC0+aGFzT3duZWRCdWZmZXIoKSkK KyAgICAgICAgICAgIGluZm8uYWRkUmF3QnVmZmVyKGJ1ZmZlciwgYnVmZmVyU2l6ZSk7CiAKICAg ICAgICAgaWYgKHN0cmluZ0ltcGwtPmhhczE2Qml0U2hhZG93KCkpCi0gICAgICAgICAgICBpbmZv LmFkZFJhd0J1ZmZlcihzdHJpbmdJbXBsLT5jaGFyYWN0ZXJzKCksIChzdHJpbmdJbXBsLT5sZW5n dGgoKSArIChzdHJpbmdJbXBsLT5oYXNUZXJtaW5hdGluZ051bGxDaGFyYWN0ZXIoKSA/IDEgOiAw KSkgKiBzaXplb2YoVUNoYXIpKTsKKyAgICAgICAgICAgIGluZm8uYWRkUmF3QnVmZmVyKHN0cmlu Z0ltcGwtPmNoYXJhY3RlcnMoKSwgbGVuZ3RoICogc2l6ZW9mKFVDaGFyKSk7CiAgICAgfQogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaCBiL1NvdXJjZS9X VEYvd3RmL3RleHQvU3RyaW5nSW1wbC5oCmluZGV4IDRkYTY3NjZhY2RlYzdkYWRiNzRlYWEwMWJi YTZhNGZjOGNiYTllNmYuLjQzZGI3YjRkMmI2YzdiNzFhMTFiYWNhZWMzZDc1MWMzNDM0OGIxMGYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5oCisrKyBiL1NvdXJj ZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5oCkBAIC00NTMsNyArNDUzLDcgQEAgcHVibGljOgog CiAgICAgdW5zaWduZWQgbGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gbV9sZW5ndGg7IH0KICAgICBi b29sIGlzOEJpdCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzaEFuZEZsYWdzICYgc19oYXNoRmxhZzhC aXRCdWZmZXI7IH0KLSAgICBib29sIGhhc0ludGVybmFsQnVmZmVyKCkgY29uc3QgeyByZXR1cm4g YnVmZmVyT3duZXJzaGlwKCkgPT0gQnVmZmVySW50ZXJuYWwgJiYgIWhhc1Rlcm1pbmF0aW5nTnVs bENoYXJhY3RlcigpOyB9CisgICAgYm9vbCBoYXNJbnRlcm5hbEJ1ZmZlcigpIGNvbnN0IHsgcmV0 dXJuIGJ1ZmZlck93bmVyc2hpcCgpID09IEJ1ZmZlckludGVybmFsOyB9CiAgICAgYm9vbCBoYXNP d25lZEJ1ZmZlcigpIGNvbnN0IHsgcmV0dXJuIGJ1ZmZlck93bmVyc2hpcCgpID09IEJ1ZmZlck93 bmVkOyB9CiAgICAgU3RyaW5nSW1wbCogYmFzZVN0cmluZygpIGNvbnN0IHsgcmV0dXJuIGJ1ZmZl ck93bmVyc2hpcCgpID09IEJ1ZmZlclN1YnN0cmluZyA/IG1fc3Vic3RyaW5nQnVmZmVyIDogMDsg fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL01lbW9yeUluc3Ry dW1lbnRhdGlvblRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9NZW1vcnlJ bnN0cnVtZW50YXRpb25UZXN0LmNwcAppbmRleCAxMDU5MDc3ZjBjMWU5Zjg4YTRkYjZiZWRiZGM0 Y2Y3NzBkMDgzMzRlLi40YzE3OWRlYWYwNDFkNjg3NDZiMDNiMjliOTI1ZWYzMjUzNjlkNzc2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL01lbW9yeUluc3RydW1lbnRh dGlvblRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTWVtb3J5SW5z dHJ1bWVudGF0aW9uVGVzdC5jcHAKQEAgLTI5NSw3ICsyOTUsNyBAQCBURVNUKE1lbW9yeUluc3Ry dW1lbnRhdGlvblRlc3QsIHZpc2l0U3RyaW5ncykKICAgICAgICAgSW5zdHJ1bWVudGVkT3duZXI8 U3RyaW5nPiBzdHJpbmdJbnN0cnVtZW50ZWRPd25lcigiU3RyaW5nIik7CiAgICAgICAgIHN0cmlu Z0luc3RydW1lbnRlZE93bmVyLm1fdmFsdWUuY2hhcmFjdGVycygpOwogICAgICAgICBoZWxwZXIu YWRkUm9vdE9iamVjdChzdHJpbmdJbnN0cnVtZW50ZWRPd25lcik7Ci0gICAgICAgIEVYUEVDVF9F UShzaXplb2YoU3RyaW5nSW1wbCkgKyBzdHJpbmdJbnN0cnVtZW50ZWRPd25lci5tX3ZhbHVlLmxl bmd0aCgpICogMywgaGVscGVyLnJlcG9ydGVkU2l6ZUZvckFsbFR5cGVzKCkpOworICAgICAgICBF WFBFQ1RfRVEoc2l6ZW9mKFN0cmluZ0ltcGwpICsgc3RyaW5nSW5zdHJ1bWVudGVkT3duZXIubV92 YWx1ZS5sZW5ndGgoKSAqIChzaXplb2YoTENoYXIpICsgc2l6ZW9mKFVDaGFyKSksIGhlbHBlci5y ZXBvcnRlZFNpemVGb3JBbGxUeXBlcygpKTsKICAgICAgICAgRVhQRUNUX0VRKDIsIGhlbHBlci52 aXNpdGVkT2JqZWN0cygpKTsKICAgICB9CiAKQEAgLTMwNCw3ICszMDQsNyBAQCBURVNUKE1lbW9y eUluc3RydW1lbnRhdGlvblRlc3QsIHZpc2l0U3RyaW5ncykKICAgICAgICAgU3RyaW5nIHN0cmlu ZygiU3RyaW5nIik7CiAgICAgICAgIEluc3RydW1lbnRlZE93bmVyPFN0cmluZz4gc3RyaW5nSW5z dHJ1bWVudGVkT3duZXIoU3RyaW5nKHN0cmluZy5jaGFyYWN0ZXJzKCksIHN0cmluZy5sZW5ndGgo KSkpOwogICAgICAgICBoZWxwZXIuYWRkUm9vdE9iamVjdChzdHJpbmdJbnN0cnVtZW50ZWRPd25l cik7Ci0gICAgICAgIEVYUEVDVF9FUShzaXplb2YoU3RyaW5nSW1wbCkgKyBzdHJpbmdJbnN0cnVt ZW50ZWRPd25lci5tX3ZhbHVlLmxlbmd0aCgpICogMiwgaGVscGVyLnJlcG9ydGVkU2l6ZUZvckFs bFR5cGVzKCkpOworICAgICAgICBFWFBFQ1RfRVEoc2l6ZW9mKFN0cmluZ0ltcGwpICsgc3RyaW5n SW5zdHJ1bWVudGVkT3duZXIubV92YWx1ZS5sZW5ndGgoKSAqIHNpemVvZihVQ2hhciksIGhlbHBl ci5yZXBvcnRlZFNpemVGb3JBbGxUeXBlcygpKTsKICAgICAgICAgRVhQRUNUX0VRKDEsIGhlbHBl ci52aXNpdGVkT2JqZWN0cygpKTsKICAgICB9CiAKQEAgLTMxNywxMyArMzE3LDIyIEBAIFRFU1Qo TWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdCwgdmlzaXRTdHJpbmdzKQogICAgICAgICBFWFBFQ1Rf RVEoMSwgaGVscGVyLnZpc2l0ZWRPYmplY3RzKCkpOwogICAgIH0KIAorICAgIHsgLy8gWmVybyB0 ZXJtaW5hdGVkIGludGVybmFsIGJ1ZmZlci4KKyAgICAgICAgSW5zdHJ1bWVudGF0aW9uVGVzdEhl bHBlciBoZWxwZXI7CisgICAgICAgIEluc3RydW1lbnRlZE93bmVyPFN0cmluZz4gc3RyaW5nSW5z dHJ1bWVudGVkT3duZXIoInN0cmluZyIpOworICAgICAgICBzdHJpbmdJbnN0cnVtZW50ZWRPd25l ci5tX3ZhbHVlLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCk7CisgICAgICAgIGhlbHBl ci5hZGRSb290T2JqZWN0KHN0cmluZ0luc3RydW1lbnRlZE93bmVyKTsKKyAgICAgICAgRVhQRUNU X0VRKHNpemVvZihTdHJpbmdJbXBsKSArIChzdHJpbmdJbnN0cnVtZW50ZWRPd25lci5tX3ZhbHVl Lmxlbmd0aCgpICsgMSkgKiAoc2l6ZW9mKExDaGFyKSArIHNpemVvZihVQ2hhcikpLCBoZWxwZXIu cmVwb3J0ZWRTaXplRm9yQWxsVHlwZXMoKSk7CisgICAgICAgIEVYUEVDVF9FUSgyLCBoZWxwZXIu dmlzaXRlZE9iamVjdHMoKSk7CisgICAgfQorCiAgICAgeyAvLyBTdWJzdHJpbmcKICAgICAgICAg SW5zdHJ1bWVudGF0aW9uVGVzdEhlbHBlciBoZWxwZXI7CiAgICAgICAgIFN0cmluZyBiYXNlU3Ry aW5nKCJTdHJpbmciKTsKICAgICAgICAgYmFzZVN0cmluZy5jaGFyYWN0ZXJzKCk7IC8vIEZvcmNl IDE2IHNoYWRvdyBjcmVhdGlvbi4KICAgICAgICAgSW5zdHJ1bWVudGVkT3duZXI8U3RyaW5nPiBz dHJpbmdJbnN0cnVtZW50ZWRPd25lcihiYXNlU3RyaW5nLnN1YnN0cmluZ1NoYXJpbmdJbXBsKDEs IDQpKTsKICAgICAgICAgaGVscGVyLmFkZFJvb3RPYmplY3Qoc3RyaW5nSW5zdHJ1bWVudGVkT3du ZXIpOwotICAgICAgICBFWFBFQ1RfRVEoc2l6ZW9mKFN0cmluZ0ltcGwpICogMiArIGJhc2VTdHJp bmcubGVuZ3RoKCkgKiAzLCBoZWxwZXIucmVwb3J0ZWRTaXplRm9yQWxsVHlwZXMoKSk7CisgICAg ICAgIEVYUEVDVF9FUShzaXplb2YoU3RyaW5nSW1wbCkgKiAyICsgYmFzZVN0cmluZy5sZW5ndGgo KSAqIChzaXplb2YoTENoYXIpICsgc2l6ZW9mKFVDaGFyKSksIGhlbHBlci5yZXBvcnRlZFNpemVG b3JBbGxUeXBlcygpKTsKICAgICAgICAgRVhQRUNUX0VRKDMsIGhlbHBlci52aXNpdGVkT2JqZWN0 cygpKTsKICAgICB9CiAKQEAgLTM0MSw3ICszNTAsNyBAQCBURVNUKE1lbW9yeUluc3RydW1lbnRh dGlvblRlc3QsIHZpc2l0U3RyaW5ncykKICAgICAgICAgSW5zdHJ1bWVudGVkT3duZXI8QXRvbWlj U3RyaW5nPiBhdG9taWNTdHJpbmdJbnN0cnVtZW50ZWRPd25lcigiQXRvbWljU3RyaW5nIik7CiAg ICAgICAgIGF0b21pY1N0cmluZ0luc3RydW1lbnRlZE93bmVyLm1fdmFsdWUuc3RyaW5nKCkuY2hh cmFjdGVycygpOyAvLyBGb3JjZSAxNmJpdCBzaGFkb3cgY3JlYXRpb24uCiAgICAgICAgIGhlbHBl ci5hZGRSb290T2JqZWN0KGF0b21pY1N0cmluZ0luc3RydW1lbnRlZE93bmVyKTsKLSAgICAgICAg RVhQRUNUX0VRKHNpemVvZihTdHJpbmdJbXBsKSArIGF0b21pY1N0cmluZ0luc3RydW1lbnRlZE93 bmVyLm1fdmFsdWUubGVuZ3RoKCkgKiAzLCBoZWxwZXIucmVwb3J0ZWRTaXplRm9yQWxsVHlwZXMo KSk7CisgICAgICAgIEVYUEVDVF9FUShzaXplb2YoU3RyaW5nSW1wbCkgKyBhdG9taWNTdHJpbmdJ bnN0cnVtZW50ZWRPd25lci5tX3ZhbHVlLmxlbmd0aCgpICogKHNpemVvZihMQ2hhcikgKyBzaXpl b2YoVUNoYXIpKSwgaGVscGVyLnJlcG9ydGVkU2l6ZUZvckFsbFR5cGVzKCkpOwogICAgICAgICBF WFBFQ1RfRVEoMiwgaGVscGVyLnZpc2l0ZWRPYmplY3RzKCkpOwogICAgIH0KIAo=