96478 2012-09-12 01:16:22 -0700 [EFL][WK2] Implement missing initializeLogChannel function 2012-09-13 18:15:22 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 96500 1 ky0.choi ky0.choi gyuyoung.kim lucas.de.marchi rakuco ryuan.choi webkit.review.bot oldest_to_newest 718034 0 ky0.choi 2012-09-12 01:16:22 -0700 Implemented log channel initialization function for EFL platform in WebKit2. 718035 1 163539 ky0.choi 2012-09-12 01:19:45 -0700 Created attachment 163539 Patch 718056 2 163539 rakuco 2012-09-12 01:45:34 -0700 Comment on attachment 163539 Patch Why not use the implementation we already have in WebCore? Plus the use of glib here is absolutely unnecessary. 718168 3 ky0.choi 2012-09-12 04:11:03 -0700 (In reply to comment #2) > (From update of attachment 163539 [details]) > Why not use the implementation we already have in WebCore? Plus the use of glib here is absolutely unnecessary. The implementation of logging on WebKit is little bit different from WebCore. The routine is called once in case of WebCore implementation, but the routine is called many times in case of WebKit implementation. I think, it's enough to call initializeLogChannel() once like WebCore implementation. 718263 4 ky0.choi 2012-09-12 05:47:21 -0700 I want to change previous routine on GTK and QT first. (Bug 96500) 718264 5 163539 gyuyoung.kim 2012-09-12 05:47:50 -0700 Comment on attachment 163539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163539&action=review > Source/WebKit2/Platform/efl/LoggingEfl.cpp:37 > + DEFINE_STATIC_LOCAL(const String, logValue, (g_getenv("WEBKIT_DEBUG"))); If we use getenv instead of g_getenv, can't we remove "#include <glib.h>" ? If possible, EFL port should not have glib dependency. > Source/WebKit2/Platform/efl/LoggingEfl.cpp:46 > + logValue.split(",", activatedNames); "," -> ',' ? 718271 6 163539 ryuan.choi 2012-09-12 05:51:17 -0700 Comment on attachment 163539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163539&action=review > Source/WebKit2/Platform/efl/LoggingEfl.cpp:37 > + DEFINE_STATIC_LOCAL(const String, logValue, (g_getenv("WEBKIT_DEBUG"))); I think that it can be moved into below 44 line. (without static) > Source/WebKit2/Platform/efl/LoggingEfl.cpp:38 > + static Vector<WTFLogChannel*> activatedChannels; Why this is not static ? > Source/WebKit2/Platform/efl/LoggingEfl.cpp:45 > + static Vector<String> activatedNames; Should it be static? > Source/WebKit2/Platform/efl/LoggingEfl.cpp:46 > + logValue.split(",", activatedNames); As following http://trac.webkit.org/wiki/EfficientStrings, we recommand ASCIILiteral like logValue.split(ASCIILiteral(",", ...) > Source/WebKit2/Platform/efl/LoggingEfl.cpp:47 > + for (unsigned int i = 0; i < activatedNames.size(); i++) { I prefered size_t. 718275 7 ryuan.choi 2012-09-12 05:54:05 -0700 (In reply to comment #6) > (From update of attachment 163539 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=163539&action=review > > > Source/WebKit2/Platform/efl/LoggingEfl.cpp:46 > > + logValue.split(",", activatedNames); > Oops, I think that gyuyoung is right. first this can be ','. If then, logValue.split(',', activatedNames); is reasonable. 719185 8 163539 ky0.choi 2012-09-13 01:00:20 -0700 Comment on attachment 163539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163539&action=review I tried to change previous routine in GTK and QT but, it can not be done easily. I just want add this feature to EFL. >>> Source/WebKit2/Platform/efl/LoggingEfl.cpp:37 >>> + DEFINE_STATIC_LOCAL(const String, logValue, (g_getenv("WEBKIT_DEBUG"))); >> >> If we use getenv instead of g_getenv, can't we remove "#include <glib.h>" ? If possible, EFL port should not have glib dependency. > > I think that it can be moved into below 44 line. (without static) I will remove glib dependency. I agree with Ryuan. It can be moved into below if block. >> Source/WebKit2/Platform/efl/LoggingEfl.cpp:38 >> + static Vector<WTFLogChannel*> activatedChannels; > > Why this is not static ? I think it may be static to avoid recalculation. >> Source/WebKit2/Platform/efl/LoggingEfl.cpp:45 >> + static Vector<String> activatedNames; > > Should it be static? No. >>>> Source/WebKit2/Platform/efl/LoggingEfl.cpp:46 >>>> + logValue.split(",", activatedNames); >>> >>> "," -> ',' ? >> >> As following http://trac.webkit.org/wiki/EfficientStrings, we recommand ASCIILiteral like logValue.split(ASCIILiteral(",", ...) > > Oops, I think that gyuyoung is right. first this can be ','. > If then, logValue.split(',', activatedNames); is reasonable. I will use ',' instead of "," >> Source/WebKit2/Platform/efl/LoggingEfl.cpp:47 >> + for (unsigned int i = 0; i < activatedNames.size(); i++) { > > I prefered size_t. I do. 719191 9 163808 ky0.choi 2012-09-13 01:06:54 -0700 Created attachment 163808 Patch 719386 10 ryuan.choi 2012-09-13 06:01:52 -0700 (In reply to comment #9) > Created an attachment (id=163808) [details] > Patch Looks good to me. 720186 11 163808 webkit.review.bot 2012-09-13 18:15:18 -0700 Comment on attachment 163808 Patch Clearing flags on attachment: 163808 Committed r128537: <http://trac.webkit.org/changeset/128537> 720187 12 webkit.review.bot 2012-09-13 18:15:22 -0700 All reviewed patches have been landed. Closing bug. 163539 2012-09-12 01:19:45 -0700 2012-09-13 01:06:48 -0700 Patch diff text/plain 5297 ky0.choi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiYTIyMTk2Li5jMDUxMjZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTItMDktMTIgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0VGTF1bV0syXSBJbXBsZW1lbnQgbWlzc2luZyBpbml0aWFsaXplTG9nQ2hhbm5l bCBmdW5jdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTY0NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJbXBsZW1lbnRlZCBsb2cgY2hhbm5lbCBpbml0aWFsaXphdGlvbiBmdW5jdGlvbiBmb3IgRUZM IHBsYXRmb3JtIGluIFdlYktpdDIuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9Mb2dnaW5nLmNwcDoK KyAgICAgICAgKFdlYktpdCk6CisgICAgICAgICogUGxhdGZvcm0vTG9nZ2luZy5oOgorICAgICAg ICAoV2ViS2l0KToKKyAgICAgICAgKiBQbGF0Zm9ybS9lZmwvTG9nZ2luZ0VmbC5jcHA6IEFkZGVk LgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6aW5pdGlhbGl6ZUxvZ0NoYW5u ZWwpOiBDaGFubmVsIGlzIGluaXRpYWxpemVkIGlmIGl0cyBuYW1lIGlzIGZvdW5kIGluIFdFQktJ VF9ERUJVRy4KKyAgICAgICAgKiBQbGF0Zm9ybUVmbC5jbWFrZToKKwogMjAxMi0wOS0xMSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEFjY2VsZXJhdGVk IGNvbXBvc2l0aW5nIHNob3VsZCBhbHdheXMgYmUgZm9yY2VkIHdoZW4gdXNpbmcgdGhlIHRpbGVk IGRyYXdpbmcgYXJlYQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vTG9nZ2lu Zy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dnaW5nLmNwcAppbmRleCAzM2I0NjM3 Li4xNzY5NGM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dnaW5nLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dnaW5nLmNwcApAQCAtMzgsMTQgKzM4 LDE0IEBAIFdURkxvZ0NoYW5uZWwgTG9nVmlldyAgICAgICAgID0geyAweDAwMDAwMDA4LCAiV2Vi S2l0MkxvZ0xldmVsIiwgV1RGTG9nQ2hhbm5lbE9mCiBXVEZMb2dDaGFubmVsIExvZ0ljb25EYXRh YmFzZSA9IHsgMHgwMDAwMDAxMCwgIldlYktpdDJMb2dMZXZlbCIsIFdURkxvZ0NoYW5uZWxPZmYg fTsKIFdURkxvZ0NoYW5uZWwgTG9nS2V5SGFuZGxpbmcgID0geyAweDAwMDAwMDIwLCAiV2ViS2l0 MkxvZ0xldmVsIiwgV1RGTG9nQ2hhbm5lbE9mZiB9OwogCi0jaWYgIVBMQVRGT1JNKE1BQykgJiYg IVBMQVRGT1JNKEdUSykgJiYgIVBMQVRGT1JNKFFUKQorI2lmICFQTEFURk9STShNQUMpICYmICFQ TEFURk9STShHVEspICYmICFQTEFURk9STShRVCkgJiYgIVBMQVRGT1JNKEVGTCkKIHZvaWQgaW5p dGlhbGl6ZUxvZ0NoYW5uZWwoV1RGTG9nQ2hhbm5lbCogY2hhbm5lbCkKIHsKICAgICAvLyBGSVhN RTogRWFjaCBwbGF0Zm9ybSB3aWxsIG5lZWQgdG8gZGVmaW5lIHRoZWlyIG93biBpbml0aWFsaXpl TG9nQ2hhbm5lbCgpLgogfQogI2VuZGlmCiAKLSNpZiBQTEFURk9STShHVEspIHx8IFBMQVRGT1JN KFFUKQorI2lmIFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oUVQpIHx8IFBMQVRGT1JNKEVGTCkK IFdURkxvZ0NoYW5uZWwqIGdldENoYW5uZWxGcm9tTmFtZShjb25zdCBTdHJpbmcmIGNoYW5uZWxO YW1lKQogewogICAgIGlmICghKGNoYW5uZWxOYW1lLmxlbmd0aCgpID49IDIpKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5oIGIvU291cmNlL1dlYktpdDIvUGxh dGZvcm0vTG9nZ2luZy5oCmluZGV4IGM0N2JmZmYuLjE3M2Q2MDQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1BsYXRmb3JtL0xvZ2dpbmcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bS9Mb2dnaW5nLmgKQEAgLTQ2LDcgKzQ2LDcgQEAgZXh0ZXJuIFdURkxvZ0NoYW5uZWwgTG9nVmll dzsKIAogdm9pZCBpbml0aWFsaXplTG9nQ2hhbm5lbChXVEZMb2dDaGFubmVsKik7CiB2b2lkIGlu aXRpYWxpemVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KHZvaWQpOwotI2lmIFBMQVRGT1JNKEdUSykg fHwgUExBVEZPUk0oUVQpCisjaWYgUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShRVCkgfHwgUExB VEZPUk0oRUZMKQogV1RGTG9nQ2hhbm5lbCogZ2V0Q2hhbm5lbEZyb21OYW1lKGNvbnN0IFN0cmlu ZyYgY2hhbm5lbE5hbWUpOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1Bs YXRmb3JtL2VmbC9Mb2dnaW5nRWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL2VmbC9M b2dnaW5nRWZsLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xOThjMTkw Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vZWZsL0xvZ2dpbmdF ZmwuY3BwCkBAIC0wLDAgKzEsNjAgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgU2Ftc3Vu ZyBFbGVjdHJvbmljcy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2Ug Y29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBS ZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNv cHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3Ro ZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMg YGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0Yg TUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0Ug QVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRS SUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUg R09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBP UiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElO IEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUg ImNvbmZpZy5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKKworI2luY2x1ZGUgPGdsaWIuaD4KKwor bmFtZXNwYWNlIFdlYktpdCB7CisKKyNpZiAhTE9HX0RJU0FCTEVECisKK3ZvaWQgaW5pdGlhbGl6 ZUxvZ0NoYW5uZWwoV1RGTG9nQ2hhbm5lbCogY2hhbm5lbCkKK3sKKyAgICBERUZJTkVfU1RBVElD X0xPQ0FMKGNvbnN0IFN0cmluZywgbG9nVmFsdWUsIChnX2dldGVudigiV0VCS0lUX0RFQlVHIikp KTsKKyAgICBzdGF0aWMgVmVjdG9yPFdURkxvZ0NoYW5uZWwqPiBhY3RpdmF0ZWRDaGFubmVsczsK KworICAgIGlmIChsb2dWYWx1ZS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKworICAgIC8v IEZpbGwgYWN0aXZhdGVkQ2hhbm5lbHMgdmVjdG9yIG9ubHkgb25jZSBiYXNlZCBvbiBuYW1lcyBz ZXQgaW4gbG9nVmFsdWUuCisgICAgaWYgKGFjdGl2YXRlZENoYW5uZWxzLmlzRW1wdHkoKSkgewor ICAgICAgICBzdGF0aWMgVmVjdG9yPFN0cmluZz4gYWN0aXZhdGVkTmFtZXM7CisgICAgICAgIGxv Z1ZhbHVlLnNwbGl0KCIsIiwgYWN0aXZhdGVkTmFtZXMpOworICAgICAgICBmb3IgKHVuc2lnbmVk IGludCBpID0gMDsgaSA8IGFjdGl2YXRlZE5hbWVzLnNpemUoKTsgaSsrKSB7CisgICAgICAgICAg ICBXVEZMb2dDaGFubmVsKiBhY3RpdmVDaGFubmVsID0gZ2V0Q2hhbm5lbEZyb21OYW1lKGFjdGl2 YXRlZE5hbWVzW2ldKTsKKyAgICAgICAgICAgIGlmIChhY3RpdmVDaGFubmVsKQorICAgICAgICAg ICAgICAgIGFjdGl2YXRlZENoYW5uZWxzLmFwcGVuZChhY3RpdmVDaGFubmVsKTsKKyAgICAgICAg fQorICAgIH0KKworICAgIGlmIChhY3RpdmF0ZWRDaGFubmVscy5jb250YWlucyhjaGFubmVsKSkK KyAgICAgICAgY2hhbm5lbC0+c3RhdGUgPSBXVEZMb2dDaGFubmVsT247Cit9CisKKyNlbmRpZiAv LyAhTE9HX0RJU0FCTEVECisKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3Jt RWZsLmNtYWtlIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKaW5kZXggOWFiYzZl Yy4uZDM2MzkyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UK KysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKQEAgLTEsNCArMSw1IEBACiBM SVNUKEFQUEVORCBXZWJLaXQyX1NPVVJDRVMKKyAgICBQbGF0Zm9ybS9lZmwvTG9nZ2luZ0VmbC5j cHAKICAgICBQbGF0Zm9ybS9lZmwvTW9kdWxlRWZsLmNwcAogICAgIFBsYXRmb3JtL2VmbC9Xb3Jr UXVldWVFZmwuY3BwCiAgICAgUGxhdGZvcm0vdW5peC9TaGFyZWRNZW1vcnlVbml4LmNwcAo= 163808 2012-09-13 01:06:54 -0700 2012-09-13 18:15:18 -0700 Patch bug-96478-20120913170626.patch text/plain 5647 ky0.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmEyMjE5NjIyZDBmYzA3 YzJlODUwMzVjOTg5M2EwMGQzZjI1NTgwZS4uYzA1MTI2YTgxZTc3YzRkYmQyMThkYzkxMWU4N2E3 ZTM3OTI0Nzg1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA5LTEyICBLd2Fu Z1lvbmcgQ2hvaSAgPGt5MC5jaG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0g SW1wbGVtZW50IG1pc3NpbmcgaW5pdGlhbGl6ZUxvZ0NoYW5uZWwgZnVuY3Rpb24KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NDc4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50ZWQgbG9nIGNo YW5uZWwgaW5pdGlhbGl6YXRpb24gZnVuY3Rpb24gZm9yIEVGTCBwbGF0Zm9ybSBpbiBXZWJLaXQy LgorCisgICAgICAgICogUGxhdGZvcm0vTG9nZ2luZy5jcHA6CisgICAgICAgIChXZWJLaXQpOgor ICAgICAgICAqIFBsYXRmb3JtL0xvZ2dpbmcuaDoKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAg ICogUGxhdGZvcm0vZWZsL0xvZ2dpbmdFZmwuY3BwOiBBZGRlZC4KKyAgICAgICAgKFdlYktpdCk6 CisgICAgICAgIChXZWJLaXQ6OmluaXRpYWxpemVMb2dDaGFubmVsKTogQ2hhbm5lbCBpcyBpbml0 aWFsaXplZCBpZiBpdHMgbmFtZSBpcyBmb3VuZCBpbiBXRUJLSVRfREVCVUcuCisgICAgICAgICog UGxhdGZvcm1FZmwuY21ha2U6CisKIDIwMTItMDktMTEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVy c2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBBY2NlbGVyYXRlZCBjb21wb3NpdGluZyBzaG91bGQg YWx3YXlzIGJlIGZvcmNlZCB3aGVuIHVzaW5nIHRoZSB0aWxlZCBkcmF3aW5nIGFyZWEKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0xvZ2dpbmcuY3BwIGIvU291cmNlL1dlYktp dDIvUGxhdGZvcm0vTG9nZ2luZy5jcHAKaW5kZXggMzNiNDYzNzQzNGVjMjBkNzRmYWEwYTE1NDMx MGU2YTViMDdlYmNhMC4uMTc2OTRjOTkzODIzZDZlOTBhOGMzMjM0YTQyNzM1YTJkZWQwNTk3NCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5jcHAKQEAgLTM4LDE0ICszOCwxNCBAQCBXVEZM b2dDaGFubmVsIExvZ1ZpZXcgICAgICAgICA9IHsgMHgwMDAwMDAwOCwgIldlYktpdDJMb2dMZXZl bCIsIFdURkxvZ0NoYW5uZWxPZgogV1RGTG9nQ2hhbm5lbCBMb2dJY29uRGF0YWJhc2UgPSB7IDB4 MDAwMDAwMTAsICJXZWJLaXQyTG9nTGV2ZWwiLCBXVEZMb2dDaGFubmVsT2ZmIH07CiBXVEZMb2dD aGFubmVsIExvZ0tleUhhbmRsaW5nICA9IHsgMHgwMDAwMDAyMCwgIldlYktpdDJMb2dMZXZlbCIs IFdURkxvZ0NoYW5uZWxPZmYgfTsKIAotI2lmICFQTEFURk9STShNQUMpICYmICFQTEFURk9STShH VEspICYmICFQTEFURk9STShRVCkKKyNpZiAhUExBVEZPUk0oTUFDKSAmJiAhUExBVEZPUk0oR1RL KSAmJiAhUExBVEZPUk0oUVQpICYmICFQTEFURk9STShFRkwpCiB2b2lkIGluaXRpYWxpemVMb2dD aGFubmVsKFdURkxvZ0NoYW5uZWwqIGNoYW5uZWwpCiB7CiAgICAgLy8gRklYTUU6IEVhY2ggcGxh dGZvcm0gd2lsbCBuZWVkIHRvIGRlZmluZSB0aGVpciBvd24gaW5pdGlhbGl6ZUxvZ0NoYW5uZWwo KS4KIH0KICNlbmRpZgogCi0jaWYgUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShRVCkKKyNpZiBQ TEFURk9STShHVEspIHx8IFBMQVRGT1JNKFFUKSB8fCBQTEFURk9STShFRkwpCiBXVEZMb2dDaGFu bmVsKiBnZXRDaGFubmVsRnJvbU5hbWUoY29uc3QgU3RyaW5nJiBjaGFubmVsTmFtZSkKIHsKICAg ICBpZiAoIShjaGFubmVsTmFtZS5sZW5ndGgoKSA+PSAyKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1BsYXRmb3JtL0xvZ2dpbmcuaCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0xvZ2dp bmcuaAppbmRleCBjNDdiZmZmNmVlMTlhNDEwYWIyMTA3MjYzYTUyYzAwMDdkYzczZjZlLi4xNzNk NjA0ZTlkMzBjNDE2ZjcwNTA5YjM1ZjBhZTU3YTViM2M4ZjZkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9QbGF0Zm9ybS9Mb2dnaW5nLmgKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0v TG9nZ2luZy5oCkBAIC00Niw3ICs0Niw3IEBAIGV4dGVybiBXVEZMb2dDaGFubmVsIExvZ1ZpZXc7 CiAKIHZvaWQgaW5pdGlhbGl6ZUxvZ0NoYW5uZWwoV1RGTG9nQ2hhbm5lbCopOwogdm9pZCBpbml0 aWFsaXplTG9nQ2hhbm5lbHNJZk5lY2Vzc2FyeSh2b2lkKTsKLSNpZiBQTEFURk9STShHVEspIHx8 IFBMQVRGT1JNKFFUKQorI2lmIFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oUVQpIHx8IFBMQVRG T1JNKEVGTCkKIFdURkxvZ0NoYW5uZWwqIGdldENoYW5uZWxGcm9tTmFtZShjb25zdCBTdHJpbmcm IGNoYW5uZWxOYW1lKTsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybS9lZmwvTG9nZ2luZ0VmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9lZmwvTG9n Z2luZ0VmbC5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNWM4YjcwMDk3YWVkMWI1Yjk0YzRlMTUxYTY4Mjk0MDY4 YTE4Mjc5NQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL2VmbC9M b2dnaW5nRWZsLmNwcApAQCAtMCwwICsxLDU4IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEy IFNhbXN1bmcgRWxlY3Ryb25pY3MuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Yg c291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgor ICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5k L29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgor ICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJ QlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElF UywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQ VVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElU UyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElO Q0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdF UyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJT VElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsg T1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBU SEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJ TElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJ U0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNp bmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgiCisKKyNpZiAhTE9HX0RJU0FC TEVECisKK25hbWVzcGFjZSBXZWJLaXQgeworCit2b2lkIGluaXRpYWxpemVMb2dDaGFubmVsKFdU RkxvZ0NoYW5uZWwqIGNoYW5uZWwpCit7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChWZWN0b3I8 V1RGTG9nQ2hhbm5lbCo+LCBhY3RpdmF0ZWRDaGFubmVscywgKCkpOworCisgICAgLy8gRmlsbCBh Y3RpdmF0ZWRDaGFubmVscyB2ZWN0b3Igb25seSBvbmNlIGJhc2VkIG9uIG5hbWVzIHNldCBpbiBs b2dWYWx1ZS4KKyAgICBpZiAoYWN0aXZhdGVkQ2hhbm5lbHMuaXNFbXB0eSgpKSB7CisgICAgICAg IGNvbnN0IFN0cmluZyBsb2dWYWx1ZSA9IGdldGVudigiV0VCS0lUX0RFQlVHIik7CisgICAgICAg IGlmIChsb2dWYWx1ZS5pc0VtcHR5KCkpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAg VmVjdG9yPFN0cmluZz4gYWN0aXZhdGVkTmFtZXM7CisgICAgICAgIGxvZ1ZhbHVlLnNwbGl0KCcs JywgYWN0aXZhdGVkTmFtZXMpOworICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGFjdGl2 YXRlZE5hbWVzLnNpemUoKTsgaSsrKSB7CisgICAgICAgICAgICBXVEZMb2dDaGFubmVsKiBhY3Rp dmVDaGFubmVsID0gZ2V0Q2hhbm5lbEZyb21OYW1lKGFjdGl2YXRlZE5hbWVzW2ldKTsKKyAgICAg ICAgICAgIGlmIChhY3RpdmVDaGFubmVsKQorICAgICAgICAgICAgICAgIGFjdGl2YXRlZENoYW5u ZWxzLmFwcGVuZChhY3RpdmVDaGFubmVsKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIGlmIChh Y3RpdmF0ZWRDaGFubmVscy5jb250YWlucyhjaGFubmVsKSkKKyAgICAgICAgY2hhbm5lbC0+c3Rh dGUgPSBXVEZMb2dDaGFubmVsT247Cit9CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdAorCisjZW5k aWYgLy8gIUxPR19ESVNBQkxFRApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm1F ZmwuY21ha2UgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUVmbC5jbWFrZQppbmRleCA5YWJjNmVj MzQyNjMwMTAzMmNlNDhhYjg5Yjg1YjI3NDJkOTFkYThkLi5kMzYzOTIzN2ZiOGMyMTEwMTlhMDM3 MDE4ZGNkNmZjODY5YTNkYTE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUVm bC5jbWFrZQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUVmbC5jbWFrZQpAQCAtMSw0ICsx LDUgQEAKIExJU1QoQVBQRU5EIFdlYktpdDJfU09VUkNFUworICAgIFBsYXRmb3JtL2VmbC9Mb2dn aW5nRWZsLmNwcAogICAgIFBsYXRmb3JtL2VmbC9Nb2R1bGVFZmwuY3BwCiAgICAgUGxhdGZvcm0v ZWZsL1dvcmtRdWV1ZUVmbC5jcHAKICAgICBQbGF0Zm9ybS91bml4L1NoYXJlZE1lbW9yeVVuaXgu Y3BwCg==