230933 2021-09-28 20:12:50 -0700 Reduce allocations in DatabaseUtilities::sortedTables 2021-10-01 16:15:08 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez darin webkit-bug-importer oldest_to_newest 1798154 0 achristensen 2021-09-28 20:12:50 -0700 Reduce allocations in DatabaseUtilities::sortedTables 1798155 1 439561 achristensen 2021-09-28 20:13:52 -0700 Created attachment 439561 Patch 1798158 2 439561 cdumez 2021-09-28 20:21:49 -0700 Comment on attachment 439561 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439561&action=review > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:276 > +Span<const ASCIILiteral> ResourceLoadStatisticsDatabaseStore::sortedTables() Why return a span and not a const std::array<ASCIILiteral>& ? 1798180 3 achristensen 2021-09-28 22:00:50 -0700 Because they have different sizes. std::array has a template parameter that is its size, so they would return different types. 1798386 4 ews-feeder 2021-09-29 09:28:55 -0700 Committed r283227 (242269@main): <https://commits.webkit.org/242269@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439561. 1798387 5 webkit-bug-importer 2021-09-29 09:29:20 -0700 <rdar://problem/83674449> 1799605 6 439561 darin 2021-10-01 16:12:43 -0700 Comment on attachment 439561 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439561&action=review > Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.cpp:116 > + static std::array sortedTables { Why not constexpr? 1799607 7 439561 achristensen 2021-10-01 16:15:08 -0700 Comment on attachment 439561 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439561&action=review >> Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.cpp:116 >> + static std::array sortedTables { > > Why not constexpr? indeed. That could be added. I missed that. 439561 2021-09-28 20:13:52 -0700 2021-09-29 09:28:56 -0700 Patch bug-230933-20210928201351.patch text/plain 7642 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUxZmZmMjllYTU5ODlhYWIx OGY5ODVkNzY2Yjc4N2JiMmYzMmUzMTQuLjJiODliYWEwOGFlNWJiZDU1NDU0Mjk1OTRjNTA3MmQy NjBiZjEwMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDktMjggIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZWR1Y2UgYWxs b2NhdGlvbnMgaW4gRGF0YWJhc2VVdGlsaXRpZXM6OnNvcnRlZFRhYmxlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwOTMzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2aW9y IGV4Y2VwdCBubyBtb3JlIG1lbW9yeSBhbGxvY2F0aW9ucy4gIFdoYXQgYSB3b25kZXJmdWwgdGhp bmcuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0 YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OnNvcnRlZFRhYmxlcyk6CisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5o OgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0RhdGFiYXNlVXRpbGl0aWVzLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6RGF0YWJhc2VVdGlsaXRpZXM6Om1pZ3JhdGVEYXRhVG9OZXdUYWJsZXNJZk5l Y2Vzc2FyeSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvRGF0YWJhc2VVdGlsaXRpZXMuaDoK KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRl Q2xpY2tNZWFzdXJlbWVudERhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UENNOjpEYXRh YmFzZTo6c29ydGVkVGFibGVzKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xp Y2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudERhdGFiYXNlLmg6CisKIDIwMjEt MDktMjggIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVt b3ZlIHVudXNlZCAiY29tLmFwcGxlLnNlY3VyaXR5LmV4Y2VwdGlvbi5maWxlKiIgcnVsZXMgZnJv bSBXZWJLaXQgc2FuZGJveGVzIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcCBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHAKaW5kZXggMzI2NDlhYTFlYmFhZTk2ZTJkMmM1YTQ1MzNl ZTIzZDU2YTE5MmNhYi4uNTA4YjBkZTk2NDIwMGM3MzZjZGIxMzk5YzI0ZTUyNmViYTk3ODU1MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291 cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3Rv cmUuY3BwCkBAIC0yNzMsOSArMjczLDkgQEAgY29uc3QgTWVtb3J5Q29tcGFjdExvb2t1cE9ubHlS b2Jpbkhvb2RIYXNoTWFwPFN0cmluZywgVGFibGVBbmRJbmRleFBhaXI+JiBSZXNvdXIKICAgICBy ZXR1cm4gZXhwZWN0ZWRUYWJsZUFuZEluZGV4UXVlcmllczsKIH0KIAotY29uc3QgVmVjdG9yPFN0 cmluZz4mIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpzb3J0ZWRUYWJsZXMo KQorU3Bhbjxjb25zdCBBU0NJSUxpdGVyYWw+IFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFz ZVN0b3JlOjpzb3J0ZWRUYWJsZXMoKQogewotICAgIHN0YXRpYyBhdXRvIHNvcnRlZFRhYmxlcyA9 IG1ha2VOZXZlckRlc3Ryb3llZChWZWN0b3I8U3RyaW5nPiB7CisgICAgc3RhdGljIGNvbnN0ZXhw ciBzdGQ6OmFycmF5IHNvcnRlZFRhYmxlcyB7CiAgICAgICAgICJPYnNlcnZlZERvbWFpbnMiX3Ms CiAgICAgICAgICJUb3BMZXZlbERvbWFpbnMiX3MsCiAgICAgICAgICJTdG9yYWdlQWNjZXNzVW5k ZXJUb3BGcmFtZURvbWFpbnMiX3MsCkBAIC0yODksOSArMjg5LDkgQEAgY29uc3QgVmVjdG9yPFN0 cmluZz4mIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpzb3J0ZWRUYWJsZXMo KQogICAgICAgICAiU3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdHNUbyJfcywKICAgICAgICAgIlN1 YnJlc291cmNlVW5pcXVlUmVkaXJlY3RzRnJvbSJfcywKICAgICAgICAgIk9wZXJhdGluZ0RhdGVz Il9zCi0gICAgfSk7CisgICAgfTsKIAotICAgIHJldHVybiBzb3J0ZWRUYWJsZXM7CisgICAgcmV0 dXJuIHsgc29ydGVkVGFibGVzLmRhdGEoKSwgc29ydGVkVGFibGVzLnNpemUoKSB9OwogfQogCiB0 ZW1wbGF0ZSA8dHlwZW5hbWUgQ29udGFpbmVyVHlwZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJh c2VTdG9yZS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291 cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmgKaW5kZXggNTA5MmQ1MTQ0NzM3ZTgzZGQ4 ODEyYzRmMzYyNjcyYzNhYmQyZTMxYi4uNjkwMTg2ZjIxNDYwOWMyOTA4MjJiMTViN2NjZjZhZDk2 NDk2NzIxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lm aWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmgKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRh YmFzZVN0b3JlLmgKQEAgLTExNyw3ICsxMTcsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAg Y29uc3QgTWVtb3J5Q29tcGFjdExvb2t1cE9ubHlSb2Jpbkhvb2RIYXNoTWFwPFN0cmluZywgVGFi bGVBbmRJbmRleFBhaXI+JiBleHBlY3RlZFRhYmxlQW5kSW5kZXhRdWVyaWVzKCkgZmluYWw7Ci0g ICAgY29uc3QgVmVjdG9yPFN0cmluZz4mIHNvcnRlZFRhYmxlcygpIGZpbmFsOworICAgIFNwYW48 Y29uc3QgQVNDSUlMaXRlcmFsPiBzb3J0ZWRUYWJsZXMoKSBmaW5hbDsKICAgICB2b2lkIGluY2x1 ZGVUb2RheUFzT3BlcmF0aW5nRGF0ZUlmTmVjZXNzYXJ5KCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBj bGVhck9wZXJhdGluZ0RhdGVzKCkgb3ZlcnJpZGUgeyB9CiAgICAgYm9vbCBoYXNTdGF0aXN0aWNz RXhwaXJlZChXYWxsVGltZSBtb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZSwgT3BlcmF0aW5n RGF0ZXNXaW5kb3cpIGNvbnN0IG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9EYXRhYmFzZVV0aWxpdGllcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL0RhdGFiYXNlVXRpbGl0aWVzLmNwcAppbmRleCAyNjNkY2MzNjFiYmQ3MDNkMzJm YzA3MGNhM2VmZWQyNjBmMDQ3N2YzLi4zZGRmM2E2NjNkMWZjNWIxYTNiOTM4NTU4ODA3N2I4ZDNi NDNhMTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0RhdGFiYXNl VXRpbGl0aWVzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0RhdGFiYXNl VXRpbGl0aWVzLmNwcApAQCAtMjgwLDcgKzI4MCw3IEBAIHZvaWQgRGF0YWJhc2VVdGlsaXRpZXM6 Om1pZ3JhdGVEYXRhVG9OZXdUYWJsZXNJZk5lY2Vzc2FyeSgpCiAgICAgZm9yIChhdXRvJiB0YWJs ZSA6IHNvcnRlZFRhYmxlcygpKSB7CiAgICAgICAgIGF1dG8gbWlncmF0ZVRhYmxlRGF0YSA9IGlu c2VydERpc3RpbmN0VmFsdWVzSW5UYWJsZVN0YXRlbWVudChtX2RhdGFiYXNlLCB0YWJsZSk7CiAg ICAgICAgIGlmICghbWlncmF0ZVRhYmxlRGF0YSB8fCBtaWdyYXRlVGFibGVEYXRhLT5zdGVwKCkg IT0gU1FMSVRFX0RPTkUpIHsKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByaXZhdGVD bGlja01lYXN1cmVtZW50LCAiJXAgLSBEYXRhYmFzZVV0aWxpdGllczo6bWlncmF0ZURhdGFUb05l d1RhYmxlc0lmTmVjZXNzYXJ5ICh0YWJsZSAlcykgZmFpbGVkIHRvIG1pZ3JhdGUgc2NoZW1hLCBl cnJvciBtZXNzYWdlOiAlcyIsIHRoaXMsIHRhYmxlLnV0ZjgoKS5kYXRhKCksIG1fZGF0YWJhc2Uu bGFzdEVycm9yTXNnKCkpOworICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoUHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnQsICIlcCAtIERhdGFiYXNlVXRpbGl0aWVzOjptaWdyYXRlRGF0YVRvTmV3 VGFibGVzSWZOZWNlc3NhcnkgKHRhYmxlICVzKSBmYWlsZWQgdG8gbWlncmF0ZSBzY2hlbWEsIGVy cm9yIG1lc3NhZ2U6ICVzIiwgdGhpcywgdGFibGUuY2hhcmFjdGVycygpLCBtX2RhdGFiYXNlLmxh c3RFcnJvck1zZygpKTsKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL0RhdGFiYXNlVXRpbGl0aWVzLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL0RhdGFiYXNlVXRpbGl0aWVzLmgKaW5kZXggYWY3ZmVjOTVlMmVjYzIyMzQxOWM2ZWVlNTc5 ZTFlOWFlYzQ5YWZmNy4uNGM1OTU1MGI4ZDExYjk2ZWQ3N2IyYmIxZGE2MzIzY2Y3MTEyZmY2NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9EYXRhYmFzZVV0aWxpdGll cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRGF0YWJhc2VVdGlsaXRpZXMu aApAQCAtNjAsNyArNjAsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBTdHJpbmcgZ2V0RG9t YWluU3RyaW5nRnJvbURvbWFpbklEKHVuc2lnbmVkKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBi b29sIG5lZWRzVXBkYXRlZFNjaGVtYSgpID0gMDsKICAgICB2aXJ0dWFsIGNvbnN0IE1lbW9yeUNv bXBhY3RMb29rdXBPbmx5Um9iaW5Ib29kSGFzaE1hcDxTdHJpbmcsIFRhYmxlQW5kSW5kZXhQYWly PiYgZXhwZWN0ZWRUYWJsZUFuZEluZGV4UXVlcmllcygpID0gMDsKLSAgICB2aXJ0dWFsIGNvbnN0 IFZlY3RvcjxTdHJpbmc+JiBzb3J0ZWRUYWJsZXMoKSA9IDA7CisgICAgdmlydHVhbCBTcGFuPGNv bnN0IEFTQ0lJTGl0ZXJhbD4gc29ydGVkVGFibGVzKCkgPSAwOwogICAgIFRhYmxlQW5kSW5kZXhQ YWlyIGN1cnJlbnRUYWJsZUFuZEluZGV4UXVlcmllcyhjb25zdCBTdHJpbmcmKTsKICAgICBTdHJp bmcgc3RyaXBJbmRleFF1ZXJ5VG9NYXRjaFN0b3JlZFZhbHVlKGNvbnN0IGNoYXIqIG9yaWdpbmFs UXVlcnkpOwogICAgIHZvaWQgbWlncmF0ZURhdGFUb05ld1RhYmxlc0lmTmVjZXNzYXJ5KCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1 cmVtZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50RGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFz dXJlbWVudERhdGFiYXNlLmNwcAppbmRleCBhNzRlNjMxYmFhZDNlOTIzODFiYmU0MGFmZjdjNGEy ODMxOTAwNGUyLi4xODk2YmRkYmMxNjllZTg4YjBkYzMwOTM2MzFkNDZmODk0M2ZlMzk5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVt ZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50RGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnREYXRhYmFzZS5jcHAKQEAgLTExMSwxNSArMTExLDE1IEBAIGNvbnN0IE1lbW9yeUNv bXBhY3RMb29rdXBPbmx5Um9iaW5Ib29kSGFzaE1hcDxTdHJpbmcsIFRhYmxlQW5kSW5kZXhQYWly PiYgRGF0YWJhCiAgICAgcmV0dXJuIGV4cGVjdGVkVGFibGVBbmRJbmRleFF1ZXJpZXM7CiB9CiAK LWNvbnN0IFZlY3RvcjxTdHJpbmc+JiBEYXRhYmFzZTo6c29ydGVkVGFibGVzKCkKK1NwYW48Y29u c3QgQVNDSUlMaXRlcmFsPiBEYXRhYmFzZTo6c29ydGVkVGFibGVzKCkKIHsKLSAgICBzdGF0aWMg YXV0byBzb3J0ZWRUYWJsZXMgPSBtYWtlTmV2ZXJEZXN0cm95ZWQoVmVjdG9yPFN0cmluZz4gewor ICAgIHN0YXRpYyBzdGQ6OmFycmF5IHNvcnRlZFRhYmxlcyB7CiAgICAgICAgICJQQ01PYnNlcnZl ZERvbWFpbnMiX3MsCiAgICAgICAgICJVbmF0dHJpYnV0ZWRQcml2YXRlQ2xpY2tNZWFzdXJlbWVu dCJfcywKICAgICAgICAgIkF0dHJpYnV0ZWRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCJfcwotICAg IH0pOworICAgIH07CiAKLSAgICByZXR1cm4gc29ydGVkVGFibGVzOworICAgIHJldHVybiB7IHNv cnRlZFRhYmxlcy5kYXRhKCksIHNvcnRlZFRhYmxlcy5zaXplKCkgfTsKIH0KIAogdm9pZCBEYXRh YmFzZTo6aW50ZXJydXB0QWxsRGF0YWJhc2VzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnREYXRhYmFzZS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xp Y2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudERhdGFiYXNlLmgKaW5kZXggMmVl ZDg5NDVkYTBiZmQyNTYxYWQ5ODcwNGI4ZWY3MTE4MDIxOWQzYS4uMGZjNzc3NTk1MGYxMTlkOTJi NGI0ZWZkNDgwZDdiNDVmMjc0YjlhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudERh dGFiYXNlLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tN ZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudERhdGFiYXNlLmgKQEAgLTgwLDcgKzgw LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG5lZWRzVXBkYXRlZFNjaGVtYSgpIGZpbmFsOwogICAg IGJvb2wgY3JlYXRlVW5pcXVlSW5kaWNlcygpIGZpbmFsOwogICAgIGNvbnN0IE1lbW9yeUNvbXBh Y3RMb29rdXBPbmx5Um9iaW5Ib29kSGFzaE1hcDxTdHJpbmcsIFRhYmxlQW5kSW5kZXhQYWlyPiYg ZXhwZWN0ZWRUYWJsZUFuZEluZGV4UXVlcmllcygpIGZpbmFsOwotICAgIGNvbnN0IFZlY3RvcjxT dHJpbmc+JiBzb3J0ZWRUYWJsZXMoKSBmaW5hbDsKKyAgICBTcGFuPGNvbnN0IEFTQ0lJTGl0ZXJh bD4gc29ydGVkVGFibGVzKCkgZmluYWw7CiAKICAgICBWZWN0b3I8U3RyaW5nPiBjb2x1bW5zRm9y VGFibGUoY29uc3QgU3RyaW5nJiB0YWJsZU5hbWUpOwogICAgIHZvaWQgYWRkTWlzc2luZ0NvbHVt blRvVGFibGUoY29uc3QgU3RyaW5nJiB0YWJsZU5hbWUsIGNvbnN0IFN0cmluZyYgY29sdW1uTmFt ZSk7Cg==