132976 2014-05-15 16:56:19 -0700 [Mac] Move discovery of sharing services off the main thread 2014-05-15 17:15:55 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrowe mrowe beidson oldest_to_newest 1009662 0 mrowe 2014-05-15 16:56:19 -0700 Discovering sharing services isn't a particularly cheap operation, requiring disk access and even IPC. Since the discovery is already asynchronous and we've been told the API we're using can be safely used from a background thread, we should move it off the main thread. 1009664 1 231543 mrowe 2014-05-15 17:01:22 -0700 Created attachment 231543 Patch 1009665 2 231543 beidson 2014-05-15 17:08:21 -0700 Comment on attachment 231543 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231543&action=review > Source/WebKit2/UIProcess/mac/ServicesController.mm:82 > + NSLog(@"+ServicesController::refreshExistingServices"); No. > Source/WebKit2/UIProcess/mac/ServicesController.mm:110 > + NSLog(@"-ServicesController::refreshExistingServices"); No. 1009667 3 mrowe 2014-05-15 17:15:55 -0700 Landed in <http://trac.webkit.org/changeset/168918>. 231543 2014-05-15 17:01:22 -0700 2014-05-15 17:08:21 -0700 Patch bug-132976-20140515170058.patch text/plain 6046 mrowe U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4ODMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjE0MDRiMmM0MjJkMWNl YmQxMGEwNGI3MzRlMzU3MjRmNDYwMTJiNS4uOWYxZTBjNDI2ZmQxODFjNTg3NWZhY2Q2YjA4ZDhk MmMyZmI2NWQ5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTA1LTE1ICBNYXJr IFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CisKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9i LzEzMjk3Nj4gTW92ZSBkaXNjb3Zlcnkgb2Ygc2hhcmluZyBzZXJ2aWNlcyBvZmYgdGhlIG1haW4g dGhyZWFkCisKKyAgICAgICAgRGlzY292ZXJ5IG9mIHNoYXJpbmcgc2VydmljZXMgY2FuIHJlcXVp cmUgZGlzayBhY2Nlc3MgYW5kIElQQy4gU2luY2UgdGhlIGludGVyZmFjZSB0bworICAgICAgICBT ZXJ2aWNlc0NvbnRyb2xsZXIgaXMgYWxyZWFkeSBhc3luY2hyb25vdXMsIHdlIGNhbiBlYXNpbHkg cGVyZm9ybSB0aGUgZGlzY292ZXJ5IG9uIGEKKyAgICAgICAgYmFja2dyb3VuZCBxdWV1ZS4gVGhp cyBjYW4gZWxpbWluYXRlIHRlbnMgdG8gaHVuZHJlZHMgb2YgbWlsbGlzZWNvbmRzIHdvcnRoIG9m IHdvcmsKKyAgICAgICAgZnJvbSB0aGUgbWFpbiB0aHJlYWQgd2hlbiBjcmVhdGluZyB0aGUgZmly c3Qgd2ViIHByb2Nlc3MuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1NlcnZpY2VzQ29udHJvbGxlci5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9tYWMvU2VydmljZXNDb250cm9sbGVyLm1tOgorICAgICAgICAoV2ViS2l0OjpT ZXJ2aWNlc0NvbnRyb2xsZXI6OlNlcnZpY2VzQ29udHJvbGxlcik6CisgICAgICAgIChXZWJLaXQ6 OlNlcnZpY2VzQ29udHJvbGxlcjo6cmVmcmVzaEV4aXN0aW5nU2VydmljZXMpOiBCYWlsIG91dCBl YXJseSBpZiB3ZSdyZSBhbHJlYWR5CisgICAgICAgIGluIHRoZSBwcm9jZXNzIG9mIHJlZnJlc2hp bmcgdGhlIHNlcnZpY2VzLiBLaWNrIHRoZSBkaXNjb3Zlcnkgb3ZlciB0byBhIGJhY2tncm91bmQg cXVldWUsCisgICAgICAgIHdpdGggaXQgaG9wcGluZyBiYWNrIHRvIHRoZSBtYWluIHF1ZXVlIHRv IHVwZGF0ZSB0aGUgYWN0dWFsIHN0YXRlIGFuZCBub3RpZnkgYW55IGNvbnRleHRzCisgICAgICAg IHRoYXQgd2VyZSBpbnRlcmVzdGVkLgorCiAyMDE0LTA1LTEzICBHeXV5b3VuZyBLaW0gIDxneXV5 b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF1bV0syXSBBZGQgZXdrX3ZpZXdf Zml4ZWRfbGF5b3V0X3NpemVfc2V0fGdldCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1NlcnZpY2VzQ29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9TZXJ2aWNlc0NvbnRyb2xsZXIuaAppbmRleCBmYTY0MzU3OTBlMjg4Y2U2MTMxMmY5 OTU0Y2IwNWM0MGIyOWU2MTlmLi5jNmIzMjIxZDMzNmFmZmFkN2U3MDA4Zjc4NzEwZTkxMDI2NjUy ZjNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1NlcnZpY2VzQ29u dHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvU2VydmljZXNDb250 cm9sbGVyLmgKQEAgLTUxLDkgKzUxLDEwIEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgU2Vydmlj ZXNDb250cm9sbGVyKCk7CiAKLSAgICB2b2lkIHJlZnJlc2hFeGlzdGluZ1NlcnZpY2VzVGltZXJG aXJlZCgpOworICAgIHZvaWQgcmVmcmVzaEV4aXN0aW5nU2VydmljZXMoKTsKIAotICAgIFJ1bkxv b3A6OlRpbWVyPFNlcnZpY2VzQ29udHJvbGxlcj4gbV9yZWZyZXNoRXhpc3RpbmdTZXJ2aWNlc1Rp bWVyOworICAgIGRpc3BhdGNoX3F1ZXVlX3QgbV9yZWZyZXNoUXVldWU7CisgICAgYm9vbCBtX2lz UmVmcmVzaGluZzsKIAogICAgIGJvb2wgbV9oYXNJbWFnZVNlcnZpY2VzOwogICAgIGJvb2wgbV9o YXNTZWxlY3Rpb25TZXJ2aWNlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvU2VydmljZXNDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9TZXJ2aWNlc0NvbnRyb2xsZXIubW0KaW5kZXggYzU0NjVlZDAwOTc3NGY2N2FkNWRmZmY1NDhm ZDVjODJmNDQ4ODJhNC4uYzdkYWRmNTY3NjgzODBmYTUyMTRiNmZjMzJhMWY3ODgxOGRlNDg3ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9TZXJ2aWNlc0NvbnRyb2xs ZXIubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9TZXJ2aWNlc0NvbnRyb2xs ZXIubW0KQEAgLTU3LDQ1ICs1Nyw1OSBAQCBTZXJ2aWNlc0NvbnRyb2xsZXImIFNlcnZpY2VzQ29u dHJvbGxlcjo6c2hhcmVkKCkKIH0KIAogU2VydmljZXNDb250cm9sbGVyOjpTZXJ2aWNlc0NvbnRy b2xsZXIoKQotICAgIDogbV9yZWZyZXNoRXhpc3RpbmdTZXJ2aWNlc1RpbWVyKFJ1bkxvb3A6Om1h aW4oKSwgdGhpcywgJlNlcnZpY2VzQ29udHJvbGxlcjo6cmVmcmVzaEV4aXN0aW5nU2VydmljZXNU aW1lckZpcmVkKQorICAgIDogbV9yZWZyZXNoUXVldWUoZGlzcGF0Y2hfcXVldWVfY3JlYXRlKCJj b20uYXBwbGUuV2ViS2l0LlNlcnZpY2VzQ29udHJvbGxlciIsIERJU1BBVENIX1FVRVVFX1NFUklB TCkpCisgICAgLCBtX2lzUmVmcmVzaGluZyhmYWxzZSkKICAgICAsIG1faGFzSW1hZ2VTZXJ2aWNl cyhmYWxzZSkKICAgICAsIG1faGFzU2VsZWN0aW9uU2VydmljZXMoZmFsc2UpCiB7Ci0gICAgbV9y ZWZyZXNoRXhpc3RpbmdTZXJ2aWNlc1RpbWVyLnN0YXJ0T25lU2hvdCgwKTsKKyAgICByZWZyZXNo RXhpc3RpbmdTZXJ2aWNlcygpOwogfQogCiB2b2lkIFNlcnZpY2VzQ29udHJvbGxlcjo6cmVmcmVz aEV4aXN0aW5nU2VydmljZXMoV2ViQ29udGV4dCogY29udGV4dCkKIHsKLSAgICBBU1NFUlQoY29u dGV4dCk7CisgICAgQVNTRVJUX0FSRyhjb250ZXh0LCBjb250ZXh0KTsKKyAgICBBU1NFUlQoW05T VGhyZWFkIGlzTWFpblRocmVhZF0pOwogCiAgICAgbV9jb250ZXh0c1RvTm90aWZ5LmFkZChjb250 ZXh0KTsKLSAgICBtX3JlZnJlc2hFeGlzdGluZ1NlcnZpY2VzVGltZXIuc3RhcnRPbmVTaG90KDAp OworICAgIHJlZnJlc2hFeGlzdGluZ1NlcnZpY2VzKCk7CiB9CiAKLXZvaWQgU2VydmljZXNDb250 cm9sbGVyOjpyZWZyZXNoRXhpc3RpbmdTZXJ2aWNlc1RpbWVyRmlyZWQoKQordm9pZCBTZXJ2aWNl c0NvbnRyb2xsZXI6OnJlZnJlc2hFeGlzdGluZ1NlcnZpY2VzKCkKIHsKLSAgICBzdGF0aWMgTmV2 ZXJEZXN0cm95ZWQ8TlNJbWFnZSAqPiBpbWFnZShbW05TSW1hZ2UgYWxsb2NdIGluaXRdKTsKLSAg ICBSZXRhaW5QdHI8TlNTaGFyaW5nU2VydmljZVBpY2tlcj4gIHBpY2tlciA9IGFkb3B0TlMoW1tO U1NoYXJpbmdTZXJ2aWNlUGlja2VyIGFsbG9jXSBpbml0V2l0aEl0ZW1zOkBbIGltYWdlIF1dKTsK LSAgICBbcGlja2VyIHNldFN0eWxlOk5TU2hhcmluZ1NlcnZpY2VQaWNrZXJTdHlsZVJvbGxvdmVy XTsKKyAgICBpZiAobV9pc1JlZnJlc2hpbmcpCisgICAgICAgIHJldHVybjsKIAotICAgIGJvb2wg aGFzSW1hZ2VTZXJ2aWNlcyA9IHBpY2tlci5nZXQoKS5tZW51OworICAgIE5TTG9nKEAiK1NlcnZp Y2VzQ29udHJvbGxlcjo6cmVmcmVzaEV4aXN0aW5nU2VydmljZXMiKTsKKyAgICBtX2lzUmVmcmVz aGluZyA9IHRydWU7CisgICAgZGlzcGF0Y2hfYXN5bmMobV9yZWZyZXNoUXVldWUsIF57CisgICAg ICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxOU0ltYWdlICo+IGltYWdlKFtbTlNJbWFnZSBhbGxv Y10gaW5pdF0pOworICAgICAgICBSZXRhaW5QdHI8TlNTaGFyaW5nU2VydmljZVBpY2tlcj4gIHBp Y2tlciA9IGFkb3B0TlMoW1tOU1NoYXJpbmdTZXJ2aWNlUGlja2VyIGFsbG9jXSBpbml0V2l0aEl0 ZW1zOkBbIGltYWdlIF1dKTsKKyAgICAgICAgW3BpY2tlciBzZXRTdHlsZTpOU1NoYXJpbmdTZXJ2 aWNlUGlja2VyU3R5bGVSb2xsb3Zlcl07CiAKLSAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8TlNB dHRyaWJ1dGVkU3RyaW5nICo+IGF0dHJpYnV0ZWRTdHJpbmcoW1tOU0F0dHJpYnV0ZWRTdHJpbmcg YWxsb2NdIGluaXRXaXRoU3RyaW5nOkAiYSJdKTsKLSAgICBwaWNrZXIgPSBhZG9wdE5TKFtbTlNT aGFyaW5nU2VydmljZVBpY2tlciBhbGxvY10gaW5pdFdpdGhJdGVtczpAWyBhdHRyaWJ1dGVkU3Ry aW5nIF1dKTsKLSAgICBbcGlja2VyIHNldFN0eWxlOk5TU2hhcmluZ1NlcnZpY2VQaWNrZXJTdHls ZVRleHRTZWxlY3Rpb25dOworICAgICAgICBib29sIGhhc0ltYWdlU2VydmljZXMgPSBwaWNrZXIu Z2V0KCkubWVudTsKIAotICAgIGJvb2wgaGFzU2VsZWN0aW9uU2VydmljZXMgPSBwaWNrZXIuZ2V0 KCkubWVudTsKKyAgICAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPE5TQXR0cmlidXRlZFN0cmlu ZyAqPiBhdHRyaWJ1dGVkU3RyaW5nKFtbTlNBdHRyaWJ1dGVkU3RyaW5nIGFsbG9jXSBpbml0V2l0 aFN0cmluZzpAImEiXSk7CisgICAgICAgIHBpY2tlciA9IGFkb3B0TlMoW1tOU1NoYXJpbmdTZXJ2 aWNlUGlja2VyIGFsbG9jXSBpbml0V2l0aEl0ZW1zOkBbIGF0dHJpYnV0ZWRTdHJpbmcgXV0pOwor ICAgICAgICBbcGlja2VyIHNldFN0eWxlOk5TU2hhcmluZ1NlcnZpY2VQaWNrZXJTdHlsZVRleHRT ZWxlY3Rpb25dOwogCi0gICAgYm9vbCBub3RpZnlDb250ZXh0cyA9IChoYXNJbWFnZVNlcnZpY2Vz ICE9IG1faGFzSW1hZ2VTZXJ2aWNlcykgfHwgKGhhc1NlbGVjdGlvblNlcnZpY2VzICE9IG1faGFz U2VsZWN0aW9uU2VydmljZXMpOwotICAgIG1faGFzU2VsZWN0aW9uU2VydmljZXMgPSBoYXNTZWxl Y3Rpb25TZXJ2aWNlczsKLSAgICBtX2hhc0ltYWdlU2VydmljZXMgPSBoYXNJbWFnZVNlcnZpY2Vz OworICAgICAgICBib29sIGhhc1NlbGVjdGlvblNlcnZpY2VzID0gcGlja2VyLmdldCgpLm1lbnU7 CiAKLSAgICBpZiAobm90aWZ5Q29udGV4dHMpIHsKLSAgICAgICAgZm9yIChjb25zdCBSZWZQdHI8 V2ViQ29udGV4dD4mIGNvbnRleHQgOiBtX2NvbnRleHRzVG9Ob3RpZnkpCi0gICAgICAgICAgICBj b250ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXMoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlNldEVuYWJs ZWRTZXJ2aWNlcyhtX2hhc0ltYWdlU2VydmljZXMsIG1faGFzU2VsZWN0aW9uU2VydmljZXMpKTsK LSAgICB9CisgICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCks IF57CisgICAgICAgICAgICBib29sIG5vdGlmeUNvbnRleHRzID0gKGhhc0ltYWdlU2VydmljZXMg IT0gbV9oYXNJbWFnZVNlcnZpY2VzKSB8fCAoaGFzU2VsZWN0aW9uU2VydmljZXMgIT0gbV9oYXNT ZWxlY3Rpb25TZXJ2aWNlcyk7CisgICAgICAgICAgICBtX2hhc1NlbGVjdGlvblNlcnZpY2VzID0g aGFzU2VsZWN0aW9uU2VydmljZXM7CisgICAgICAgICAgICBtX2hhc0ltYWdlU2VydmljZXMgPSBo YXNJbWFnZVNlcnZpY2VzOwogCi0gICAgbV9jb250ZXh0c1RvTm90aWZ5LmNsZWFyKCk7CisgICAg ICAgICAgICBpZiAobm90aWZ5Q29udGV4dHMpIHsKKyAgICAgICAgICAgICAgICBmb3IgKGNvbnN0 IFJlZlB0cjxXZWJDb250ZXh0PiYgY29udGV4dCA6IG1fY29udGV4dHNUb05vdGlmeSkKKyAgICAg ICAgICAgICAgICAgICAgY29udGV4dC0+c2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJQ cm9jZXNzOjpTZXRFbmFibGVkU2VydmljZXMobV9oYXNJbWFnZVNlcnZpY2VzLCBtX2hhc1NlbGVj dGlvblNlcnZpY2VzKSk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIG1fY29udGV4dHNU b05vdGlmeS5jbGVhcigpOworCisgICAgICAgICAgICBtX2lzUmVmcmVzaGluZyA9IGZhbHNlOwor ICAgICAgICAgICAgTlNMb2coQCItU2VydmljZXNDb250cm9sbGVyOjpyZWZyZXNoRXhpc3RpbmdT ZXJ2aWNlcyIpOworICAgICAgICB9KTsKKyAgICB9KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0Cg==