143691 2015-04-13 19:35:53 -0700 Replace JavaScriptCoreOutputConsoleMessagesToSystemConsole default with an SPI 2015-04-14 17:48:48 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck ggaren joepeck msaboff timothy oldest_to_newest 1085031 0 joepeck 2015-04-13 19:35:53 -0700 * SUMMARY Replace JavaScriptCoreOutputConsoleMessagesToSystemConsole default with an SPI. Accessing the default using CFPreferences comes with a non-trivial amount of memory and overhead. It would be nice to get off of the preferences API here and move to something simpler, like an SPI. There can be different approaches here: - Global log to system console setting - matches the existing default - Per context log to system console setting - more fine grained control Seeing as the existing value was global, lets just make a global setting for this as well. 1085032 1 250689 joepeck 2015-04-13 19:39:07 -0700 Created attachment 250689 [PATCH] Proposed Fix 1085033 2 joepeck 2015-04-13 19:40:27 -0700 <rdar://problem/20470092> 1085042 3 250689 timothy 2015-04-13 20:31:25 -0700 Comment on attachment 250689 [PATCH] Proposed Fix Are there any clients that need to adopt? Safari? 1085357 4 250765 joepeck 2015-04-14 17:37:46 -0700 Created attachment 250765 [PATCH] Proposed Fix Better version. This moves the setting to the new JSRemoteInspector.h private header and renames it to JSRemoteInspectorSetLogToSystemConsole. 1085361 5 250765 ggaren 2015-04-14 17:45:31 -0700 Comment on attachment 250765 [PATCH] Proposed Fix r=me 1085363 6 joepeck 2015-04-14 17:48:48 -0700 http://trac.webkit.org/changeset/182826 250689 2015-04-13 19:39:07 -0700 2015-04-14 17:37:46 -0700 [PATCH] Proposed Fix log-to-system-console.patch text/plain 5849 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNCYXNlLmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNCYXNlLmNwcAppbmRleCAwMzI1ZmVjLi4yZDRjZDdiIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQmFzZS5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0Jhc2UuY3BwCkBAIC0zMiwxMSArMzIsMTIgQEAKICNp bmNsdWRlICJDb21wbGV0aW9uLmgiCiAjaW5jbHVkZSAiR0NBY3Rpdml0eUNhbGxiYWNrLmgiCiAj aW5jbHVkZSAiSW5pdGlhbGl6ZVRocmVhZGluZy5oIgorI2luY2x1ZGUgIkpTQ0lubGluZXMuaCIK ICNpbmNsdWRlICJKU0dsb2JhbE9iamVjdC5oIgorI2luY2x1ZGUgIkpTR2xvYmFsT2JqZWN0Q29u c29sZUNsaWVudC5oIgogI2luY2x1ZGUgIkpTTG9jay5oIgogI2luY2x1ZGUgIkpTT2JqZWN0Lmgi CiAjaW5jbHVkZSAiT3BhcXVlSlNTdHJpbmcuaCIKLSNpbmNsdWRlICJKU0NJbmxpbmVzLmgiCiAj aW5jbHVkZSAiU291cmNlQ29kZS5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0hhc2guaD4K IApAQCAtMTcxLDYgKzE3MiwxMSBAQCB2b2lkIEpTRGlzYWJsZUdDVGltZXIodm9pZCkKICAgICBH Q0FjdGl2aXR5Q2FsbGJhY2s6OnNfc2hvdWxkQ3JlYXRlR0NUaW1lciA9IGZhbHNlOwogfQogCit2 b2lkIEpTU2V0TG9nVG9TeXN0ZW1Db25zb2xlKGJvb2wgbG9nVG9TeXN0ZW1Db25zb2xlKQorewor ICAgIEluc3BlY3Rvcjo6SlNHbG9iYWxPYmplY3RDb25zb2xlQ2xpZW50OjpzZXRMb2dUb1N5c3Rl bUNvbnNvbGUobG9nVG9TeXN0ZW1Db25zb2xlKTsKK30KKwogI2lmIFBMQVRGT1JNKElPUykKIC8v IEZJWE1FOiBFeHBvc2Ugc3ltYm9scyB0byB0ZWxsIGR5bGQgd2hlcmUgdG8gZmluZCBKYXZhU2Ny aXB0Q29yZSBvbiBvbGRlciB2ZXJzaW9ucyBvZgogLy8gaU9TICg8IDcuMCkuIFdlIHNob3VsZCBy ZW1vdmUgdGhlc2Ugc3ltYm9scyBvbmNlIHdlIG5vIGxvbmdlciBuZWVkIHRvIHN1cHBvcnQgc3Vj aApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0Jhc2VQcml2YXRlLmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQmFzZVByaXZhdGUuaAppbmRleCAxMzc1OTQ5 Li5hYTk2ZTE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQmFzZVBy aXZhdGUuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQmFzZVByaXZhdGUuaApA QCAtNDcsNiArNDcsOCBAQCBKU19FWFBPUlQgdm9pZCBKU1JlcG9ydEV4dHJhTWVtb3J5Q29zdChK U0NvbnRleHRSZWYgY3R4LCBzaXplX3Qgc2l6ZSkgQ0ZfQVZBSUxBQgogCiBKU19FWFBPUlQgdm9p ZCBKU0Rpc2FibGVHQ1RpbWVyKHZvaWQpOwogCitKU19FWFBPUlQgdm9pZCBKU1NldExvZ1RvU3lz dGVtQ29uc29sZShib29sKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYKZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nCmluZGV4IGIyOTA0YzcuLjQxOTRmNzAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE1LTA0LTEzICBKb3NlcGggUGVjb3Jhcm8gIDxw ZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgUmVwbGFjZSBKYXZhU2NyaXB0Q29yZU91dHB1 dENvbnNvbGVNZXNzYWdlc1RvU3lzdGVtQ29uc29sZSBkZWZhdWx0IHdpdGggYW4gU1BJCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM2OTEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEFQSS9KU0Jhc2VQ cml2YXRlLmg6CisgICAgICAgICogQVBJL0pTQmFzZS5jcHA6CisgICAgICAgIChKU1NldExvZ1Rv U3lzdGVtQ29uc29sZSk6CisgICAgICAgIEFkZCBTUEkgdG8gZW5hYmxlL2Rpc2FibGUgbG9nZ2lu ZyB0byB0aGUgc3lzdGVtIGNvbnNvbGUuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSlNHbG9iYWxP YmplY3RDb25zb2xlQ2xpZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0pTR2xvYmFsT2JqZWN0 Q29uc29sZUNsaWVudC5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6OkpTR2xvYmFsT2JqZWN0Q29u c29sZUNsaWVudDo6bG9nVG9TeXN0ZW1Db25zb2xlKToKKyAgICAgICAgKEluc3BlY3Rvcjo6SlNH bG9iYWxPYmplY3RDb25zb2xlQ2xpZW50OjpzZXRMb2dUb1N5c3RlbUNvbnNvbGUpOgorICAgICAg ICAoSW5zcGVjdG9yOjpKU0dsb2JhbE9iamVjdENvbnNvbGVDbGllbnQ6Om1lc3NhZ2VXaXRoVHlw ZUFuZExldmVsKToKKyAgICAgICAgKEluc3BlY3Rvcjo6SlNHbG9iYWxPYmplY3RDb25zb2xlQ2xp ZW50Ojppbml0aWFsaXplTG9nVG9TeXN0ZW1Db25zb2xlKTogRGVsZXRlZC4KKyAgICAgICAgU2lt cGxpZnkgYWNjZXNzIHRvIHRoZSBzZXR0aW5nIG5vdyB0aGF0IGl0IGRvZXNuJ3QgbmVlZCB0bwor ICAgICAgICBpbml0aWFsaXplIGl0cyB2YWx1ZSBmcm9tIHByZWZlcmVuY2VzLgorCisyMDE1LTA0 LTEzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2Vi IEluc3BlY3RvcjogQXV0by1hdHRhY2ggZmFpbHMgYWZ0ZXIgcjE3OTU2MiwgaW5pdGlhbGl6YXRp b24gdG9vIGxhdGUgYWZ0ZXIgZGlzcGF0Y2gKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MzY4MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL0pTR2xvYmFsT2JqZWN0Q29uc29sZUNsaWVudC5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTR2xvYmFsT2JqZWN0Q29uc29sZUNsaWVudC5jcHAK aW5kZXggNzVhZDAyZC4uNzViODA1ZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9KU0dsb2JhbE9iamVjdENvbnNvbGVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNHbG9iYWxPYmplY3RDb25zb2xlQ2xpZW50LmNwcApA QCAtMzIsNTEgKzMyLDI2IEBACiAjaW5jbHVkZSAiU2NyaXB0Q2FsbFN0YWNrLmgiCiAjaW5jbHVk ZSAiU2NyaXB0Q2FsbFN0YWNrRmFjdG9yeS5oIgogCi0jaWYgVVNFKENGKQotI2luY2x1ZGUgPENv cmVGb3VuZGF0aW9uL0NvcmVGb3VuZGF0aW9uLmg+Ci0jZW5kaWYKLQogdXNpbmcgbmFtZXNwYWNl IEpTQzsKIAogbmFtZXNwYWNlIEluc3BlY3RvciB7CiAKKyNpZiAhTE9HX0RJU0FCTEVECitzdGF0 aWMgYm9vbCBzTG9nVG9TeXN0ZW1Db25zb2xlID0gdHJ1ZTsKKyNlbHNlCiBzdGF0aWMgYm9vbCBz TG9nVG9TeXN0ZW1Db25zb2xlID0gZmFsc2U7Ci1zdGF0aWMgYm9vbCBzU2V0TG9nVG9TeXN0ZW1D b25zb2xlID0gZmFsc2U7CisjZW5kaWYKIAogYm9vbCBKU0dsb2JhbE9iamVjdENvbnNvbGVDbGll bnQ6OmxvZ1RvU3lzdGVtQ29uc29sZSgpCiB7Ci0gICAgaWYgKCFzU2V0TG9nVG9TeXN0ZW1Db25z b2xlKSB7Ci0gICAgICAgIHN0YXRpYyBzdGQ6Om9uY2VfZmxhZyBpbml0aWFsaXplTG9nZ2luZzsK LSAgICAgICAgc3RkOjpjYWxsX29uY2UoaW5pdGlhbGl6ZUxvZ2dpbmcsIFtdewotICAgICAgICAg ICAgSlNHbG9iYWxPYmplY3RDb25zb2xlQ2xpZW50Ojppbml0aWFsaXplTG9nVG9TeXN0ZW1Db25z b2xlKCk7Ci0gICAgICAgIH0pOwotICAgIH0KICAgICByZXR1cm4gc0xvZ1RvU3lzdGVtQ29uc29s ZTsKIH0KIAogdm9pZCBKU0dsb2JhbE9iamVjdENvbnNvbGVDbGllbnQ6OnNldExvZ1RvU3lzdGVt Q29uc29sZShib29sIHNob3VsZExvZykKIHsKLSAgICBzU2V0TG9nVG9TeXN0ZW1Db25zb2xlID0g dHJ1ZTsKICAgICBzTG9nVG9TeXN0ZW1Db25zb2xlID0gc2hvdWxkTG9nOwogfQogCi12b2lkIEpT R2xvYmFsT2JqZWN0Q29uc29sZUNsaWVudDo6aW5pdGlhbGl6ZUxvZ1RvU3lzdGVtQ29uc29sZSgp Ci17Ci0gICAgLy8gSWYgc2V0TG9nVG9TeXN0ZW1Db25zb2xlKCkgd2FzIGNhbGxlZCwgbm8gbmVl ZCB0byBxdWVyeSB0aGUgZGVmYXVsdCB2YWx1ZS4KLSAgICBpZiAoc1NldExvZ1RvU3lzdGVtQ29u c29sZSkKLSAgICAgICAgcmV0dXJuOwotCi0jaWYgIUxPR19ESVNBQkxFRAotICAgIHNMb2dUb1N5 c3RlbUNvbnNvbGUgPSB0cnVlOwotI2VsaWYgVVNFKENGKQotICAgIEJvb2xlYW4ga2V5RXhpc3Rz QW5kSGFzVmFsaWRGb3JtYXQgPSBmYWxzZTsKLSAgICBCb29sZWFuIHByZWZlcmVuY2UgPSBDRlBy ZWZlcmVuY2VzR2V0QXBwQm9vbGVhblZhbHVlKENGU1RSKCJKYXZhU2NyaXB0Q29yZU91dHB1dENv bnNvbGVNZXNzYWdlc1RvU3lzdGVtQ29uc29sZSIpLCBrQ0ZQcmVmZXJlbmNlc0N1cnJlbnRBcHBs aWNhdGlvbiwgJmtleUV4aXN0c0FuZEhhc1ZhbGlkRm9ybWF0KTsKLSAgICBpZiAoa2V5RXhpc3Rz QW5kSGFzVmFsaWRGb3JtYXQpCi0gICAgICAgIHNMb2dUb1N5c3RlbUNvbnNvbGUgPSBwcmVmZXJl bmNlOwotI2VuZGlmCi0gICAgc1NldExvZ1RvU3lzdGVtQ29uc29sZSA9IHRydWU7Ci19Ci0KIEpT R2xvYmFsT2JqZWN0Q29uc29sZUNsaWVudDo6SlNHbG9iYWxPYmplY3RDb25zb2xlQ2xpZW50KElu c3BlY3RvckNvbnNvbGVBZ2VudCogY29uc29sZUFnZW50KQogICAgIDogQ29uc29sZUNsaWVudCgp CiAgICAgLCBtX2NvbnNvbGVBZ2VudChjb25zb2xlQWdlbnQpCkBAIC04NSw3ICs2MCw2IEBAIEpT R2xvYmFsT2JqZWN0Q29uc29sZUNsaWVudDo6SlNHbG9iYWxPYmplY3RDb25zb2xlQ2xpZW50KElu c3BlY3RvckNvbnNvbGVBZ2VudCoKIAogdm9pZCBKU0dsb2JhbE9iamVjdENvbnNvbGVDbGllbnQ6 Om1lc3NhZ2VXaXRoVHlwZUFuZExldmVsKE1lc3NhZ2VUeXBlIHR5cGUsIE1lc3NhZ2VMZXZlbCBs ZXZlbCwgSlNDOjpFeGVjU3RhdGUqIGV4ZWMsIFJlZlB0cjxTY3JpcHRBcmd1bWVudHM+JiYgYXJn dW1lbnRzKQogewotCiAgICAgaWYgKEpTR2xvYmFsT2JqZWN0Q29uc29sZUNsaWVudDo6bG9nVG9T eXN0ZW1Db25zb2xlKCkpCiAgICAgICAgIENvbnNvbGVDbGllbnQ6OnByaW50Q29uc29sZU1lc3Nh Z2VXaXRoQXJndW1lbnRzKE1lc3NhZ2VTb3VyY2U6OkNvbnNvbGVBUEksIHR5cGUsIGxldmVsLCBl eGVjLCBhcmd1bWVudHMuY29weVJlZigpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9KU0dsb2JhbE9iamVjdENvbnNvbGVDbGllbnQuaCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNHbG9iYWxPYmplY3RDb25zb2xlQ2xpZW50LmgKaW5k ZXggNDU4YTdmOC4uMTJlMWU0MSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2lu c3BlY3Rvci9KU0dsb2JhbE9iamVjdENvbnNvbGVDbGllbnQuaAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL0pTR2xvYmFsT2JqZWN0Q29uc29sZUNsaWVudC5oCkBAIC01MSw4 ICs1MSw2IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgdGltZVN0YW1wKEpTQzo6RXhl Y1N0YXRlKiwgUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4mJikgb3ZlcnJpZGU7CiAKIHByaXZhdGU6 Ci0gICAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUxvZ1RvU3lzdGVtQ29uc29sZSgpOwotCiAgICAg dm9pZCB3YXJuVW5pbXBsZW1lbnRlZChjb25zdCBTdHJpbmcmIG1ldGhvZCk7CiAgICAgdm9pZCBp bnRlcm5hbEFkZE1lc3NhZ2UoTWVzc2FnZVR5cGUsIE1lc3NhZ2VMZXZlbCwgSlNDOjpFeGVjU3Rh dGUqLCBSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiYmKTsKIAo= 250765 2015-04-14 17:37:46 -0700 2015-04-14 17:45:31 -0700 [PATCH] Proposed Fix better-fix.patch text/plain 5964 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNSZW1vdGVJbnNwZWN0b3Iu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU1JlbW90ZUluc3BlY3Rvci5jcHAKaW5k ZXggYTY1MmE1YS4uM2Y3MGY4OCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQ SS9KU1JlbW90ZUluc3BlY3Rvci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9K U1JlbW90ZUluc3BlY3Rvci5jcHAKQEAgLTI2LDEwICsyNiwxMyBAQAogI2luY2x1ZGUgImNvbmZp Zy5oIgogI2luY2x1ZGUgIkpTUmVtb3RlSW5zcGVjdG9yLmgiCiAKKyNpbmNsdWRlICJKU0dsb2Jh bE9iamVjdENvbnNvbGVDbGllbnQuaCIKKwogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQog I2luY2x1ZGUgIlJlbW90ZUluc3BlY3Rvci5oIgorI2VuZGlmCisKIHVzaW5nIG5hbWVzcGFjZSBJ bnNwZWN0b3I7Ci0jZW5kaWYKIAogdm9pZCBKU1JlbW90ZUluc3BlY3RvckRpc2FibGVBdXRvU3Rh cnQodm9pZCkKIHsKQEAgLTU2LDMgKzU5LDggQEAgdm9pZCBKU1JlbW90ZUluc3BlY3RvclNldFBh cmVudFByb2Nlc3NJbmZvcm1hdGlvbihwaWRfdCBwaWQsIGNvbnN0IFVJbnQ4KiBhdWRpdEQKICAg ICBVTlVTRURfUEFSQU0oYXVkaXRMZW5ndGgpOwogI2VuZGlmCiB9CisKK3ZvaWQgSlNSZW1vdGVJ bnNwZWN0b3JTZXRMb2dUb1N5c3RlbUNvbnNvbGUoYm9vbCBsb2dUb1N5c3RlbUNvbnNvbGUpCit7 CisgICAgSlNHbG9iYWxPYmplY3RDb25zb2xlQ2xpZW50OjpzZXRMb2dUb1N5c3RlbUNvbnNvbGUo bG9nVG9TeXN0ZW1Db25zb2xlKTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9BUEkvSlNSZW1vdGVJbnNwZWN0b3IuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNS ZW1vdGVJbnNwZWN0b3IuaAppbmRleCBjOWQ3OTQxLi5hNDU4YTExIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTUmVtb3RlSW5zcGVjdG9yLmgKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0FQSS9KU1JlbW90ZUluc3BlY3Rvci5oCkBAIC0zNyw2ICszNyw4IEBAIEpT X0VYUE9SVCB2b2lkIEpTUmVtb3RlSW5zcGVjdG9yRGlzYWJsZUF1dG9TdGFydCh2b2lkKSBDRl9B VkFJTEFCTEUoMTBfMTEsIDlfMCk7CiBKU19FWFBPUlQgdm9pZCBKU1JlbW90ZUluc3BlY3RvclN0 YXJ0KHZvaWQpIENGX0FWQUlMQUJMRSgxMF8xMSwgOV8wKTsKIEpTX0VYUE9SVCB2b2lkIEpTUmVt b3RlSW5zcGVjdG9yU2V0UGFyZW50UHJvY2Vzc0luZm9ybWF0aW9uKHBpZF90LCBjb25zdCB1aW50 OF90KiBhdWRpdERhdGEsIHNpemVfdCBhdWRpdExlbmd0aCkgQ0ZfQVZBSUxBQkxFKDEwXzExLCA5 XzApOwogCitKU19FWFBPUlQgdm9pZCBKU1JlbW90ZUluc3BlY3RvclNldExvZ1RvU3lzdGVtQ29u c29sZShib29sKSBDRl9BVkFJTEFCTEUoMTBfMTEsIDlfMCk7CisKICNpZmRlZiBfX2NwbHVzcGx1 cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9n IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAxMDhjODcxLi40MGJkMDVk IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNyBAQAogMjAxNS0wNC0xNCAg Sm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCisgICAgICAgIFJlcGxhY2Ug SmF2YVNjcmlwdENvcmVPdXRwdXRDb25zb2xlTWVzc2FnZXNUb1N5c3RlbUNvbnNvbGUgZGVmYXVs dCB3aXRoIGFuIFNQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQzNjkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBBUEkvSlNSZW1vdGVJbnNwZWN0b3IuaDoKKyAgICAgICAgKiBBUEkvSlNSZW1vdGVJ bnNwZWN0b3IuY3BwOgorICAgICAgICAoSlNSZW1vdGVJbnNwZWN0b3JTZXRMb2dUb1N5c3RlbUNv bnNvbGUpOgorICAgICAgICBBZGQgU1BJIHRvIGVuYWJsZS9kaXNhYmxlIGxvZ2dpbmcgdG8gdGhl IHN5c3RlbSBjb25zb2xlLgorICAgICAgICBUaGlzIG9ubHkgYWZmZWN0cyBKU0NvbnRleHQgYGNv bnNvbGVgIGxvZ3MgYW5kIHdhcm5pbmdzLgorCisgICAgICAgICogaW5zcGVjdG9yL0pTR2xvYmFs T2JqZWN0Q29uc29sZUNsaWVudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9KU0dsb2JhbE9iamVj dENvbnNvbGVDbGllbnQuY3BwOgorICAgICAgICAoSW5zcGVjdG9yOjpKU0dsb2JhbE9iamVjdENv bnNvbGVDbGllbnQ6OmxvZ1RvU3lzdGVtQ29uc29sZSk6CisgICAgICAgIChJbnNwZWN0b3I6OkpT R2xvYmFsT2JqZWN0Q29uc29sZUNsaWVudDo6c2V0TG9nVG9TeXN0ZW1Db25zb2xlKToKKyAgICAg ICAgKEluc3BlY3Rvcjo6SlNHbG9iYWxPYmplY3RDb25zb2xlQ2xpZW50OjptZXNzYWdlV2l0aFR5 cGVBbmRMZXZlbCk6CisgICAgICAgIChJbnNwZWN0b3I6OkpTR2xvYmFsT2JqZWN0Q29uc29sZUNs aWVudDo6aW5pdGlhbGl6ZUxvZ1RvU3lzdGVtQ29uc29sZSk6IERlbGV0ZWQuCisgICAgICAgIFNp bXBsaWZ5IGFjY2VzcyB0byB0aGUgc2V0dGluZyBub3cgdGhhdCBpdCBkb2Vzbid0IG5lZWQgdG8K KyAgICAgICAgaW5pdGlhbGl6ZSBpdHMgdmFsdWUgZnJvbSBwcmVmZXJlbmNlcy4KKworMjAxNS0w NC0xNCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IEF1dG8tYXR0YWNoIGZhaWxzIGFmdGVyIHIxNzk1NjIsIGluaXRpYWxpemF0 aW9uIHRvbyBsYXRlIGFmdGVyIGRpc3BhdGNoCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM2ODIKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9KU0dsb2JhbE9iamVjdENvbnNvbGVDbGllbnQuY3BwIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0dsb2JhbE9iamVjdENvbnNvbGVDbGllbnQuY3Bw CmluZGV4IDc1YWQwMmQuLjc1YjgwNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3IvSlNHbG9iYWxPYmplY3RDb25zb2xlQ2xpZW50LmNwcAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTR2xvYmFsT2JqZWN0Q29uc29sZUNsaWVudC5jcHAK QEAgLTMyLDUxICszMiwyNiBAQAogI2luY2x1ZGUgIlNjcmlwdENhbGxTdGFjay5oIgogI2luY2x1 ZGUgIlNjcmlwdENhbGxTdGFja0ZhY3RvcnkuaCIKIAotI2lmIFVTRShDRikKLSNpbmNsdWRlIDxD b3JlRm91bmRhdGlvbi9Db3JlRm91bmRhdGlvbi5oPgotI2VuZGlmCi0KIHVzaW5nIG5hbWVzcGFj ZSBKU0M7CiAKIG5hbWVzcGFjZSBJbnNwZWN0b3IgewogCisjaWYgIUxPR19ESVNBQkxFRAorc3Rh dGljIGJvb2wgc0xvZ1RvU3lzdGVtQ29uc29sZSA9IHRydWU7CisjZWxzZQogc3RhdGljIGJvb2wg c0xvZ1RvU3lzdGVtQ29uc29sZSA9IGZhbHNlOwotc3RhdGljIGJvb2wgc1NldExvZ1RvU3lzdGVt Q29uc29sZSA9IGZhbHNlOworI2VuZGlmCiAKIGJvb2wgSlNHbG9iYWxPYmplY3RDb25zb2xlQ2xp ZW50Ojpsb2dUb1N5c3RlbUNvbnNvbGUoKQogewotICAgIGlmICghc1NldExvZ1RvU3lzdGVtQ29u c29sZSkgewotICAgICAgICBzdGF0aWMgc3RkOjpvbmNlX2ZsYWcgaW5pdGlhbGl6ZUxvZ2dpbmc7 Ci0gICAgICAgIHN0ZDo6Y2FsbF9vbmNlKGluaXRpYWxpemVMb2dnaW5nLCBbXXsKLSAgICAgICAg ICAgIEpTR2xvYmFsT2JqZWN0Q29uc29sZUNsaWVudDo6aW5pdGlhbGl6ZUxvZ1RvU3lzdGVtQ29u c29sZSgpOwotICAgICAgICB9KTsKLSAgICB9CiAgICAgcmV0dXJuIHNMb2dUb1N5c3RlbUNvbnNv bGU7CiB9CiAKIHZvaWQgSlNHbG9iYWxPYmplY3RDb25zb2xlQ2xpZW50OjpzZXRMb2dUb1N5c3Rl bUNvbnNvbGUoYm9vbCBzaG91bGRMb2cpCiB7Ci0gICAgc1NldExvZ1RvU3lzdGVtQ29uc29sZSA9 IHRydWU7CiAgICAgc0xvZ1RvU3lzdGVtQ29uc29sZSA9IHNob3VsZExvZzsKIH0KIAotdm9pZCBK U0dsb2JhbE9iamVjdENvbnNvbGVDbGllbnQ6OmluaXRpYWxpemVMb2dUb1N5c3RlbUNvbnNvbGUo KQotewotICAgIC8vIElmIHNldExvZ1RvU3lzdGVtQ29uc29sZSgpIHdhcyBjYWxsZWQsIG5vIG5l ZWQgdG8gcXVlcnkgdGhlIGRlZmF1bHQgdmFsdWUuCi0gICAgaWYgKHNTZXRMb2dUb1N5c3RlbUNv bnNvbGUpCi0gICAgICAgIHJldHVybjsKLQotI2lmICFMT0dfRElTQUJMRUQKLSAgICBzTG9nVG9T eXN0ZW1Db25zb2xlID0gdHJ1ZTsKLSNlbGlmIFVTRShDRikKLSAgICBCb29sZWFuIGtleUV4aXN0 c0FuZEhhc1ZhbGlkRm9ybWF0ID0gZmFsc2U7Ci0gICAgQm9vbGVhbiBwcmVmZXJlbmNlID0gQ0ZQ cmVmZXJlbmNlc0dldEFwcEJvb2xlYW5WYWx1ZShDRlNUUigiSmF2YVNjcmlwdENvcmVPdXRwdXRD b25zb2xlTWVzc2FnZXNUb1N5c3RlbUNvbnNvbGUiKSwga0NGUHJlZmVyZW5jZXNDdXJyZW50QXBw bGljYXRpb24sICZrZXlFeGlzdHNBbmRIYXNWYWxpZEZvcm1hdCk7Ci0gICAgaWYgKGtleUV4aXN0 c0FuZEhhc1ZhbGlkRm9ybWF0KQotICAgICAgICBzTG9nVG9TeXN0ZW1Db25zb2xlID0gcHJlZmVy ZW5jZTsKLSNlbmRpZgotICAgIHNTZXRMb2dUb1N5c3RlbUNvbnNvbGUgPSB0cnVlOwotfQotCiBK U0dsb2JhbE9iamVjdENvbnNvbGVDbGllbnQ6OkpTR2xvYmFsT2JqZWN0Q29uc29sZUNsaWVudChJ bnNwZWN0b3JDb25zb2xlQWdlbnQqIGNvbnNvbGVBZ2VudCkKICAgICA6IENvbnNvbGVDbGllbnQo KQogICAgICwgbV9jb25zb2xlQWdlbnQoY29uc29sZUFnZW50KQpAQCAtODUsNyArNjAsNiBAQCBK U0dsb2JhbE9iamVjdENvbnNvbGVDbGllbnQ6OkpTR2xvYmFsT2JqZWN0Q29uc29sZUNsaWVudChJ bnNwZWN0b3JDb25zb2xlQWdlbnQqCiAKIHZvaWQgSlNHbG9iYWxPYmplY3RDb25zb2xlQ2xpZW50 OjptZXNzYWdlV2l0aFR5cGVBbmRMZXZlbChNZXNzYWdlVHlwZSB0eXBlLCBNZXNzYWdlTGV2ZWwg bGV2ZWwsIEpTQzo6RXhlY1N0YXRlKiBleGVjLCBSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiYmIGFy Z3VtZW50cykKIHsKLQogICAgIGlmIChKU0dsb2JhbE9iamVjdENvbnNvbGVDbGllbnQ6OmxvZ1Rv U3lzdGVtQ29uc29sZSgpKQogICAgICAgICBDb25zb2xlQ2xpZW50OjpwcmludENvbnNvbGVNZXNz YWdlV2l0aEFyZ3VtZW50cyhNZXNzYWdlU291cmNlOjpDb25zb2xlQVBJLCB0eXBlLCBsZXZlbCwg ZXhlYywgYXJndW1lbnRzLmNvcHlSZWYoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnNwZWN0b3IvSlNHbG9iYWxPYmplY3RDb25zb2xlQ2xpZW50LmggYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTR2xvYmFsT2JqZWN0Q29uc29sZUNsaWVudC5oCmlu ZGV4IDQ1OGE3ZjguLjEyZTFlNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3IvSlNHbG9iYWxPYmplY3RDb25zb2xlQ2xpZW50LmgKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9KU0dsb2JhbE9iamVjdENvbnNvbGVDbGllbnQuaApAQCAtNTEs OCArNTEsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lkIHRpbWVTdGFtcChKU0M6OkV4 ZWNTdGF0ZSosIFJlZlB0cjxTY3JpcHRBcmd1bWVudHM+JiYpIG92ZXJyaWRlOwogCiBwcml2YXRl OgotICAgIHN0YXRpYyB2b2lkIGluaXRpYWxpemVMb2dUb1N5c3RlbUNvbnNvbGUoKTsKLQogICAg IHZvaWQgd2FyblVuaW1wbGVtZW50ZWQoY29uc3QgU3RyaW5nJiBtZXRob2QpOwogICAgIHZvaWQg aW50ZXJuYWxBZGRNZXNzYWdlKE1lc3NhZ2VUeXBlLCBNZXNzYWdlTGV2ZWwsIEpTQzo6RXhlY1N0 YXRlKiwgUmVmUHRyPFNjcmlwdEFyZ3VtZW50cz4mJik7CiAK