135895 2014-08-13 12:30:34 -0700 Make bmalloc::PerThread work without C++ thread local storage 2014-08-13 22:12:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates dbates ggaren oldest_to_newest 1028864 0 dbates 2014-08-13 12:30:34 -0700 Following up on Geoffrey Garen's comment (bug #135848, comment 4), we should look to remove the hardcoded constant __PTK_FRAMEWORK_JAVASCRIPTCORE_KEY0, which imposes a maintenance burden as we need to keep its value synchronized with the value of a macro define by the same name in System/pthread_machdep.h. This constant was hardcoded because the iOS public SDK neither includes the header System/pthread_machdep.h nor supports the use of the thread local storage attribute __thread as of the time of writing. One alternative to hardcoding the constant __PTK_FRAMEWORK_JAVASCRIPTCORE_KEY0 is to add logic for toolchains that don't support C++ thread local storage to initialize a shared Pthread key exactly once (say, using std::call_once()). Then we would use a similar approach to the System/pthread_machdep.h logic in <http://trac.webkit.org/browser/trunk/Source/bmalloc/bmalloc/PerThread.h?rev=166956#L56> and explicitly save/retrieve the thread-specific data using this shared key and pthread_{get, set}specific(). 1028905 1 236553 dbates 2014-08-13 14:12:24 -0700 Created attachment 236553 Patch 1028907 2 236553 ggaren 2014-08-13 14:16:58 -0700 Comment on attachment 236553 Patch r=me The #ifdefs are starting to get gross, but I don't have a better suggestion :/. 1029031 3 dbates 2014-08-13 22:00:49 -0700 Committed r172576: <http://trac.webkit.org/changeset/172576> 1029033 4 dbates 2014-08-13 22:12:11 -0700 Committed build fix in <http://trac.webkit.org/changeset/172577>. 236553 2014-08-13 14:12:24 -0700 2014-08-13 14:16:57 -0700 Patch bug-135895-20140813141214.patch text/plain 5631 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyNTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9D aGFuZ2VMb2cgYi9Tb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cKaW5kZXggMDQyNTdjNzQyNGM4ZjE4 NTYyZjljOGNjNTk4YWFmZmM0ZmFiMjBlOS4uZGY5YWFmYWRjMzRjNGU4MmU4ZGQ2ODc2YWM3NDgz ZDZlZDg2MTllNyAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9ibWFsbG9jL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE0LTA4LTEzICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAgICAgICBNYWtlIGJtYWxsb2M6OlBl clRocmVhZCB3b3JrIHdpdGhvdXQgQysrIHRocmVhZCBsb2NhbCBzdG9yYWdlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU4OTUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgc3VwcG9ydCBm b3IgYnVpbGRpbmcgYm1hbGxvYyB3aXRob3V0IEMrKyB0aHJlYWQgbG9jYWwgc3RvcmFnZS4KKwor ICAgICAgICAqIGJtYWxsb2MvQlBsYXRmb3JtLmg6IFJlbW92ZSBtYWNybyBkZWZpbmUgQlBMQVRG T1JNX0lPU19TSU1VTEFUT1IuIEFkZGVkIG1hY3JvIGZ1bmN0aW9uCisgICAgICAgIEJDT01QSUxF Ul9TVVBQT1JUUygpIGFuZCBtYWNybyBkZWZpbmUgQkNPTVBJTEVSX1NVUFBPUlRTX0NYWF9USFJF QURfTE9DQUwgdGhhdCBjYW4gYmUgdXNlZAorICAgICAgICB0byBkZXRlcm1pbmUgd2hldGhlciB0 aGUgY29tcGlsZXIgc3VwcG9ydHMgQysrIHRocmVhZCBsb2NhbCBzdG9yYWdlLgorICAgICAgICAq IGJtYWxsb2MvUGVyVGhyZWFkLmg6CisgICAgICAgIChibWFsbG9jOjpQZXJUaHJlYWRTdG9yYWdl OjpnZXQpOiBNb2RpZmllZCB0byBjYWxsIHB0aHJlYWRfZ2V0c3BlY2lmaWMoKSB3aGVuIGJ1aWxk aW5nCisgICAgICAgIHdpdGhvdXQgQysrIHRocmVhZCBsb2NhbCBzdG9yYWdlLgorICAgICAgICAo Ym1hbGxvYzo6UGVyVGhyZWFkU3RvcmFnZTo6aW5pdFNoYXJlZEtleUlmTmVlZGVkKTogQWRkZWQu CisgICAgICAgIChibWFsbG9jOjpQZXJUaHJlYWRTdG9yYWdlOjppbml0KTogTW92ZWQgbG9naWMg dG8gaW5pdGlhbGl6ZSBzaGFyZWQgUHRocmVhZCBrZXkgZnJvbSBoZXJlIHRvCisgICAgICAgIFBl clRocmVhZFN0b3JhZ2U6OmluaXRTaGFyZWRLZXlJZk5lZWRlZCgpLgorICAgICAgICAoYm1hbGxv Yzo6UGVyVGhyZWFkPFQ+OjpnZXRGYXN0Q2FzZSk6IE1vZGlmaWVkIHRvIGNhbGwgUGVyVGhyZWFk U3RvcmFnZTo6aW5pdFNoYXJlZEtleUlmTmVlZGVkKCkKKyAgICAgICAgYmVmb3JlIHF1ZXJ5aW5n IFBlclRocmVhZFN0b3JhZ2U6OmdldCgpIHdoZW4gYnVpbGRpbmcgd2l0aG91dCBDKysgdGhyZWFk IGxvY2FsIHN0b3JhZ2Ugc28gYXMgdG8KKyAgICAgICAgZW5zdXJlIHRoYXQgdGhlIHNoYXJlZCBr ZXkgaGFzIGJlZW4gaW5pdGlhbGl6ZWQuCisgICAgICAgIChfcHRocmVhZF9zZXRzcGVjaWZpY19k aXJlY3QpOiBEZWxldGVkLgorICAgICAgICAoX3B0aHJlYWRfZ2V0c3BlY2lmaWNfZGlyZWN0KTog RGVsZXRlZC4KKworMjAxNC0wOC0xMyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+ CisKICAgICAgICAgW2lPU10gTWFrZSBKYXZhU2NyaXB0Q29yZSBhbmQgYm1hbGxvYyBidWlsZCB3 aXRoIHRoZSBwdWJsaWMgU0RLCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzU4NDgKIApkaWZmIC0tZ2l0IGEvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9C UGxhdGZvcm0uaCBiL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQlBsYXRmb3JtLmgKaW5kZXggNzQ2 YWE2MTFmMzc4NThhYWMwZTM2YTdjNjc3Njg3NjdmNjVjM2MyNi4uZTM4NzI1OTMyYjgxMzI3Y2Iz ODgwOGI4MTUzMTEyNGRjNWFlNDc4YyAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvYm1hbGxv Yy9CUGxhdGZvcm0uaAorKysgYi9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0JQbGF0Zm9ybS5oCkBA IC0zOCw4ICszOCw3IEBACiAjZGVmaW5lIEJQTEFURk9STV9JT1MgMQogI2VuZGlmCiAKLSNpZiBk ZWZpbmVkKFRBUkdFVF9JUEhPTkVfU0lNVUxBVE9SKSAmJiBUQVJHRVRfSVBIT05FX1NJTVVMQVRP UgotI2RlZmluZSBCUExBVEZPUk1fSU9TX1NJTVVMQVRPUiAxCi0jZW5kaWYKKyNkZWZpbmUgQkNP TVBJTEVSX1NVUFBPUlRTKENPTVBJTEVSX0ZFQVRVUkUpIChkZWZpbmVkIEJDT01QSUxFUl9TVVBQ T1JUU18jI0NPTVBJTEVSX0ZFQVRVUkUgJiYgQkNPTVBJTEVSX1NVUFBPUlRTXyMjQ09NUElMRVJf RkVBVFVSRSkKKyNkZWZpbmUgQkNPTVBJTEVSX1NVUFBPUlRTX0NYWF9USFJFQURfTE9DQUwgKGRl ZmluZWQoX19oYXNfZmVhdHVyZSkgJiYgX19oYXNfZmVhdHVyZShjeHhfdGhyZWFkX2xvY2FsKSkK IAogI2VuZGlmIC8vIEJQbGF0Zm9ybV9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9ibWFs bG9jL1BlclRocmVhZC5oIGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9QZXJUaHJlYWQuaAppbmRl eCA3ODlmOWY1NGM1YmQwY2Q1OGQzYTM0OWQ1NjgyNDdkYWM0ZTg2YzlkLi41ZDViNzI1YjU0Mzcx NjliMTFjZDJiZmU0YjkzOTI4NjBmOTJjNWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvYm1hbGxvYy9i bWFsbG9jL1BlclRocmVhZC5oCisrKyBiL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvUGVyVGhyZWFk LmgKQEAgLTMyLDE1ICszMiw2IEBACiAjaW5jbHVkZSA8cHRocmVhZC5oPgogI2lmIGRlZmluZWQo X19oYXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8U3lzdGVtL3B0aHJlYWRfbWFjaGRlcC5o PikKICNpbmNsdWRlIDxTeXN0ZW0vcHRocmVhZF9tYWNoZGVwLmg+Ci0jZWxpZiBCUExBVEZPUk0o SU9TX1NJTVVMQVRPUikKLS8vIEZJWE1FOiBXZSBzaG91bGRuJ3QgaGFyZGNvZGUgdGhpcyBjb25z dGFudCBhcyBpdCBjYW4gYmVjb21lIG91dC1vZi1kYXRlIHdpdGggdGhlIG1hY3JvIGRlZmluZSBv ZiB0aGUgc2FtZQotLy8gbmFtZSBpbiBTeXN0ZW0vcHRocmVhZF9tYWNoZGVwLmguIEluc3RlYWQs IHdlIHNob3VsZCBtYWtlIFBlclRocmVhZCB3b3JrIHdpdGhvdXQgQysrIHRocmVhZCBsb2NhbCBz dG9yYWdlLgotLy8gU2VlIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM1ODk1PiBmb3IgbW9yZSBkZXRhaWxzLgotY29uc3QgcHRocmVhZF9rZXlfdCBfX1BUS19GUkFN RVdPUktfSkFWQVNDUklQVENPUkVfS0VZMCA9IDkwOwotCi1JTkxJTkUgaW50IF9wdGhyZWFkX3Nl dHNwZWNpZmljX2RpcmVjdChwdGhyZWFkX2tleV90IGtleSwgY29uc3Qgdm9pZCogdmFsdWUpIHsg cmV0dXJuIHB0aHJlYWRfc2V0c3BlY2lmaWMoa2V5LCB2YWx1ZSk7IH0KLUlOTElORSB2b2lkKiBf cHRocmVhZF9nZXRzcGVjaWZpY19kaXJlY3QocHRocmVhZF9rZXlfdCBrZXkpIHsgcmV0dXJuIHB0 aHJlYWRfZ2V0c3BlY2lmaWMoa2V5KTsgfQotZXh0ZXJuICJDIiBpbnQgcHRocmVhZF9rZXlfaW5p dF9ucChpbnQsIHZvaWQgKCpkZXN0cnVjdG9yKSh2b2lkKikpOwogI2VuZGlmCiAKIG5hbWVzcGFj ZSBibWFsbG9jIHsKQEAgLTYzLDcgKzU0LDcgQEAgY2xhc3MgQ2FjaGU7CiAKIHRlbXBsYXRlPHR5 cGVuYW1lIFQ+IHN0cnVjdCBQZXJUaHJlYWRTdG9yYWdlOwogCi0jaWYgKGRlZmluZWQoX19oYXNf aW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8U3lzdGVtL3B0aHJlYWRfbWFjaGRlcC5oPikpIHx8 IEJQTEFURk9STShJT1NfU0lNVUxBVE9SKQorI2lmIGRlZmluZWQoX19oYXNfaW5jbHVkZSkgJiYg X19oYXNfaW5jbHVkZSg8U3lzdGVtL3B0aHJlYWRfbWFjaGRlcC5oPikKIC8vIEZvciBub3csIHdl IG9ubHkgc3VwcG9ydCBQZXJUaHJlYWQ8Q2FjaGU+LiBXZSBjYW4gZXhwYW5kIHRvIG90aGVyIHR5 cGVzIGJ5CiAvLyB1c2luZyBtb3JlIGtleXMuCiAKQEAgLTgwLDMwICs3MSw1MiBAQCB0ZW1wbGF0 ZTw+IHN0cnVjdCBQZXJUaHJlYWRTdG9yYWdlPENhY2hlPiB7CiAjZWxzZQogCiB0ZW1wbGF0ZTx0 eXBlbmFtZSBUPiBzdHJ1Y3QgUGVyVGhyZWFkU3RvcmFnZSB7CisjaWYgQkNPTVBJTEVSX1NVUFBP UlRTKENYWF9USFJFQURfTE9DQUwpCiAgICAgc3RhdGljIF9fdGhyZWFkIHZvaWQqIG9iamVjdDsK KyNlbmRpZgogICAgIHN0YXRpYyBwdGhyZWFkX2tleV90IGtleTsKICAgICBzdGF0aWMgc3RkOjpv bmNlX2ZsYWcgb25jZUZsYWc7CiAKLSAgICBzdGF0aWMgdm9pZCogZ2V0KCkgeyByZXR1cm4gb2Jq ZWN0OyB9Ci0gICAgc3RhdGljIHZvaWQgaW5pdCh2b2lkKiBvYmplY3QsIHZvaWQgKCpkZXN0cnVj dG9yKSh2b2lkKikpCisgICAgc3RhdGljIHZvaWQqIGdldCgpCisgICAgeworI2lmIEJDT01QSUxF Ul9TVVBQT1JUUyhDWFhfVEhSRUFEX0xPQ0FMKQorICAgICAgICByZXR1cm4gb2JqZWN0OworI2Vs c2UKKyAgICAgICAgcmV0dXJuIHB0aHJlYWRfZ2V0c3BlY2lmaWMoa2V5KTsKKyNlbmRpZgorICAg IH0KKworICAgIHN0YXRpYyB2b2lkIGluaXRTaGFyZWRLZXlJZk5lZWRlZCh2b2lkICgqZGVzdHJ1 Y3Rvcikodm9pZCopKQogICAgIHsKICAgICAgICAgc3RkOjpjYWxsX29uY2Uob25jZUZsYWcsIFtk ZXN0cnVjdG9yXSgpIHsKICAgICAgICAgICAgIHB0aHJlYWRfa2V5X2NyZWF0ZSgma2V5LCBkZXN0 cnVjdG9yKTsKICAgICAgICAgfSk7CisgICAgfQorCisgICAgc3RhdGljIHZvaWQgaW5pdCh2b2lk KiBvYmplY3QsIHZvaWQgKCpkZXN0cnVjdG9yKSh2b2lkKikpCisgICAgeworICAgICAgICBpbml0 U2hhcmVkS2V5SWZOZWVkZWQoZGVzdHJ1Y3Rvcik7CiAgICAgICAgIHB0aHJlYWRfc2V0c3BlY2lm aWMoa2V5LCBvYmplY3QpOworI2lmIEJDT01QSUxFUl9TVVBQT1JUUyhDWFhfVEhSRUFEX0xPQ0FM KQogICAgICAgICBQZXJUaHJlYWRTdG9yYWdlPENhY2hlPjo6b2JqZWN0ID0gb2JqZWN0OworI2Vu ZGlmCiAgICAgfQogfTsKIAorI2lmIEJDT01QSUxFUl9TVVBQT1JUUyhDWFhfVEhSRUFEX0xPQ0FM KQogdGVtcGxhdGU8dHlwZW5hbWUgVD4gX190aHJlYWQgdm9pZCogUGVyVGhyZWFkU3RvcmFnZTxU Pjo6b2JqZWN0OworI2VuZGlmCiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBwdGhyZWFkX2tleV90IFBl clRocmVhZFN0b3JhZ2U8VD46OmtleTsKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHN0ZDo6b25jZV9m bGFnIFBlclRocmVhZFN0b3JhZ2U8VD46Om9uY2VGbGFnOwogCi0jZW5kaWYgLy8gKGRlZmluZWQo X19oYXNfaW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8U3lzdGVtL3B0aHJlYWRfbWFjaGRlcC5o PikpIHx8IEJQTEFURk9STShJT1NfU0lNVUxBVE9SKQorI2VuZGlmIC8vIGRlZmluZWQoX19oYXNf aW5jbHVkZSkgJiYgX19oYXNfaW5jbHVkZSg8U3lzdGVtL3B0aHJlYWRfbWFjaGRlcC5oPikKIAog dGVtcGxhdGU8dHlwZW5hbWUgVD4KIElOTElORSBUKiBQZXJUaHJlYWQ8VD46OmdldEZhc3RDYXNl KCkKIHsKKyNpZiAhQkNPTVBJTEVSX1NVUFBPUlRTKENYWF9USFJFQURfTE9DQUwpCisgICAgaW5p dFNoYXJlZEtleUlmTmVlZGVkKGRlc3RydWN0b3IpOworI2VuZGlmCiAgICAgcmV0dXJuIHN0YXRp Y19jYXN0PFQqPihQZXJUaHJlYWRTdG9yYWdlPFQ+OjpnZXQoKSk7CiB9CiAK