130320 2014-03-17 00:03:29 -0700 [Mac] WTFThreadData should use _pthread_getspecific_direct(). 2014-03-17 10:08:42 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling ap benjamin cmarcelo commit-queue darin ggaren ossy webkit-ews oldest_to_newest 991117 0 kling 2014-03-17 00:03:29 -0700 [Mac] WTFThreadData should use _pthread_getspecific_direct(). 991122 1 226890 kling 2014-03-17 00:11:22 -0700 Created attachment 226890 Patch idea 991132 2 226890 darin 2014-03-17 00:39:58 -0700 Comment on attachment 226890 Patch idea View in context: https://bugs.webkit.org/attachment.cgi?id=226890&action=review Looks good. > Source/WTF/wtf/WTFThreadData.cpp:77 > +#if USE(PTHREAD_GETSPECIFIC_DIRECT) > +static void destroyWTFThreadData(void* data) Should leave another blank line here to match the one we left below before #endif. Also could consider using a lambda instead of declaring a separate function. Not sure what is preferred style. > Source/WTF/wtf/WTFThreadData.h:47 > +#ifdef __has_include > +#if __has_include(<System/pthread_machdep.h>) > + > +#include <System/pthread_machdep.h> > + > +#if defined(__PTK_FRAMEWORK_JAVASCRIPTCORE_KEY0) > +#define WTF_USE_PTHREAD_GETSPECIFIC_DIRECT 1 > +#endif > + > +#endif > +#endif I don’t like nested #if, so I’d write it like this: #if defined(__has_include) && __has_include(<System/pthread_machdep.h>) #include <System/pthread_machdep.h> #endif #if defined(__PTK_FRAMEWORK_JAVASCRIPTCORE_KEY1) #define WTF_USE_PTHREAD_GETSPECIFIC_DIRECT 1 #endif I think we should make the same improvement in FastMalloc.cpp; just easier to read without the nesting. But also, I am not sure we should use the same USE(PTHREAD_GETSPECIFIC_DIRECT) both here and there; is there a risk of conflict if we compile all-in-one or something? The reason I suggest checking for __PTK_FRAMEWORK_JAVASCRIPTCORE_KEY1 instead of __PTK_FRAMEWORK_JAVASCRIPTCORE_KEY0 is that is the key we are actually using here. Which I suppose doesn’t make sense if this is a single USE for both places. > Source/WTF/wtf/WTFThreadData.h:159 > +#if USE(PTHREAD_GETSPECIFIC_DIRECT) Might consider putting the portable side of the #if first rather than the platform-specific one. > Source/WTF/wtf/WTFThreadData.h:177 > // WRT WebCore: I think this comment applies to both sides of the #if, so it should be outside the #if. 991135 3 226893 kling 2014-03-17 00:50:52 -0700 Created attachment 226893 Patch for landing Tweaked per Darin's recipe. 991137 4 226894 kling 2014-03-17 00:52:00 -0700 Created attachment 226894 Patch for landing 991141 5 226894 darin 2014-03-17 00:54:00 -0700 Comment on attachment 226894 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=226894&action=review > Source/WTF/wtf/WTFThreadData.h:160 > +#if USE(PTHREAD_GETSPECIFIC_DIRECT) > + static const pthread_key_t directKey = __PTK_FRAMEWORK_JAVASCRIPTCORE_KEY1; > + WTF_EXPORT_PRIVATE static WTFThreadData& createAndRegisterForGetspecificDirect(); > +#else > static WTF_EXPORTDATA ThreadSpecific<WTFThreadData>* staticData; > +#endif Portable first could apply here too. 991147 6 226894 commit-queue 2014-03-17 01:29:40 -0700 Comment on attachment 226894 Patch for landing Clearing flags on attachment: 226894 Committed r165725: <http://trac.webkit.org/changeset/165725> 991148 7 commit-queue 2014-03-17 01:29:44 -0700 All reviewed patches have been landed. Closing bug. 991163 8 ossy 2014-03-17 03:06:59 -0700 (In reply to comment #6) > (From update of attachment 226894 [details]) > Clearing flags on attachment: 226894 > > Committed r165725: <http://trac.webkit.org/changeset/165725> And buildfixes landed in - http://trac.webkit.org/changeset/165726 - http://trac.webkit.org/changeset/165729 It would have been better to let the EWS run before landing the patch. 991168 9 ossy 2014-03-17 03:16:30 -0700 (In reply to comment #2) > > Source/WTF/wtf/WTFThreadData.h:47 > > +#ifdef __has_include > > +#if __has_include(<System/pthread_machdep.h>) > > + > > +#include <System/pthread_machdep.h> > > + > > +#if defined(__PTK_FRAMEWORK_JAVASCRIPTCORE_KEY0) > > +#define WTF_USE_PTHREAD_GETSPECIFIC_DIRECT 1 > > +#endif > > + > > +#endif > > +#endif > > I don’t like nested #if, so I’d write it like this: > > #if defined(__has_include) && __has_include(<System/pthread_machdep.h>) > #include <System/pthread_machdep.h> > #endif The idea was reasonable not to have nested ifs. But unfortunately it made GCC unhappy: /mnt/buildbot/efl-linux-slave-3/efl-linux-32-release/build/Source/WTF/wtf/WTFThreadData.h:37:44: error: missing binary operator before token "(" It seems short circuit evaluation doesn't work in GCC preprocessor and its parser gets confused by the undefined __has_include() macro. In this case only the nested #if works: #ifdef __has_include #if __has_include(...) #include ... #endif #endif 991269 10 ap 2014-03-17 09:53:14 -0700 Tests started to crash with assertion failures around the time this was landed: http://build.webkit.org/results/Apple%20Mavericks%20Debug%20WK2%20(Tests)/r165732%20(3394)/svg/dom/transform-parser-crash-log.txt http://build.webkit.org/results/Apple%20Mavericks%20Debug%20WK1%20(Tests)/r165733%20(3842)/svg/W3C-SVG-1.1/shapes-polyline-01-t-crash-log.txt Can this change be the culprit? Should we temporarily roll out to see if that fixes the crashes? 991275 11 ap 2014-03-17 10:08:42 -0700 Andreas found an instance of this crash happening prior to this change, and suspects bug 130317. 226890 2014-03-17 00:11:22 -0700 2014-03-17 00:50:52 -0700 Patch idea bug-130320.diff text/plain 3786 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggMDc3ZDZmYi4uZGNjOGJiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxNC0wMy0xNyAg QW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gV1RGVGhy ZWFkRGF0YSBzaG91bGQgdXNlIF9wdGhyZWFkX2dldHNwZWNpZmljX2RpcmVjdCgpLgorICAgICAg ICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTMwMzIwPgorCisgICAgICAgIEhhY2sgV1RGVGhyZWFk RGF0YSB0byB1c2UgYSBkaXJlY3Qga2V5IGZvciBUTFMgYWNjZXNzIHdoZW4gYXZhaWxhYmxlLgor ICAgICAgICBUaGlzIG1lY2hhbmlzbSB1c2VzIGEgZGVkaWNhdGVkIHNlZ21lbnQgcmVnaXN0ZXIg YW5kIGlzIHRoZSBzYW1lIHdheQorICAgICAgICB3ZSBpbXBsZW1lbnQgdGhlIGZhc3QgcGF0aCBp biBGYXN0TWFsbG9jLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogd3RmL1dURlRocmVhZERhdGEuY3BwOgorICAgICAgICAoV1RGOjpkZXN0cm95V1RG VGhyZWFkRGF0YSk6CisgICAgICAgIChXVEY6OldURlRocmVhZERhdGE6OmNyZWF0ZUFuZFJlZ2lz dGVyRm9yR2V0c3BlY2lmaWNEaXJlY3QpOgorICAgICAgICAqIHd0Zi9XVEZUaHJlYWREYXRhLmg6 CisgICAgICAgIChXVEY6Ond0ZlRocmVhZERhdGEpOgorCiAyMDE0LTAzLTE2ICBEYXZpZCBLaWx6 ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgRm9sbG93LXVwOiBGaXggdW5kZWZp bmVkIGJlaGF2aW9yIGluIFdURjo6ZXF1YWwoKSBpbiBTdHJpbmdJbXBsLmggZm9yIGkzODYveDg2 XzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9XVEZUaHJlYWREYXRhLmNwcCBiL1NvdXJj ZS9XVEYvd3RmL1dURlRocmVhZERhdGEuY3BwCmluZGV4IDg1NDRiMWIuLmRmOGU3NDMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1dURlRocmVhZERhdGEuY3BwCisrKyBiL1NvdXJjZS9XVEYv d3RmL1dURlRocmVhZERhdGEuY3BwCkBAIC0zNSw3ICszNSw5IEBACiAKIG5hbWVzcGFjZSBXVEYg ewogCisjaWYgIVVTRShQVEhSRUFEX0dFVFNQRUNJRklDX0RJUkVDVCkKIFRocmVhZFNwZWNpZmlj PFdURlRocmVhZERhdGE+KiBXVEZUaHJlYWREYXRhOjpzdGF0aWNEYXRhOworI2VuZGlmCiAKIFdU RlRocmVhZERhdGE6OldURlRocmVhZERhdGEoKQogICAgIDogbV9hcGlEYXRhKDApCkBAIC03MSw2 ICs3MywyMiBAQCBXVEZUaHJlYWREYXRhOjp+V1RGVGhyZWFkRGF0YSgpCiAgICAgZGVsZXRlIG1f ZGVmYXVsdElkZW50aWZpZXJUYWJsZTsKIH0KIAorI2lmIFVTRShQVEhSRUFEX0dFVFNQRUNJRklD X0RJUkVDVCkKK3N0YXRpYyB2b2lkIGRlc3Ryb3lXVEZUaHJlYWREYXRhKHZvaWQqIGRhdGEpCit7 CisgICAgZGVsZXRlIHN0YXRpY19jYXN0PFdURlRocmVhZERhdGEqPihkYXRhKTsKK30KKworV1RG VGhyZWFkRGF0YSYgV1RGVGhyZWFkRGF0YTo6Y3JlYXRlQW5kUmVnaXN0ZXJGb3JHZXRzcGVjaWZp Y0RpcmVjdCgpCit7CisgICAgV1RGVGhyZWFkRGF0YSogZGF0YSA9IG5ldyBXVEZUaHJlYWREYXRh OworICAgIF9wdGhyZWFkX3NldHNwZWNpZmljX2RpcmVjdChkaXJlY3RLZXksIGRhdGEpOworICAg IHB0aHJlYWRfa2V5X2luaXRfbnAoZGlyZWN0S2V5LCBkZXN0cm95V1RGVGhyZWFkRGF0YSk7Cisg ICAgcmV0dXJuICpkYXRhOworfQorCisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2UgV1RGCiAKIG5h bWVzcGFjZSBKU0MgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvV1RGVGhyZWFkRGF0YS5o IGIvU291cmNlL1dURi93dGYvV1RGVGhyZWFkRGF0YS5oCmluZGV4IDBmMjJmZGUuLmMwZmRlMjgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1dURlRocmVhZERhdGEuaAorKysgYi9Tb3VyY2Uv V1RGL3d0Zi9XVEZUaHJlYWREYXRhLmgKQEAgLTMzLDggKzMzLDIzIEBACiAjaW5jbHVkZSA8d3Rm L1N0YWNrQm91bmRzLmg+CiAjaW5jbHVkZSA8d3RmL1N0YWNrU3RhdHMuaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9TdHJpbmdIYXNoLmg+CisKKyNpZmRlZiBfX2hhc19pbmNsdWRlCisjaWYgX19oYXNf aW5jbHVkZSg8U3lzdGVtL3B0aHJlYWRfbWFjaGRlcC5oPikKKworI2luY2x1ZGUgPFN5c3RlbS9w dGhyZWFkX21hY2hkZXAuaD4KKworI2lmIGRlZmluZWQoX19QVEtfRlJBTUVXT1JLX0pBVkFTQ1JJ UFRDT1JFX0tFWTApCisjZGVmaW5lIFdURl9VU0VfUFRIUkVBRF9HRVRTUEVDSUZJQ19ESVJFQ1Qg MQorI2VuZGlmCisKKyNlbmRpZgorI2VuZGlmCisKKyNpZiAhVVNFKFBUSFJFQURfR0VUU1BFQ0lG SUNfRElSRUNUKQogI2luY2x1ZGUgPHd0Zi9UaHJlYWRTcGVjaWZpYy5oPgogI2luY2x1ZGUgPHd0 Zi9UaHJlYWRpbmcuaD4KKyNlbmRpZgogCiAvLyBGSVhNRTogVGhpcyBpcyBhIHRlbXBvcmFyeSBs YXllcmluZyB2aW9sYXRpb24gdW50aWwgd2UgbW92ZSBtb3JlIG9mIHRoZSBzdHJpbmcgY29kZSBm cm9tIEphdmFTY3JpcHRDb3JlIHRvIFdURi4KIG5hbWVzcGFjZSBKU0MgewpAQCAtMTQxLDEzICsx NTYsMjQgQEAgcHJpdmF0ZToKICAgICB2b2lkKiBtX3NhdmVkU3RhY2tQb2ludGVyQXRWTUVudHJ5 OwogICAgIHZvaWQqIG1fc2F2ZWRMYXN0U3RhY2tUb3A7CiAKKyNpZiBVU0UoUFRIUkVBRF9HRVRT UEVDSUZJQ19ESVJFQ1QpCisgICAgc3RhdGljIGNvbnN0IHB0aHJlYWRfa2V5X3QgZGlyZWN0S2V5 ID0gX19QVEtfRlJBTUVXT1JLX0pBVkFTQ1JJUFRDT1JFX0tFWTE7CisgICAgc3RhdGljIFdURlRo cmVhZERhdGEmIGNyZWF0ZUFuZFJlZ2lzdGVyRm9yR2V0c3BlY2lmaWNEaXJlY3QoKTsKKyNlbHNl CiAgICAgc3RhdGljIFdURl9FWFBPUlREQVRBIFRocmVhZFNwZWNpZmljPFdURlRocmVhZERhdGE+ KiBzdGF0aWNEYXRhOworI2VuZGlmCisKICAgICBmcmllbmQgV1RGVGhyZWFkRGF0YSYgd3RmVGhy ZWFkRGF0YSgpOwogICAgIGZyaWVuZCBjbGFzcyBBdG9taWNTdHJpbmdUYWJsZTsKIH07CiAKIGlu bGluZSBXVEZUaHJlYWREYXRhJiB3dGZUaHJlYWREYXRhKCkKIHsKKyNpZiBVU0UoUFRIUkVBRF9H RVRTUEVDSUZJQ19ESVJFQ1QpCisgICAgaWYgKFdURlRocmVhZERhdGEqIGRhdGEgPSBzdGF0aWNf Y2FzdDxXVEZUaHJlYWREYXRhKj4oX3B0aHJlYWRfZ2V0c3BlY2lmaWNfZGlyZWN0KFdURlRocmVh ZERhdGE6OmRpcmVjdEtleSkpKQorICAgICAgICByZXR1cm4gKmRhdGE7CisgICAgcmV0dXJuIFdU RlRocmVhZERhdGE6OmNyZWF0ZUFuZFJlZ2lzdGVyRm9yR2V0c3BlY2lmaWNEaXJlY3QoKTsKKyNl bHNlCiAgICAgLy8gV1JUIFdlYkNvcmU6CiAgICAgLy8gICAgV1RGVGhyZWFkRGF0YSBpcyB1c2Vk IG9uIG1haW4gdGhyZWFkIGJlZm9yZSBpdCBjb3VsZCBwb3NzaWJseSBiZSB1c2VkCiAgICAgLy8g ICAgb24gc2Vjb25kYXJ5IG9uZXMsIHNvIHRoZXJlIGlzIG5vIG5lZWQgZm9yIHN5bmNocm9uaXph dGlvbiBoZXJlLgpAQCAtMTU3LDYgKzE4Myw3IEBAIGlubGluZSBXVEZUaHJlYWREYXRhJiB3dGZU aHJlYWREYXRhKCkKICAgICBpZiAoIVdURlRocmVhZERhdGE6OnN0YXRpY0RhdGEpCiAgICAgICAg IFdURlRocmVhZERhdGE6OnN0YXRpY0RhdGEgPSBuZXcgVGhyZWFkU3BlY2lmaWM8V1RGVGhyZWFk RGF0YT47CiAgICAgcmV0dXJuICoqV1RGVGhyZWFkRGF0YTo6c3RhdGljRGF0YTsKKyNlbmRpZgog fQogCiB9IC8vIG5hbWVzcGFjZSBXVEYK 226893 2014-03-17 00:50:52 -0700 2014-03-17 00:52:00 -0700 Patch for landing land-130320.diff text/plain 4434 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggMDc3ZDZmYi4uNGFkZTUzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxNC0wMy0xNyAg QW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gV1RGVGhy ZWFkRGF0YSBzaG91bGQgdXNlIF9wdGhyZWFkX2dldHNwZWNpZmljX2RpcmVjdCgpLgorICAgICAg ICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTMwMzIwPgorCisgICAgICAgIEhhY2sgV1RGVGhyZWFk RGF0YSB0byB1c2UgYSBkaXJlY3Qga2V5IGZvciBUTFMgYWNjZXNzIHdoZW4gYXZhaWxhYmxlLgor ICAgICAgICBUaGlzIG1lY2hhbmlzbSB1c2VzIGEgZGVkaWNhdGVkIHNlZ21lbnQgcmVnaXN0ZXIg YW5kIGlzIHRoZSBzYW1lIHdheQorICAgICAgICB3ZSBpbXBsZW1lbnQgdGhlIGZhc3QgcGF0aCBp biBGYXN0TWFsbG9jLgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAg ICAgICogd3RmL0Zhc3RNYWxsb2MuY3BwOgorICAgICAgICAqIHd0Zi9XVEZUaHJlYWREYXRhLmNw cDoKKyAgICAgICAgKFdURjo6V1RGVGhyZWFkRGF0YTo6Y3JlYXRlQW5kUmVnaXN0ZXJGb3JHZXRz cGVjaWZpY0RpcmVjdCk6CisgICAgICAgICogd3RmL1dURlRocmVhZERhdGEuaDoKKyAgICAgICAg KFdURjo6d3RmVGhyZWFkRGF0YSk6CisKIDIwMTQtMDMtMTYgIERhdmlkIEtpbHplciAgPGRka2ls emVyQGFwcGxlLmNvbT4KIAogICAgICAgICBGb2xsb3ctdXA6IEZpeCB1bmRlZmluZWQgYmVoYXZp b3IgaW4gV1RGOjplcXVhbCgpIGluIFN0cmluZ0ltcGwuaCBmb3IgaTM4Ni94ODZfNjQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XVEYvd3RmL0Zhc3RNYWxsb2MuY3BwIGIvU291cmNlL1dURi93dGYvRmFz dE1hbGxvYy5jcHAKaW5kZXggZmI1ZDZjNS4uZmY1MTZhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dU Ri93dGYvRmFzdE1hbGxvYy5jcHAKKysrIGIvU291cmNlL1dURi93dGYvRmFzdE1hbGxvYy5jcHAK QEAgLTQ2MSwxNiArNDYxLDEyIEBAIGV4dGVybiAiQyIgV1RGX0VYUE9SVF9QUklWQVRFIGNvbnN0 IGludCBqc2NvcmVfZmFzdG1hbGxvY19pbnRyb3NwZWN0aW9uID0gMDsKICNpbmNsdWRlIDxkaXNw YXRjaC9kaXNwYXRjaC5oPgogI2VuZGlmCiAKLSNpZmRlZiBfX2hhc19pbmNsdWRlCi0jaWYgX19o YXNfaW5jbHVkZSg8U3lzdGVtL3B0aHJlYWRfbWFjaGRlcC5oPikKLQorI2lmIGRlZmluZWQoX19o YXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8U3lzdGVtL3B0aHJlYWRfbWFjaGRlcC5oPikK ICNpbmNsdWRlIDxTeXN0ZW0vcHRocmVhZF9tYWNoZGVwLmg+Ci0KLSNpZiBkZWZpbmVkKF9fUFRL X0ZSQU1FV09SS19KQVZBU0NSSVBUQ09SRV9LRVkwKQotI2RlZmluZSBXVEZfVVNFX1BUSFJFQURf R0VUU1BFQ0lGSUNfRElSRUNUIDEKICNlbmRpZgogCi0jZW5kaWYKKyNpZiBkZWZpbmVkKF9fUFRL X0ZSQU1FV09SS19KQVZBU0NSSVBUQ09SRV9LRVkxKQorI2RlZmluZSBXVEZfVVNFX1BUSFJFQURf R0VUU1BFQ0lGSUNfRElSRUNUIDEKICNlbmRpZgogCiAjaWZuZGVmIFBSSXVTCmRpZmYgLS1naXQg YS9Tb3VyY2UvV1RGL3d0Zi9XVEZUaHJlYWREYXRhLmNwcCBiL1NvdXJjZS9XVEYvd3RmL1dURlRo cmVhZERhdGEuY3BwCmluZGV4IDg1NDRiMWIuLmE3OGQxMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X VEYvd3RmL1dURlRocmVhZERhdGEuY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL1dURlRocmVhZERh dGEuY3BwCkBAIC0zNSw3ICszNSw5IEBACiAKIG5hbWVzcGFjZSBXVEYgewogCisjaWYgIVVTRShQ VEhSRUFEX0dFVFNQRUNJRklDX0RJUkVDVCkKIFRocmVhZFNwZWNpZmljPFdURlRocmVhZERhdGE+ KiBXVEZUaHJlYWREYXRhOjpzdGF0aWNEYXRhOworI2VuZGlmCiAKIFdURlRocmVhZERhdGE6OldU RlRocmVhZERhdGEoKQogICAgIDogbV9hcGlEYXRhKDApCkBAIC03MSw2ICs3MywxOCBAQCBXVEZU aHJlYWREYXRhOjp+V1RGVGhyZWFkRGF0YSgpCiAgICAgZGVsZXRlIG1fZGVmYXVsdElkZW50aWZp ZXJUYWJsZTsKIH0KIAorI2lmIFVTRShQVEhSRUFEX0dFVFNQRUNJRklDX0RJUkVDVCkKK1dURlRo cmVhZERhdGEmIFdURlRocmVhZERhdGE6OmNyZWF0ZUFuZFJlZ2lzdGVyRm9yR2V0c3BlY2lmaWNE aXJlY3QoKQoreworICAgIFdURlRocmVhZERhdGEqIGRhdGEgPSBuZXcgV1RGVGhyZWFkRGF0YTsK KyAgICBfcHRocmVhZF9zZXRzcGVjaWZpY19kaXJlY3QoZGlyZWN0S2V5LCBkYXRhKTsKKyAgICBw dGhyZWFkX2tleV9pbml0X25wKGRpcmVjdEtleSwgW10odm9pZCogZGF0YSl7CisgICAgICAgIGRl bGV0ZSBzdGF0aWNfY2FzdDxXVEZUaHJlYWREYXRhKj4oZGF0YSk7CisgICAgfSk7CisgICAgcmV0 dXJuICpkYXRhOworfQorI2VuZGlmCisKIH0gLy8gbmFtZXNwYWNlIFdURgogCiBuYW1lc3BhY2Ug SlNDIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1dURlRocmVhZERhdGEuaCBiL1NvdXJj ZS9XVEYvd3RmL1dURlRocmVhZERhdGEuaAppbmRleCAwZjIyZmRlLi4xNmVjMzA2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV1RGL3d0Zi9XVEZUaHJlYWREYXRhLmgKKysrIGIvU291cmNlL1dURi93dGYv V1RGVGhyZWFkRGF0YS5oCkBAIC0zMyw4ICszMywxOSBAQAogI2luY2x1ZGUgPHd0Zi9TdGFja0Jv dW5kcy5oPgogI2luY2x1ZGUgPHd0Zi9TdGFja1N0YXRzLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv U3RyaW5nSGFzaC5oPgorCisjaWYgZGVmaW5lZChfX2hhc19pbmNsdWRlKSAmJiBfX2hhc19pbmNs dWRlKDxTeXN0ZW0vcHRocmVhZF9tYWNoZGVwLmg+KQorI2luY2x1ZGUgPFN5c3RlbS9wdGhyZWFk X21hY2hkZXAuaD4KKyNlbmRpZgorCisjaWYgZGVmaW5lZChfX1BUS19GUkFNRVdPUktfSkFWQVND UklQVENPUkVfS0VZMSkKKyNkZWZpbmUgV1RGX1VTRV9QVEhSRUFEX0dFVFNQRUNJRklDX0RJUkVD VCAxCisjZW5kaWYKKworI2lmICFVU0UoUFRIUkVBRF9HRVRTUEVDSUZJQ19ESVJFQ1QpCiAjaW5j bHVkZSA8d3RmL1RocmVhZFNwZWNpZmljLmg+CiAjaW5jbHVkZSA8d3RmL1RocmVhZGluZy5oPgor I2VuZGlmCiAKIC8vIEZJWE1FOiBUaGlzIGlzIGEgdGVtcG9yYXJ5IGxheWVyaW5nIHZpb2xhdGlv biB1bnRpbCB3ZSBtb3ZlIG1vcmUgb2YgdGhlIHN0cmluZyBjb2RlIGZyb20gSmF2YVNjcmlwdENv cmUgdG8gV1RGLgogbmFtZXNwYWNlIEpTQyB7CkBAIC0xNDEsNyArMTUyLDEzIEBAIHByaXZhdGU6 CiAgICAgdm9pZCogbV9zYXZlZFN0YWNrUG9pbnRlckF0Vk1FbnRyeTsKICAgICB2b2lkKiBtX3Nh dmVkTGFzdFN0YWNrVG9wOwogCisjaWYgVVNFKFBUSFJFQURfR0VUU1BFQ0lGSUNfRElSRUNUKQor ICAgIHN0YXRpYyBjb25zdCBwdGhyZWFkX2tleV90IGRpcmVjdEtleSA9IF9fUFRLX0ZSQU1FV09S S19KQVZBU0NSSVBUQ09SRV9LRVkxOworICAgIFdURl9FWFBPUlRfUFJJVkFURSBzdGF0aWMgV1RG VGhyZWFkRGF0YSYgY3JlYXRlQW5kUmVnaXN0ZXJGb3JHZXRzcGVjaWZpY0RpcmVjdCgpOworI2Vs c2UKICAgICBzdGF0aWMgV1RGX0VYUE9SVERBVEEgVGhyZWFkU3BlY2lmaWM8V1RGVGhyZWFkRGF0 YT4qIHN0YXRpY0RhdGE7CisjZW5kaWYKKwogICAgIGZyaWVuZCBXVEZUaHJlYWREYXRhJiB3dGZU aHJlYWREYXRhKCk7CiAgICAgZnJpZW5kIGNsYXNzIEF0b21pY1N0cmluZ1RhYmxlOwogfTsKQEAg LTE1NCw5ICsxNzEsMTUgQEAgaW5saW5lIFdURlRocmVhZERhdGEmIHd0ZlRocmVhZERhdGEoKQog ICAgIC8vIFdSVCBKYXZhU2NyaXB0Q29yZToKICAgICAvLyAgICB3dGZUaHJlYWREYXRhKCkgaXMg aW5pdGlhbGx5IGNhbGxlZCBmcm9tIGluaXRpYWxpemVUaHJlYWRpbmcoKSwgZW5zdXJpbmcKICAg ICAvLyAgICB0aGlzIGlzIGluaXRpYWxseSBjYWxsZWQgaW4gYSBwdGhyZWFkX29uY2UgbG9ja2Vk IGNvbnRleHQuCisjaWYgIVVTRShQVEhSRUFEX0dFVFNQRUNJRklDX0RJUkVDVCkKICAgICBpZiAo IVdURlRocmVhZERhdGE6OnN0YXRpY0RhdGEpCiAgICAgICAgIFdURlRocmVhZERhdGE6OnN0YXRp Y0RhdGEgPSBuZXcgVGhyZWFkU3BlY2lmaWM8V1RGVGhyZWFkRGF0YT47CiAgICAgcmV0dXJuICoq V1RGVGhyZWFkRGF0YTo6c3RhdGljRGF0YTsKKyNlbHNlCisgICAgaWYgKFdURlRocmVhZERhdGEq IGRhdGEgPSBzdGF0aWNfY2FzdDxXVEZUaHJlYWREYXRhKj4oX3B0aHJlYWRfZ2V0c3BlY2lmaWNf ZGlyZWN0KFdURlRocmVhZERhdGE6OmRpcmVjdEtleSkpKQorICAgICAgICByZXR1cm4gKmRhdGE7 CisgICAgcmV0dXJuIFdURlRocmVhZERhdGE6OmNyZWF0ZUFuZFJlZ2lzdGVyRm9yR2V0c3BlY2lm aWNEaXJlY3QoKTsKKyNlbmRpZgogfQogCiB9IC8vIG5hbWVzcGFjZSBXVEYK 226894 2014-03-17 00:52:00 -0700 2014-03-17 01:29:40 -0700 Patch for landing land-130320.diff text/plain 4374 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggMDc3ZDZmYi4uNGFkZTUzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxNC0wMy0xNyAg QW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gV1RGVGhy ZWFkRGF0YSBzaG91bGQgdXNlIF9wdGhyZWFkX2dldHNwZWNpZmljX2RpcmVjdCgpLgorICAgICAg ICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTMwMzIwPgorCisgICAgICAgIEhhY2sgV1RGVGhyZWFk RGF0YSB0byB1c2UgYSBkaXJlY3Qga2V5IGZvciBUTFMgYWNjZXNzIHdoZW4gYXZhaWxhYmxlLgor ICAgICAgICBUaGlzIG1lY2hhbmlzbSB1c2VzIGEgZGVkaWNhdGVkIHNlZ21lbnQgcmVnaXN0ZXIg YW5kIGlzIHRoZSBzYW1lIHdheQorICAgICAgICB3ZSBpbXBsZW1lbnQgdGhlIGZhc3QgcGF0aCBp biBGYXN0TWFsbG9jLgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAg ICAgICogd3RmL0Zhc3RNYWxsb2MuY3BwOgorICAgICAgICAqIHd0Zi9XVEZUaHJlYWREYXRhLmNw cDoKKyAgICAgICAgKFdURjo6V1RGVGhyZWFkRGF0YTo6Y3JlYXRlQW5kUmVnaXN0ZXJGb3JHZXRz cGVjaWZpY0RpcmVjdCk6CisgICAgICAgICogd3RmL1dURlRocmVhZERhdGEuaDoKKyAgICAgICAg KFdURjo6d3RmVGhyZWFkRGF0YSk6CisKIDIwMTQtMDMtMTYgIERhdmlkIEtpbHplciAgPGRka2ls emVyQGFwcGxlLmNvbT4KIAogICAgICAgICBGb2xsb3ctdXA6IEZpeCB1bmRlZmluZWQgYmVoYXZp b3IgaW4gV1RGOjplcXVhbCgpIGluIFN0cmluZ0ltcGwuaCBmb3IgaTM4Ni94ODZfNjQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XVEYvd3RmL0Zhc3RNYWxsb2MuY3BwIGIvU291cmNlL1dURi93dGYvRmFz dE1hbGxvYy5jcHAKaW5kZXggZmI1ZDZjNS4uZTIxMDcxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dU Ri93dGYvRmFzdE1hbGxvYy5jcHAKKysrIGIvU291cmNlL1dURi93dGYvRmFzdE1hbGxvYy5jcHAK QEAgLTQ2MSwxOCArNDYxLDE0IEBAIGV4dGVybiAiQyIgV1RGX0VYUE9SVF9QUklWQVRFIGNvbnN0 IGludCBqc2NvcmVfZmFzdG1hbGxvY19pbnRyb3NwZWN0aW9uID0gMDsKICNpbmNsdWRlIDxkaXNw YXRjaC9kaXNwYXRjaC5oPgogI2VuZGlmCiAKLSNpZmRlZiBfX2hhc19pbmNsdWRlCi0jaWYgX19o YXNfaW5jbHVkZSg8U3lzdGVtL3B0aHJlYWRfbWFjaGRlcC5oPikKLQorI2lmIGRlZmluZWQoX19o YXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8U3lzdGVtL3B0aHJlYWRfbWFjaGRlcC5oPikK ICNpbmNsdWRlIDxTeXN0ZW0vcHRocmVhZF9tYWNoZGVwLmg+CisjZW5kaWYKIAogI2lmIGRlZmlu ZWQoX19QVEtfRlJBTUVXT1JLX0pBVkFTQ1JJUFRDT1JFX0tFWTApCiAjZGVmaW5lIFdURl9VU0Vf UFRIUkVBRF9HRVRTUEVDSUZJQ19ESVJFQ1QgMQogI2VuZGlmCiAKLSNlbmRpZgotI2VuZGlmCi0K ICNpZm5kZWYgUFJJdVMKICNkZWZpbmUgUFJJdVMgInp1IgogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV1RGL3d0Zi9XVEZUaHJlYWREYXRhLmNwcCBiL1NvdXJjZS9XVEYvd3RmL1dURlRocmVh ZERhdGEuY3BwCmluZGV4IDg1NDRiMWIuLmE3OGQxMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv d3RmL1dURlRocmVhZERhdGEuY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL1dURlRocmVhZERhdGEu Y3BwCkBAIC0zNSw3ICszNSw5IEBACiAKIG5hbWVzcGFjZSBXVEYgewogCisjaWYgIVVTRShQVEhS RUFEX0dFVFNQRUNJRklDX0RJUkVDVCkKIFRocmVhZFNwZWNpZmljPFdURlRocmVhZERhdGE+KiBX VEZUaHJlYWREYXRhOjpzdGF0aWNEYXRhOworI2VuZGlmCiAKIFdURlRocmVhZERhdGE6OldURlRo cmVhZERhdGEoKQogICAgIDogbV9hcGlEYXRhKDApCkBAIC03MSw2ICs3MywxOCBAQCBXVEZUaHJl YWREYXRhOjp+V1RGVGhyZWFkRGF0YSgpCiAgICAgZGVsZXRlIG1fZGVmYXVsdElkZW50aWZpZXJU YWJsZTsKIH0KIAorI2lmIFVTRShQVEhSRUFEX0dFVFNQRUNJRklDX0RJUkVDVCkKK1dURlRocmVh ZERhdGEmIFdURlRocmVhZERhdGE6OmNyZWF0ZUFuZFJlZ2lzdGVyRm9yR2V0c3BlY2lmaWNEaXJl Y3QoKQoreworICAgIFdURlRocmVhZERhdGEqIGRhdGEgPSBuZXcgV1RGVGhyZWFkRGF0YTsKKyAg ICBfcHRocmVhZF9zZXRzcGVjaWZpY19kaXJlY3QoZGlyZWN0S2V5LCBkYXRhKTsKKyAgICBwdGhy ZWFkX2tleV9pbml0X25wKGRpcmVjdEtleSwgW10odm9pZCogZGF0YSl7CisgICAgICAgIGRlbGV0 ZSBzdGF0aWNfY2FzdDxXVEZUaHJlYWREYXRhKj4oZGF0YSk7CisgICAgfSk7CisgICAgcmV0dXJu ICpkYXRhOworfQorI2VuZGlmCisKIH0gLy8gbmFtZXNwYWNlIFdURgogCiBuYW1lc3BhY2UgSlND IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1dURlRocmVhZERhdGEuaCBiL1NvdXJjZS9X VEYvd3RmL1dURlRocmVhZERhdGEuaAppbmRleCAwZjIyZmRlLi4xNmVjMzA2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV1RGL3d0Zi9XVEZUaHJlYWREYXRhLmgKKysrIGIvU291cmNlL1dURi93dGYvV1RG VGhyZWFkRGF0YS5oCkBAIC0zMyw4ICszMywxOSBAQAogI2luY2x1ZGUgPHd0Zi9TdGFja0JvdW5k cy5oPgogI2luY2x1ZGUgPHd0Zi9TdGFja1N0YXRzLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3Ry aW5nSGFzaC5oPgorCisjaWYgZGVmaW5lZChfX2hhc19pbmNsdWRlKSAmJiBfX2hhc19pbmNsdWRl KDxTeXN0ZW0vcHRocmVhZF9tYWNoZGVwLmg+KQorI2luY2x1ZGUgPFN5c3RlbS9wdGhyZWFkX21h Y2hkZXAuaD4KKyNlbmRpZgorCisjaWYgZGVmaW5lZChfX1BUS19GUkFNRVdPUktfSkFWQVNDUklQ VENPUkVfS0VZMSkKKyNkZWZpbmUgV1RGX1VTRV9QVEhSRUFEX0dFVFNQRUNJRklDX0RJUkVDVCAx CisjZW5kaWYKKworI2lmICFVU0UoUFRIUkVBRF9HRVRTUEVDSUZJQ19ESVJFQ1QpCiAjaW5jbHVk ZSA8d3RmL1RocmVhZFNwZWNpZmljLmg+CiAjaW5jbHVkZSA8d3RmL1RocmVhZGluZy5oPgorI2Vu ZGlmCiAKIC8vIEZJWE1FOiBUaGlzIGlzIGEgdGVtcG9yYXJ5IGxheWVyaW5nIHZpb2xhdGlvbiB1 bnRpbCB3ZSBtb3ZlIG1vcmUgb2YgdGhlIHN0cmluZyBjb2RlIGZyb20gSmF2YVNjcmlwdENvcmUg dG8gV1RGLgogbmFtZXNwYWNlIEpTQyB7CkBAIC0xNDEsNyArMTUyLDEzIEBAIHByaXZhdGU6CiAg ICAgdm9pZCogbV9zYXZlZFN0YWNrUG9pbnRlckF0Vk1FbnRyeTsKICAgICB2b2lkKiBtX3NhdmVk TGFzdFN0YWNrVG9wOwogCisjaWYgVVNFKFBUSFJFQURfR0VUU1BFQ0lGSUNfRElSRUNUKQorICAg IHN0YXRpYyBjb25zdCBwdGhyZWFkX2tleV90IGRpcmVjdEtleSA9IF9fUFRLX0ZSQU1FV09SS19K QVZBU0NSSVBUQ09SRV9LRVkxOworICAgIFdURl9FWFBPUlRfUFJJVkFURSBzdGF0aWMgV1RGVGhy ZWFkRGF0YSYgY3JlYXRlQW5kUmVnaXN0ZXJGb3JHZXRzcGVjaWZpY0RpcmVjdCgpOworI2Vsc2UK ICAgICBzdGF0aWMgV1RGX0VYUE9SVERBVEEgVGhyZWFkU3BlY2lmaWM8V1RGVGhyZWFkRGF0YT4q IHN0YXRpY0RhdGE7CisjZW5kaWYKKwogICAgIGZyaWVuZCBXVEZUaHJlYWREYXRhJiB3dGZUaHJl YWREYXRhKCk7CiAgICAgZnJpZW5kIGNsYXNzIEF0b21pY1N0cmluZ1RhYmxlOwogfTsKQEAgLTE1 NCw5ICsxNzEsMTUgQEAgaW5saW5lIFdURlRocmVhZERhdGEmIHd0ZlRocmVhZERhdGEoKQogICAg IC8vIFdSVCBKYXZhU2NyaXB0Q29yZToKICAgICAvLyAgICB3dGZUaHJlYWREYXRhKCkgaXMgaW5p dGlhbGx5IGNhbGxlZCBmcm9tIGluaXRpYWxpemVUaHJlYWRpbmcoKSwgZW5zdXJpbmcKICAgICAv LyAgICB0aGlzIGlzIGluaXRpYWxseSBjYWxsZWQgaW4gYSBwdGhyZWFkX29uY2UgbG9ja2VkIGNv bnRleHQuCisjaWYgIVVTRShQVEhSRUFEX0dFVFNQRUNJRklDX0RJUkVDVCkKICAgICBpZiAoIVdU RlRocmVhZERhdGE6OnN0YXRpY0RhdGEpCiAgICAgICAgIFdURlRocmVhZERhdGE6OnN0YXRpY0Rh dGEgPSBuZXcgVGhyZWFkU3BlY2lmaWM8V1RGVGhyZWFkRGF0YT47CiAgICAgcmV0dXJuICoqV1RG VGhyZWFkRGF0YTo6c3RhdGljRGF0YTsKKyNlbHNlCisgICAgaWYgKFdURlRocmVhZERhdGEqIGRh dGEgPSBzdGF0aWNfY2FzdDxXVEZUaHJlYWREYXRhKj4oX3B0aHJlYWRfZ2V0c3BlY2lmaWNfZGly ZWN0KFdURlRocmVhZERhdGE6OmRpcmVjdEtleSkpKQorICAgICAgICByZXR1cm4gKmRhdGE7Cisg ICAgcmV0dXJuIFdURlRocmVhZERhdGE6OmNyZWF0ZUFuZFJlZ2lzdGVyRm9yR2V0c3BlY2lmaWNE aXJlY3QoKTsKKyNlbmRpZgogfQogCiB9IC8vIG5hbWVzcGFjZSBXVEYK