153880 2016-02-04 11:45:17 -0800 Web Inspector: Give nested inspectors their own process pool 2016-02-04 13:02:34 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck andersca bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1162095 0 joepeck 2016-02-04 11:45:17 -0800 * SUMMARY Give nested inspectors their own process pool. When inspecting the inspector, in order for profiling information to be useful the inspector¹ and inspector² should be in separate processes (or at least not share the same VM). When sampling I was seeing JavaScript running in both inspectors in the sample, because they were sharing the same process and VM. 1162096 1 webkit-bug-importer 2016-02-04 11:46:29 -0800 <rdar://problem/24508310> 1162100 2 270676 joepeck 2016-02-04 11:50:39 -0800 Created attachment 270676 [PATCH] Proposed Fix We could create a Vector for pools per level, but I think just 2 pools is fine for now. Needs a WK2 Owner nod. 1162102 3 270676 timothy 2016-02-04 11:56:49 -0800 Comment on attachment 270676 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=270676&action=review > Source/WebKit2/UIProcess/WebInspectorProxy.cpp:314 > + WebProcessPool* pool = inspectionLevel == 1 ? s_mainInspectorProcessPool : s_nestedInspectorProcessPool; I think this needs to be a reference or a ** to make the later assignment work right. As it stands, I suspect this makes a new pool each time and s_mainInspectorProcessPool / s_nestedInspectorProcessPool are always null. 1162116 4 270683 joepeck 2016-02-04 12:12:22 -0800 Created attachment 270683 [PATCH] Proposed Fix 1162140 5 270683 commit-queue 2016-02-04 13:02:31 -0800 Comment on attachment 270683 [PATCH] Proposed Fix Clearing flags on attachment: 270683 Committed r196142: <http://trac.webkit.org/changeset/196142> 1162141 6 commit-queue 2016-02-04 13:02:34 -0800 All reviewed patches have been landed. Closing bug. 270676 2016-02-04 11:50:39 -0800 2016-02-04 12:13:28 -0800 [PATCH] Proposed Fix nested-inspector.patch text/plain 6368 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3OTc0OTA5Li41Y2ZiNjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTYtMDItMDQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBHaXZlIG5lc3RlZCBpbnNwZWN0b3JzIHRoZWlyIG93biBw cm9jZXNzIHBvb2wKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1Mzg4MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjQ1MDgzMTA+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBpbnNwZWN0aW5nIHRo ZSBpbnNwZWN0b3IgYm90aCBpbnNwZWN0b3JzIHdlcmUgdXNpbmcgdGhlIHNhbWUKKyAgICAgICAg SW5zcGVjdG9yIHByb2Nlc3MgYW5kIHNoYXJpbmcgdGhlIHNhbWUgVk0uIFRoaXMgbWVhbnQgdGhh dCBwcm9maWxpbmcKKyAgICAgICAgaW5mb3JtYXRpb24gd2FzIGNvbmZ1c2luZyAobWVtb3J5IGFu ZCBKYXZhU2NyaXB0IHNhbXBsaW5nKSBiZWNhdXNlCisgICAgICAgIGl0IHdhcyBzaG93aW5nIGRh dGEgYWJvdXQgYm90aCBpbnNwZWN0b3JzIHNoYXJpbmcgdGhlIHNhbWUgcHJvY2Vzcy4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JQcm9jZXNzUG9vbCk6CisgICAgICAgIChXZWJL aXQ6OldlYkluc3BlY3RvclByb3h5Ojppc0luc3BlY3RvclByb2Nlc3NQb29sKToKKyAgICAgICAg SGF2ZSB0d28gcHJvY2VzcyBwb29scy4gVGhlIG1haW4gaW5zcGVjdG9yIHByb2Nlc3MgcG9vbCAo MXN0IGxldmVsIGluc3BlY3RvcnMpCisgICAgICAgIGFuZCBhIG5lc3RlZCBpbnNwZWN0b3IgcHJv Y2VzcyBwb29sIChpbnNwZWN0aW5nIHRoZSBpbnNwZWN0b3IsIG9ubHkgZXhwZWN0ZWQKKyAgICAg ICAgYnkgV2ViS2l0IGRldmVsb3BlcnMpLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkluc3Bl Y3RvclByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9XZWJJbnNwZWN0b3JQcm94eUVm bC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybUNyZWF0 ZUluc3BlY3RvclBhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJv eHlHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1D cmVhdGVJbnNwZWN0b3JQYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkluc3BlY3Rv clByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZv cm1DcmVhdGVJbnNwZWN0b3JQYWdlKToKKyAgICAgICAgUGFzcyB0aGUgaW5zcGVjdGlvbkxldmVs IHRvIGRldGVybWluZSB0aGUgYXBwcm9wcmlhdGUgcG9vbCB0byB1c2UuCisKIDIwMTYtMDItMDIg IEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBV c2UgcHJvcG9zZWQgY3JlZGVudGlhbHMgaW4gYXV0aGVudGljYXRpb24gY2hhbGxlbmdlcyB3aXRo IE5ldHdvcmtTZXNzaW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi SW5zcGVjdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3Rv clByb3h5LmNwcAppbmRleCBjNjQzM2ViLi4yNmEwODUyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCkBAIC0zMDQsMjYgKzMwNCwyNSBAQCB2 b2lkIFdlYkluc3BlY3RvclByb3h5Ojp0b2dnbGVQYWdlUHJvZmlsaW5nKCkKICAgICBtX2lzUHJv ZmlsaW5nUGFnZSA9ICFtX2lzUHJvZmlsaW5nUGFnZTsKIH0KIAotc3RhdGljIFdlYlByb2Nlc3NQ b29sKiBzX3Byb2Nlc3NQb29sOworc3RhdGljIFdlYlByb2Nlc3NQb29sKiBzX21haW5JbnNwZWN0 b3JQcm9jZXNzUG9vbDsKK3N0YXRpYyBXZWJQcm9jZXNzUG9vbCogc19uZXN0ZWRJbnNwZWN0b3JQ cm9jZXNzUG9vbDsKIAotV2ViUHJvY2Vzc1Bvb2wmIFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0 b3JQcm9jZXNzUG9vbCgpCitXZWJQcm9jZXNzUG9vbCYgV2ViSW5zcGVjdG9yUHJveHk6Omluc3Bl Y3RvclByb2Nlc3NQb29sKHVuc2lnbmVkIGluc3BlY3Rpb25MZXZlbCkKIHsKICAgICAvLyBIYXZp bmcgb3VyIG93biBwcm9jZXNzIHBvb2wgcmVtb3ZlcyB1cyBmcm9tIHRoZSBtYWluIHByb2Nlc3Mg cG9vbCBhbmQKICAgICAvLyBndWFyYW50ZWVzIG5vIHByb2Nlc3Mgc2hhcmluZyBmb3Igb3VyIHVz ZXIgaW50ZXJmYWNlLgotICAgIGlmICghc19wcm9jZXNzUG9vbCkgeworICAgIFdlYlByb2Nlc3NQ b29sKiBwb29sID0gaW5zcGVjdGlvbkxldmVsID09IDEgPyBzX21haW5JbnNwZWN0b3JQcm9jZXNz UG9vbCA6IHNfbmVzdGVkSW5zcGVjdG9yUHJvY2Vzc1Bvb2w7CisgICAgaWYgKCFwb29sKSB7CiAg ICAgICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IEFQSTo6UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u OjpjcmVhdGVXaXRoTGVnYWN5T3B0aW9ucygpOwotICAgICAgICBzX3Byb2Nlc3NQb29sID0gJldl YlByb2Nlc3NQb29sOjpjcmVhdGUoY29uZmlndXJhdGlvbi5nZXQoKSkubGVha1JlZigpOwotICAg IH07Ci0KLSAgICByZXR1cm4gKnNfcHJvY2Vzc1Bvb2w7CisgICAgICAgIHBvb2wgPSAmV2ViUHJv Y2Vzc1Bvb2w6OmNyZWF0ZShjb25maWd1cmF0aW9uLmdldCgpKS5sZWFrUmVmKCk7CisgICAgfQor ICAgIHJldHVybiAqcG9vbDsKIH0KIAogYm9vbCBXZWJJbnNwZWN0b3JQcm94eTo6aXNJbnNwZWN0 b3JQcm9jZXNzUG9vbChXZWJQcm9jZXNzUG9vbCYgcHJvY2Vzc1Bvb2wpCiB7Ci0gICAgaWYgKCFz X3Byb2Nlc3NQb29sKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICByZXR1cm4gc19wcm9j ZXNzUG9vbCA9PSAmcHJvY2Vzc1Bvb2w7CisgICAgcmV0dXJuIChzX21haW5JbnNwZWN0b3JQcm9j ZXNzUG9vbCAmJiBzX21haW5JbnNwZWN0b3JQcm9jZXNzUG9vbCA9PSAmcHJvY2Vzc1Bvb2wpCisg ICAgICAgIHx8IChzX25lc3RlZEluc3BlY3RvclByb2Nlc3NQb29sICYmIHNfbmVzdGVkSW5zcGVj dG9yUHJvY2Vzc1Bvb2wgPT0gJnByb2Nlc3NQb29sKTsKIH0KIAogYm9vbCBXZWJJbnNwZWN0b3JQ cm94eTo6aXNJbnNwZWN0b3JQYWdlKFdlYlBhZ2VQcm94eSYgd2ViUGFnZSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmgKaW5kZXggMmQwZjU5MS4uY2ZmYTI2 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5 LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmgKQEAg LTE1Myw3ICsxNTMsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGV4cGxpY2l0IFdlYkluc3Bl Y3RvclByb3h5KFdlYlBhZ2VQcm94eSopOwogCi0gICAgc3RhdGljIFdlYlByb2Nlc3NQb29sJiBp bnNwZWN0b3JQcm9jZXNzUG9vbCgpOworICAgIHN0YXRpYyBXZWJQcm9jZXNzUG9vbCYgaW5zcGVj dG9yUHJvY2Vzc1Bvb2wodW5zaWduZWQgaW5zcGVjdGlvbkxldmVsKTsKIAogICAgIHZvaWQgZWFn ZXJseUNyZWF0ZUluc3BlY3RvclBhZ2UoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2VmbC9XZWJJbnNwZWN0b3JQcm94eUVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclByb3h5RWZsLmNwcAppbmRleCBmYmZkMGZiLi4yMTMy MjQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3BlY3Rv clByb3h5RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3Bl Y3RvclByb3h5RWZsLmNwcApAQCAtMTA2LDcgKzEwNiw3IEBAIFdlYlBhZ2VQcm94eSogV2ViSW5z cGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlSW5zcGVjdG9yUGFnZSgpCiAgICAgaWYgKCFtX2lu c3BlY3RvcldpbmRvdykKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBXS0NvbnRleHRSZWYgd2tD b250ZXh0ID0gdG9BUEkoJmluc3BlY3RvclByb2Nlc3NQb29sKCkpOworICAgIFdLQ29udGV4dFJl ZiB3a0NvbnRleHQgPSB0b0FQSSgmaW5zcGVjdG9yUHJvY2Vzc1Bvb2woaW5zcGVjdGlvbkxldmVs KCkpKTsKICAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gd2tHcm91cElkZW50aWZpZXIgPSBh ZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGluc3BlY3RvclBhZ2VHcm91cElk ZW50aWZpZXIoKS51dGY4KCkuZGF0YSgpKSk7CiAgICAgV0tQYWdlR3JvdXBSZWYgd2tQYWdlR3Jv dXAgPSBXS1BhZ2VHcm91cENyZWF0ZVdpdGhJZGVudGlmaWVyKHdrR3JvdXBJZGVudGlmaWVyLmdl dCgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJJbnNw ZWN0b3JQcm94eUd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkluc3Bl Y3RvclByb3h5R3RrLmNwcAppbmRleCA5MDdkMzRhLi4wN2UxM2ZkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcApAQCAt ODAsNyArODAsNyBAQCBXZWJQYWdlUHJveHkqIFdlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybUNy ZWF0ZUluc3BlY3RvclBhZ2UoKQogICAgIFJlZlB0cjxXZWJQYWdlR3JvdXA+IHBhZ2VHcm91cCA9 IFdlYlBhZ2VHcm91cDo6Y3JlYXRlKGluc3BlY3RvclBhZ2VHcm91cElkZW50aWZpZXIoKSwgZmFs c2UsIGZhbHNlKTsKIAogICAgIGF1dG8gcGFnZUNvbmZpZ3VyYXRpb24gPSBBUEk6OlBhZ2VDb25m aWd1cmF0aW9uOjpjcmVhdGUoKTsKLSAgICBwYWdlQ29uZmlndXJhdGlvbi0+c2V0UHJvY2Vzc1Bv b2woJmluc3BlY3RvclByb2Nlc3NQb29sKCkpOworICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRQ cm9jZXNzUG9vbCgmaW5zcGVjdG9yUHJvY2Vzc1Bvb2woaW5zcGVjdGlvbkxldmVsKCkpKTsKICAg ICBwYWdlQ29uZmlndXJhdGlvbi0+c2V0UHJlZmVyZW5jZXMocHJlZmVyZW5jZXMuZ2V0KCkpOwog ICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRQYWdlR3JvdXAocGFnZUdyb3VwLmdldCgpKTsKICAg ICBtX2luc3BlY3RvclZpZXcgPSBHVEtfV0lER0VUKHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlKCpw YWdlQ29uZmlndXJhdGlvbi5wdHIoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvV2ViSW5zcGVjdG9yUHJveHlNYWMubW0KaW5kZXggZTEyNDcwMy4uNzYwYjcyNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94 eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclBy b3h5TWFjLm1tCkBAIC0zNzUsNyArMzc1LDcgQEAgV2ViUGFnZVByb3h5KiBXZWJJbnNwZWN0b3JQ cm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdlKCkKICAgICAgICAgcHJlZmVyZW5jZXMu X3BhZ2VWaXNpYmlsaXR5QmFzZWRQcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkID0gTk87CiAgICAg fQogCi0gICAgW2NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6IDo6V2ViS2l0Ojp3cmFwcGVy KGluc3BlY3RvclByb2Nlc3NQb29sKCkpXTsKKyAgICBbY29uZmlndXJhdGlvbiBzZXRQcm9jZXNz UG9vbDogOjpXZWJLaXQ6OndyYXBwZXIoaW5zcGVjdG9yUHJvY2Vzc1Bvb2woaW5zcGVjdGlvbkxl dmVsKCkpKV07CiAgICAgW2NvbmZpZ3VyYXRpb24gX3NldEdyb3VwSWRlbnRpZmllcjppbnNwZWN0 b3JQYWdlR3JvdXBJZGVudGlmaWVyKCldOwogCiAgICAgbV9pbnNwZWN0b3JWaWV3ID0gYWRvcHRO UyhbW1dLV2ViSW5zcGVjdG9yV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOmluaXRpYWxS ZWN0IGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwo= 270683 2016-02-04 12:12:22 -0800 2016-02-04 13:02:31 -0800 [PATCH] Proposed Fix nested-v2.patch text/plain 6368 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3OTc0OTA5Li41Y2ZiNjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTYtMDItMDQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBHaXZlIG5lc3RlZCBpbnNwZWN0b3JzIHRoZWlyIG93biBw cm9jZXNzIHBvb2wKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1Mzg4MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjQ1MDgzMTA+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBpbnNwZWN0aW5nIHRo ZSBpbnNwZWN0b3IgYm90aCBpbnNwZWN0b3JzIHdlcmUgdXNpbmcgdGhlIHNhbWUKKyAgICAgICAg SW5zcGVjdG9yIHByb2Nlc3MgYW5kIHNoYXJpbmcgdGhlIHNhbWUgVk0uIFRoaXMgbWVhbnQgdGhh dCBwcm9maWxpbmcKKyAgICAgICAgaW5mb3JtYXRpb24gd2FzIGNvbmZ1c2luZyAobWVtb3J5IGFu ZCBKYXZhU2NyaXB0IHNhbXBsaW5nKSBiZWNhdXNlCisgICAgICAgIGl0IHdhcyBzaG93aW5nIGRh dGEgYWJvdXQgYm90aCBpbnNwZWN0b3JzIHNoYXJpbmcgdGhlIHNhbWUgcHJvY2Vzcy4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JQcm9jZXNzUG9vbCk6CisgICAgICAgIChXZWJL aXQ6OldlYkluc3BlY3RvclByb3h5Ojppc0luc3BlY3RvclByb2Nlc3NQb29sKToKKyAgICAgICAg SGF2ZSB0d28gcHJvY2VzcyBwb29scy4gVGhlIG1haW4gaW5zcGVjdG9yIHByb2Nlc3MgcG9vbCAo MXN0IGxldmVsIGluc3BlY3RvcnMpCisgICAgICAgIGFuZCBhIG5lc3RlZCBpbnNwZWN0b3IgcHJv Y2VzcyBwb29sIChpbnNwZWN0aW5nIHRoZSBpbnNwZWN0b3IsIG9ubHkgZXhwZWN0ZWQKKyAgICAg ICAgYnkgV2ViS2l0IGRldmVsb3BlcnMpLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkluc3Bl Y3RvclByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9XZWJJbnNwZWN0b3JQcm94eUVm bC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybUNyZWF0 ZUluc3BlY3RvclBhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJv eHlHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1D cmVhdGVJbnNwZWN0b3JQYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkluc3BlY3Rv clByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZv cm1DcmVhdGVJbnNwZWN0b3JQYWdlKToKKyAgICAgICAgUGFzcyB0aGUgaW5zcGVjdGlvbkxldmVs IHRvIGRldGVybWluZSB0aGUgYXBwcm9wcmlhdGUgcG9vbCB0byB1c2UuCisKIDIwMTYtMDItMDIg IEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBV c2UgcHJvcG9zZWQgY3JlZGVudGlhbHMgaW4gYXV0aGVudGljYXRpb24gY2hhbGxlbmdlcyB3aXRo IE5ldHdvcmtTZXNzaW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi SW5zcGVjdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3Rv clByb3h5LmNwcAppbmRleCBjNjQzM2ViLi4zYzI2NjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKQEAgLTMwNCwyNiArMzA0LDI1IEBAIHZv aWQgV2ViSW5zcGVjdG9yUHJveHk6OnRvZ2dsZVBhZ2VQcm9maWxpbmcoKQogICAgIG1faXNQcm9m aWxpbmdQYWdlID0gIW1faXNQcm9maWxpbmdQYWdlOwogfQogCi1zdGF0aWMgV2ViUHJvY2Vzc1Bv b2wqIHNfcHJvY2Vzc1Bvb2w7CitzdGF0aWMgV2ViUHJvY2Vzc1Bvb2wqIHNfbWFpbkluc3BlY3Rv clByb2Nlc3NQb29sOworc3RhdGljIFdlYlByb2Nlc3NQb29sKiBzX25lc3RlZEluc3BlY3RvclBy b2Nlc3NQb29sOwogCi1XZWJQcm9jZXNzUG9vbCYgV2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3Rv clByb2Nlc3NQb29sKCkKK1dlYlByb2Nlc3NQb29sJiBXZWJJbnNwZWN0b3JQcm94eTo6aW5zcGVj dG9yUHJvY2Vzc1Bvb2wodW5zaWduZWQgaW5zcGVjdGlvbkxldmVsKQogewogICAgIC8vIEhhdmlu ZyBvdXIgb3duIHByb2Nlc3MgcG9vbCByZW1vdmVzIHVzIGZyb20gdGhlIG1haW4gcHJvY2VzcyBw b29sIGFuZAogICAgIC8vIGd1YXJhbnRlZXMgbm8gcHJvY2VzcyBzaGFyaW5nIGZvciBvdXIgdXNl ciBpbnRlcmZhY2UuCi0gICAgaWYgKCFzX3Byb2Nlc3NQb29sKSB7CisgICAgV2ViUHJvY2Vzc1Bv b2wqJiBwb29sID0gaW5zcGVjdGlvbkxldmVsID09IDEgPyBzX21haW5JbnNwZWN0b3JQcm9jZXNz UG9vbCA6IHNfbmVzdGVkSW5zcGVjdG9yUHJvY2Vzc1Bvb2w7CisgICAgaWYgKCFwb29sKSB7CiAg ICAgICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IEFQSTo6UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u OjpjcmVhdGVXaXRoTGVnYWN5T3B0aW9ucygpOwotICAgICAgICBzX3Byb2Nlc3NQb29sID0gJldl YlByb2Nlc3NQb29sOjpjcmVhdGUoY29uZmlndXJhdGlvbi5nZXQoKSkubGVha1JlZigpOwotICAg IH07Ci0KLSAgICByZXR1cm4gKnNfcHJvY2Vzc1Bvb2w7CisgICAgICAgIHBvb2wgPSAmV2ViUHJv Y2Vzc1Bvb2w6OmNyZWF0ZShjb25maWd1cmF0aW9uLmdldCgpKS5sZWFrUmVmKCk7CisgICAgfQor ICAgIHJldHVybiAqcG9vbDsKIH0KIAogYm9vbCBXZWJJbnNwZWN0b3JQcm94eTo6aXNJbnNwZWN0 b3JQcm9jZXNzUG9vbChXZWJQcm9jZXNzUG9vbCYgcHJvY2Vzc1Bvb2wpCiB7Ci0gICAgaWYgKCFz X3Byb2Nlc3NQb29sKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICByZXR1cm4gc19wcm9j ZXNzUG9vbCA9PSAmcHJvY2Vzc1Bvb2w7CisgICAgcmV0dXJuIChzX21haW5JbnNwZWN0b3JQcm9j ZXNzUG9vbCAmJiBzX21haW5JbnNwZWN0b3JQcm9jZXNzUG9vbCA9PSAmcHJvY2Vzc1Bvb2wpCisg ICAgICAgIHx8IChzX25lc3RlZEluc3BlY3RvclByb2Nlc3NQb29sICYmIHNfbmVzdGVkSW5zcGVj dG9yUHJvY2Vzc1Bvb2wgPT0gJnByb2Nlc3NQb29sKTsKIH0KIAogYm9vbCBXZWJJbnNwZWN0b3JQ cm94eTo6aXNJbnNwZWN0b3JQYWdlKFdlYlBhZ2VQcm94eSYgd2ViUGFnZSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmgKaW5kZXggMmQwZjU5MS4uY2ZmYTI2 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5 LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmgKQEAg LTE1Myw3ICsxNTMsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGV4cGxpY2l0IFdlYkluc3Bl Y3RvclByb3h5KFdlYlBhZ2VQcm94eSopOwogCi0gICAgc3RhdGljIFdlYlByb2Nlc3NQb29sJiBp bnNwZWN0b3JQcm9jZXNzUG9vbCgpOworICAgIHN0YXRpYyBXZWJQcm9jZXNzUG9vbCYgaW5zcGVj dG9yUHJvY2Vzc1Bvb2wodW5zaWduZWQgaW5zcGVjdGlvbkxldmVsKTsKIAogICAgIHZvaWQgZWFn ZXJseUNyZWF0ZUluc3BlY3RvclBhZ2UoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2VmbC9XZWJJbnNwZWN0b3JQcm94eUVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclByb3h5RWZsLmNwcAppbmRleCBmYmZkMGZiLi4yMTMy MjQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3BlY3Rv clByb3h5RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3Bl Y3RvclByb3h5RWZsLmNwcApAQCAtMTA2LDcgKzEwNiw3IEBAIFdlYlBhZ2VQcm94eSogV2ViSW5z cGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlSW5zcGVjdG9yUGFnZSgpCiAgICAgaWYgKCFtX2lu c3BlY3RvcldpbmRvdykKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBXS0NvbnRleHRSZWYgd2tD b250ZXh0ID0gdG9BUEkoJmluc3BlY3RvclByb2Nlc3NQb29sKCkpOworICAgIFdLQ29udGV4dFJl ZiB3a0NvbnRleHQgPSB0b0FQSSgmaW5zcGVjdG9yUHJvY2Vzc1Bvb2woaW5zcGVjdGlvbkxldmVs KCkpKTsKICAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gd2tHcm91cElkZW50aWZpZXIgPSBh ZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGluc3BlY3RvclBhZ2VHcm91cElk ZW50aWZpZXIoKS51dGY4KCkuZGF0YSgpKSk7CiAgICAgV0tQYWdlR3JvdXBSZWYgd2tQYWdlR3Jv dXAgPSBXS1BhZ2VHcm91cENyZWF0ZVdpdGhJZGVudGlmaWVyKHdrR3JvdXBJZGVudGlmaWVyLmdl dCgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJJbnNw ZWN0b3JQcm94eUd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkluc3Bl Y3RvclByb3h5R3RrLmNwcAppbmRleCA5MDdkMzRhLi4wN2UxM2ZkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcApAQCAt ODAsNyArODAsNyBAQCBXZWJQYWdlUHJveHkqIFdlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybUNy ZWF0ZUluc3BlY3RvclBhZ2UoKQogICAgIFJlZlB0cjxXZWJQYWdlR3JvdXA+IHBhZ2VHcm91cCA9 IFdlYlBhZ2VHcm91cDo6Y3JlYXRlKGluc3BlY3RvclBhZ2VHcm91cElkZW50aWZpZXIoKSwgZmFs c2UsIGZhbHNlKTsKIAogICAgIGF1dG8gcGFnZUNvbmZpZ3VyYXRpb24gPSBBUEk6OlBhZ2VDb25m aWd1cmF0aW9uOjpjcmVhdGUoKTsKLSAgICBwYWdlQ29uZmlndXJhdGlvbi0+c2V0UHJvY2Vzc1Bv b2woJmluc3BlY3RvclByb2Nlc3NQb29sKCkpOworICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRQ cm9jZXNzUG9vbCgmaW5zcGVjdG9yUHJvY2Vzc1Bvb2woaW5zcGVjdGlvbkxldmVsKCkpKTsKICAg ICBwYWdlQ29uZmlndXJhdGlvbi0+c2V0UHJlZmVyZW5jZXMocHJlZmVyZW5jZXMuZ2V0KCkpOwog ICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRQYWdlR3JvdXAocGFnZUdyb3VwLmdldCgpKTsKICAg ICBtX2luc3BlY3RvclZpZXcgPSBHVEtfV0lER0VUKHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlKCpw YWdlQ29uZmlndXJhdGlvbi5wdHIoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvV2ViSW5zcGVjdG9yUHJveHlNYWMubW0KaW5kZXggZTEyNDcwMy4uNzYwYjcyNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94 eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclBy b3h5TWFjLm1tCkBAIC0zNzUsNyArMzc1LDcgQEAgV2ViUGFnZVByb3h5KiBXZWJJbnNwZWN0b3JQ cm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdlKCkKICAgICAgICAgcHJlZmVyZW5jZXMu X3BhZ2VWaXNpYmlsaXR5QmFzZWRQcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkID0gTk87CiAgICAg fQogCi0gICAgW2NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6IDo6V2ViS2l0Ojp3cmFwcGVy KGluc3BlY3RvclByb2Nlc3NQb29sKCkpXTsKKyAgICBbY29uZmlndXJhdGlvbiBzZXRQcm9jZXNz UG9vbDogOjpXZWJLaXQ6OndyYXBwZXIoaW5zcGVjdG9yUHJvY2Vzc1Bvb2woaW5zcGVjdGlvbkxl dmVsKCkpKV07CiAgICAgW2NvbmZpZ3VyYXRpb24gX3NldEdyb3VwSWRlbnRpZmllcjppbnNwZWN0 b3JQYWdlR3JvdXBJZGVudGlmaWVyKCldOwogCiAgICAgbV9pbnNwZWN0b3JWaWV3ID0gYWRvcHRO UyhbW1dLV2ViSW5zcGVjdG9yV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOmluaXRpYWxS ZWN0IGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwo=