105026 2012-12-14 07:50:44 -0800 Web Inspector: Native Memory Instrumentation: MemoryInstrumentation doesn't detect reportMemoryUsage method defined in a base class. 2012-12-17 08:32:26 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo loislo apavlov benjamin keishi loislo ojan.autocc pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 791606 0 loislo 2012-12-14 07:50:44 -0800 It is relatively frequent case when we report a pointer to an object of a class and this class does not have reportMemoryUsage method but its parent does. Current implementation does not detect such cases. As a result we count such objects via sizeof and do not call reportMemoryUsage. I found a working solution and need to check it against all the WebKit compilers. http://stackoverflow.com/questions/1966362/sfinae-to-check-for-inherited-member-functions 791615 1 179485 loislo 2012-12-14 08:00:38 -0800 Created attachment 179485 Patch 791618 2 loislo 2012-12-14 08:03:06 -0800 The coverage increases by ~3% on cnn, nytimes and google. 791648 3 179485 buildbot 2012-12-14 09:01:36 -0800 Comment on attachment 179485 Patch Attachment 179485 did not pass win-ews (win): Output: http://queues.webkit.org/results/15310752 792054 4 179485 yurys 2012-12-14 22:48:26 -0800 Comment on attachment 179485 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179485&action=review > Source/WTF/wtf/MemoryInstrumentation.h:133 > + struct Base : public Type, public BaseMixin { }; Will it compile if there is no default constructor for Type ? 792521 5 179698 loislo 2012-12-17 00:08:54 -0800 Created attachment 179698 for try-bots. speculative fix for windows 792571 6 179485 yurys 2012-12-17 02:03:49 -0800 Comment on attachment 179485 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179485&action=review >> Source/WTF/wtf/MemoryInstrumentation.h:133 >> + struct Base : public Type, public BaseMixin { }; > > Will it compile if there is no default constructor for Type ? Why is it called Base, shouldn't it be Derived instead? > Source/WTF/wtf/MemoryInstrumentation.h:144 > + template <int> template <bool> ? 792606 7 loislo 2012-12-17 03:30:50 -0800 Committed r137892: <http://trac.webkit.org/changeset/137892> 792609 8 loislo 2012-12-17 03:36:43 -0800 Reverted r137892 for reason: it broke compilation on windows Committed r137893: <http://trac.webkit.org/changeset/137893> 792745 9 loislo 2012-12-17 08:32:26 -0800 Committed r137911: <http://trac.webkit.org/changeset/137911> 179485 2012-12-14 08:00:38 -0800 2012-12-17 02:03:49 -0800 Patch bug-105026-20121214195757.patch text/plain 6580 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDQ0OTkzZDA0ZWU5Mjk0YzQzMTgyNDhm OWZlM2QzODI5Njc5YzUzYzYuLjZhODU1ZjgzMmFlN2YyMjMzNDI1ZDIzYTg4NWM5ODNkNWM5ZDIx NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTItMTItMTQgIElseWEgVGlraG9ub3Zza3kgIDxs b2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5hdGl2ZSBNZW1v cnkgSW5zdHJ1bWVudGF0aW9uOiBNZW1vcnlJbnN0cnVtZW50YXRpb24gZG9lc24ndCBkZXRlY3Qg cmVwb3J0TWVtb3J5VXNhZ2UgbWV0aG9kIGRlZmluZWQgaW4gYSBiYXNlIGNsYXNzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1MDI2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT2xkIFNGSU5BRSB0ZXN0 IHdhcyByZXBsYWNlZCB3aXRoIG5ldyBvbmUgYmFzZWQgb24gdGhpcyBhcnRpY2xlOgorICAgICAg ICBodHRwOi8vc3RhY2tvdmVyZmxvdy5jb20vcXVlc3Rpb25zLzE5NjYzNjIvc2ZpbmFlLXRvLWNo ZWNrLWZvci1pbmhlcml0ZWQtbWVtYmVyLWZ1bmN0aW9ucworCisgICAgICAgICogd3RmL01lbW9y eUluc3RydW1lbnRhdGlvbi5oOgorICAgICAgICAoTWVtb3J5SW5zdHJ1bWVudGF0aW9uKToKKyAg ICAgICAgKHllcyk6CisgICAgICAgIChJc0luc3RydW1lbnRlZCk6CisgICAgICAgIChubyk6Cisg ICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6SXNJbnN0cnVtZW50ZWQ6OkJhc2VN aXhpbjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVtZW50 YXRpb246OnNlbGVjdEluc3RydW1lbnRhdGlvbk1ldGhvZCk6CisgICAgICAgIChJbnN0cnVtZW50 YXRpb25TZWxlY3Rvcik6CisgICAgICAgIChXVEYpOgorICAgICAgICAoV1RGOjo6OnJlcG9ydE9i amVjdE1lbW9yeVVzYWdlKToKKwogMjAxMi0xMi0xMyAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBw bGUuY29tPgogCiAgICAgICAgIEF0dGVtcHQgdG8gcmF0aW9uYWxpemUgYW5kIHNpbXBsaWZ5IFdU Rjo6YmluYXJ5U2VhcmNoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVt ZW50YXRpb24uaCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbi5oCmluZGV4 IDBjYzk0MTdmNGEwYTM4ZTc1MDQzNjY2NDE1MzdkOTNhOTEwM2Y2NjguLmRlNDg1YzBhZjk1YTcw MjU4NzYzZTJlNjAzYTU2YTYzYWJhYTliNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01l bW9yeUluc3RydW1lbnRhdGlvbi5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1l bnRhdGlvbi5oCkBAIC0xMTYsMjUgKzExNiwzNiBAQCBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFz cyBNZW1vcnlDbGFzc0luZm87CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gZnJpZW5kIHZvaWQg cmVwb3J0TWVtb3J5VXNhZ2UoY29uc3QgVCosIE1lbW9yeU9iamVjdEluZm8qKTsKIAotICAgIHRl bXBsYXRlPHR5cGVuYW1lIFQ+IHN0YXRpYyB2b2lkIHNlbGVjdEluc3RydW1lbnRhdGlvbk1ldGhv ZChjb25zdCBUKiBvYmplY3QsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pCi0g ICAgewotICAgICAgICAvLyBJZiB0aGVyZSBpcyByZXBvcnRNZW1vcnlVc2FnZSBtZXRob2Qgb24g dGhlIG9iamVjdCwgY2FsbCBpdC4KLSAgICAgICAgLy8gT3RoZXJ3aXNlIGNvdW50IG9ubHkgb2Jq ZWN0J3Mgc2VsZiBzaXplLgotICAgICAgICByZXBvcnRPYmplY3RNZW1vcnlVc2FnZTxULCB2b2lk IChUOjoqKShNZW1vcnlPYmplY3RJbmZvKikgY29uc3Q+KG9iamVjdCwgbWVtb3J5T2JqZWN0SW5m bywgMCk7Ci0gICAgfQorICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUeXBlPgorICAgIGNsYXNzIElz SW5zdHJ1bWVudGVkIHsKKyAgICAgICAgY2xhc3MgeWVzIHsKKyAgICAgICAgICAgIGNoYXIgbTsK KyAgICAgICAgfTsKIAotICAgIHRlbXBsYXRlPHR5cGVuYW1lIFR5cGUsIFR5cGUgUHRyPiBzdHJ1 Y3QgTWVtYmVySGVscGVyU3RydWN0OwotICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1l IFR5cGU+Ci0gICAgc3RhdGljIHZvaWQgcmVwb3J0T2JqZWN0TWVtb3J5VXNhZ2UoY29uc3QgVCog b2JqZWN0LCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvLCAgTWVtYmVySGVscGVy U3RydWN0PFR5cGUsICZUOjpyZXBvcnRNZW1vcnlVc2FnZT4qKQotICAgIHsKLSAgICAgICAgb2Jq ZWN0LT5yZXBvcnRNZW1vcnlVc2FnZShtZW1vcnlPYmplY3RJbmZvKTsKLSAgICB9CisgICAgICAg IGNsYXNzIG5vIHsKKyAgICAgICAgICAgIHllcyBtWzJdOworICAgICAgICB9OworCisgICAgICAg IHN0cnVjdCBCYXNlTWl4aW4geworICAgICAgICAgICAgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShN ZW1vcnlPYmplY3RJbmZvKikgY29uc3QgeyB9CisgICAgICAgIH07CisKKyAgICAgICAgc3RydWN0 IEJhc2UgOiBwdWJsaWMgVHlwZSwgcHVibGljIEJhc2VNaXhpbiB7IH07CisgICAgICAgIHRlbXBs YXRlIDx0eXBlbmFtZSBULCBUIHQ+IGNsYXNzIEhlbHBlciB7IH07CisKKyAgICAgICAgdGVtcGxh dGUgPHR5cGVuYW1lIFU+IHN0YXRpYyBubyBkZWR1Y2UoVSosIEhlbHBlcjx2b2lkIChCYXNlTWl4 aW46OiopKE1lbW9yeU9iamVjdEluZm8qKSBjb25zdCwgJlU6OnJlcG9ydE1lbW9yeVVzYWdlPiog PSAwKTsKKyAgICAgICAgc3RhdGljIHllcyBkZWR1Y2UoLi4uKTsKKworICAgIHB1YmxpYzoKKyAg ICAgICAgc3RhdGljIGNvbnN0IGJvb2wgcmVzdWx0ID0gc2l6ZW9mKHllcykgPT0gc2l6ZW9mKGRl ZHVjZSgoQmFzZSopKDApKSk7CisKKyAgICB9OworCisgICAgdGVtcGxhdGUgPGludD4KKyAgICBz dHJ1Y3QgSW5zdHJ1bWVudGF0aW9uU2VsZWN0b3IgeworICAgICAgICB0ZW1wbGF0ZSA8dHlwZW5h bWUgVD4gc3RhdGljIHZvaWQgcmVwb3J0T2JqZWN0TWVtb3J5VXNhZ2UoY29uc3QgVCosIE1lbW9y eU9iamVjdEluZm8qKTsKKyAgICB9OwogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5h bWUgVHlwZT4KLSAgICBzdGF0aWMgdm9pZCByZXBvcnRPYmplY3RNZW1vcnlVc2FnZShjb25zdCBU KiBvYmplY3QsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8sIC4uLikKLSAgICB7 Ci0gICAgICAgIGNhbGxSZXBvcnRPYmplY3RJbmZvKG1lbW9yeU9iamVjdEluZm8sIG9iamVjdCwg MCwgc2l6ZW9mKFQpKTsKLSAgICB9CiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIHN0YXRpYyB2b2lk IGNhbGxSZXBvcnRPYmplY3RJbmZvKE1lbW9yeU9iamVjdEluZm8qLCBjb25zdCB2b2lkKiBwb2lu dGVyLCBNZW1vcnlPYmplY3RUeXBlLCBzaXplX3Qgb2JqZWN0U2l6ZSk7CiAKICAgICB0ZW1wbGF0 ZTx0eXBlbmFtZSBUPiBjbGFzcyBXcmFwcGVyIDogcHVibGljIFdyYXBwZXJCYXNlIHsKQEAgLTE4 OSw2ICsyMDAsMjAgQEAgcHJpdmF0ZToKICAgICBNZW1vcnlJbnN0cnVtZW50YXRpb25DbGllbnQq IG1fY2xpZW50OwogfTsKIAordGVtcGxhdGUgPD4KK3RlbXBsYXRlIDx0eXBlbmFtZSBUPgordm9p ZCBNZW1vcnlJbnN0cnVtZW50YXRpb246Okluc3RydW1lbnRhdGlvblNlbGVjdG9yPHRydWU+Ojpy ZXBvcnRPYmplY3RNZW1vcnlVc2FnZShjb25zdCBUKiBvYmplY3QsIE1lbW9yeU9iamVjdEluZm8q IG1lbW9yeU9iamVjdEluZm8pCit7CisgICAgb2JqZWN0LT5yZXBvcnRNZW1vcnlVc2FnZShtZW1v cnlPYmplY3RJbmZvKTsKK30KKwordGVtcGxhdGUgPD4KK3RlbXBsYXRlIDx0eXBlbmFtZSBUPgor dm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246Okluc3RydW1lbnRhdGlvblNlbGVjdG9yPGZhbHNl Pjo6cmVwb3J0T2JqZWN0TWVtb3J5VXNhZ2UoY29uc3QgVCogb2JqZWN0LCBNZW1vcnlPYmplY3RJ bmZvKiBtZW1vcnlPYmplY3RJbmZvKQoreworICAgIGNhbGxSZXBvcnRPYmplY3RJbmZvKG1lbW9y eU9iamVjdEluZm8sIG9iamVjdCwgMCwgc2l6ZW9mKFQpKTsKK30KKwogY2xhc3MgTWVtb3J5Q2xh c3NJbmZvIHsKIHB1YmxpYzoKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgpAQCAtMjI0LDcgKzI0 OSw3IEBAIHByaXZhdGU6CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgogdm9pZCByZXBvcnRNZW1vcnlV c2FnZShjb25zdCBUKiBvYmplY3QsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8p CiB7Ci0gICAgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpzZWxlY3RJbnN0cnVtZW50YXRpb25NZXRo b2Q8VD4ob2JqZWN0LCBtZW1vcnlPYmplY3RJbmZvKTsKKyAgICBNZW1vcnlJbnN0cnVtZW50YXRp b246Okluc3RydW1lbnRhdGlvblNlbGVjdG9yPE1lbW9yeUluc3RydW1lbnRhdGlvbjo6SXNJbnN0 cnVtZW50ZWQ8VD46OnJlc3VsdD46OnJlcG9ydE9iamVjdE1lbW9yeVVzYWdlKG9iamVjdCwgbWVt b3J5T2JqZWN0SW5mbyk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzIzNDljZDI3ZWMxMzEzMjlk OTY0MmQ3ZGQwYWFiNWU0YTg3YjFkYy4uYzNiZWE3ZGMzZTUwNTAyZWQ5NDk3MzBkYTE5MzViNDFm NTdjMTAzOSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTEyLTE0ICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xv QGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBOYXRpdmUgTWVtb3J5IElu c3RydW1lbnRhdGlvbjogTWVtb3J5SW5zdHJ1bWVudGF0aW9uIGRvZXNuJ3QgZGV0ZWN0IHJlcG9y dE1lbW9yeVVzYWdlIG1ldGhvZCBkZWZpbmVkIGluIGEgYmFzZSBjbGFzcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTAyNgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE9sZCBTRklOQUUgdGVzdCB3YXMg cmVwbGFjZWQgd2l0aCBuZXcgb25lIGJhc2VkIG9uIHRoaXMgYXJ0aWNsZToKKyAgICAgICAgaHR0 cDovL3N0YWNrb3ZlcmZsb3cuY29tL3F1ZXN0aW9ucy8xOTY2MzYyL3NmaW5hZS10by1jaGVjay1m b3ItaW5oZXJpdGVkLW1lbWJlci1mdW5jdGlvbnMKKworICAgICAgICBOZXcgdGVzdCB3aGljaCBj b3ZlcnMgdGhpcyBwcm9ibGVtIHdhcyBhZGRlZC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV1RGL01lbW9yeUluc3RydW1lbnRhdGlvblRlc3QuY3BwOgorCiAyMDEyLTEyLTEzICBF cmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgLS1wcm9maWxlcj1Q Uk9GSUxFUiBvcHRpb24gdG8gcnVuLXBlcmYtdGVzdHMgdG8gYWxsb3cgc3BlY2lmeWluZyB3aGlj aCBwcm9maWxlciB0byB1c2Ugb24gcGxhdGZvcm1zIHdpdGggbWFueQpkaWZmIC0tZ2l0IGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdC5jcHAg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9NZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0 LmNwcAppbmRleCAwZTBjOWFjNDAxMDJlZDk2YTYwZmJiNTdmZDRlYjY2MGI5MmVlZGI1Li43YmRj YWMwNjM3OTQxYmEwMDBmZDNhNjAyOGMxZTFhZTRjYmQ3OWVhIDEwMDY0NAotLS0gYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9NZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LmNwcAorKysg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9NZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0 LmNwcApAQCAtODcyLDUgKzg3MiwyMSBAQCBURVNUKE1lbW9yeUluc3RydW1lbnRhdGlvblRlc3Qs IGRvTm90UmVwb3J0RWRnZVR3aWNlKQogICAgIGluc3RydW1lbnRhdGlvbi5hZGRSb290T2JqZWN0 KGluc3RhbmNlLmdldCgpKTsKICAgICBFWFBFQ1RfRVEoMSwgY2xpZW50LmxpbmtDb3VudCgpKTsK IH0KKworY2xhc3MgRGVyaXZlZENsYXNzIDogcHVibGljIEluc3RydW1lbnRlZCB7CitwdWJsaWM6 CisgICAgc2l6ZV90IG1fbWVtYmVyOworfTsKKworVEVTVChNZW1vcnlJbnN0cnVtZW50YXRpb25U ZXN0LCBkZXRlY3RCYXNlQ2xhc3NJbnN0cnVtZW50YXRpb24pCit7CisgICAgT3duUHRyPERlcml2 ZWRDbGFzcz4gaW5zdGFuY2UgPSBhZG9wdFB0cihuZXcgRGVyaXZlZENsYXNzKCkpOworCisgICAg SW5zdHJ1bWVudGF0aW9uVGVzdEhlbHBlciBoZWxwZXI7CisgICAgaGVscGVyLmFkZFJvb3RPYmpl Y3QoaW5zdGFuY2UuZ2V0KCksIFRlc3RUeXBlKTsKKyAgICBFWFBFQ1RfRVEoc2l6ZW9mKEluc3Ry dW1lbnRlZCkgKyBzaXplb2YoTm90SW5zdHJ1bWVudGVkKSwgaGVscGVyLnJlcG9ydGVkU2l6ZUZv ckFsbFR5cGVzKCkpOworICAgIEVYUEVDVF9FUSgydSwgaGVscGVyLnZpc2l0ZWRPYmplY3RzKCkp OworfQorCiB9IC8vIG5hbWVzcGFjZQogCg== 179698 2012-12-17 00:08:54 -0800 2012-12-17 01:33:59 -0800 for try-bots. speculative fix for windows bug-105026-20121217120611.patch text/plain 6580 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3ODgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDFjN2ZlOTc1ZmRmNzJkMGM1Y2FmOWRl Mjg4MWNiNjFlNWRjZTcxYmQuLjZjMzMxYWYzZmQ3NjUyYjlmZjExN2VlN2E3YmFiZTkwMWQ3NjZl NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTItMTItMTQgIElseWEgVGlraG9ub3Zza3kgIDxs b2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5hdGl2ZSBNZW1v cnkgSW5zdHJ1bWVudGF0aW9uOiBNZW1vcnlJbnN0cnVtZW50YXRpb24gZG9lc24ndCBkZXRlY3Qg cmVwb3J0TWVtb3J5VXNhZ2UgbWV0aG9kIGRlZmluZWQgaW4gYSBiYXNlIGNsYXNzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1MDI2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT2xkIFNGSU5BRSB0ZXN0 IHdhcyByZXBsYWNlZCB3aXRoIG5ldyBvbmUgYmFzZWQgb24gdGhpcyBhcnRpY2xlOgorICAgICAg ICBodHRwOi8vc3RhY2tvdmVyZmxvdy5jb20vcXVlc3Rpb25zLzE5NjYzNjIvc2ZpbmFlLXRvLWNo ZWNrLWZvci1pbmhlcml0ZWQtbWVtYmVyLWZ1bmN0aW9ucworCisgICAgICAgICogd3RmL01lbW9y eUluc3RydW1lbnRhdGlvbi5oOgorICAgICAgICAoTWVtb3J5SW5zdHJ1bWVudGF0aW9uKToKKyAg ICAgICAgKHllcyk6CisgICAgICAgIChJc0luc3RydW1lbnRlZCk6CisgICAgICAgIChubyk6Cisg ICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6SXNJbnN0cnVtZW50ZWQ6OkJhc2VN aXhpbjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVtZW50 YXRpb246OnNlbGVjdEluc3RydW1lbnRhdGlvbk1ldGhvZCk6CisgICAgICAgIChJbnN0cnVtZW50 YXRpb25TZWxlY3Rvcik6CisgICAgICAgIChXVEYpOgorICAgICAgICAoV1RGOjo6OnJlcG9ydE9i amVjdE1lbW9yeVVzYWdlKToKKwogMjAxMi0xMi0xNCAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlz QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgZGF0YSBncmlkIGZv ciBleHBsb3JpbmcgbmF0aXZlIGhlYXAgZ3JhcGgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3Rm L01lbW9yeUluc3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVu dGF0aW9uLmgKaW5kZXggZjljYzI4YjViYzM4YTQ1MTIyM2FmN2UyMDQ2ZDVhZTkwZWFkY2U0MC4u ZWQ1NDc1YzQ0NDE1OGVkNDlkMzc3ODcyZDU4N2U0NTU3MjJjYzg4OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNlL1dURi93dGYv TWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKQEAgLTExNiwyNSArMTE2LDM4IEBAIHByaXZhdGU6CiAg ICAgZnJpZW5kIGNsYXNzIE1lbW9yeUNsYXNzSW5mbzsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBU PiBmcmllbmQgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShjb25zdCBUKiwgTWVtb3J5T2JqZWN0SW5m byopOwogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gc3RhdGljIHZvaWQgc2VsZWN0SW5zdHJ1 bWVudGF0aW9uTWV0aG9kKGNvbnN0IFQqIG9iamVjdCwgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5 T2JqZWN0SW5mbykKLSAgICB7Ci0gICAgICAgIC8vIElmIHRoZXJlIGlzIHJlcG9ydE1lbW9yeVVz YWdlIG1ldGhvZCBvbiB0aGUgb2JqZWN0LCBjYWxsIGl0LgotICAgICAgICAvLyBPdGhlcndpc2Ug Y291bnQgb25seSBvYmplY3QncyBzZWxmIHNpemUuCi0gICAgICAgIHJlcG9ydE9iamVjdE1lbW9y eVVzYWdlPFQsIHZvaWQgKFQ6OiopKE1lbW9yeU9iamVjdEluZm8qKSBjb25zdD4ob2JqZWN0LCBt ZW1vcnlPYmplY3RJbmZvLCAwKTsKLSAgICB9CisgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFR5cGU+ CisgICAgY2xhc3MgSXNJbnN0cnVtZW50ZWQgeworICAgICAgICBjbGFzcyB5ZXMgeworICAgICAg ICAgICAgY2hhciBtOworICAgICAgICB9OwogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVHlwZSwg VHlwZSBQdHI+IHN0cnVjdCBNZW1iZXJIZWxwZXJTdHJ1Y3Q7Ci0gICAgdGVtcGxhdGU8dHlwZW5h bWUgVCwgdHlwZW5hbWUgVHlwZT4KLSAgICBzdGF0aWMgdm9pZCByZXBvcnRPYmplY3RNZW1vcnlV c2FnZShjb25zdCBUKiBvYmplY3QsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8s ICBNZW1iZXJIZWxwZXJTdHJ1Y3Q8VHlwZSwgJlQ6OnJlcG9ydE1lbW9yeVVzYWdlPiopCi0gICAg ewotICAgICAgICBvYmplY3QtPnJlcG9ydE1lbW9yeVVzYWdlKG1lbW9yeU9iamVjdEluZm8pOwot ICAgIH0KKyAgICAgICAgY2xhc3Mgbm8geworICAgICAgICAgICAgeWVzIG1bMl07CisgICAgICAg IH07CisKKyAgICAgICAgc3RydWN0IEJhc2VNaXhpbiB7CisgICAgICAgICAgICB2b2lkIHJlcG9y dE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qKSBjb25zdCB7IH0KKyAgICAgICAgfTsKKwor ICAgICAgICBzdHJ1Y3QgQmFzZSA6IHB1YmxpYyBUeXBlLCBwdWJsaWMgQmFzZU1peGluIHsKKyAg ICAgICAgICAgIH5CYXNlKCkgeyB9CisgICAgICAgIH07CisgICAgICAgIHRlbXBsYXRlIDx0eXBl bmFtZSBULCBUIHQ+IGNsYXNzIEhlbHBlciB7IH07CisKKyAgICAgICAgdGVtcGxhdGUgPHR5cGVu YW1lIFU+IHN0YXRpYyBubyBkZWR1Y2UoVSosIEhlbHBlcjx2b2lkIChCYXNlTWl4aW46OiopKE1l bW9yeU9iamVjdEluZm8qKSBjb25zdCwgJlU6OnJlcG9ydE1lbW9yeVVzYWdlPiogPSAwKTsKKyAg ICAgICAgc3RhdGljIHllcyBkZWR1Y2UoLi4uKTsKKworICAgIHB1YmxpYzoKKyAgICAgICAgc3Rh dGljIGNvbnN0IGJvb2wgcmVzdWx0ID0gc2l6ZW9mKHllcykgPT0gc2l6ZW9mKGRlZHVjZSgoQmFz ZSopKDApKSk7CisKKyAgICB9OworCisgICAgdGVtcGxhdGUgPGludD4KKyAgICBzdHJ1Y3QgSW5z dHJ1bWVudGF0aW9uU2VsZWN0b3IgeworICAgICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gc3Rh dGljIHZvaWQgcmVwb3J0T2JqZWN0TWVtb3J5VXNhZ2UoY29uc3QgVCosIE1lbW9yeU9iamVjdElu Zm8qKTsKKyAgICB9OwogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVHlwZT4K LSAgICBzdGF0aWMgdm9pZCByZXBvcnRPYmplY3RNZW1vcnlVc2FnZShjb25zdCBUKiBvYmplY3Qs IE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8sIC4uLikKLSAgICB7Ci0gICAgICAg IGNhbGxSZXBvcnRPYmplY3RJbmZvKG1lbW9yeU9iamVjdEluZm8sIG9iamVjdCwgMCwgc2l6ZW9m KFQpKTsKLSAgICB9CiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIHN0YXRpYyB2b2lkIGNhbGxSZXBv cnRPYmplY3RJbmZvKE1lbW9yeU9iamVjdEluZm8qLCBjb25zdCB2b2lkKiBwb2ludGVyLCBNZW1v cnlPYmplY3RUeXBlLCBzaXplX3Qgb2JqZWN0U2l6ZSk7CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFt ZSBUPiBjbGFzcyBXcmFwcGVyIDogcHVibGljIFdyYXBwZXJCYXNlIHsKQEAgLTE4OSw2ICsyMDIs MjAgQEAgcHJpdmF0ZToKICAgICBNZW1vcnlJbnN0cnVtZW50YXRpb25DbGllbnQqIG1fY2xpZW50 OwogfTsKIAordGVtcGxhdGUgPD4KK3RlbXBsYXRlIDx0eXBlbmFtZSBUPgordm9pZCBNZW1vcnlJ bnN0cnVtZW50YXRpb246Okluc3RydW1lbnRhdGlvblNlbGVjdG9yPHRydWU+OjpyZXBvcnRPYmpl Y3RNZW1vcnlVc2FnZShjb25zdCBUKiBvYmplY3QsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9i amVjdEluZm8pCit7CisgICAgb2JqZWN0LT5yZXBvcnRNZW1vcnlVc2FnZShtZW1vcnlPYmplY3RJ bmZvKTsKK30KKwordGVtcGxhdGUgPD4KK3RlbXBsYXRlIDx0eXBlbmFtZSBUPgordm9pZCBNZW1v cnlJbnN0cnVtZW50YXRpb246Okluc3RydW1lbnRhdGlvblNlbGVjdG9yPGZhbHNlPjo6cmVwb3J0 T2JqZWN0TWVtb3J5VXNhZ2UoY29uc3QgVCogb2JqZWN0LCBNZW1vcnlPYmplY3RJbmZvKiBtZW1v cnlPYmplY3RJbmZvKQoreworICAgIGNhbGxSZXBvcnRPYmplY3RJbmZvKG1lbW9yeU9iamVjdElu Zm8sIG9iamVjdCwgMCwgc2l6ZW9mKFQpKTsKK30KKwogY2xhc3MgTWVtb3J5Q2xhc3NJbmZvIHsK IHB1YmxpYzoKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgpAQCAtMjI0LDcgKzI1MSw3IEBAIHBy aXZhdGU6CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgogdm9pZCByZXBvcnRNZW1vcnlVc2FnZShjb25z dCBUKiBvYmplY3QsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pCiB7Ci0gICAg TWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpzZWxlY3RJbnN0cnVtZW50YXRpb25NZXRob2Q8VD4ob2Jq ZWN0LCBtZW1vcnlPYmplY3RJbmZvKTsKKyAgICBNZW1vcnlJbnN0cnVtZW50YXRpb246Okluc3Ry dW1lbnRhdGlvblNlbGVjdG9yPE1lbW9yeUluc3RydW1lbnRhdGlvbjo6SXNJbnN0cnVtZW50ZWQ8 VD46OnJlc3VsdD46OnJlcG9ydE9iamVjdE1lbW9yeVVzYWdlKG9iamVjdCwgbWVtb3J5T2JqZWN0 SW5mbyk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTQ1ZTk5ZWNmYjAxYjA1OTkyZDBjNjY2ODc1 MjhlNDIwNThlODE1Yy4uYWI4NzVkYmM2NjQyMDc1OGM0Mzg5NWVmZmIxY2Q4ODYzZjU5OWNhMCAx MDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE3IEBACisyMDEyLTEyLTE0ICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVt Lm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBOYXRpdmUgTWVtb3J5IEluc3RydW1lbnRh dGlvbjogTWVtb3J5SW5zdHJ1bWVudGF0aW9uIGRvZXNuJ3QgZGV0ZWN0IHJlcG9ydE1lbW9yeVVz YWdlIG1ldGhvZCBkZWZpbmVkIGluIGEgYmFzZSBjbGFzcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTAyNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE9sZCBTRklOQUUgdGVzdCB3YXMgcmVwbGFjZWQg d2l0aCBuZXcgb25lIGJhc2VkIG9uIHRoaXMgYXJ0aWNsZToKKyAgICAgICAgaHR0cDovL3N0YWNr b3ZlcmZsb3cuY29tL3F1ZXN0aW9ucy8xOTY2MzYyL3NmaW5hZS10by1jaGVjay1mb3ItaW5oZXJp dGVkLW1lbWJlci1mdW5jdGlvbnMKKworICAgICAgICBOZXcgdGVzdCB3aGljaCBjb3ZlcnMgdGhp cyBwcm9ibGVtIHdhcyBhZGRlZC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV1RG L01lbW9yeUluc3RydW1lbnRhdGlvblRlc3QuY3BwOgorCiAyMDEyLTEyLTE2ICBBcnZpZCBOaWxz c29uICA8YW5pbHNzb25AcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gQWRhcHQgdG8g bmV3IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpUb3VjaFBvaW50IEFQSQpkaWZmIC0tZ2l0IGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdC5jcHAg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9NZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0 LmNwcAppbmRleCAwZTBjOWFjNDAxMDJlZDk2YTYwZmJiNTdmZDRlYjY2MGI5MmVlZGI1Li43YmRj YWMwNjM3OTQxYmEwMDBmZDNhNjAyOGMxZTFhZTRjYmQ3OWVhIDEwMDY0NAotLS0gYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9NZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LmNwcAorKysg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9NZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0 LmNwcApAQCAtODcyLDUgKzg3MiwyMSBAQCBURVNUKE1lbW9yeUluc3RydW1lbnRhdGlvblRlc3Qs IGRvTm90UmVwb3J0RWRnZVR3aWNlKQogICAgIGluc3RydW1lbnRhdGlvbi5hZGRSb290T2JqZWN0 KGluc3RhbmNlLmdldCgpKTsKICAgICBFWFBFQ1RfRVEoMSwgY2xpZW50LmxpbmtDb3VudCgpKTsK IH0KKworY2xhc3MgRGVyaXZlZENsYXNzIDogcHVibGljIEluc3RydW1lbnRlZCB7CitwdWJsaWM6 CisgICAgc2l6ZV90IG1fbWVtYmVyOworfTsKKworVEVTVChNZW1vcnlJbnN0cnVtZW50YXRpb25U ZXN0LCBkZXRlY3RCYXNlQ2xhc3NJbnN0cnVtZW50YXRpb24pCit7CisgICAgT3duUHRyPERlcml2 ZWRDbGFzcz4gaW5zdGFuY2UgPSBhZG9wdFB0cihuZXcgRGVyaXZlZENsYXNzKCkpOworCisgICAg SW5zdHJ1bWVudGF0aW9uVGVzdEhlbHBlciBoZWxwZXI7CisgICAgaGVscGVyLmFkZFJvb3RPYmpl Y3QoaW5zdGFuY2UuZ2V0KCksIFRlc3RUeXBlKTsKKyAgICBFWFBFQ1RfRVEoc2l6ZW9mKEluc3Ry dW1lbnRlZCkgKyBzaXplb2YoTm90SW5zdHJ1bWVudGVkKSwgaGVscGVyLnJlcG9ydGVkU2l6ZUZv ckFsbFR5cGVzKCkpOworICAgIEVYUEVDVF9FUSgydSwgaGVscGVyLnZpc2l0ZWRPYmplY3RzKCkp OworfQorCiB9IC8vIG5hbWVzcGFjZQogCg==