178263 2017-10-13 08:15:11 -0700 [WPE][GTK] Provide an implementation of PAL::logLevelString() 2017-10-13 12:05:21 -0700 1 1 1 Unclassified WebKit WPE WebKit Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 178276 1 aperez aperez annulen bugs-noreply cgarcia clopez commit-queue mcatanzaro mmaxfield rniwa webkit-bug-importer zan oldest_to_newest 1360005 0 aperez 2017-10-13 08:15:11 -0700 The debug builds of the WPE and GTK+ port are currently broken due the “PAL::logLevelString” symbol being missing. For example: https://build.webkit.org/builders/GTK%20Linux%2064-bit%20Debug%20(Build)/builds/5976/steps/compile-webkit/logs/stdio We need to provide an implementation for it. 1360006 1 323671 aperez 2017-10-13 08:20:48 -0700 Created attachment 323671 Patch 1360010 2 323671 annulen 2017-10-13 08:41:01 -0700 Comment on attachment 323671 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323671&action=review > Source/WebCore/PAL/pal/unix/LoggingUnix.cpp:44 > + return String("NotYetImplemented,") + logEnv; ASCIILiteral("NotYetImplemented,") may be more appropriate here 1360011 3 323671 annulen 2017-10-13 08:42:47 -0700 Comment on attachment 323671 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323671&action=review > Source/WebCore/PAL/pal/unix/LoggingUnix.cpp:47 > + return emptyString(); I think it should be just String() because we return String, not const String& 1360048 4 aperez 2017-10-13 10:03:19 -0700 (In reply to Konstantin Tokarev from comment #2) > Comment on attachment 323671 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=323671&action=review > > > Source/WebCore/PAL/pal/unix/LoggingUnix.cpp:44 > > + return String("NotYetImplemented,") + logEnv; > > ASCIILiteral("NotYetImplemented,") may be more appropriate here ASCIILiteral does not have an overloadded “+” with the RHS being a char*. We can use the following, at the cost of having one more temporary: return ASCIILiteral("NotYetImplemented,") + String(logEnv); I guess the extra temporary is okay and not a big deal. 1360053 5 aperez 2017-10-13 10:09:26 -0700 (In reply to Konstantin Tokarev from comment #3) > Comment on attachment 323671 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=323671&action=review > > > Source/WebCore/PAL/pal/unix/LoggingUnix.cpp:47 > > + return emptyString(); > > I think it should be just String() because we return String, not const > String& Sure, I'll change this and re-upload. Probably later on we would also want to change “Source/WebCore/platform/unix/LoggingUnix.cpp” and “Source/WebKit/Platform/unix/LoggingUnix.cpp” to use “return String()”. 1360054 6 323688 aperez 2017-10-13 10:10:41 -0700 Created attachment 323688 Patch 1360056 7 323671 annulen 2017-10-13 10:13:56 -0700 Comment on attachment 323671 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323671&action=review >>> Source/WebCore/PAL/pal/unix/LoggingUnix.cpp:44 >>> + return String("NotYetImplemented,") + logEnv; >> >> ASCIILiteral("NotYetImplemented,") may be more appropriate here > > ASCIILiteral does not have an overloadded “+” with the RHS being a char*. > We can use the following, at the cost of having one more temporary: > > return ASCIILiteral("NotYetImplemented,") + String(logEnv); > > I guess the extra temporary is okay and not a big deal. Oh, indeed. Looks like the next approach is better: makeString("NotYetImplemented,", logEnv); 1360065 8 323691 aperez 2017-10-13 10:23:07 -0700 Created attachment 323691 Patch Updated to use the WEBKIT_DEBUG environment variable, as per discussion with Konstantin on IRC, it seems better to have a single variable control logging instead of having to remember to set different ones. 1360069 9 323671 clopez 2017-10-13 10:28:37 -0700 Comment on attachment 323671 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323671&action=review > Source/WebCore/PAL/pal/unix/LoggingUnix.cpp:41 > +#if defined(NDEBUG) > + WTFLogAlways("WEBCORE_DEBUG is not empty, but this is a release build. Notice that many log messages will only appear in a debug build."); > +#endif Not sure about this. I think it only adds extra noise. As you can now build release with logging enabled by simple setting on your environment CXXFLAGS="-DLOG_DISABLED=0" (I do that) I was even looking forward to do this by default on developer builds at bug 177459 1360076 10 323691 clopez 2017-10-13 10:36:29 -0700 Comment on attachment 323691 Patch r=me due to the urgency of this (build currently broken). Please open a new bug (or don't close this one) to address the remaining comments 1360140 11 aperez 2017-10-13 11:52:01 -0700 (In reply to Carlos Alberto Lopez Perez from comment #10) > Comment on attachment 323691 [details] > Patch > > r=me due to the urgency of this (build currently broken). > Please open a new bug (or don't close this one) to address the remaining > comments I have filed bug #178276 as follow-up to try to unify and improve the three logLevelString() functions. 1360149 12 323691 commit-queue 2017-10-13 12:04:27 -0700 Comment on attachment 323691 Patch Clearing flags on attachment: 323691 Committed r223296: <https://trac.webkit.org/changeset/223296> 1360151 13 commit-queue 2017-10-13 12:04:29 -0700 All reviewed patches have been landed. Closing bug. 323671 2017-10-13 08:20:48 -0700 2017-10-13 10:10:34 -0700 Patch bug-178263-20171013182047.patch text/plain 4301 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBhYmFmZGQz OTQzNjNmOGU1ZjRjZjE5MGE1MTcwYWYyNWQzMzA3Mjk2Li4xYzI0ZDdlMTZlMWI3NjI4YzIwMDAw ZTk5NTExMmI2Y2FmYjU2NmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAor MjAxNy0xMC0xMyAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgor CisgICAgICAgIFtXUEVdW0dUS10gUHJvdmlkZSBhbiBpbXBsZW1lbnRhdGlvbiBvZiBQQUw6Omxv Z0xldmVsU3RyaW5nKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3ODI2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFByb3ZpZGUgYW4gaW1wbGVtZW50YXRpb24gb2YgUEFMOjpsb2dMZXZlbFN0cmluZygp IHdoaWNoIHBpY2tzIHRoZSB2YWx1ZSBmcm9tIHRoZQorICAgICAgICBXRUJDT1JFX0RFQlVHIGVu dmlyb25tZW50IHZhcmlhYmxlLiBMb2dnaW5nIG9mIG5vdEltcGxlbWVudGVkKCkgY2FsbHMgaXMg YWx3YXlzIGVuYWJsZWQsCisgICAgICAgIHdoaWNoIGlzIHRoZSBzYW1lIGJlaGF2aW9yIGFzIGlu IFdlYkNvcmU6OmxvZ0xldmVsU3RyaW5nKCkuCisKKyAgICAgICAgKiBwYWwvUGxhdGZvcm1HVEsu Y21ha2U6IEFkZCBMb2dnaW5nVW5peC5jcHAgdG8gdGhlIGxpc3Qgb2Ygc291cmNlcy4KKyAgICAg ICAgKiBwYWwvUGxhdGZvcm1XUEUuY21ha2U6IEFkZCBMb2dnaW5nVW5peC5jcHAgdG8gdGhlIGxp c3Qgb2Ygc291cmNlcy4KKyAgICAgICAgKiBwYWwvdW5peC9Mb2dnaW5nVW5peC5jcHA6IEFkZGVk LgorICAgICAgICAoUEFMOjpsb2dMZXZlbFN0cmluZyk6CisKIDIwMTctMTAtMTIgIE15bGVzIEMu IE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luXSBCdWlsZCBm aXggYWZ0ZXIgcjIyMzIwNgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9QbGF0 Zm9ybUdUSy5jbWFrZSBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvUGxhdGZvcm1HVEsuY21ha2UK aW5kZXggYzZkN2JiZWZiNTA3ZDUxOGE1MTYzMTkzNTk5OGMyY2Q4MDQ5N2UwMy4uYjRhZDQ1Y2M3 ZmI1NTBlYzQ0N2U0ZDA4NTA3ODlkMWFkODc3NTFlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvUEFML3BhbC9QbGF0Zm9ybUdUSy5jbWFrZQorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFs L1BsYXRmb3JtR1RLLmNtYWtlCkBAIC02LDYgKzYsOCBAQCBsaXN0KEFQUEVORCBQQUxfU09VUkNF UwogICAgIHN5c3RlbS9ndGsvU291bmRHdGsuY3BwCiAKICAgICB0ZXh0L0tpbGxSaW5nLmNwcAor CisgICAgdW5peC9Mb2dnaW5nVW5peC5jcHAKICkKIAogaWYgKEVOQUJMRV9TVUJUTEVfQ1JZUFRP KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9QbGF0Zm9ybVdQRS5jbWFrZSBi L1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvUGxhdGZvcm1XUEUuY21ha2UKaW5kZXggYWFiN2UxZjJi ZGU2NDNkMmU1MzQxMjNiYmJkMWQyMTY0MzhkZWFiOC4uMjVmNjY5NGQ5NzJjZWE4ZTFmYzM2NmNh MTVhODZjZjZiYzE5MDlmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9QbGF0 Zm9ybVdQRS5jbWFrZQorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL1BsYXRmb3JtV1BFLmNt YWtlCkBAIC01LDYgKzUsOCBAQCBsaXN0KEFQUEVORCBQQUxfU09VUkNFUwogICAgIHN5c3RlbS9T b3VuZC5jcHAKIAogICAgIHRleHQvS2lsbFJpbmcuY3BwCisKKyAgICB1bml4L0xvZ2dpbmdVbml4 LmNwcAogKQogCiBpZiAoRU5BQkxFX1NVQlRMRV9DUllQVE8pCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9QQUwvcGFsL3VuaXgvTG9nZ2luZ1VuaXguY3BwIGIvU291cmNlL1dlYkNvcmUvUEFM L3BhbC91bml4L0xvZ2dpbmdVbml4LmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lN2Q4NjJhMTExZGMxZGExYjli NjNkMjk0Zjc2ZTQ1ZjhmMTk5ODU3Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUv UEFML3BhbC91bml4L0xvZ2dpbmdVbml4LmNwcApAQCAtMCwwICsxLDUyIEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDE3LCBJZ2FsaWEgUy5MLiBBbGwgUmlnaHRzIFJlc2VydmVkLgorICoKKyAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9u LgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElT JycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElT Q0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IKKyAqIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFM LAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAq IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgi CisjaW5jbHVkZSAiTG9nZ2luZy5oIgorCisjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+ CisKKyNpZiAhTE9HX0RJU0FCTEVEIHx8ICFSRUxFQVNFX0xPR19ESVNBQkxFRAorCituYW1lc3Bh Y2UgUEFMIHsKKworU3RyaW5nIGxvZ0xldmVsU3RyaW5nKCkKK3sKKyAgICBpZiAoY2hhciogbG9n RW52ID0gZ2V0ZW52KCJXRUJDT1JFX0RFQlVHIikpIHsKKworI2lmIGRlZmluZWQoTkRFQlVHKQor ICAgICAgICBXVEZMb2dBbHdheXMoIldFQkNPUkVfREVCVUcgaXMgbm90IGVtcHR5LCBidXQgdGhp cyBpcyBhIHJlbGVhc2UgYnVpbGQuIE5vdGljZSB0aGF0IG1hbnkgbG9nIG1lc3NhZ2VzIHdpbGwg b25seSBhcHBlYXIgaW4gYSBkZWJ1ZyBidWlsZC4iKTsKKyNlbmRpZgorCisgICAgICAgIC8vIFRv IGRpc2FibGUgbG9nZ2luZyBub3RJbXBsZW1lbnRlZCBzZXQgdGhlIERJU0FCTEVfTklfV0FSTklO RyBlbnZpcm9ubWVudCB2YXJpYWJsZSB0byAxLgorICAgICAgICByZXR1cm4gU3RyaW5nKCJOb3RZ ZXRJbXBsZW1lbnRlZCwiKSArIGxvZ0VudjsKKyAgICB9CisKKyAgICByZXR1cm4gZW1wdHlTdHJp bmcoKTsKK30KKworfSAvLyBuYW1lc3BhY2UgUEFMCisKKyNlbmRpZiAvLyAhTE9HX0RJU0FCTEVE IHx8ICFSRUxFQVNFX0xPR19ESVNBQkxFRAo= 323688 2017-10-13 10:10:41 -0700 2017-10-13 10:23:01 -0700 Patch bug-178263-20171013201039.patch text/plain 4310 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBhYmFmZGQz OTQzNjNmOGU1ZjRjZjE5MGE1MTcwYWYyNWQzMzA3Mjk2Li4xYzI0ZDdlMTZlMWI3NjI4YzIwMDAw ZTk5NTExMmI2Y2FmYjU2NmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAor MjAxNy0xMC0xMyAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgor CisgICAgICAgIFtXUEVdW0dUS10gUHJvdmlkZSBhbiBpbXBsZW1lbnRhdGlvbiBvZiBQQUw6Omxv Z0xldmVsU3RyaW5nKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3ODI2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFByb3ZpZGUgYW4gaW1wbGVtZW50YXRpb24gb2YgUEFMOjpsb2dMZXZlbFN0cmluZygp IHdoaWNoIHBpY2tzIHRoZSB2YWx1ZSBmcm9tIHRoZQorICAgICAgICBXRUJDT1JFX0RFQlVHIGVu dmlyb25tZW50IHZhcmlhYmxlLiBMb2dnaW5nIG9mIG5vdEltcGxlbWVudGVkKCkgY2FsbHMgaXMg YWx3YXlzIGVuYWJsZWQsCisgICAgICAgIHdoaWNoIGlzIHRoZSBzYW1lIGJlaGF2aW9yIGFzIGlu IFdlYkNvcmU6OmxvZ0xldmVsU3RyaW5nKCkuCisKKyAgICAgICAgKiBwYWwvUGxhdGZvcm1HVEsu Y21ha2U6IEFkZCBMb2dnaW5nVW5peC5jcHAgdG8gdGhlIGxpc3Qgb2Ygc291cmNlcy4KKyAgICAg ICAgKiBwYWwvUGxhdGZvcm1XUEUuY21ha2U6IEFkZCBMb2dnaW5nVW5peC5jcHAgdG8gdGhlIGxp c3Qgb2Ygc291cmNlcy4KKyAgICAgICAgKiBwYWwvdW5peC9Mb2dnaW5nVW5peC5jcHA6IEFkZGVk LgorICAgICAgICAoUEFMOjpsb2dMZXZlbFN0cmluZyk6CisKIDIwMTctMTAtMTIgIE15bGVzIEMu IE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luXSBCdWlsZCBm aXggYWZ0ZXIgcjIyMzIwNgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9QbGF0 Zm9ybUdUSy5jbWFrZSBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvUGxhdGZvcm1HVEsuY21ha2UK aW5kZXggYzZkN2JiZWZiNTA3ZDUxOGE1MTYzMTkzNTk5OGMyY2Q4MDQ5N2UwMy4uYjRhZDQ1Y2M3 ZmI1NTBlYzQ0N2U0ZDA4NTA3ODlkMWFkODc3NTFlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvUEFML3BhbC9QbGF0Zm9ybUdUSy5jbWFrZQorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFs L1BsYXRmb3JtR1RLLmNtYWtlCkBAIC02LDYgKzYsOCBAQCBsaXN0KEFQUEVORCBQQUxfU09VUkNF UwogICAgIHN5c3RlbS9ndGsvU291bmRHdGsuY3BwCiAKICAgICB0ZXh0L0tpbGxSaW5nLmNwcAor CisgICAgdW5peC9Mb2dnaW5nVW5peC5jcHAKICkKIAogaWYgKEVOQUJMRV9TVUJUTEVfQ1JZUFRP KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9QbGF0Zm9ybVdQRS5jbWFrZSBi L1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvUGxhdGZvcm1XUEUuY21ha2UKaW5kZXggYWFiN2UxZjJi ZGU2NDNkMmU1MzQxMjNiYmJkMWQyMTY0MzhkZWFiOC4uMjVmNjY5NGQ5NzJjZWE4ZTFmYzM2NmNh MTVhODZjZjZiYzE5MDlmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9QbGF0 Zm9ybVdQRS5jbWFrZQorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL1BsYXRmb3JtV1BFLmNt YWtlCkBAIC01LDYgKzUsOCBAQCBsaXN0KEFQUEVORCBQQUxfU09VUkNFUwogICAgIHN5c3RlbS9T b3VuZC5jcHAKIAogICAgIHRleHQvS2lsbFJpbmcuY3BwCisKKyAgICB1bml4L0xvZ2dpbmdVbml4 LmNwcAogKQogCiBpZiAoRU5BQkxFX1NVQlRMRV9DUllQVE8pCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9QQUwvcGFsL3VuaXgvTG9nZ2luZ1VuaXguY3BwIGIvU291cmNlL1dlYkNvcmUvUEFM L3BhbC91bml4L0xvZ2dpbmdVbml4LmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43YzcyNDllOWEyZDU5NDk2NGVm YTM5Mzk4ODkxMWNjMTE3ZmFkOWRlCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUv UEFML3BhbC91bml4L0xvZ2dpbmdVbml4LmNwcApAQCAtMCwwICsxLDUyIEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDE3LCBJZ2FsaWEgUy5MLiBBbGwgUmlnaHRzIFJlc2VydmVkLgorICoKKyAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9u LgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElT JycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElT Q0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IKKyAqIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFM LAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAq IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgi CisjaW5jbHVkZSAiTG9nZ2luZy5oIgorCisjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+ CisKKyNpZiAhTE9HX0RJU0FCTEVEIHx8ICFSRUxFQVNFX0xPR19ESVNBQkxFRAorCituYW1lc3Bh Y2UgUEFMIHsKKworU3RyaW5nIGxvZ0xldmVsU3RyaW5nKCkKK3sKKyAgICBpZiAoY2hhciogbG9n RW52ID0gZ2V0ZW52KCJXRUJDT1JFX0RFQlVHIikpIHsKKworI2lmIGRlZmluZWQoTkRFQlVHKQor ICAgICAgICBXVEZMb2dBbHdheXMoIldFQkNPUkVfREVCVUcgaXMgbm90IGVtcHR5LCBidXQgdGhp cyBpcyBhIHJlbGVhc2UgYnVpbGQuIE5vdGljZSB0aGF0IG1hbnkgbG9nIG1lc3NhZ2VzIHdpbGwg b25seSBhcHBlYXIgaW4gYSBkZWJ1ZyBidWlsZC4iKTsKKyNlbmRpZgorCisgICAgICAgIC8vIFRv IGRpc2FibGUgbG9nZ2luZyBub3RJbXBsZW1lbnRlZCBzZXQgdGhlIERJU0FCTEVfTklfV0FSTklO RyBlbnZpcm9ubWVudCB2YXJpYWJsZSB0byAxLgorICAgICAgICByZXR1cm4gQVNDSUlMaXRlcmFs KCJOb3RZZXRJbXBsZW1lbnRlZCwiKSArIFN0cmluZyhsb2dFbnYpOworICAgIH0KKworICAgIHJl dHVybiBTdHJpbmcoKTsKK30KKworfSAvLyBuYW1lc3BhY2UgUEFMCisKKyNlbmRpZiAvLyAhTE9H X0RJU0FCTEVEIHx8ICFSRUxFQVNFX0xPR19ESVNBQkxFRAo= 323691 2017-10-13 10:23:07 -0700 2017-10-13 12:04:27 -0700 Patch bug-178263-20171013202305.patch text/plain 4309 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBhYmFmZGQz OTQzNjNmOGU1ZjRjZjE5MGE1MTcwYWYyNWQzMzA3Mjk2Li4xYzI0ZDdlMTZlMWI3NjI4YzIwMDAw ZTk5NTExMmI2Y2FmYjU2NmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAor MjAxNy0xMC0xMyAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgor CisgICAgICAgIFtXUEVdW0dUS10gUHJvdmlkZSBhbiBpbXBsZW1lbnRhdGlvbiBvZiBQQUw6Omxv Z0xldmVsU3RyaW5nKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3ODI2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFByb3ZpZGUgYW4gaW1wbGVtZW50YXRpb24gb2YgUEFMOjpsb2dMZXZlbFN0cmluZygp IHdoaWNoIHBpY2tzIHRoZSB2YWx1ZSBmcm9tIHRoZQorICAgICAgICBXRUJDT1JFX0RFQlVHIGVu dmlyb25tZW50IHZhcmlhYmxlLiBMb2dnaW5nIG9mIG5vdEltcGxlbWVudGVkKCkgY2FsbHMgaXMg YWx3YXlzIGVuYWJsZWQsCisgICAgICAgIHdoaWNoIGlzIHRoZSBzYW1lIGJlaGF2aW9yIGFzIGlu IFdlYkNvcmU6OmxvZ0xldmVsU3RyaW5nKCkuCisKKyAgICAgICAgKiBwYWwvUGxhdGZvcm1HVEsu Y21ha2U6IEFkZCBMb2dnaW5nVW5peC5jcHAgdG8gdGhlIGxpc3Qgb2Ygc291cmNlcy4KKyAgICAg ICAgKiBwYWwvUGxhdGZvcm1XUEUuY21ha2U6IEFkZCBMb2dnaW5nVW5peC5jcHAgdG8gdGhlIGxp c3Qgb2Ygc291cmNlcy4KKyAgICAgICAgKiBwYWwvdW5peC9Mb2dnaW5nVW5peC5jcHA6IEFkZGVk LgorICAgICAgICAoUEFMOjpsb2dMZXZlbFN0cmluZyk6CisKIDIwMTctMTAtMTIgIE15bGVzIEMu IE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luXSBCdWlsZCBm aXggYWZ0ZXIgcjIyMzIwNgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9QbGF0 Zm9ybUdUSy5jbWFrZSBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvUGxhdGZvcm1HVEsuY21ha2UK aW5kZXggYzZkN2JiZWZiNTA3ZDUxOGE1MTYzMTkzNTk5OGMyY2Q4MDQ5N2UwMy4uYjRhZDQ1Y2M3 ZmI1NTBlYzQ0N2U0ZDA4NTA3ODlkMWFkODc3NTFlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvUEFML3BhbC9QbGF0Zm9ybUdUSy5jbWFrZQorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFs L1BsYXRmb3JtR1RLLmNtYWtlCkBAIC02LDYgKzYsOCBAQCBsaXN0KEFQUEVORCBQQUxfU09VUkNF UwogICAgIHN5c3RlbS9ndGsvU291bmRHdGsuY3BwCiAKICAgICB0ZXh0L0tpbGxSaW5nLmNwcAor CisgICAgdW5peC9Mb2dnaW5nVW5peC5jcHAKICkKIAogaWYgKEVOQUJMRV9TVUJUTEVfQ1JZUFRP KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9QbGF0Zm9ybVdQRS5jbWFrZSBi L1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvUGxhdGZvcm1XUEUuY21ha2UKaW5kZXggYWFiN2UxZjJi ZGU2NDNkMmU1MzQxMjNiYmJkMWQyMTY0MzhkZWFiOC4uMjVmNjY5NGQ5NzJjZWE4ZTFmYzM2NmNh MTVhODZjZjZiYzE5MDlmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9QbGF0 Zm9ybVdQRS5jbWFrZQorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL1BsYXRmb3JtV1BFLmNt YWtlCkBAIC01LDYgKzUsOCBAQCBsaXN0KEFQUEVORCBQQUxfU09VUkNFUwogICAgIHN5c3RlbS9T b3VuZC5jcHAKIAogICAgIHRleHQvS2lsbFJpbmcuY3BwCisKKyAgICB1bml4L0xvZ2dpbmdVbml4 LmNwcAogKQogCiBpZiAoRU5BQkxFX1NVQlRMRV9DUllQVE8pCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9QQUwvcGFsL3VuaXgvTG9nZ2luZ1VuaXguY3BwIGIvU291cmNlL1dlYkNvcmUvUEFM L3BhbC91bml4L0xvZ2dpbmdVbml4LmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xMzM1ZDA1YzY1MmI3OWQzYzVm ZDk0NjY0MDhmNmE4Zjc4MjM0YzIzCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUv UEFML3BhbC91bml4L0xvZ2dpbmdVbml4LmNwcApAQCAtMCwwICsxLDUyIEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDE3LCBJZ2FsaWEgUy5MLiBBbGwgUmlnaHRzIFJlc2VydmVkLgorICoKKyAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9u LgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElT JycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElT Q0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IKKyAqIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFM LAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAq IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgi CisjaW5jbHVkZSAiTG9nZ2luZy5oIgorCisjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+ CisKKyNpZiAhTE9HX0RJU0FCTEVEIHx8ICFSRUxFQVNFX0xPR19ESVNBQkxFRAorCituYW1lc3Bh Y2UgUEFMIHsKKworU3RyaW5nIGxvZ0xldmVsU3RyaW5nKCkKK3sKKyAgICBpZiAoY2hhciogbG9n RW52ID0gZ2V0ZW52KCJXRUJLSVRfREVCVUciKSkgeworCisjaWYgZGVmaW5lZChOREVCVUcpCisg ICAgICAgIFdURkxvZ0Fsd2F5cygiV0VCQ09SRV9ERUJVRyBpcyBub3QgZW1wdHksIGJ1dCB0aGlz IGlzIGEgcmVsZWFzZSBidWlsZC4gTm90aWNlIHRoYXQgbWFueSBsb2cgbWVzc2FnZXMgd2lsbCBv bmx5IGFwcGVhciBpbiBhIGRlYnVnIGJ1aWxkLiIpOworI2VuZGlmCisKKyAgICAgICAgLy8gVG8g ZGlzYWJsZSBsb2dnaW5nIG5vdEltcGxlbWVudGVkIHNldCB0aGUgRElTQUJMRV9OSV9XQVJOSU5H IGVudmlyb25tZW50IHZhcmlhYmxlIHRvIDEuCisgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwo Ik5vdFlldEltcGxlbWVudGVkLCIpICsgU3RyaW5nKGxvZ0Vudik7CisgICAgfQorCisgICAgcmV0 dXJuIFN0cmluZygpOworfQorCit9IC8vIG5hbWVzcGFjZSBQQUwKKworI2VuZGlmIC8vICFMT0df RElTQUJMRUQgfHwgIVJFTEVBU0VfTE9HX0RJU0FCTEVECg==