150593 2015-10-27 10:43:49 -0700 [GTK] Move the socket polling off the WorkQueue 2015-10-30 05:47:51 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned benjamin bugs-noreply cmarcelo commit-queue zan oldest_to_newest 1136841 0 cgarcia 2015-10-27 10:43:49 -0700 It doesn't really belong to the Workqueue, it's only used by the WebKit2 connection, so it can be moved there. 1136844 1 264139 cgarcia 2015-10-27 10:50:35 -0700 Created attachment 264139 Patch 1136950 2 264139 andersca 2015-10-27 15:07:29 -0700 Comment on attachment 264139 Patch Very nice! 1137858 3 cgarcia 2015-10-30 05:47:51 -0700 Committed r191788: <http://trac.webkit.org/changeset/191788> 264139 2015-10-27 10:50:35 -0700 2015-10-27 15:07:29 -0700 Patch wk2-socket-poll-source.diff text/plain 6622 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggYzBhOTM0Ni4uZGQyYjNjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMCBAQAogMjAxNS0xMC0yNyAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKKyAgICAgICAgW0dU S10gTW92ZSB0aGUgc29ja2V0IHBvbGxpbmcgb2ZmIHRoZSBXb3JrUXVldWUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDU5MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IGRvZXNuJ3QgcmVhbGx5IGJl bG9uZyB0byB0aGUgV29ya1F1ZXVlLCBpdCdzIG9ubHkgdXNlZCBieSB0aGUKKyAgICAgICAgV2Vi S2l0MiBjb25uZWN0aW9uLCBzbyBpdCBjYW4gYmUgbW92ZWQgdGhlcmUuCisKKyAgICAgICAgKiB3 dGYvV29ya1F1ZXVlLmg6CisgICAgICAgICogd3RmL2dsaWIvV29ya1F1ZXVlR0xpYi5jcHA6Cisg ICAgICAgIChXVEY6OldvcmtRdWV1ZTo6cmVnaXN0ZXJTb2NrZXRFdmVudEhhbmRsZXIpOiBEZWxl dGVkLgorICAgICAgICAoV1RGOjpXb3JrUXVldWU6OnVucmVnaXN0ZXJTb2NrZXRFdmVudEhhbmRs ZXIpOiBEZWxldGVkLgorCisyMDE1LTEwLTI3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBVc2UgYSBwZXJzaXN0ZW50IG1haW4gbG9v cCBzb3VyY2UgaW4gUnVuTG9vcCBnbGliIGltcGxlbWVudGF0aW9uCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTA1OTAKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dURi93dGYvV29ya1F1ZXVlLmggYi9Tb3VyY2UvV1RGL3d0Zi9Xb3JrUXVldWUuaAppbmRl eCAyYjliZDNlLi4xZjEyZDRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Xb3JrUXVldWUu aAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9Xb3JrUXVldWUuaApAQCAtNzYsOCArNzYsNyBAQCBwdWJs aWM6CiAjaWYgT1MoREFSV0lOKQogICAgIGRpc3BhdGNoX3F1ZXVlX3QgZGlzcGF0Y2hRdWV1ZSgp IGNvbnN0IHsgcmV0dXJuIG1fZGlzcGF0Y2hRdWV1ZTsgfQogI2VsaWYgUExBVEZPUk0oR1RLKQot ICAgIHZvaWQgcmVnaXN0ZXJTb2NrZXRFdmVudEhhbmRsZXIoaW50LCBzdGQ6OmZ1bmN0aW9uPHZv aWQgKCk+LCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+KTsKLSAgICB2b2lkIHVucmVnaXN0ZXJTb2Nr ZXRFdmVudEhhbmRsZXIoaW50KTsKKyAgICBHTWFpbkNvbnRleHQqIG1haW5Db250ZXh0KCkgY29u c3QgeyByZXR1cm4gbV9ldmVudENvbnRleHQuZ2V0KCk7IH0KICNlbGlmIFBMQVRGT1JNKEVGTCkK ICAgICB2b2lkIHJlZ2lzdGVyU29ja2V0RXZlbnRIYW5kbGVyKGludCwgc3RkOjpmdW5jdGlvbjx2 b2lkICgpPik7CiAgICAgdm9pZCB1bnJlZ2lzdGVyU29ja2V0RXZlbnRIYW5kbGVyKGludCk7CkBA IC0xMDksNyArMTA4LDYgQEAgcHJpdmF0ZToKICAgICBUaHJlYWRJZGVudGlmaWVyIG1fd29ya1F1 ZXVlVGhyZWFkOwogICAgIEdSZWZQdHI8R01haW5Db250ZXh0PiBtX2V2ZW50Q29udGV4dDsKICAg ICBHUmVmUHRyPEdNYWluTG9vcD4gbV9ldmVudExvb3A7Ci0gICAgR01haW5Mb29wU291cmNlIG1f c29ja2V0RXZlbnRTb3VyY2U7CiAjZWxpZiBQTEFURk9STShFRkwpCiAgICAgUmVmUHRyPERpc3Bh dGNoUXVldWU+IG1fZGlzcGF0Y2hRdWV1ZTsKICNlbGlmIE9TKFdJTkRPV1MpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV1RGL3d0Zi9nbGliL1dvcmtRdWV1ZUdMaWIuY3BwIGIvU291cmNlL1dURi93dGYv Z2xpYi9Xb3JrUXVldWVHTGliLmNwcAppbmRleCBlZTFiNjBiLi4zOWQzYmY5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV1RGL3d0Zi9nbGliL1dvcmtRdWV1ZUdMaWIuY3BwCisrKyBiL1NvdXJjZS9XVEYv d3RmL2dsaWIvV29ya1F1ZXVlR0xpYi5jcHAKQEAgLTI4LDcgKzI4LDcgQEAKICNpbmNsdWRlICJj b25maWcuaCIKICNpbmNsdWRlICJXb3JrUXVldWUuaCIKIAotI2luY2x1ZGUgPGdpby9naW8uaD4K KyNpbmNsdWRlIDxnbGliLmg+CiAjaW5jbHVkZSA8c3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBXVEYg ewpAQCAtODQsMzMgKzg0LDYgQEAgdm9pZCBXb3JrUXVldWU6OnBsYXRmb3JtSW52YWxpZGF0ZSgp CiAgICAgbV9ldmVudENvbnRleHQgPSBudWxscHRyOwogfQogCi12b2lkIFdvcmtRdWV1ZTo6cmVn aXN0ZXJTb2NrZXRFdmVudEhhbmRsZXIoaW50IGZpbGVEZXNjcmlwdG9yLCBzdGQ6OmZ1bmN0aW9u PHZvaWQgKCk+IGZ1bmN0aW9uLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGNsb3NlRnVuY3Rpb24p Ci17Ci0gICAgR1JlZlB0cjxHU29ja2V0PiBzb2NrZXQgPSBhZG9wdEdSZWYoZ19zb2NrZXRfbmV3 X2Zyb21fZmQoZmlsZURlc2NyaXB0b3IsIDApKTsKLSAgICByZWYoKTsKLSAgICBtX3NvY2tldEV2 ZW50U291cmNlLnNjaGVkdWxlKCJbV2ViS2l0XSBXb3JrUXVldWU6OlNvY2tldEV2ZW50SGFuZGxl ciIsIFtmdW5jdGlvbiwgY2xvc2VGdW5jdGlvbl0oR0lPQ29uZGl0aW9uIGNvbmRpdGlvbikgewot ICAgICAgICAgICAgaWYgKGNvbmRpdGlvbiAmIEdfSU9fSFVQIHx8IGNvbmRpdGlvbiAmIEdfSU9f RVJSIHx8IGNvbmRpdGlvbiAmIEdfSU9fTlZBTCkgewotICAgICAgICAgICAgICAgIGNsb3NlRnVu Y3Rpb24oKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gR01haW5Mb29wU291cmNlOjpTdG9wOwot ICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBpZiAoY29uZGl0aW9uICYgR19JT19JTikgewot ICAgICAgICAgICAgICAgIGZ1bmN0aW9uKCk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIEdNYWlu TG9vcFNvdXJjZTo6Q29udGludWU7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgcmV0dXJuIEdNYWluTG9vcFNvdXJjZTo6U3Rv cDsKLSAgICAgICAgfSwgc29ja2V0LmdldCgpLCBHX0lPX0lOLAotICAgICAgICBbdGhpc10geyBk ZXJlZigpOyB9LAotICAgICAgICBtX2V2ZW50Q29udGV4dC5nZXQoKSk7Ci19Ci0KLXZvaWQgV29y a1F1ZXVlOjp1bnJlZ2lzdGVyU29ja2V0RXZlbnRIYW5kbGVyKGludCkKLXsKLSAgICBtX3NvY2tl dEV2ZW50U291cmNlLmNhbmNlbCgpOwotfQotCiB2b2lkIFdvcmtRdWV1ZTo6ZGlzcGF0Y2goc3Rk OjpmdW5jdGlvbjx2b2lkICgpPiBmdW5jdGlvbikKIHsKICAgICByZWYoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRl eCA5YzQzNDY2Li5kMGJmOWQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTUtMTAt MjcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAg IFtHVEtdIE1vdmUgdGhlIHNvY2tldCBwb2xsaW5nIG9mZiB0aGUgV29ya1F1ZXVlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTA1OTMKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDcmVhdGUgdGhlIHNvY2tl dCBwb2xsIHNvdXJjZSBpbiBDb25uZWN0aW9uOjpvcGVuIGFuZCBhdHRhY2ggaXQgdG8KKyAgICAg ICAgdGhlIGNvbm5lY3Rpb24gd29yayBxdWV1ZSBjb250ZXh0LgorCisgICAgICAgICogUGxhdGZv cm0vSVBDL0Nvbm5lY3Rpb24uaDoKKyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvdW5peC9Db25uZWN0 aW9uVW5peC5jcHA6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246OnBsYXRmb3JtSW52YWxpZGF0 ZSk6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246Om9wZW4pOgorCisyMDE1LTEwLTI3ICBDYXJs b3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBV c2UgUnVuTG9vcDo6VGltZXIgaW5zdGVhZCBvZiBHTWFpbkxvb3BTb3VyY2UKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDU5MgogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oIGIvU291cmNlL1dlYktp dDIvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rpb24uaAppbmRleCBkZjM2ZWEwLi5mMzQ2NmUyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmgKQEAgLTUyLDYgKzUyLDEwIEBA CiAjaW5jbHVkZSAiUGxhdGZvcm1Qcm9jZXNzSWRlbnRpZmllci5oIgogI2VuZGlmCiAKKyNpZiBQ TEFURk9STShHVEspCisjaW5jbHVkZSA8d3RmL2dsaWIvR01haW5Mb29wU291cmNlLmg+CisjZW5k aWYKKwogbmFtZXNwYWNlIElQQyB7CiAKIHN0cnVjdCBXYWl0Rm9yTWVzc2FnZVN0YXRlOwpAQCAt MzU0LDYgKzM1OCw5IEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPGludD4gbV9maWxlRGVzY3JpcHRv cnM7CiAgICAgc2l6ZV90IG1fZmlsZURlc2NyaXB0b3JzU2l6ZTsKICAgICBpbnQgbV9zb2NrZXRE ZXNjcmlwdG9yOworI2lmIFBMQVRGT1JNKEdUSykKKyAgICBHTWFpbkxvb3BTb3VyY2UgbV9zb2Nr ZXRFdmVudFNvdXJjZTsKKyNlbmRpZgogI2VuZGlmCiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9QbGF0Zm9ybS9JUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9QbGF0Zm9ybS9JUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAKaW5kZXggMmU3MmM1OS4u MjE3OTJmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL3VuaXgvQ29u bmVjdGlvblVuaXguY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy91bml4L0Nv bm5lY3Rpb25Vbml4LmNwcApAQCAtNDAsNyArNDAsNyBAQAogI2luY2x1ZGUgPHd0Zi9VbmlTdGRF eHRyYXMuaD4KIAogI2lmIFBMQVRGT1JNKEdUSykKLSNpbmNsdWRlIDxnbGliLmg+CisjaW5jbHVk ZSA8Z2lvL2dpby5oPgogI2VuZGlmCiAKICNpZmRlZiBTT0NLX1NFUVBBQ0tFVApAQCAtMTQ3LDcg KzE0Nyw5IEBAIHZvaWQgQ29ubmVjdGlvbjo6cGxhdGZvcm1JbnZhbGlkYXRlKCkKICAgICBpZiAo IW1faXNDb25uZWN0ZWQpCiAgICAgICAgIHJldHVybjsKIAotI2lmIFBMQVRGT1JNKEdUSykgfHwg UExBVEZPUk0oRUZMKQorI2lmIFBMQVRGT1JNKEdUSykKKyAgICBtX3NvY2tldEV2ZW50U291cmNl LmNhbmNlbCgpOworI2VsaWYgUExBVEZPUk0oRUZMKQogICAgIG1fY29ubmVjdGlvblF1ZXVlLT51 bnJlZ2lzdGVyU29ja2V0RXZlbnRIYW5kbGVyKG1fc29ja2V0RGVzY3JpcHRvcik7CiAjZW5kaWYK IApAQCAtMzc0LDEzICszNzYsMjEgQEAgYm9vbCBDb25uZWN0aW9uOjpvcGVuKCkKICAgICBSZWZQ dHI8Q29ubmVjdGlvbj4gcHJvdGVjdGVkVGhpcyh0aGlzKTsKICAgICBtX2lzQ29ubmVjdGVkID0g dHJ1ZTsKICNpZiBQTEFURk9STShHVEspCi0gICAgbV9jb25uZWN0aW9uUXVldWUtPnJlZ2lzdGVy U29ja2V0RXZlbnRIYW5kbGVyKG1fc29ja2V0RGVzY3JpcHRvciwKLSAgICAgICAgW3Byb3RlY3Rl ZFRoaXNdIHsKLSAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPnJlYWR5UmVhZEhhbmRsZXIoKTsK LSAgICAgICAgfSwKLSAgICAgICAgW3Byb3RlY3RlZFRoaXNdIHsKKyAgICBHUmVmUHRyPEdTb2Nr ZXQ+IHNvY2tldCA9IGFkb3B0R1JlZihnX3NvY2tldF9uZXdfZnJvbV9mZChtX3NvY2tldERlc2Ny aXB0b3IsIG51bGxwdHIpKTsKKyAgICBtX3NvY2tldEV2ZW50U291cmNlLnNjaGVkdWxlKCJbV2Vi S2l0XSBDb25uZWN0aW9uOjpTb2NrZXRFdmVudEhhbmRsZXIiLCBbcHJvdGVjdGVkVGhpc10gKEdJ T0NvbmRpdGlvbiBjb25kaXRpb24pIHsKKyAgICAgICAgaWYgKGNvbmRpdGlvbiAmIEdfSU9fSFVQ IHx8IGNvbmRpdGlvbiAmIEdfSU9fRVJSIHx8IGNvbmRpdGlvbiAmIEdfSU9fTlZBTCkgewogICAg ICAgICAgICAgcHJvdGVjdGVkVGhpcy0+Y29ubmVjdGlvbkRpZENsb3NlKCk7Ci0gICAgICAgIH0p OworICAgICAgICAgICAgcmV0dXJuIEdNYWluTG9vcFNvdXJjZTo6U3RvcDsKKyAgICAgICAgfQor CisgICAgICAgIGlmIChjb25kaXRpb24gJiBHX0lPX0lOKSB7CisgICAgICAgICAgICBwcm90ZWN0 ZWRUaGlzLT5yZWFkeVJlYWRIYW5kbGVyKCk7CisgICAgICAgICAgICByZXR1cm4gR01haW5Mb29w U291cmNlOjpDb250aW51ZTsKKyAgICAgICAgfQorCisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOworICAgICAgICByZXR1cm4gR01haW5Mb29wU291cmNlOjpTdG9wOworICAgIH0sIHNvY2tl dC5nZXQoKSwgR19JT19JTiwgbnVsbHB0ciwgbV9jb25uZWN0aW9uUXVldWUtPm1haW5Db250ZXh0 KCkpOwogI2VsaWYgUExBVEZPUk0oRUZMKQogICAgIG1fY29ubmVjdGlvblF1ZXVlLT5yZWdpc3Rl clNvY2tldEV2ZW50SGFuZGxlcihtX3NvY2tldERlc2NyaXB0b3IsCiAgICAgICAgIFtwcm90ZWN0 ZWRUaGlzXSB7Cg==