191638 2018-11-14 09:31:58 -0800 WebKit.WebsiteDataStoreCustomPaths API test is failing when enabling process prewarming 2018-11-15 08:50:18 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 191634 191693 191572 1 cdumez cdumez achristensen beidson commit-queue ggaren rniwa sihui_liu tsavell webkit-bug-importer oldest_to_newest 1478475 0 cdumez 2018-11-14 09:31:58 -0800 WebKit.WebsiteDataStoreCustomPaths API test is failing when enabling process prewarming. 1478485 1 354824 cdumez 2018-11-14 09:48:33 -0800 Created attachment 354824 Patch 1478623 2 354824 rniwa 2018-11-14 14:21:10 -0800 Comment on attachment 354824 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=354824&action=review > Tools/ChangeLog:13 > + However, process prewarming constructs the default data store and passes it to the > + new WebProcessProxy if WebProcessPool::m_websiteDataStore is null. Hm... wouldn't this affect existing apps that would pre-warm processes? 1478633 3 cdumez 2018-11-14 14:39:39 -0800 (In reply to Ryosuke Niwa from comment #2) > Comment on attachment 354824 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=354824&action=review > > > Tools/ChangeLog:13 > > + However, process prewarming constructs the default data store and passes it to the > > + new WebProcessProxy if WebProcessPool::m_websiteDataStore is null. > > Hm... wouldn't this affect existing apps that would pre-warm processes? What's the big deal about creating the default data store if it does not exist yet? 1478654 4 beidson 2018-11-14 15:13:37 -0800 (In reply to Chris Dumez from comment #3) > (In reply to Ryosuke Niwa from comment #2) > > Comment on attachment 354824 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=354824&action=review > > > > > Tools/ChangeLog:13 > > > + However, process prewarming constructs the default data store and passes it to the > > > + new WebProcessProxy if WebProcessPool::m_websiteDataStore is null. > > > > Hm... wouldn't this affect existing apps that would pre-warm processes? > > What's the big deal about creating the default data store if it does not > exist yet? You can't do it because it's a huge no-no on iOS. 1478662 5 354862 cdumez 2018-11-14 15:38:05 -0800 Created attachment 354862 Patch 1478663 6 cdumez 2018-11-14 15:38:59 -0800 Ok, I implemented an alternative approach which makes sure process prewarming tries to find a suitable data store but never creates the default one when it does not exist. 1478748 7 354862 commit-queue 2018-11-14 19:31:05 -0800 Comment on attachment 354862 Patch Clearing flags on attachment: 354862 Committed r238215: <https://trac.webkit.org/changeset/238215> 1478749 8 commit-queue 2018-11-14 19:31:07 -0800 All reviewed patches have been landed. Closing bug. 1478754 9 webkit-bug-importer 2018-11-14 19:33:31 -0800 <rdar://problem/46084619> 1478907 10 tsavell 2018-11-15 08:23:26 -0800 Looks like the changes in https://trac.webkit.org/changeset/238215/webkit build: https://trac.webkit.org/changeset/238215/webkit has caused two API failures: TestWebKitAPI.WKProcessPool.InitialWarmedProcessUsed /Volumes/Data/slave/sierra-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessPreWarming.mm:62 Value of: [pool _hasPrewarmedWebProcess] Actual: false Expected: true /Volumes/Data/slave/sierra-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessPreWarming.mm:63 Expected equality of these values: 1U Which is: 1 [pool _webPageContentProcessCount] Which is: 0 TestWebKitAPI.WKProcessPool.WarmInitialProcess /Volumes/Data/slave/sierra-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessPreWarming.mm:47 Value of: [pool _hasPrewarmedWebProcess] Actual: false Expected: true 1478911 11 cdumez 2018-11-15 08:35:01 -0800 (In reply to Truitt Savell from comment #10) > Looks like the changes in https://trac.webkit.org/changeset/238215/webkit > > build: > https://trac.webkit.org/changeset/238215/webkit > > has caused two API failures: > > TestWebKitAPI.WKProcessPool.InitialWarmedProcessUsed > > > /Volumes/Data/slave/sierra-release/build/Tools/TestWebKitAPI/Tests/ > WebKitCocoa/ProcessPreWarming.mm:62 > Value of: [pool _hasPrewarmedWebProcess] > Actual: false > Expected: true > > > > /Volumes/Data/slave/sierra-release/build/Tools/TestWebKitAPI/Tests/ > WebKitCocoa/ProcessPreWarming.mm:63 > Expected equality of these values: > 1U > Which is: 1 > [pool _webPageContentProcessCount] > Which is: 0 > > > TestWebKitAPI.WKProcessPool.WarmInitialProcess > > > /Volumes/Data/slave/sierra-release/build/Tools/TestWebKitAPI/Tests/ > WebKitCocoa/ProcessPreWarming.mm:47 > Value of: [pool _hasPrewarmedWebProcess] > Actual: false > Expected: true Will look now, thanks. I believe the test just needs updating. 1478923 12 cdumez 2018-11-15 08:50:18 -0800 (In reply to Chris Dumez from comment #11) > (In reply to Truitt Savell from comment #10) > > Looks like the changes in https://trac.webkit.org/changeset/238215/webkit > > > > build: > > https://trac.webkit.org/changeset/238215/webkit > > > > has caused two API failures: > > > > TestWebKitAPI.WKProcessPool.InitialWarmedProcessUsed > > > > > > /Volumes/Data/slave/sierra-release/build/Tools/TestWebKitAPI/Tests/ > > WebKitCocoa/ProcessPreWarming.mm:62 > > Value of: [pool _hasPrewarmedWebProcess] > > Actual: false > > Expected: true > > > > > > > > /Volumes/Data/slave/sierra-release/build/Tools/TestWebKitAPI/Tests/ > > WebKitCocoa/ProcessPreWarming.mm:63 > > Expected equality of these values: > > 1U > > Which is: 1 > > [pool _webPageContentProcessCount] > > Which is: 0 > > > > > > TestWebKitAPI.WKProcessPool.WarmInitialProcess > > > > > > /Volumes/Data/slave/sierra-release/build/Tools/TestWebKitAPI/Tests/ > > WebKitCocoa/ProcessPreWarming.mm:47 > > Value of: [pool _hasPrewarmedWebProcess] > > Actual: false > > Expected: true > > Will look now, thanks. I believe the test just needs updating. https://bugs.webkit.org/show_bug.cgi?id=191693 Patch coming shortly. 354824 2018-11-14 09:48:33 -0800 2018-11-14 15:38:04 -0800 Patch bug-191638-20181114094832.patch text/plain 3622 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4MTc5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmEyMTk4NTUwYTg3MDI1YWU1Y2QwNDAyMDI0MjkyNzg0 MzI4MTFmYi4uMzQ3MDE5ZGExYTBlMjdkMmY2MjY2NTgyNjMwYTA2YzlmZTBhZDJkZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDE4LTExLTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgV2ViS2l0LldlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocyBBUEkgdGVzdCBpcyBmYWlsaW5n IHdoZW4gZW5hYmxpbmcgcHJvY2VzcyBwcmV3YXJtaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTE2MzgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQuV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBh dGhzIEFQSSB0ZXN0IGRvZXMgc2V2ZXJhbCBvcGVyYXRpb25zIHdpdGggbm9uLWRlZmF1bHQKKyAg ICAgICAgZGF0YSBzdG9yZXMgYW5kIHRoZW4gY2hlY2tzIHRoYXQgdGhlIGRlZmF1bHQgZGF0YSBz dG9yZSB3YXMgbm90IGNyZWF0ZWQgYnkgdGhvc2UKKyAgICAgICAgb3BlcmF0aW9ucy4KKworICAg ICAgICBIb3dldmVyLCBwcm9jZXNzIHByZXdhcm1pbmcgY29uc3RydWN0cyB0aGUgZGVmYXVsdCBk YXRhIHN0b3JlIGFuZCBwYXNzZXMgaXQgdG8gdGhlCisgICAgICAgIG5ldyBXZWJQcm9jZXNzUHJv eHkgaWYgV2ViUHJvY2Vzc1Bvb2w6Om1fd2Vic2l0ZURhdGFTdG9yZSBpcyBudWxsLgorCisgICAg ICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCB1cGRhdGUgdGhpcyB0ZXN0IHNvIHRoYXQgaXQgZGlz YWJsZXMgYXV0b21hdGljIHByb2Nlc3MKKyAgICAgICAgcHJld2FybWluZy4KKworICAgICAgICAq IFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBh dGhzLm1tOgorICAgICAgICAoVEVTVCk6CisKIDIwMTgtMTEtMTQgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQuQXBwbGljYXRpb25NYW5pZmVzdEJhc2lj IEFQSSB0ZXN0IGlzIGZhaWxpbmcgd2hlbiBlbmFibGluZyBQU09OCmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21Q YXRocy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURh dGFTdG9yZUN1c3RvbVBhdGhzLm1tCmluZGV4IDk5NzVjYTc5YjY3OTU1NTg0MWQ4OGJjM2ZlNDkw MzIzZGE1NDM2ZWUuLmUxYmIxZWZmMzg5NDU1OTBkMWI1ODAxZmIzMzgxN2NkMDZmYzBjYWQgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURh dGFTdG9yZUN1c3RvbVBhdGhzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCkBAIC03NSw2ICs3NSwxMSBA QCBzdGF0aWMgV0tTY3JpcHRNZXNzYWdlICpnZXROZXh0TWVzc2FnZSgpCiAKIFRFU1QoV2ViS2l0 LCBXZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMpCiB7CisgICAgYXV0byBwcm9jZXNzUG9vbENv bmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9j XSBpbml0XSk7CisgICAgLy8gRGlzYWJsZSBwcm9jZXNzIHByZXdhcm1pbmcgYXMgaXQgd291bGQg Y3JlYXRlIHRoZSBkZWZhdWx0IGRhdGEgc3RvcmUuCisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uLmdldCgpLnByZXdhcm1zUHJvY2Vzc2VzQXV0b21hdGljYWxseSA9IE5POworICAgIGF1dG8g cHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNzUG9vbCBhbGxvY10gX2luaXRXaXRoQ29u ZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKwogICAgIFJldGFp blB0cjxXZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHNNZXNzYWdlSGFuZGxlcj4gaGFuZGxlciA9 IGFkb3B0TlMoW1tXZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHNNZXNzYWdlSGFuZGxlciBhbGxv Y10gaW5pdF0pOwogICAgIFJldGFpblB0cjxXS1dlYlZpZXdDb25maWd1cmF0aW9uPiBjb25maWd1 cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsK ICAgICBbW2NvbmZpZ3VyYXRpb24gdXNlckNvbnRlbnRDb250cm9sbGVyXSBhZGRTY3JpcHRNZXNz YWdlSGFuZGxlcjpoYW5kbGVyLmdldCgpIG5hbWU6QCJ0ZXN0SGFuZGxlciJdOwpAQCAtMTE4LDYg KzEyMyw3IEBAIFRFU1QoV2ViS2l0LCBXZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMpCiAgICAg d2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uZ2V0KCkuX3Jlc291cmNlTG9hZFN0YXRpc3Rp Y3NEaXJlY3RvcnkgPSByZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGF0aDsKIAogICAgIGNvbmZpZ3Vy YXRpb24uZ2V0KCkud2Vic2l0ZURhdGFTdG9yZSA9IFtbW1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxv Y10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjp3ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5n ZXQoKV0gYXV0b3JlbGVhc2VdOworICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1Bvb2wg PSBwcm9jZXNzUG9vbC5nZXQoKTsKIAogICAgIFJldGFpblB0cjxXS1dlYlZpZXc+IHdlYlZpZXcg PSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwg MCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwogICAgIFt3 ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpoYW5kbGVyLmdldCgpXTsKQEAgLTE3Nyw4ICsx ODMsNiBAQCBURVNUKFdlYktpdCwgV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzKQogICAgIFJl dGFpblB0cjxOU1VSTD4gZmlsZUlEQlBhdGggPSBbaWRiUGF0aCBVUkxCeUFwcGVuZGluZ1BhdGhD b21wb25lbnQ6QCJmaWxlX18wIl07CiAgICAgRVhQRUNUX1RSVUUoW1tOU0ZpbGVNYW5hZ2VyIGRl ZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOmZpbGVJREJQYXRoLmdldCgpLnBhdGhdKTsK IAotICAgIC8vIERhdGEgc3RvcmVzIGNhbid0IGRlbGV0ZSBhbnl0aGluZyB1bmxlc3MgYSBXS1By b2Nlc3NQb29sIGV4aXN0cywgc28gbWFrZSBzdXJlIHRoZSBzaGFyZWQgZGF0YSBzdG9yZSBleGlz dHMuCi0gICAgYXV0byAqcHJvY2Vzc1Bvb2wgPSBbV0tQcm9jZXNzUG9vbCBfc2hhcmVkUHJvY2Vz c1Bvb2xdOwogICAgIFJldGFpblB0cjxXS1dlYnNpdGVEYXRhU3RvcmU+IGRhdGFTdG9yZSA9IFtb V0tXZWJzaXRlRGF0YVN0b3JlIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOndlYnNpdGVE YXRhU3RvcmVDb25maWd1cmF0aW9uLmdldCgpXTsKICAgICBSZXRhaW5QdHI8TlNTZXQ+IHR5cGVz ID0gYWRvcHROUyhbW05TU2V0IGFsbG9jXSBpbml0V2l0aE9iamVjdHM6V0tXZWJzaXRlRGF0YVR5 cGVJbmRleGVkREJEYXRhYmFzZXMsIG5pbF0pOwogCg== 354862 2018-11-14 15:38:05 -0800 2018-11-14 19:31:05 -0800 Patch bug-191638-20181114153805.patch text/plain 8891 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4MjAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFhZTRhNjA3ZTMzM2Q1OWEy NDQzZDI5MmRjYTk4MWU0ZGMwZWEwYjMuLmQ4MjhlZjE0ODRkYmVhNGY4ZTlhNzk2YzcxMzRiNWE4 YjNhNjQxYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTgtMTEtMTQgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXQuV2Vic2l0ZURhdGFTdG9y ZUN1c3RvbVBhdGhzIEFQSSB0ZXN0IGlzIGZhaWxpbmcgd2hlbiBlbmFibGluZyBwcm9jZXNzIHBy ZXdhcm1pbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MTYzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdlYlByb2Nlc3NQb29sOjpwcmV3YXJtUHJvY2VzcygpIHNob3VsZCBub3QgY3JlYXRlIHRoZSBk ZWZhdWx0IFdlYlNpdGUgRGF0YSBTdG9yZSBpZiBpdAorICAgICAgICBkb2VzIG5vdCBleGlzdCB5 ZXQuIFRoaXMgaXMgYmFkIGZvciBtZW1vcnkgY29uc3VtcHRpb24gYW5kIGl0IGlzIHdoYXQgd2Fz IGNhdXNpbmcgdGhpcworICAgICAgICBBUEkgdGVzdCB0byBmYWlsLgorCisgICAgICAgIFdlYlBy b2Nlc3NQb29sOjpwcmV3YXJtUHJvY2VzcygpIG5vdyB0cmllcyB0byB1c2UgdGhlIGZvbGxvd2lu ZyBkYXRhIHN0b3JlcyBpbiB0aGlzCisgICAgICAgIG9yZGVyIG9mIHByZWZlcmVuY2U6CisgICAg ICAgIDEuIFdlYlByb2Nlc3NQb29sOjptX3dlYnNpdGVEYXRhU3RvcmUgKGFrYSB0aGlzIHByb2Nl c3MgcG9vbCdzIHByaW1hcnkgZGF0YSBzdG9yZSkKKyAgICAgICAgMi4gVGhlIGRhdGEgc3RvcmUg b2YgdGhlIGxhc3QgV2ViUHJvY2Vzc1Byb3h5IHRoYXQgd2FzIGNyZWF0ZWQKKyAgICAgICAgMy4g VGhlIGRlZmF1bHQgZGF0YSBzdG9yZSBpZiBpdCBleGlzdHMKKworICAgICAgICBJZiBubyBzdWl0 YWJsZSBkYXRhIHN0b3JlIGlzIGZvdW5kLCB3ZSBjYW5jZWwgdGhlIHByb2Nlc3MgcHJld2FybWlu ZyBhbmQgbG9nIGEgY29uc29sZQorICAgICAgICBtZXNzYWdlIGluc3RlYWQuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzUG9vbDo6cHJld2FybVByb2Nlc3MpOgorCiAyMDE4LTExLTE0ICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBhdHRlbXB0ZWQgd2lu Y2Fpcm8gYnVpbGQgZml4IGFmdGVyIDIzODE5Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQb29sLmNwcAppbmRleCBjODJhZmNmMzVhMjI0OWRlMDAyMDlkNDVjYzQwZDZmMzky N2YwZDMzLi5kOTJmNDJlNGM5NTMzYjZjNDRlZGY5MTNhZGZmOWM2MTMxMTNiNmE0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC05NTUsMTIgKzk1NSwy MSBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpwcmV3YXJtUHJvY2VzcygpCiAgICAgaWYgKG1fcHJl d2FybWVkUHJvY2VzcykKICAgICAgICAgcmV0dXJuOwogCi0gICAgYXV0byogd2Vic2l0ZURhdGFT dG9yZSA9IG1fd2Vic2l0ZURhdGFTdG9yZS5nZXQoKTsKLSAgICBpZiAoIXdlYnNpdGVEYXRhU3Rv cmUpCi0gICAgICAgIHdlYnNpdGVEYXRhU3RvcmUgPSBBUEk6OldlYnNpdGVEYXRhU3RvcmU6OmRl ZmF1bHREYXRhU3RvcmUoKS5wdHIoKTsKKyAgICBhdXRvKiB3ZWJzaXRlRGF0YVN0b3JlID0gbV93 ZWJzaXRlRGF0YVN0b3JlID8gJm1fd2Vic2l0ZURhdGFTdG9yZS0+d2Vic2l0ZURhdGFTdG9yZSgp IDogbnVsbHB0cjsKKyAgICBpZiAoIXdlYnNpdGVEYXRhU3RvcmUpIHsKKyAgICAgICAgaWYgKCFt X3Byb2Nlc3Nlcy5pc0VtcHR5KCkpCisgICAgICAgICAgICB3ZWJzaXRlRGF0YVN0b3JlID0gJm1f cHJvY2Vzc2VzLmxhc3QoKS0+d2Vic2l0ZURhdGFTdG9yZSgpOworICAgICAgICBlbHNlIGlmIChB UEk6OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmVFeGlzdHMoKSkKKyAgICAgICAg ICAgIHdlYnNpdGVEYXRhU3RvcmUgPSAmQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0 YVN0b3JlKCktPndlYnNpdGVEYXRhU3RvcmUoKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAg ICBSRUxFQVNFX0xPRyhQZXJmb3JtYW5jZUxvZ2dpbmcsICJVbmFibGUgdG8gcHJld2FybWluZyBh IFdlYlByb2Nlc3MgYmVjYXVzZSB3ZSBjb3VsZCBub3QgZmluZCBhIHVzYWJsZSBkYXRhIHN0b3Jl Iik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICB9CisgICAgQVNTRVJUKHdl YnNpdGVEYXRhU3RvcmUpOwogCiAgICAgUkVMRUFTRV9MT0coUGVyZm9ybWFuY2VMb2dnaW5nLCAi UHJld2FybWluZyBhIFdlYlByb2Nlc3MgZm9yIHBlcmZvcm1hbmNlIik7Ci0gICAgY3JlYXRlTmV3 V2ViUHJvY2Vzcyh3ZWJzaXRlRGF0YVN0b3JlLT53ZWJzaXRlRGF0YVN0b3JlKCksIFdlYlByb2Nl c3NQcm94eTo6SXNQcmV3YXJtZWQ6Olllcyk7CisgICAgY3JlYXRlTmV3V2ViUHJvY2Vzcygqd2Vi c2l0ZURhdGFTdG9yZSwgV2ViUHJvY2Vzc1Byb3h5OjpJc1ByZXdhcm1lZDo6WWVzKTsKIH0KIAog dm9pZCBXZWJQcm9jZXNzUG9vbDo6ZW5hYmxlUHJvY2Vzc1Rlcm1pbmF0aW9uKCkKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4YzUzNWM3ZmY2MzA3 Yzk1NWZhOTc3MTIxMzA0ODhlNGFhODhjZTk2Li4yMTkxNDhiNDEwZWJiMjdmOGY5ZGM0NjhjMWE0 ODFiMDcwN2U2ZGJkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTgtMTEtMTQgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXQuV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhz IEFQSSB0ZXN0IGlzIGZhaWxpbmcgd2hlbiBlbmFibGluZyBwcm9jZXNzIHByZXdhcm1pbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTYzOAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBBUEkgdGVz dCBjb3ZlcmFnZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tOgorICAgICAgICAocnVuV2Vic2l0ZURhdGFT dG9yZUN1c3RvbVBhdGhzKToKKyAgICAgICAgKFRFU1QpOgorCiAyMDE4LTExLTE0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIFNQSSB0 byBzaG93IGEgc2FmZSBicm93c2luZyB3YXJuaW5nCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbSBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1 c3RvbVBhdGhzLm1tCmluZGV4IDk5NzVjYTc5YjY3OTU1NTg0MWQ4OGJjM2ZlNDkwMzIzZGE1NDM2 ZWUuLmYxZDhhYTUxYWU2NWMyMjA2YjdlMThhNGQzNjYyY2UwNWVhY2E4NmMgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1 c3RvbVBhdGhzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCkBAIC03Myw4ICs3MywxNCBAQCBzdGF0aWMg V0tTY3JpcHRNZXNzYWdlICpnZXROZXh0TWVzc2FnZSgpCiAgICAgcmV0dXJuIFtbc2NyaXB0TWVz c2FnZXMudGFrZUZpcnN0KCkgcmV0YWluXSBhdXRvcmVsZWFzZV07CiB9CiAKLVRFU1QoV2ViS2l0 LCBXZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMpCitlbnVtIGNsYXNzIFNob3VsZEVuYWJsZVBy b2Nlc3NQcmV3YXJtaW5nIHsgTm8sIFllcyB9OworCitzdGF0aWMgdm9pZCBydW5XZWJzaXRlRGF0 YVN0b3JlQ3VzdG9tUGF0aHMoU2hvdWxkRW5hYmxlUHJvY2Vzc1ByZXdhcm1pbmcgc2hvdWxkRW5h YmxlUHJvY2Vzc1ByZXdhcm1pbmcpCiB7CisgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRp b24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7 CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByZXdhcm1zUHJvY2Vzc2VzQXV0 b21hdGljYWxseSA9IHNob3VsZEVuYWJsZVByb2Nlc3NQcmV3YXJtaW5nID09IFNob3VsZEVuYWJs ZVByb2Nlc3NQcmV3YXJtaW5nOjpZZXMgPyBZRVMgOiBOTzsKKyAgICBhdXRvIHByb2Nlc3NQb29s ID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246 cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpXSk7CisKICAgICBSZXRhaW5QdHI8V2Vic2l0 ZURhdGFTdG9yZUN1c3RvbVBhdGhzTWVzc2FnZUhhbmRsZXI+IGhhbmRsZXIgPSBhZG9wdE5TKFtb V2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzTWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsK ICAgICBSZXRhaW5QdHI8V0tXZWJWaWV3Q29uZmlndXJhdGlvbj4gY29uZmlndXJhdGlvbiA9IGFk b3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CiAgICAgW1tjb25m aWd1cmF0aW9uIHVzZXJDb250ZW50Q29udHJvbGxlcl0gYWRkU2NyaXB0TWVzc2FnZUhhbmRsZXI6 aGFuZGxlci5nZXQoKSBuYW1lOkAidGVzdEhhbmRsZXIiXTsKQEAgLTExOCw2ICsxMjQsNyBAQCBU RVNUKFdlYktpdCwgV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzKQogICAgIHdlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uLmdldCgpLl9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5 ID0gcmVzb3VyY2VMb2FkU3RhdGlzdGljc1BhdGg7CiAKICAgICBjb25maWd1cmF0aW9uLmdldCgp LndlYnNpdGVEYXRhU3RvcmUgPSBbW1tXS1dlYnNpdGVEYXRhU3RvcmUgYWxsb2NdIF9pbml0V2l0 aENvbmZpZ3VyYXRpb246d2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uZ2V0KCldIGF1dG9y ZWxlYXNlXTsKKyAgICBjb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NQb29sID0gcHJvY2Vzc1Bv b2wuZ2V0KCk7CiAKICAgICBSZXRhaW5QdHI8V0tXZWJWaWV3PiB3ZWJWaWV3ID0gYWRvcHROUyhb W1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAw KSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKICAgICBbd2ViVmlldyBzZXRO YXZpZ2F0aW9uRGVsZWdhdGU6aGFuZGxlci5nZXQoKV07CkBAIC0xNzcsOCArMTg0LDYgQEAgVEVT VChXZWJLaXQsIFdlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocykKICAgICBSZXRhaW5QdHI8TlNV Ukw+IGZpbGVJREJQYXRoID0gW2lkYlBhdGggVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAi ZmlsZV9fMCJdOwogICAgIEVYUEVDVF9UUlVFKFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdl cl0gZmlsZUV4aXN0c0F0UGF0aDpmaWxlSURCUGF0aC5nZXQoKS5wYXRoXSk7CiAKLSAgICAvLyBE YXRhIHN0b3JlcyBjYW4ndCBkZWxldGUgYW55dGhpbmcgdW5sZXNzIGEgV0tQcm9jZXNzUG9vbCBl eGlzdHMsIHNvIG1ha2Ugc3VyZSB0aGUgc2hhcmVkIGRhdGEgc3RvcmUgZXhpc3RzLgotICAgIGF1 dG8gKnByb2Nlc3NQb29sID0gW1dLUHJvY2Vzc1Bvb2wgX3NoYXJlZFByb2Nlc3NQb29sXTsKICAg ICBSZXRhaW5QdHI8V0tXZWJzaXRlRGF0YVN0b3JlPiBkYXRhU3RvcmUgPSBbW1dLV2Vic2l0ZURh dGFTdG9yZSBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjp3ZWJzaXRlRGF0YVN0b3JlQ29u ZmlndXJhdGlvbi5nZXQoKV07CiAgICAgUmV0YWluUHRyPE5TU2V0PiB0eXBlcyA9IGFkb3B0TlMo W1tOU1NldCBhbGxvY10gaW5pdFdpdGhPYmplY3RzOldLV2Vic2l0ZURhdGFUeXBlSW5kZXhlZERC RGF0YWJhc2VzLCBuaWxdKTsKIApAQCAtMTg2LDE3ICsxOTEsMTcgQEAgVEVTVChXZWJLaXQsIFdl YnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocykKICAgICBSZXRhaW5QdHI8TlNVUkw+IHVybDEgPSBb W05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAiSW5kZXhlZERCIiB3aXRoRXh0 ZW5zaW9uOkAic3FsaXRlMyIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMi XTsKICAgICBSZXRhaW5QdHI8TlNVUkw+IHVybDIgPSBbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVS TEZvclJlc291cmNlOkAiSW5kZXhlZERCIiB3aXRoRXh0ZW5zaW9uOkAic3FsaXRlMy1zaG0iIHN1 YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl07CiAgICAgUmV0YWluUHRyPE5T VVJMPiB1cmwzID0gW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAIkluZGV4 ZWREQiIgd2l0aEV4dGVuc2lvbjpAInNxbGl0ZTMtd2FsIiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2Vi S2l0QVBJLnJlc291cmNlcyJdOwotICAgIAorCiAgICAgUmV0YWluUHRyPE5TVVJMPiBmcmFtZUlE QlBhdGggPSBbW2ZpbGVJREJQYXRoIFVSTEJ5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAImh0dHBz X2FwcGxlLmNvbV8wIl0gVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiV2Vic2l0ZURhdGFT dG9yZUN1c3RvbVBhdGhzIl07CiAgICAgW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBj cmVhdGVEaXJlY3RvcnlBdFVSTDpmcmFtZUlEQlBhdGguZ2V0KCkgd2l0aEludGVybWVkaWF0ZURp cmVjdG9yaWVzOllFUyBhdHRyaWJ1dGVzOm5pbCBlcnJvcjpuaWxdOwotICAgIAorCiAgICAgW1tO U0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBjb3B5SXRlbUF0VVJMOnVybDEuZ2V0KCkgdG9V Ukw6W2ZyYW1lSURCUGF0aC5nZXQoKSBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJJbmRl eGVkREIuc3FsaXRlMyJdIGVycm9yOm5pbF07CiAgICAgW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRN YW5hZ2VyXSBjb3B5SXRlbUF0VVJMOnVybDIuZ2V0KCkgdG9VUkw6W2ZyYW1lSURCUGF0aC5nZXQo KSBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJJbmRleGVkREIuc3FsaXRlMy1zaG0iXSBl cnJvcjpuaWxdOwogICAgIFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gY29weUl0ZW1B dFVSTDp1cmwzLmdldCgpIHRvVVJMOltmcmFtZUlEQlBhdGguZ2V0KCkgVVJMQnlBcHBlbmRpbmdQ YXRoQ29tcG9uZW50OkAiSW5kZXhlZERCLnNxbGl0ZTMtd2FsIl0gZXJyb3I6bmlsXTsKLSAgICAK KwogICAgIFJldGFpblB0cjxOU1VSTD4gZnJhbWVJREJQYXRoMiA9IFtbZmlsZUlEQlBhdGggVVJM QnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiaHR0cHNfd2Via2l0Lm9yZ18wIl0gVVJMQnlBcHBl bmRpbmdQYXRoQ29tcG9uZW50OkAiV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzIl07CiAgICAg W1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBjcmVhdGVEaXJlY3RvcnlBdFVSTDpmcmFt ZUlEQlBhdGgyLmdldCgpIHdpdGhJbnRlcm1lZGlhdGVEaXJlY3RvcmllczpZRVMgYXR0cmlidXRl czpuaWwgZXJyb3I6bmlsXTsKLSAgICAKKwogICAgIFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFu YWdlcl0gY29weUl0ZW1BdFVSTDp1cmwxLmdldCgpIHRvVVJMOltmcmFtZUlEQlBhdGgyLmdldCgp IFVSTEJ5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIkluZGV4ZWREQi5zcWxpdGUzIl0gZXJyb3I6 bmlsXTsKICAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGNvcHlJdGVtQXRVUkw6 dXJsMi5nZXQoKSB0b1VSTDpbZnJhbWVJREJQYXRoMi5nZXQoKSBVUkxCeUFwcGVuZGluZ1BhdGhD b21wb25lbnQ6QCJJbmRleGVkREIuc3FsaXRlMy1zaG0iXSBlcnJvcjpuaWxdOwogICAgIFtbTlNG aWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gY29weUl0ZW1BdFVSTDp1cmwzLmdldCgpIHRvVVJM OltmcmFtZUlEQlBhdGgyLmdldCgpIFVSTEJ5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIkluZGV4 ZWREQi5zcWxpdGUzLXdhbCJdIGVycm9yOm5pbF07CkBAIC0yNjIsNiArMjY3LDE2IEBAIFRFU1Qo V2ViS2l0LCBXZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMpCiAgICAgRVhQRUNUX0ZBTFNFKFtX S1dlYnNpdGVEYXRhU3RvcmUgX2RlZmF1bHREYXRhU3RvcmVFeGlzdHNdKTsKIH0KIAorVEVTVChX ZWJLaXQsIFdlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRoc1dpdGhvdXRQcmV3YXJtaW5nKQorewor ICAgIHJ1bldlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocyhTaG91bGRFbmFibGVQcm9jZXNzUHJl d2FybWluZzo6Tm8pOworfQorCitURVNUKFdlYktpdCwgV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBh dGhzV2l0aFByZXdhcm1pbmcpCit7CisgICAgcnVuV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhz KFNob3VsZEVuYWJsZVByb2Nlc3NQcmV3YXJtaW5nOjpZZXMpOworfQorCiBURVNUKFdlYktpdCwg Q3VzdG9tRGF0YVN0b3JlUGF0aHNWZXJzdXNDb21wbGV0aW9uSGFuZGxlcnMpCiB7CiAgICAgLy8g Q29weSB0aGUgYmFrZWQgZGF0YWJhc2UgZmlsZXMgdG8gdGhlIGRhdGFiYXNlIGRpcmVjdG9yeQo=