127251 2014-01-19 10:27:54 -0800 Convert LoaderRunLoopCF.cpp and WebCoreThreadRun.cpp over to modern threading primitives 2014-01-19 10:37:41 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 969599 0 andersca 2014-01-19 10:27:54 -0800 Convert LoaderRunLoopCF.cpp and WebCoreThreadRun.cpp over to modern threading primitives 969600 1 221588 andersca 2014-01-19 10:30:06 -0800 Created attachment 221588 Patch 969601 2 221588 koivisto 2014-01-19 10:35:58 -0800 Comment on attachment 221588 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221588&action=review > Source/WebCore/platform/ios/wak/WebCoreThreadRun.cpp:116 > +static std::mutex* runQueueMutex = nullptr; > +static CFRunLoopSourceRef runSource = nullptr; > +static WebThreadRunQueue* runQueue = nullptr; > Don't need to initialise globals to null. 969602 3 andersca 2014-01-19 10:37:41 -0800 Committed r162292: <http://trac.webkit.org/changeset/162292> 221588 2014-01-19 10:30:06 -0800 2014-01-19 10:35:58 -0800 Patch bug-127251-20140119103005.patch text/plain 6960 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMjkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTczYzA3MmViOGQ5NGYw ZDQxZjE2ODdhODUxY2UwOTkxZDY1YmNkZS4uNDAxNDBjZGIyOGQ4NGIzYWMwMGJkYTAxNzkxZGVh NGIyNjIxYTQxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE0LTAxLTE5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ29udmVydCBMb2Fk ZXJSdW5Mb29wQ0YuY3BwIGFuZCBXZWJDb3JlVGhyZWFkUnVuLmNwcCBvdmVyIHRvIG1vZGVybiB0 aHJlYWRpbmcgcHJpbWl0aXZlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI3MjUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWxzbyBhZGQgYSBjb25kaXRpb24gdG8gdGhlIGxvYWRlclJ1bkxvb3AoKSBm dW5jdGlvbiB0byBwcm90ZWN0IGFnYWluc3Qgc3B1cmlvdXMgd2FrZS11cHMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9pb3Mvd2FrL1dlYkNvcmVUaHJlYWRSdW4uY3BwOgorICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvY2YvTG9hZGVyUnVuTG9vcENGLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omxv YWRlclJ1bkxvb3BNdXRleCk6CisgICAgICAgIChXZWJDb3JlOjpsb2FkZXJSdW5Mb29wQ29uZGl0 aW9uVmFyaWFibGUpOgorICAgICAgICAoV2ViQ29yZTo6cnVuTG9hZGVyVGhyZWFkKToKKyAgICAg ICAgKFdlYkNvcmU6OmxvYWRlclJ1bkxvb3ApOgorCisyMDE0LTAxLTE5ICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgTW9kZXJuaXplIFJldmVyYkNvbnZv bHZlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3 MjUwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV2ViQ29y ZVRocmVhZFJ1bi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mvd2FrL1dlYkNvcmVU aHJlYWRSdW4uY3BwCmluZGV4IDNmZDk4MDVmN2ZlYjM4OWViMWU4ZjQwZWZjYmMwMGQzMjA1MzAz ZTYuLjhhNGE2NDk3MTVkMDBjNTZjZDMzYjE1N2U0NTg2M2JjMjFhMjBkMzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV2ViQ29yZVRocmVhZFJ1bi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XZWJDb3JlVGhyZWFkUnVuLmNwcApA QCAtMzAsNyArMzAsNyBAQAogCiAjaW5jbHVkZSAiV2ViQ29yZVRocmVhZC5oIgogI2luY2x1ZGUg IldlYkNvcmVUaHJlYWRJbnRlcm5hbC5oIgotI2luY2x1ZGUgPHd0Zi9UaHJlYWRpbmdQcmltaXRp dmVzLmg+CisjaW5jbHVkZSA8Y29uZGl0aW9uX3ZhcmlhYmxlPgogI2luY2x1ZGUgPHd0Zi9WZWN0 b3IuaD4KIAogbmFtZXNwYWNlIHsKQEAgLTQ0LDIxICs0NCwyMyBAQCBwdWJsaWM6CiAKICAgICB2 b2lkIHdhaXRGb3JDb21wbGV0aW9uKCkKICAgICB7Ci0gICAgICAgIE11dGV4TG9ja2VyIGxvY2tl cihtX3N0YXRlTXV0ZXgpOwotICAgICAgICB3aGlsZSAoIW1fY29tcGxldGVkKQotICAgICAgICAg ICAgbV9jb21wbGV0aW9uQ29uZGl0aW9uLndhaXQobV9zdGF0ZU11dGV4KTsKKyAgICAgICAgc3Rk Ojp1bmlxdWVfbG9jazxzdGQ6Om11dGV4PiBsb2NrKG1fc3RhdGVNdXRleCk7CisKKyAgICAgICAg bV9jb21wbGV0aW9uQ29uZGl0aW9uVmFyaWFibGUud2FpdChsb2NrLCBbdGhpc10geyByZXR1cm4g bV9jb21wbGV0ZWQ7IH0pOwogICAgIH0KIAogICAgIHZvaWQgc2V0Q29tcGxldGVkKCkKICAgICB7 Ci0gICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX3N0YXRlTXV0ZXgpOworICAgICAgICBzdGQ6 OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9jayhtX3N0YXRlTXV0ZXgpOworCiAgICAgICAgIEFT U0VSVCghbV9jb21wbGV0ZWQpOwogICAgICAgICBtX2NvbXBsZXRlZCA9IHRydWU7Ci0gICAgICAg IG1fY29tcGxldGlvbkNvbmRpdGlvbi5zaWduYWwoKTsKKyAgICAgICAgbV9jb21wbGV0aW9uQ29u ZGl0aW9uVmFyaWFibGUubm90aWZ5X29uZSgpOwogICAgIH0KKwogcHJpdmF0ZToKLSAgICBXVEY6 Ok11dGV4IG1fc3RhdGVNdXRleDsKLSAgICBXVEY6OlRocmVhZENvbmRpdGlvbiBtX2NvbXBsZXRp b25Db25kaXRpb247CisgICAgc3RkOjptdXRleCBtX3N0YXRlTXV0ZXg7CisgICAgc3RkOjpjb25k aXRpb25fdmFyaWFibGUgbV9jb21wbGV0aW9uQ29uZGl0aW9uVmFyaWFibGU7CiAgICAgYm9vbCBt X2NvbXBsZXRlZDsKIH07CiAKQEAgLTEwOCwyNyArMTEwLDI3IEBAIGV4dGVybiAiQyIgewogCiB0 eXBlZGVmIFdURjo6VmVjdG9yPFdlYlRocmVhZEJsb2NrPiBXZWJUaHJlYWRSdW5RdWV1ZTsKIAot c3RhdGljIFdURjo6TXV0ZXggKnJ1blF1ZXVlTG9jayA9IE5VTEw7Ci1zdGF0aWMgQ0ZSdW5Mb29w U291cmNlUmVmIHJ1blNvdXJjZSA9IE5VTEw7Ci1zdGF0aWMgV2ViVGhyZWFkUnVuUXVldWUgKnJ1 blF1ZXVlID0gTlVMTDsKK3N0YXRpYyBzdGQ6Om11dGV4KiBydW5RdWV1ZU11dGV4ID0gbnVsbHB0 cjsKK3N0YXRpYyBDRlJ1bkxvb3BTb3VyY2VSZWYgcnVuU291cmNlID0gbnVsbHB0cjsKK3N0YXRp YyBXZWJUaHJlYWRSdW5RdWV1ZSogcnVuUXVldWUgPSBudWxscHRyOwogCiBzdGF0aWMgdm9pZCBI YW5kbGVSdW5Tb3VyY2Uodm9pZCAqaW5mbykKIHsKICAgICBVTlVTRURfUEFSQU0oaW5mbyk7CiAg ICAgQVNTRVJUKFdlYlRocmVhZElzQ3VycmVudCgpKTsKLSAgICBBU1NFUlQocnVuUXVldWVMb2Nr KTsKKyAgICBBU1NFUlQocnVuUXVldWVNdXRleCk7CiAgICAgQVNTRVJUKHJ1blNvdXJjZSk7CiAg ICAgQVNTRVJUKHJ1blF1ZXVlKTsKIAogICAgIFdlYlRocmVhZFJ1blF1ZXVlIHF1ZXVlQ29weTsK ICAgICB7Ci0gICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcigqcnVuUXVldWVMb2NrKTsKKyAgICAg ICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2soKnJ1blF1ZXVlTXV0ZXgpOwogICAg ICAgICBxdWV1ZUNvcHkgPSAqcnVuUXVldWU7CiAgICAgICAgIHJ1blF1ZXVlLT5jbGVhcigpOwog ICAgIH0KIAotICAgIGZvciAoV2ViVGhyZWFkUnVuUXVldWU6OmNvbnN0X2l0ZXJhdG9yIGl0ID0g cXVldWVDb3B5LmJlZ2luKCk7IGl0ICE9IHF1ZXVlQ29weS5lbmQoKTsgKytpdCkKLSAgICAgICAg KCppdCkoKTsKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGJsb2NrIDogcXVldWVDb3B5KQorICAgICAg ICBibG9jaygpOwogfQogCiBzdGF0aWMgdm9pZCBfV2ViVGhyZWFkUnVuKHZvaWQgKF50YXNrKSgp LCBib29sIHN5bmNocm9ub3VzKQpAQCAtMTM3LDggKzEzOSw4IEBAIHN0YXRpYyB2b2lkIF9XZWJU aHJlYWRSdW4odm9pZCAoXnRhc2spKCksIGJvb2wgc3luY2hyb25vdXMpCiAgICAgICAgIHRhc2so KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICAKLSAgICBBU1NFUlQocnVuUXVldWVMb2Nr KTsKKworICAgIEFTU0VSVChydW5RdWV1ZU11dGV4KTsKICAgICBBU1NFUlQocnVuU291cmNlKTsK ICAgICBBU1NFUlQocnVuUXVldWUpOwogCkBAIC0xNDcsNyArMTQ5LDcgQEAgc3RhdGljIHZvaWQg X1dlYlRocmVhZFJ1bih2b2lkIChedGFzaykoKSwgYm9vbCBzeW5jaHJvbm91cykKICAgICAgICAg c3RhdGUgPSBuZXcgV2ViVGhyZWFkQmxvY2tTdGF0ZTsKIAogICAgIHsKLSAgICAgICAgTXV0ZXhM b2NrZXIgbG9ja2VyKCpydW5RdWV1ZUxvY2spOworICAgICAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3Rk OjptdXRleD4gbG9jaygqcnVuUXVldWVNdXRleCk7CiAgICAgICAgIHJ1blF1ZXVlLT5hcHBlbmQo V2ViVGhyZWFkQmxvY2sodGFzaywgc3RhdGUpKTsKICAgICB9CiAKQEAgLTE3Myw3ICsxNzUsNyBA QCB2b2lkIFdlYlRocmVhZFJ1blN5bmModm9pZCAoXnRhc2spKCkpCiB2b2lkIFdlYlRocmVhZElu aXRSdW5RdWV1ZSgpCiB7CiAgICAgQVNTRVJUKCFydW5RdWV1ZSk7Ci0gICAgQVNTRVJUKCFydW5R dWV1ZUxvY2spOworICAgIEFTU0VSVCghcnVuUXVldWVNdXRleCk7CiAgICAgQVNTRVJUKCFydW5T b3VyY2UpOwogCiAgICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBwcmVkOwpAQCAtMTg0LDcgKzE4 Niw3IEBAIHZvaWQgV2ViVGhyZWFkSW5pdFJ1blF1ZXVlKCkKICAgICAgICAgcnVuU291cmNlID0g Q0ZSdW5Mb29wU291cmNlQ3JlYXRlKE5VTEwsIC0xLCAmcnVuU291cmNlQ29udGV4dCk7CiAgICAg ICAgIENGUnVuTG9vcEFkZFNvdXJjZShXZWJUaHJlYWRSdW5Mb29wKCksIHJ1blNvdXJjZSwga0NG UnVuTG9vcERlZmF1bHRNb2RlKTsKIAotICAgICAgICBydW5RdWV1ZUxvY2sgPSBuZXcgV1RGOjpN dXRleDsKKyAgICAgICAgcnVuUXVldWVNdXRleCA9IHN0ZDo6bWFrZV91bmlxdWU8c3RkOjptdXRl eD4oKS5yZWxlYXNlKCk7CiAgICAgfSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvY2YvTG9hZGVyUnVuTG9vcENGLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvY2YvTG9hZGVyUnVuTG9vcENGLmNwcAppbmRleCAzMTFmZjFiN2U3 MTc5M2Y4YTliNWE0MjM5MGExMjQxY2IxNDNlNjBjLi4xNGU0MTMwYWFkNzk0ODQ1YzU0YjQxMzc2 YjRkOThkY2FhZTY1YWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2NmL0xvYWRlclJ1bkxvb3BDRi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jZi9Mb2FkZXJSdW5Mb29wQ0YuY3BwCkBAIC0yOSwyNSArMjksMjkgQEAKICNpZiBV U0UoQ0ZORVRXT1JLKQogCiAjaW5jbHVkZSA8Q29yZUZvdW5kYXRpb24vQ29yZUZvdW5kYXRpb24u aD4KKyNpbmNsdWRlIDxjb25kaXRpb25fdmFyaWFibGU+CiAjaW5jbHVkZSA8bGltaXRzPgogI2lu Y2x1ZGUgPHd0Zi9BdXRvZHJhaW5lZFBvb2wuaD4KICNpbmNsdWRlIDx3dGYvTWFpblRocmVhZC5o PgorI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogI2luY2x1ZGUgPHd0Zi9UaHJlYWRp bmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdGF0aWMgQ0ZSdW5Mb29wUmVmIGxvYWRl clJ1bkxvb3BPYmplY3QgPSAwOwogCi1zdGF0aWMgTXV0ZXgmIGxvYWRlclJ1bkxvb3BNdXRleCgp CitzdGF0aWMgc3RkOjptdXRleCYgbG9hZGVyUnVuTG9vcE11dGV4KCkKIHsKLSAgICBERUZJTkVf U1RBVElDX0xPQ0FMKE11dGV4LCBtdXRleCwgKCkpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3ll ZDxzdGQ6Om11dGV4PiBtdXRleDsKKwogICAgIHJldHVybiBtdXRleDsKIH0KIAotc3RhdGljIFRo cmVhZENvbmRpdGlvbiYgbG9hZGVyUnVuTG9vcENvbmRpdGlvbigpCitzdGF0aWMgc3RkOjpjb25k aXRpb25fdmFyaWFibGUmIGxvYWRlclJ1bkxvb3BDb25kaXRpb25WYXJpYWJsZSgpCiB7Ci0gICAg REVGSU5FX1NUQVRJQ19MT0NBTChUaHJlYWRDb25kaXRpb24sIHRocmVhZENvbmRpdGlvbiwgKCkp OwotICAgIHJldHVybiB0aHJlYWRDb25kaXRpb247CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVk PHN0ZDo6Y29uZGl0aW9uX3ZhcmlhYmxlPiBjb25kaXRpb25WYXJpYWJsZTsKKworICAgIHJldHVy biBjb25kaXRpb25WYXJpYWJsZTsKIH0KIAogc3RhdGljIHZvaWQgZW1wdHlQZXJmb3JtKHZvaWQq KSAKQEAgLTU3LDcgKzYxLDggQEAgc3RhdGljIHZvaWQgZW1wdHlQZXJmb3JtKHZvaWQqKQogc3Rh dGljIHZvaWQgcnVuTG9hZGVyVGhyZWFkKHZvaWQqKQogewogICAgIHsKLSAgICAgICAgTXV0ZXhM b2NrZXIgbG9jayhsb2FkZXJSdW5Mb29wTXV0ZXgoKSk7CisgICAgICAgIHN0ZDo6bG9ja19ndWFy ZDxzdGQ6Om11dGV4PiBsb2NrKGxvYWRlclJ1bkxvb3BNdXRleCgpKTsKKwogICAgICAgICBsb2Fk ZXJSdW5Mb29wT2JqZWN0ID0gQ0ZSdW5Mb29wR2V0Q3VycmVudCgpOwogCiAgICAgICAgIC8vIE11 c3QgYWRkIGEgc291cmNlIHRvIHRoZSBydW4gbG9vcCB0byBwcmV2ZW50IENGUnVuTG9vcFJ1bigp IGZyb20gZXhpdGluZy4KQEAgLTY1LDcgKzcwLDcgQEAgc3RhdGljIHZvaWQgcnVuTG9hZGVyVGhy ZWFkKHZvaWQqKQogICAgICAgICBDRlJ1bkxvb3BTb3VyY2VSZWYgYm9ndXNTb3VyY2UgPSBDRlJ1 bkxvb3BTb3VyY2VDcmVhdGUoMCwgMCwgJmN0eHQpOwogICAgICAgICBDRlJ1bkxvb3BBZGRTb3Vy Y2UobG9hZGVyUnVuTG9vcE9iamVjdCwgYm9ndXNTb3VyY2UsIGtDRlJ1bkxvb3BEZWZhdWx0TW9k ZSk7CiAKLSAgICAgICAgbG9hZGVyUnVuTG9vcENvbmRpdGlvbigpLnNpZ25hbCgpOworICAgICAg ICBsb2FkZXJSdW5Mb29wQ29uZGl0aW9uVmFyaWFibGUoKS5ub3RpZnlfb25lKCk7CiAgICAgfQog CiAgICAgU0ludDMyIHJlc3VsdDsKQEAgLTc5LDExICs4NCwxNCBAQCBDRlJ1bkxvb3BSZWYgbG9h ZGVyUnVuTG9vcCgpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIAotICAgIE11dGV4 TG9ja2VyIGxvY2sobG9hZGVyUnVuTG9vcE11dGV4KCkpOworICAgIHN0ZDo6dW5pcXVlX2xvY2s8 c3RkOjptdXRleD4gbG9jayhsb2FkZXJSdW5Mb29wTXV0ZXgoKSk7CisKICAgICBpZiAoIWxvYWRl clJ1bkxvb3BPYmplY3QpIHsKICAgICAgICAgY3JlYXRlVGhyZWFkKHJ1bkxvYWRlclRocmVhZCwg MCwgIldlYkNvcmU6IENGTmV0d29yayBMb2FkZXIiKTsKLSAgICAgICAgbG9hZGVyUnVuTG9vcENv bmRpdGlvbigpLndhaXQobG9hZGVyUnVuTG9vcE11dGV4KCkpOworCisgICAgICAgIGxvYWRlclJ1 bkxvb3BDb25kaXRpb25WYXJpYWJsZSgpLndhaXQobG9jaywgW10geyByZXR1cm4gbG9hZGVyUnVu TG9vcE9iamVjdDsgfSk7CiAgICAgfQorCiAgICAgcmV0dXJuIGxvYWRlclJ1bkxvb3BPYmplY3Q7 CiB9CiAK