211495 2020-05-05 22:17:31 -0700 Better surfacing of the presenting parent PID in the Network process 2020-05-06 13:35:16 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=205295 InRadar P2 Normal --- 1 krollin krollin cdumez webkit-bug-importer youennf oldest_to_newest 1649498 0 krollin 2020-05-05 22:17:31 -0700 In Bug 205295, NetworkResourceLoader logging was improved, with one of the changes being that the PID of parent process that invoked the Network process was logged at the start of NetworkResourceLoader::start(). However, there was an execution path that skipped calling start() (NetworkConnectionToWebProcess::scheduleResourceLoad -> NetworkResourceLoader ::startWithServiceWorker -> serviceWorkerDidNotHandle -> restartNetworkLoad -> startNetworkLoad), and so the the logging would not show the parent PID. This logging is needed for diagnostic purposes, so tweak the logging a little bit more in order to ensure we emit it. In this change, logging is added to various loading-related NetworkConnectionToWebProcess entry points (not just scheduleResourceLoad) in order to (a) ensure we emit the logging we want and (b) to give a clearer picture of what operations are being invoked in the Network process. 1649499 1 webkit-bug-importer 2020-05-05 22:17:43 -0700 <rdar://problem/62917205> 1649504 2 398592 krollin 2020-05-05 22:21:43 -0700 Created attachment 398592 Patch 1649774 3 ews-feeder 2020-05-06 13:35:15 -0700 Committed r261249: <https://trac.webkit.org/changeset/261249> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398592. 398592 2020-05-05 22:21:43 -0700 2020-05-06 13:35:16 -0700 Patch bug-211495-20200505222142.patch text/plain 12355 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkxN2Q3MTkzMWYzMWQxOGVk OWZhM2VjYzJiMWIwZjM1YzdlODQxMTQuLjA5MDBhMGZiNDA0NWNhMThjMDcxNjRmOWUzZjI4MzI1 N2I4ODYwOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjAtMDUtMDUgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIEJldHRlciBzdXJmYWNpbmcgb2Yg dGhlIHByZXNlbnRpbmcgcGFyZW50IFBJRCBpbiB0aGUgTmV0d29yayBwcm9jZXNzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTE0OTUKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzYyOTE3MjA1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEluIEJ1ZyAyMDUyOTUsIE5ldHdvcmtSZXNvdXJjZUxvYWRlciBs b2dnaW5nIHdhcyBpbXByb3ZlZCwgd2l0aCBvbmUgb2YKKyAgICAgICAgdGhlIGNoYW5nZXMgYmVp bmcgdGhhdCB0aGUgUElEIG9mIHBhcmVudCBwcm9jZXNzIHRoYXQgaW52b2tlZCB0aGUKKyAgICAg ICAgTmV0d29yayBwcm9jZXNzIHdhcyBsb2dnZWQgYXQgdGhlIHN0YXJ0IG9mCisgICAgICAgIE5l dHdvcmtSZXNvdXJjZUxvYWRlcjo6c3RhcnQoKS4gSG93ZXZlciwgdGhlcmUgd2FzIGFuIGV4ZWN1 dGlvbiBwYXRoCisgICAgICAgIHRoYXQgc2tpcHBlZCBjYWxsaW5nIHN0YXJ0KCkKKyAgICAgICAg KE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpzY2hlZHVsZVJlc291cmNlTG9hZCAtPgor ICAgICAgICBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnN0YXJ0V2l0aFNlcnZpY2VXb3JrZXIgLT4K KyAgICAgICAgc2VydmljZVdvcmtlckRpZE5vdEhhbmRsZSAtPiByZXN0YXJ0TmV0d29ya0xvYWQg LT4gc3RhcnROZXR3b3JrTG9hZCksCisgICAgICAgIGFuZCBzbyB0aGUgdGhlIGxvZ2dpbmcgd291 bGQgbm90IHNob3cgdGhlIHBhcmVudCBQSUQuIFRoaXMgbG9nZ2luZyBpcworICAgICAgICBuZWVk ZWQgZm9yIGRpYWdub3N0aWMgcHVycG9zZXMsIHNvIHR3ZWFrIHRoZSBsb2dnaW5nIGEgbGl0dGxl IGJpdCBtb3JlCisgICAgICAgIGluIG9yZGVyIHRvIGVuc3VyZSB3ZSBlbWl0IGl0LiBJbiB0aGlz IGNoYW5nZSwgbG9nZ2luZyBpcyBhZGRlZCB0bworICAgICAgICB2YXJpb3VzIGxvYWRpbmctcmVs YXRlZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2VzcyBlbnRyeSBwb2ludHMKKyAgICAgICAg KG5vdCBqdXN0IHNjaGVkdWxlUmVzb3VyY2VMb2FkKSBpbiBvcmRlciB0byAoYSkgZW5zdXJlIHdl IGVtaXQgdGhlCisgICAgICAgIGxvZ2dpbmcgd2Ugd2FudCBhbmQgKGIpIHRvIGdpdmUgYSBjbGVh cmVyIHBpY3R1cmUgb2Ygd2hhdCBvcGVyYXRpb25zCisgICAgICAgIGFyZSBiZWluZyBpbnZva2Vk IGluIHRoZSBOZXR3b3JrIHByb2Nlc3MuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC0tIG5vIG5l dyBvciBjaGFuZ2VkIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpoYXNVcGxvYWRTdGF0ZUNoYW5nZWQpOgorICAgICAg ICAoV2ViS2l0OjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6cmVzb2x2ZUJsb2JSZWZl cmVuY2VzKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6 OnNjaGVkdWxlUmVzb3VyY2VMb2FkKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0Nvbm5lY3Rp b25Ub1dlYlByb2Nlc3M6OnBlcmZvcm1TeW5jaHJvbm91c0xvYWQpOgorICAgICAgICAoV2ViS2l0 OjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6bG9hZFBpbmcpOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6cHJlY29ubmVjdFRvKToKKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnNlcnZlclRvQ29udGV4 dENvbm5lY3Rpb25Ob0xvbmdlck5lZWRlZCk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0 d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNl TG9hZGVyOjpzdGFydCk6CisKIDIwMjAtMDUtMDMgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFw cGxlLmNvbT4KIAogICAgICAgICBVc2UgZGVmYXVsdCBpbml0aWFsaXplcnMgYW5kIGRlZmF1bHQg Y29uc3RydWN0b3JzIGluIFdlYkV2ZW50LmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKaW5k ZXggNTQ4ZWE0YTUxMWM4YzYwNzJiNWU2MGU2ODM2NjkyYmE1YWJlZGFjOC4uNTMyODZkZTZiM2U3 NjEzYzg5NzgxOTIyNDcwMTY4ZjA3MmY5MDc2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5j cHAKQEAgLTgxLDcgKzgxLDcgQEAKICNlbmRpZgogCiAjdW5kZWYgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRAotI2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGNoYW5uZWwsIGZtdCwgLi4uKSBS RUxFQVNFX0xPR19JRihtX3Nlc3Npb25JRC5pc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSwgY2hh bm5lbCwgIiVwIC0gTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OiIgZm10LCB0aGlzLCAj I19fVkFfQVJHU19fKQorI2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGNoYW5uZWwsIGZt dCwgLi4uKSBSRUxFQVNFX0xPR19JRihtX3Nlc3Npb25JRC5pc0Fsd2F5c09uTG9nZ2luZ0FsbG93 ZWQoKSwgY2hhbm5lbCwgIiVwIC0gW3dlYlByb2Nlc3NJZGVudGlmaWVyPSUiIFBSSXU2NCAiXSBO ZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6IiBmbXQsIHRoaXMsIHdlYlByb2Nlc3NJZGVu dGlmaWVyKCkudG9VSW50NjQoKSwgIyNfX1ZBX0FSR1NfXykKIAogI2RlZmluZSBORVRXT1JLX1BS T0NFU1NfTUVTU0FHRV9DSEVDSyhhc3NlcnRpb24pIE5FVFdPUktfUFJPQ0VTU19NRVNTQUdFX0NI RUNLX0NPTVBMRVRJT04oYXNzZXJ0aW9uLCAodm9pZCkwKQogI2RlZmluZSBORVRXT1JLX1BST0NF U1NfTUVTU0FHRV9DSEVDS19DT01QTEVUSU9OKGFzc2VydGlvbiwgY29tcGxldGlvbikgZG8geyBc CkBAIC0xNTQsNyArMTU0LDcgQEAgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6On5OZXR3 b3JrQ29ubmVjdGlvblRvV2ViUHJvY2VzcygpCiAKIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dl YlByb2Nlc3M6Omhhc1VwbG9hZFN0YXRlQ2hhbmdlZChib29sIGhhc1VwbG9hZCkKIHsKLSAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJoYXNVcGxvYWRTdGF0ZUNoYW5nZWQgLSBX ZWJQcm9jZXNzICVsbHUgLSBoYXNVcGxvYWQ6ICVkIiwgd2ViUHJvY2Vzc0lkZW50aWZpZXIoKS50 b1VJbnQ2NCgpLCBoYXNVcGxvYWQpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGlu ZywgImhhc1VwbG9hZFN0YXRlQ2hhbmdlZDogKGhhc1VwbG9hZD0lZCkiLCBoYXNVcGxvYWQpOwog ICAgIG1fbmV0d29ya1Byb2Nlc3MtPnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmQoTWVz c2FnZXM6Ok5ldHdvcmtQcm9jZXNzUHJveHk6OlNldFdlYlByb2Nlc3NIYXNVcGxvYWRzKG1fd2Vi UHJvY2Vzc0lkZW50aWZpZXIsIGhhc1VwbG9hZCksIDApOwogfQogCkBAIC00MDksOCArNDA5LDEw IEBAIE5ldHdvcmtTZXNzaW9uKiBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6bmV0d29y a1Nlc3Npb24oKQogICAgIHJldHVybiBuZXR3b3JrUHJvY2VzcygpLm5ldHdvcmtTZXNzaW9uKG1f c2Vzc2lvbklEKTsKIH0KIAotVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpCbG9iRGF0YUZpbGVSZWZl cmVuY2U+PiBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6cmVzb2x2ZUJsb2JSZWZlcmVu Y2VzKGNvbnN0IE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQorVmVj dG9yPFJlZlB0cjxXZWJDb3JlOjpCbG9iRGF0YUZpbGVSZWZlcmVuY2U+PiBOZXR3b3JrQ29ubmVj dGlvblRvV2ViUHJvY2Vzczo6cmVzb2x2ZUJsb2JSZWZlcmVuY2VzKGNvbnN0IE5ldHdvcmtSZXNv dXJjZUxvYWRQYXJhbWV0ZXJzJiBsb2FkUGFyYW1ldGVycykKIHsKKyAgICBSRUxFQVNFX0xPR19J Rl9BTExPV0VEKExvYWRpbmcsICJyZXNvbHZlQmxvYlJlZmVyZW5jZXM6IChwYXJlbnRQSUQ9JWQs IHBhZ2VQcm94eUlEPSUiIFBSSXU2NCAiLCB3ZWJQYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9 JSIgUFJJdTY0ICIsIHJlc291cmNlSUQ9JSIgUFJJdTY0ICIpIiwgbG9hZFBhcmFtZXRlcnMucGFy ZW50UElELCBsb2FkUGFyYW1ldGVycy53ZWJQYWdlUHJveHlJRC50b1VJbnQ2NCgpLCBsb2FkUGFy YW1ldGVycy53ZWJQYWdlSUQudG9VSW50NjQoKSwgbG9hZFBhcmFtZXRlcnMud2ViRnJhbWVJRC50 b1VJbnQ2NCgpLCBsb2FkUGFyYW1ldGVycy5pZGVudGlmaWVyKTsKKwogICAgIGF1dG8qIHNlc3Np b24gPSBuZXR3b3JrU2Vzc2lvbigpOwogICAgIGlmICghc2Vzc2lvbikKICAgICAgICAgcmV0dXJu IHsgfTsKQEAgLTQxOCwxMiArNDIwLDEyIEBAIFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6QmxvYkRh dGFGaWxlUmVmZXJlbmNlPj4gTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnJlCiAgICAg YXV0byYgYmxvYlJlZ2lzdHJ5ID0gc2Vzc2lvbi0+YmxvYlJlZ2lzdHJ5KCk7CiAKICAgICBWZWN0 b3I8UmVmUHRyPFdlYkNvcmU6OkJsb2JEYXRhRmlsZVJlZmVyZW5jZT4+IGZpbGVzOwotICAgIGlm IChhdXRvKiBib2R5ID0gcGFyYW1ldGVycy5yZXF1ZXN0Lmh0dHBCb2R5KCkpIHsKKyAgICBpZiAo YXV0byogYm9keSA9IGxvYWRQYXJhbWV0ZXJzLnJlcXVlc3QuaHR0cEJvZHkoKSkgewogICAgICAg ICBmb3IgKGF1dG8mIGVsZW1lbnQgOiBib2R5LT5lbGVtZW50cygpKSB7CiAgICAgICAgICAgICBp ZiAoYXV0byogYmxvYkRhdGEgPSBXVEY6OmdldF9pZjxGb3JtRGF0YUVsZW1lbnQ6OkVuY29kZWRC bG9iRGF0YT4oZWxlbWVudC5kYXRhKSkKICAgICAgICAgICAgICAgICBmaWxlcy5hcHBlbmRWZWN0 b3IoYmxvYlJlZ2lzdHJ5LmZpbGVzSW5CbG9iKGJsb2JEYXRhLT51cmwpKTsKICAgICAgICAgfQot ICAgICAgICBjb25zdF9jYXN0PFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCY+KHBhcmFtZXRlcnMu cmVxdWVzdCkuc2V0SFRUUEJvZHkoYm9keS0+cmVzb2x2ZUJsb2JSZWZlcmVuY2VzKCZibG9iUmVn aXN0cnkpKTsKKyAgICAgICAgY29uc3RfY2FzdDxXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmPihs b2FkUGFyYW1ldGVycy5yZXF1ZXN0KS5zZXRIVFRQQm9keShib2R5LT5yZXNvbHZlQmxvYlJlZmVy ZW5jZXMoJmJsb2JSZWdpc3RyeSkpOwogICAgIH0KIAogICAgIHJldHVybiBmaWxlczsKQEAgLTQz OCw2ICs0NDAsOCBAQCBzdGQ6OnVuaXF1ZV9wdHI8U2VydmljZVdvcmtlckZldGNoVGFzaz4gTmV0 d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmNyZWF0ZUZldAogCiB2b2lkIE5ldHdvcmtDb25u ZWN0aW9uVG9XZWJQcm9jZXNzOjpzY2hlZHVsZVJlc291cmNlTG9hZChOZXR3b3JrUmVzb3VyY2VM b2FkUGFyYW1ldGVycyYmIGxvYWRQYXJhbWV0ZXJzKQogeworICAgIFJFTEVBU0VfTE9HX0lGX0FM TE9XRUQoTG9hZGluZywgInNjaGVkdWxlUmVzb3VyY2VMb2FkOiAocGFyZW50UElEPSVkLCBwYWdl UHJveHlJRD0lIiBQUkl1NjQgIiwgd2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBS SXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiKSIsIGxvYWRQYXJhbWV0ZXJzLnBhcmVudFBJ RCwgbG9hZFBhcmFtZXRlcnMud2ViUGFnZVByb3h5SUQudG9VSW50NjQoKSwgbG9hZFBhcmFtZXRl cnMud2ViUGFnZUlELnRvVUludDY0KCksIGxvYWRQYXJhbWV0ZXJzLndlYkZyYW1lSUQudG9VSW50 NjQoKSwgbG9hZFBhcmFtZXRlcnMuaWRlbnRpZmllcik7CisKICNpZiBFTkFCTEUoU0VSVklDRV9X T1JLRVIpCiAgICAgYXV0byYgc2VydmVyID0gbV9uZXR3b3JrUHJvY2Vzcy0+c3dTZXJ2ZXJGb3JT ZXNzaW9uKG1fc2Vzc2lvbklEKTsKICAgICBpZiAoIXNlcnZlci5pc0ltcG9ydENvbXBsZXRlZCgp KSB7CkBAIC00NTksNyArNDYzLDYgQEAgdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vz czo6c2NoZWR1bGVSZXNvdXJjZUxvYWQoTmV0d29ya1Jlc291cmNlTG9hZFBhcmEKIAogI2lmIEVO QUJMRShTRVJWSUNFX1dPUktFUikKICAgICBsb2FkZXItPnN0YXJ0V2l0aFNlcnZpY2VXb3JrZXIo KTsKLSAgICByZXR1cm47CiAjZWxzZQogICAgIGxvYWRlci0+c3RhcnQoKTsKICNlbmRpZgpAQCAt NDY3LDYgKzQ3MCw4IEBAIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnNjaGVk dWxlUmVzb3VyY2VMb2FkKE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhCiAKIHZvaWQgTmV0d29ya0Nv bm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnBlcmZvcm1TeW5jaHJvbm91c0xvYWQoTmV0d29ya1Jlc291 cmNlTG9hZFBhcmFtZXRlcnMmJiBsb2FkUGFyYW1ldGVycywgTWVzc2FnZXM6Ok5ldHdvcmtDb25u ZWN0aW9uVG9XZWJQcm9jZXNzOjpQZXJmb3JtU3luY2hyb25vdXNMb2FkOjpEZWxheWVkUmVwbHkm JiByZXBseSkKIHsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJwZXJmb3Jt U3luY2hyb25vdXNMb2FkOiAocGFyZW50UElEPSVkLCBwYWdlUHJveHlJRD0lIiBQUkl1NjQgIiwg d2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUi IFBSSXU2NCAiKSIsIGxvYWRQYXJhbWV0ZXJzLnBhcmVudFBJRCwgbG9hZFBhcmFtZXRlcnMud2Vi UGFnZVByb3h5SUQudG9VSW50NjQoKSwgbG9hZFBhcmFtZXRlcnMud2ViUGFnZUlELnRvVUludDY0 KCksIGxvYWRQYXJhbWV0ZXJzLndlYkZyYW1lSUQudG9VSW50NjQoKSwgbG9hZFBhcmFtZXRlcnMu aWRlbnRpZmllcik7CisKICAgICBhdXRvIGlkZW50aWZpZXIgPSBsb2FkUGFyYW1ldGVycy5pZGVu dGlmaWVyOwogICAgIFJFTEVBU0VfQVNTRVJUKGlkZW50aWZpZXIpOwogICAgIFJFTEVBU0VfQVNT RVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKQEAgLTQ4Nyw2ICs0OTIsOCBAQCB2b2lkIE5ldHdvcmtD b25uZWN0aW9uVG9XZWJQcm9jZXNzOjp0ZXN0UHJvY2Vzc0luY29taW5nU3luY01lc3NhZ2VzV2hl bldhaXRpbmdGbwogCiB2b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpsb2FkUGlu ZyhOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYmIGxvYWRQYXJhbWV0ZXJzKQogeworICAg IFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgImxvYWRQaW5nOiAocGFyZW50UElEPSVk LCBwYWdlUHJveHlJRD0lIiBQUkl1NjQgIiwgd2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlE PSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiKSIsIGxvYWRQYXJhbWV0ZXJzLnBh cmVudFBJRCwgbG9hZFBhcmFtZXRlcnMud2ViUGFnZVByb3h5SUQudG9VSW50NjQoKSwgbG9hZFBh cmFtZXRlcnMud2ViUGFnZUlELnRvVUludDY0KCksIGxvYWRQYXJhbWV0ZXJzLndlYkZyYW1lSUQu dG9VSW50NjQoKSwgbG9hZFBhcmFtZXRlcnMuaWRlbnRpZmllcik7CisKICAgICBhdXRvIGNvbXBs ZXRpb25IYW5kbGVyID0gW2Nvbm5lY3Rpb24gPSBtX2Nvbm5lY3Rpb24uY29weVJlZigpLCBpZGVu dGlmaWVyID0gbG9hZFBhcmFtZXRlcnMuaWRlbnRpZmllcl0gKGNvbnN0IFJlc291cmNlRXJyb3Im IGVycm9yLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkgewogICAgICAgICBjb25u ZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246OkRpZEZpbmlz aFBpbmdMb2FkKGlkZW50aWZpZXIsIGVycm9yLCByZXNwb25zZSksIDApOwogICAgIH07CkBAIC01 NDAsOSArNTQ3LDExIEBAIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnByZWZl dGNoRE5TKGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpCiAgICAgbV9uZXR3b3JrUHJvY2Vzcy0+cHJl ZmV0Y2hETlMoaG9zdG5hbWUpOwogfQogCi12b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9j ZXNzOjpwcmVjb25uZWN0VG8oT3B0aW9uYWw8dWludDY0X3Q+IHByZWNvbm5lY3Rpb25JZGVudGlm aWVyLCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCit2b2lkIE5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpwcmVjb25uZWN0VG8oT3B0aW9uYWw8dWludDY0 X3Q+IHByZWNvbm5lY3Rpb25JZGVudGlmaWVyLCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVy cyYmIGxvYWRQYXJhbWV0ZXJzKQogewotICAgIEFTU0VSVCghcGFyYW1ldGVycy5yZXF1ZXN0Lmh0 dHBCb2R5KCkpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoTG9hZGluZywgInByZWNvbm5l Y3RUbzogKHBhcmVudFBJRD0lZCwgcGFnZVByb3h5SUQ9JSIgUFJJdTY0ICIsIHdlYlBhZ2VJRD0l IiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwgcmVzb3VyY2VJRD0lIiBQUkl1NjQgIiki LCBsb2FkUGFyYW1ldGVycy5wYXJlbnRQSUQsIGxvYWRQYXJhbWV0ZXJzLndlYlBhZ2VQcm94eUlE LnRvVUludDY0KCksIGxvYWRQYXJhbWV0ZXJzLndlYlBhZ2VJRC50b1VJbnQ2NCgpLCBsb2FkUGFy YW1ldGVycy53ZWJGcmFtZUlELnRvVUludDY0KCksIGxvYWRQYXJhbWV0ZXJzLmlkZW50aWZpZXIp OworCisgICAgQVNTRVJUKCFsb2FkUGFyYW1ldGVycy5yZXF1ZXN0Lmh0dHBCb2R5KCkpOwogCiAg ICAgYXV0byBjb21wbGV0aW9uSGFuZGxlciA9IFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJl ZigqdGhpcyksIHByZWNvbm5lY3Rpb25JZGVudGlmaWVyID0gV1RGTW92ZShwcmVjb25uZWN0aW9u SWRlbnRpZmllcildKGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKSB7CiAgICAgICAgIGlmIChw cmVjb25uZWN0aW9uSWRlbnRpZmllcikKQEAgLTU1MCw4ICs1NTksOCBAQCB2b2lkIE5ldHdvcmtD b25uZWN0aW9uVG9XZWJQcm9jZXNzOjpwcmVjb25uZWN0VG8oT3B0aW9uYWw8dWludDY0X3Q+IHBy ZWNvbm5lY3RpbwogICAgIH07CiAKICNpZiBFTkFCTEUoTEVHQUNZX0NVU1RPTV9QUk9UT0NPTF9N QU5BR0VSKQotICAgIGlmIChuZXR3b3JrUHJvY2VzcygpLnN1cHBsZW1lbnQ8TGVnYWN5Q3VzdG9t UHJvdG9jb2xNYW5hZ2VyPigpLT5zdXBwb3J0c1NjaGVtZShwYXJhbWV0ZXJzLnJlcXVlc3QudXJs KCkucHJvdG9jb2woKS50b1N0cmluZygpKSkgewotICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihp bnRlcm5hbEVycm9yKHBhcmFtZXRlcnMucmVxdWVzdC51cmwoKSkpOworICAgIGlmIChuZXR3b3Jr UHJvY2VzcygpLnN1cHBsZW1lbnQ8TGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyPigpLT5zdXBw b3J0c1NjaGVtZShsb2FkUGFyYW1ldGVycy5yZXF1ZXN0LnVybCgpLnByb3RvY29sKCkudG9TdHJp bmcoKSkpIHsKKyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoaW50ZXJuYWxFcnJvcihsb2FkUGFy YW1ldGVycy5yZXF1ZXN0LnVybCgpKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAjZW5kaWYK QEAgLTU1OSwxMyArNTY4LDEzIEBAIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6 OnByZWNvbm5lY3RUbyhPcHRpb25hbDx1aW50NjRfdD4gcHJlY29ubmVjdGlvCiAjaWYgRU5BQkxF KFNFUlZFUl9QUkVDT05ORUNUKQogICAgIGF1dG8qIHNlc3Npb24gPSBuZXR3b3JrU2Vzc2lvbigp OwogICAgIGlmIChzZXNzaW9uICYmIHNlc3Npb24tPmFsbG93c1NlcnZlclByZWNvbm5lY3QoKSkg ewotICAgICAgICBuZXcgUHJlY29ubmVjdFRhc2sobmV0d29ya1Byb2Nlc3MoKSwgc2Vzc2lvbklE KCksIFdURk1vdmUocGFyYW1ldGVycyksIFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29t cGxldGlvbkhhbmRsZXIpXSAoY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpIHsKKyAgICAgICAg bmV3IFByZWNvbm5lY3RUYXNrKG5ldHdvcmtQcm9jZXNzKCksIHNlc3Npb25JRCgpLCBXVEZNb3Zl KGxvYWRQYXJhbWV0ZXJzKSwgW2NvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9u SGFuZGxlcildIChjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikgewogICAgICAgICAgICAgY29t cGxldGlvbkhhbmRsZXIoZXJyb3IpOwogICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KICNlbmRpZgotICAgIGNvbXBsZXRpb25IYW5kbGVyKGludGVybmFsRXJyb3IocGFyYW1ldGVy cy5yZXF1ZXN0LnVybCgpKSk7CisgICAgY29tcGxldGlvbkhhbmRsZXIoaW50ZXJuYWxFcnJvcihs b2FkUGFyYW1ldGVycy5yZXF1ZXN0LnVybCgpKSk7CiB9CiAKIHZvaWQgTmV0d29ya0Nvbm5lY3Rp b25Ub1dlYlByb2Nlc3M6OmRpZEZpbmlzaFByZWNvbm5lY3Rpb24odWludDY0X3QgcHJlY29ubmVj dGlvbklkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQpAQCAtMTAzMyw3ICsx MDQyLDcgQEAgdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6Y2xvc2VTV0NvbnRl eHRDb25uZWN0aW9uKCkKIAogdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6c2Vy dmVyVG9Db250ZXh0Q29ubmVjdGlvbk5vTG9uZ2VyTmVlZGVkKCkKIHsKLSAgICBSRUxFQVNFX0xP R19JRl9BTExPV0VEKFNlcnZpY2VXb3JrZXIsICJzZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uTm9M b25nZXJOZWVkZWQgLSBXZWJQcm9jZXNzICVsbHUgbm8gbG9uZ2VyIHVzZWZ1bCBmb3IgcnVubmlu ZyBzZXJ2aWNlIHdvcmtlcnMiLCB3ZWJQcm9jZXNzSWRlbnRpZmllcigpLnRvVUludDY0KCkpOwor ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoU2VydmljZVdvcmtlciwgInNlcnZlclRvQ29udGV4 dENvbm5lY3Rpb25Ob0xvbmdlck5lZWRlZDogV2ViUHJvY2VzcyBubyBsb25nZXIgdXNlZnVsIGZv ciBydW5uaW5nIHNlcnZpY2Ugd29ya2VycyIpOwogICAgIG1fbmV0d29ya1Byb2Nlc3MtPnBhcmVu dFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzUHJveHk6 OldvcmtlckNvbnRleHRDb25uZWN0aW9uTm9Mb25nZXJOZWVkZWQgeyB3ZWJQcm9jZXNzSWRlbnRp ZmllcigpIH0sIDApOwogCiAgICAgbV9zd0NvbnRleHRDb25uZWN0aW9uID0gbnVsbHB0cjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9h ZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9h ZGVyLmNwcAppbmRleCA2ZjBlN2M5MDU2MDMzYWI5NzI3YTk5YTQwZDUxYTA4MTI4NzgwMjBlLi4x ZTQwNzFlNzZjNDNlZWU2ODRlZWVjMWI5NjQ1YWI3MTAwYjhiOTdlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCkBA IC0xNzUsNyArMTc1LDcgQEAgYm9vbCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmlzU3luY2hyb25v dXMoKSBjb25zdAogdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnN0YXJ0KCkKIHsKICAgICBB U1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInN0 YXJ0OiBwYXJlbnRQSUQ9JWQsIGhhc05ldHdvcmtMb2FkQ2hlY2tlcj0lZCIsIG1fcGFyYW1ldGVy cy5wYXJlbnRQSUQsICEhbV9uZXR3b3JrTG9hZENoZWNrZXIpOworICAgIFJFTEVBU0VfTE9HX0lG X0FMTE9XRUQoInN0YXJ0OiBoYXNOZXR3b3JrTG9hZENoZWNrZXI9JWQiLCAhIW1fbmV0d29ya0xv YWRDaGVja2VyKTsKIAogICAgIG1fbmV0d29ya0FjdGl2aXR5VHJhY2tlciA9IG1fY29ubmVjdGlv bi0+c3RhcnRUcmFja2luZ1Jlc291cmNlTG9hZChtX3BhcmFtZXRlcnMud2ViUGFnZUlELCBtX3Bh cmFtZXRlcnMuaWRlbnRpZmllciwgaXNNYWluRnJhbWVMb2FkKCkpOwogCg==