191966 2018-11-26 09:07:24 -0800 [PSON] process pre-warming should not be on for everyone 2018-11-26 14:54:58 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson commit-queue ggaren koivisto rniwa oldest_to_newest 1481533 0 cdumez 2018-11-26 09:07:24 -0800 Process pre-warming should not be on for everyone as some clients would not benefit from it and it would be an unnecessary memory cost. 1481534 1 cdumez 2018-11-26 09:07:40 -0800 <rdar://problem/46138499> 1481554 2 achristensen 2018-11-26 09:55:24 -0800 How would we be able to tell which clients would benefit from it? 1481647 3 cdumez 2018-11-26 13:03:14 -0800 (In reply to Alex Christensen from comment #2) > How would we be able to tell which clients would benefit from it? Detailed on the radar but basically, we turn on process prewarming after the first process swap. 1481671 4 355671 cdumez 2018-11-26 13:53:43 -0800 Created attachment 355671 Patch 1481674 5 355671 rniwa 2018-11-26 13:58:36 -0800 Comment on attachment 355671 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=355671&action=review > Source/WebKit/UIProcess/WebProcessPool.cpp:1288 > - if (!configuration().isAutomaticProcessWarmingEnabled()) > + if (!configuration().isAutomaticProcessWarmingEnabled() || !configuration().processSwapsOnNavigation()) But aren't there clients which would benefit from pre-warming without enabling PSON? e.g. for opening multiple WKWebViews? 1481678 6 cdumez 2018-11-26 14:03:14 -0800 (In reply to Ryosuke Niwa from comment #5) > Comment on attachment 355671 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=355671&action=review > > > Source/WebKit/UIProcess/WebProcessPool.cpp:1288 > > - if (!configuration().isAutomaticProcessWarmingEnabled()) > > + if (!configuration().isAutomaticProcessWarmingEnabled() || !configuration().processSwapsOnNavigation()) > > But aren't there clients which would benefit from pre-warming without > enabling PSON? > e.g. for opening multiple WKWebViews? Automatic process prewarming is not currently API, which is why I am adding the heuristic to turn it on automatically when we determine it would be beneficial. Process-Swap on Navigation is not not currently API and *is* enabled by default so clients do get PSON no matter what. They will also get process prewarming if our heuristic determines it would be beneficial. As the change log explains, the reason I made this particular change is because Safari will turn automatic process prewarming on explicitly and rely on the experimental feature flag for PSON support. If PSON is disabled in Safari via experimental features, I think we'd also want to disable automatic process prewarming. 1481679 7 cdumez 2018-11-26 14:06:27 -0800 (In reply to Chris Dumez from comment #6) > (In reply to Ryosuke Niwa from comment #5) > > Comment on attachment 355671 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=355671&action=review > > > > > Source/WebKit/UIProcess/WebProcessPool.cpp:1288 > > > - if (!configuration().isAutomaticProcessWarmingEnabled()) > > > + if (!configuration().isAutomaticProcessWarmingEnabled() || !configuration().processSwapsOnNavigation()) > > > > But aren't there clients which would benefit from pre-warming without > > enabling PSON? > > e.g. for opening multiple WKWebViews? > > Automatic process prewarming is not currently API, which is why I am adding > the heuristic to turn it on automatically when we determine it would be > beneficial. > > Process-Swap on Navigation is not not currently API and *is* enabled by > default so clients do get PSON no matter what. They will also get process > prewarming if our heuristic determines it would be beneficial. > > As the change log explains, the reason I made this particular change is > because Safari will turn automatic process prewarming on explicitly and rely > on the experimental feature flag for PSON support. If PSON is disabled in > Safari via experimental features, I think we'd also want to disable > automatic process prewarming. Note that the reason we support disabling PSON via experimental features is to easily identify if bugs are caused by PSON or not. I think we should include process-prewarming bugs in the same category, thus my proposal to disable process prewarming if PSON is disabled in experimental features. 1481689 8 355671 rniwa 2018-11-26 14:26:41 -0800 Comment on attachment 355671 Patch Okay. Sounds sane to me. 1481696 9 355671 commit-queue 2018-11-26 14:54:56 -0800 Comment on attachment 355671 Patch Clearing flags on attachment: 355671 Committed r238525: <https://trac.webkit.org/changeset/238525> 1481697 10 commit-queue 2018-11-26 14:54:58 -0800 All reviewed patches have been landed. Closing bug. 355671 2018-11-26 13:53:43 -0800 2018-11-26 14:54:56 -0800 Patch bug-191966-20181126135342.patch text/plain 8607 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NDk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA3MTQ0OGQ3YzJlZDlkNmVi MDdlZWE3ODNlZDkwYTgxOTIzNzFiYWEuLjNmZWQ0MmFmYzdhY2U1YjcyNzY2ZjczMmZmODBkYTEz YmE2OWM5ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTgtMTEtMjYgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbUFNPTl0gcHJvY2VzcyBwcmUtd2Fy bWluZyBzaG91bGQgbm90IGJlIG9uIGZvciBldmVyeW9uZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxOTY2CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS80NjEzODQ5OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJZiBhdXRvbWF0aWMgcHJvY2Vzcy1wcmV3YXJtaW5nIGlzIG5vdCBleHBsaWNpdGx5IHR1 cm5lZCBvbi9vZmYgYnkgdGhlIGNsaWVudCwgdGhlbiB3ZSBub3cgb25seQorICAgICAgICB0dXJu IGl0IG9uIGF1dG9tYXRpY2FsbHkgYWZ0ZXIgdGhlIGZpcnN0IHByb2Nlc3Mgc3dhcC4gUHJldmlv dXNseSwgaXQgd2FzIGFsd2F5cyBlbmFibGVkIGlmCisgICAgICAgIHByb2Nlc3Mtc3dhcCBvbiBj cm9zcy1zaXRlIG5hdmlnYXRpb24gd2FzIGVuYWJsZWQgKHdoaWNoIGlzIHRoZSBjYXNlIGJ5IGRl ZmF1bHQgZm9yIGFsbCBhcHBzKS4KKworICAgICAgICBUaGlzIGlzIGltcG9ydGFudCBiZWNhdXNl IHNvbWUgYXBwcyBkbyBub3QgYWN0dWFsbHkgYnJvd3NlIChvbmx5IGRpc3BsYXkgc3RhdGljIGNv bnRlbnQpIG9yIG5ldmVyCisgICAgICAgIGJyb3dzZSBjcm9zcy1zaXRlLCBhbmQgdGh1cyB3b3Vs ZCBub3QgYmVuZWZpdCBmcm9tIHByb2Nlc3MgcHJld2FybWluZyBhbmQgeWV0IHBheSBhIG1lbW9y eSBjb3N0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3Vy YXRpb24uaDoKKyAgICAgICAgQWRkIG1fY2xpZW50V291bGRCZW5lZml0RnJvbUF1dG9tYXRpY1By b2Nlc3NQcmV3YXJtaW5nIGZsYWcgd2hpY2ggaXMgZmFsc2UgYnkgZGVmYXVsdCBhbmQgaXMgdXNl ZAorICAgICAgICBhcyBhIGZhbGxiYWNrIGlmIHRoZSBjbGllbnQgZGlkIG5vdCBjYWxsIHNldElz QXV0b21hdGljUHJvY2Vzc1dhcm1pbmdFbmFibGVkKCkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5jcHA6CisgICAgICAgIChXS0NvbnRleHRD b25maWd1cmF0aW9uUHJld2FybXNQcm9jZXNzZXNBdXRvbWF0aWNhbGx5KToKKyAgICAgICAgKFdL Q29udGV4dENvbmZpZ3VyYXRpb25TZXRQcmV3YXJtc1Byb2Nlc3Nlc0F1dG9tYXRpY2FsbHkpOgor ICAgICAgICBBZGQgQyBBUEkgdG8gdG9nZ2xlIGF1dG9tYXRpYyBwcm9jZXNzIHByZXdhcm1pbmcu IEl0IGlzIG5lZWRlZCBmb3IgU2FmYXJpIHRvIHR1cm4gb24gdGhpcyBmZWF0dXJlCisgICAgICAg IGJ5IGRlZmF1bHQgZm9yIGJyb3dzaW5nLiBUaGlzIHdheSBTYWZhcmkgZG9lcyBub3QgaGF2ZSB0 byB3YWl0IGZvciB0aGUgZmlyc3QgcHJvY2VzcyBzd2FwIHRvCisgICAgICAgIHN0YXJ0IHByZXdh cm1pbmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlv blJlZi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpkaWRSZWFjaEdvb2RUaW1lVG9QcmV3YXJtKToKKyAg ICAgICAgT25seSBkbyBhdXRvbWF0aWMgcHJvY2VzcyBwcmV3YXJtaW5nIGlmIHByb2Nlc3Mtc3dh cCBvbiBjcm9zcy1zaXRlIG5hdmlnYXRpb24gaXMgYWxzbyBlbmFibGVkLgorICAgICAgICBUaGlz IGlzIG5lZWRlZCBmb3IgY2xpZW50cyBsaWtlIFNhZmFyaSB0aGF0IGV4cGxpY2l0bHkgZW5hYmxl IGF1dG9tYXRpYyBwcm9jZXNzIHByZXdhcm1pbmcgYnV0CisgICAgICAgIG9ubHkgd2FudCB0byBo YXZlIGl0IGVuYWJsZWQgaWYgUFNPTiBpcyBhbHNvIGVuYWJsZWQgdmlhIGV4cGVyaW1lbnRhbCBm ZWF0dXJlcy4KKworICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5h dmlnYXRpb24pOgorICAgICAgICBPbiBmaXJzdCBwcm9jZXNzIHN3YXAsIGlmIHRoZSBjbGllbnQg ZGlkIG5vdCBleHBsaWNpdGx5IHR1cm4gb24gb3Igb2ZmIGF1dG9tYXRpYyBwcm9jZXNzIHByZXdh cm1pbmcKKyAgICAgICAgdGhlbiB3ZSBlbmFibGUgaXQgdGhlbi4gVGhpcyBhdm9pZHMgcGF5aW5n IHRoZSBjb3N0IG9mIHByb2Nlc3MgcHJld2FybWluZyBpbiBhcHBzIHRoYXQgd291bGQgbm90Cisg ICAgICAgIGJlbmVmaXQgZnJvbSBpdC4KKwogMjAxOC0xMS0yNiAgQW50dGkgS29pdmlzdG8gIDxh bnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYW4gdXAgbGF5ZXIgdHJlZSBmcmVlemluZyBs b2dpYyBpbiBXZWJQYWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv QVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmgKaW5kZXggMTJiNDcwOGUzNDBlNDdjY2Zk MDIzODRiMGM1ZWYyYzg1N2U1N2QxYi4uMGZiNmNiOWUyNGI5NThkZGQwNDM0MmRmZmM5YWI3NGE0 MTAwM2E5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nl c3NQb29sQ29uZmlndXJhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9B UElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uaApAQCAtNjEsMTIgKzYxLDE1IEBAIHB1YmxpYzoK IAogICAgIGJvb2wgaXNBdXRvbWF0aWNQcm9jZXNzV2FybWluZ0VuYWJsZWQoKSBjb25zdAogICAg IHsKLSAgICAgICAgLy8gRklYTUU6IEZvciBub3csIHR1cm5pbmcgb24gUFNPTiBmcm9tIHRoZSBl eHBlcmltZW50YWwgZmVhdHVyZXMgbWVudSBhbHNvIHR1cm5zIG9uCi0gICAgICAgIC8vIGF1dG9t YXRpYyBwcm9jZXNzIHdhcm1pbmcgdW50aWwgY2xpZW50cyBjYW4gYmUgdXBkYXRlZC4KLSAgICAg ICAgcmV0dXJuIG1faXNBdXRvbWF0aWNQcm9jZXNzV2FybWluZ0VuYWJsZWRCeUNsaWVudC52YWx1 ZV9vcihtX3Byb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbkZyb21FeHBlcmltZW50YWxGZWF0dXJlcyk7 CisgICAgICAgIHJldHVybiBtX2lzQXV0b21hdGljUHJvY2Vzc1dhcm1pbmdFbmFibGVkQnlDbGll bnQudmFsdWVfb3IobV9jbGllbnRXb3VsZEJlbmVmaXRGcm9tQXV0b21hdGljUHJvY2Vzc1ByZXdh cm1pbmcpOwogICAgIH0KKworICAgIGJvb2wgd2FzQXV0b21hdGljUHJvY2Vzc1dhcm1pbmdTZXRC eUNsaWVudCgpIGNvbnN0IHsgcmV0dXJuICEhbV9pc0F1dG9tYXRpY1Byb2Nlc3NXYXJtaW5nRW5h YmxlZEJ5Q2xpZW50OyB9CiAgICAgdm9pZCBzZXRJc0F1dG9tYXRpY1Byb2Nlc3NXYXJtaW5nRW5h YmxlZChib29sIHZhbHVlKSB7IG1faXNBdXRvbWF0aWNQcm9jZXNzV2FybWluZ0VuYWJsZWRCeUNs aWVudCA9IHZhbHVlOyB9CiAKKyAgICBib29sIGNsaWVudFdvdWxkQmVuZWZpdEZyb21BdXRvbWF0 aWNQcm9jZXNzUHJld2FybWluZygpIGNvbnN0IHsgcmV0dXJuIG1fY2xpZW50V291bGRCZW5lZml0 RnJvbUF1dG9tYXRpY1Byb2Nlc3NQcmV3YXJtaW5nOyB9CisgICAgdm9pZCBzZXRDbGllbnRXb3Vs ZEJlbmVmaXRGcm9tQXV0b21hdGljUHJvY2Vzc1ByZXdhcm1pbmcoYm9vbCB2YWx1ZSkgeyBtX2Ns aWVudFdvdWxkQmVuZWZpdEZyb21BdXRvbWF0aWNQcm9jZXNzUHJld2FybWluZyA9IHZhbHVlOyB9 CisKICAgICBib29sIGRpc2tDYWNoZVNwZWN1bGF0aXZlVmFsaWRhdGlvbkVuYWJsZWQoKSBjb25z dCB7IHJldHVybiBtX2Rpc2tDYWNoZVNwZWN1bGF0aXZlVmFsaWRhdGlvbkVuYWJsZWQ7IH0KICAg ICB2b2lkIHNldERpc2tDYWNoZVNwZWN1bGF0aXZlVmFsaWRhdGlvbkVuYWJsZWQoYm9vbCBlbmFi bGVkKSB7IG1fZGlza0NhY2hlU3BlY3VsYXRpdmVWYWxpZGF0aW9uRW5hYmxlZCA9IGVuYWJsZWQ7 IH0KIApAQCAtMjIyLDYgKzIyNSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2Fsd2F5c0tlZXBB bmRSZXVzZVN3YXBwZWRQcm9jZXNzZXMgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9wcm9jZXNzU3dh cHNPbldpbmRvd09wZW5XaXRoT3BlbmVyIHsgZmFsc2UgfTsKICAgICBzdGQ6Om9wdGlvbmFsPGJv b2w+IG1faXNBdXRvbWF0aWNQcm9jZXNzV2FybWluZ0VuYWJsZWRCeUNsaWVudDsKKyAgICBib29s IG1fY2xpZW50V291bGRCZW5lZml0RnJvbUF1dG9tYXRpY1Byb2Nlc3NQcmV3YXJtaW5nIHsgZmFs c2UgfTsKICAgICBXVEY6OlN0cmluZyBtX2N1c3RvbVdlYkNvbnRlbnRTZXJ2aWNlQnVuZGxlSWRl bnRpZmllcjsKICAgICBib29sIG1faXNKSVRFbmFibGVkIHsgdHJ1ZSB9OwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVm LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENvbmZpZ3VyYXRp b25SZWYuY3BwCmluZGV4IGM1YzQ2NjRkNjFhMGI3ODUxZDFkOTg0ODFiZjhiZWUzNWJjMTJiNjcu LjQ5YzcxY2ExOThhMzYyMTgzMGM2NTc5NjYzZjRmYjFlZWZmMTA4OGIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENvbmZpZ3VyYXRp b25SZWYuY3BwCkBAIC0xNjgsNiArMTY4LDE2IEBAIHZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlv blNldFByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbihXS0NvbnRleHRDb25maWd1cmF0aW9uUmVmCiAg ICAgdG9JbXBsKGNvbmZpZ3VyYXRpb24pLT5zZXRQcm9jZXNzU3dhcHNPbk5hdmlnYXRpb24oc3dh cHMpOwogfQogCitib29sIFdLQ29udGV4dENvbmZpZ3VyYXRpb25QcmV3YXJtc1Byb2Nlc3Nlc0F1 dG9tYXRpY2FsbHkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKQorewor ICAgIHJldHVybiB0b0ltcGwoY29uZmlndXJhdGlvbiktPmlzQXV0b21hdGljUHJvY2Vzc1dhcm1p bmdFbmFibGVkKCk7Cit9CisKK3ZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldFByZXdhcm1z UHJvY2Vzc2VzQXV0b21hdGljYWxseShXS0NvbnRleHRDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3Vy YXRpb24sIGJvb2wgcHJld2FybXMpCit7CisgICAgdG9JbXBsKGNvbmZpZ3VyYXRpb24pLT5zZXRJ c0F1dG9tYXRpY1Byb2Nlc3NXYXJtaW5nRW5hYmxlZChwcmV3YXJtcyk7Cit9CisKIGJvb2wgV0tD b250ZXh0Q29uZmlndXJhdGlvbkFsd2F5c0tlZXBBbmRSZXVzZVN3YXBwZWRQcm9jZXNzZXMoV0tD b250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKQogewogICAgIHJldHVybiB0b0lt cGwoY29uZmlndXJhdGlvbiktPmFsd2F5c0tlZXBBbmRSZXVzZVN3YXBwZWRQcm9jZXNzZXMoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENvbmZp Z3VyYXRpb25SZWYuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENv bmZpZ3VyYXRpb25SZWYuaAppbmRleCAwNTgwMTE2ZDRmZTdkMjgzMjAxNTIwZWE2YjViMjIzZTk1 ZTkwMTZmLi4zZmE5YWU5M2NmZTMxZTM3NTU0Mzc1ZDIwYWRhOWMxNTRkYjBkZTI1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9u UmVmLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmln dXJhdGlvblJlZi5oCkBAIC03MSw2ICs3MSw5IEBAIFdLX0VYUE9SVCB2b2lkIFdLQ29udGV4dENv bmZpZ3VyYXRpb25TZXRTaG91bGRDYXB0dXJlQXVkaW9JblVJUHJvY2VzcyhXS0NvbnRleHRDCiBX S19FWFBPUlQgYm9vbCBXS0NvbnRleHRDb25maWd1cmF0aW9uUHJvY2Vzc1N3YXBzT25OYXZpZ2F0 aW9uKFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbik7CiBXS19FWFBPUlQg dm9pZCBXS0NvbnRleHRDb25maWd1cmF0aW9uU2V0UHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uKFdL Q29udGV4dENvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbiwgYm9vbCBzd2Fwcyk7CiAKK1dL X0VYUE9SVCBib29sIFdLQ29udGV4dENvbmZpZ3VyYXRpb25QcmV3YXJtc1Byb2Nlc3Nlc0F1dG9t YXRpY2FsbHkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKTsKK1dLX0VY UE9SVCB2b2lkIFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRQcmV3YXJtc1Byb2Nlc3Nlc0F1dG9t YXRpY2FsbHkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBib29sIHBy ZXdhcm1zKTsKKwogV0tfRVhQT1JUIGJvb2wgV0tDb250ZXh0Q29uZmlndXJhdGlvbkFsd2F5c0tl ZXBBbmRSZXVzZVN3YXBwZWRQcm9jZXNzZXMoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25m aWd1cmF0aW9uKTsKIFdLX0VYUE9SVCB2b2lkIFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRBbHdh eXNLZWVwQW5kUmV1c2VTd2FwcGVkUHJvY2Vzc2VzKFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYg Y29uZmlndXJhdGlvbiwgYm9vbCBrZWVwQW5kUmV1c2UpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKaW5kZXggN2Q0YWMzNzI2M2I1ZDM4MjgwODdjZWM4M2Qy MDgzYzc0M2Q2MDVjNS4uNjY5MTg5MWE1M2M0ZGUzYWE5MjI4ZDNjMmMzYzcwYWJmMTRkZWJhYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAtMTI4NSw3 ICsxMjg1LDcgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cG9zdE1lc3NhZ2VUb0luamVjdGVkQnVu ZGxlKGNvbnN0IFN0cmluZyYgbWVzc2FnZU5hbWUsIEFQSToKIAogdm9pZCBXZWJQcm9jZXNzUG9v bDo6ZGlkUmVhY2hHb29kVGltZVRvUHJld2FybSgpCiB7Ci0gICAgaWYgKCFjb25maWd1cmF0aW9u KCkuaXNBdXRvbWF0aWNQcm9jZXNzV2FybWluZ0VuYWJsZWQoKSkKKyAgICBpZiAoIWNvbmZpZ3Vy YXRpb24oKS5pc0F1dG9tYXRpY1Byb2Nlc3NXYXJtaW5nRW5hYmxlZCgpIHx8ICFjb25maWd1cmF0 aW9uKCkucHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uKCkpCiAgICAgICAgIHJldHVybjsKIAogICAg IGlmIChNZW1vcnlQcmVzc3VyZUhhbmRsZXI6OnNpbmdsZXRvbigpLmlzVW5kZXJNZW1vcnlQcmVz c3VyZSgpKSB7CkBAIC0yMTEzLDYgKzIxMTMsMTMgQEAgUmVmPFdlYlByb2Nlc3NQcm94eT4gV2Vi UHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JOYXZpZ2F0aW9uKFdlYlBhZ2VQcm94eSYgcGFnZSwgY28K IHsKICAgICBhdXRvIHByb2Nlc3MgPSBwcm9jZXNzRm9yTmF2aWdhdGlvbkludGVybmFsKHBhZ2Us IG5hdmlnYXRpb24sIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIHJlYXNvbik7CiAKKyAg ICAvLyBXZSBhcmUgcHJvY2Vzcy1zd2FwcGluZyBzbyBhdXRvbWF0aWMgcHJvY2VzcyBwcmV3YXJt aW5nIHdvdWxkIGJlIGJlbmVmaWNpYWwgaWYgdGhlIGNsaWVudCBoYXMgbm90IGV4cGxpY2l0bHkg ZW5hYmxlZCAvIGRpc2FibGVkIGl0LgorICAgIGJvb2wgZG9pbmdBbkF1dG9tYXRpY1Byb2Nlc3NT d2FwID0gcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCA9PSBQcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50OjpObyAmJiBwcm9jZXNzLnB0cigpICE9ICZwYWdlLnByb2Nlc3MoKTsKKyAgICBp ZiAoZG9pbmdBbkF1dG9tYXRpY1Byb2Nlc3NTd2FwICYmICFjb25maWd1cmF0aW9uKCkud2FzQXV0 b21hdGljUHJvY2Vzc1dhcm1pbmdTZXRCeUNsaWVudCgpICYmICFjb25maWd1cmF0aW9uKCkuY2xp ZW50V291bGRCZW5lZml0RnJvbUF1dG9tYXRpY1Byb2Nlc3NQcmV3YXJtaW5nKCkpIHsKKyAgICAg ICAgUkVMRUFTRV9MT0coUGVyZm9ybWFuY2VMb2dnaW5nLCAiQXV0b21hdGljYWxseSB0dXJuaW5n IG9uIHByb2Nlc3MgcHJld2FybWluZyBiZWNhdXNlIHRoZSBjbGllbnQgd291bGQgYmVuZWZpdCBm cm9tIGl0Iik7CisgICAgICAgIGNvbmZpZ3VyYXRpb24oKS5zZXRDbGllbnRXb3VsZEJlbmVmaXRG cm9tQXV0b21hdGljUHJvY2Vzc1ByZXdhcm1pbmcodHJ1ZSk7CisgICAgfQorCiAgICAgaWYgKG1f Y29uZmlndXJhdGlvbi0+YWx3YXlzS2VlcEFuZFJldXNlU3dhcHBlZFByb2Nlc3NlcygpICYmIHBy b2Nlc3MucHRyKCkgIT0gJnBhZ2UucHJvY2VzcygpKSB7CiAgICAgICAgIHN0YXRpYyBzdGQ6Om9u Y2VfZmxhZyBvbmNlRmxhZzsKICAgICAgICAgc3RkOjpjYWxsX29uY2Uob25jZUZsYWcsIFtdIHsK