Changeset 246896 in webkit

Timestamp:

Jun 27, 2019 11:43:10 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

WebSockets: avoid data copies when queuing tasks in WebSocketChannel
​https://bugs.webkit.org/show_bug.cgi?id=199262

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2019-06-27
Reviewed by Alex Christensen.

For IPC message handler arguments we can receive rvalue references instead of const references.

• WebProcess/Network/WebSocketChannel.cpp:

(WebKit::WebSocketChannel::didConnect):
(WebKit::WebSocketChannel::didReceiveText):
(WebKit::WebSocketChannel::didReceiveBinaryData):
(WebKit::WebSocketChannel::didClose):
(WebKit::WebSocketChannel::didReceiveMessageError):

• WebProcess/Network/WebSocketChannel.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Network/WebSocketChannel.cpp (modified) (7 diffs)
• WebProcess/Network/WebSocketChannel.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebSockets: avoid data copies when queuing tasks in WebSocketChannel
+        https://bugs.webkit.org/show_bug.cgi?id=199262
+
+        Reviewed by Alex Christensen.
+
+        For IPC message handler arguments we can receive rvalue references instead of const references.
+
+        * WebProcess/Network/WebSocketChannel.cpp:
+        (WebKit::WebSocketChannel::didConnect):
+        (WebKit::WebSocketChannel::didReceiveText):
+        (WebKit::WebSocketChannel::didReceiveBinaryData):
+        (WebKit::WebSocketChannel::didClose):
+        (WebKit::WebSocketChannel::didReceiveMessageError):
+        * WebProcess/Network/WebSocketChannel.h:
+
 2019-06-27  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/WebProcess/Network/WebSocketChannel.cpp

@@ -162 +162 @@
 }
 
-void WebSocketChannel::didConnect(const String& subprotocol)
+void WebSocketChannel::didConnect(String&& subprotocol)
 {
     if (m_isClosing)
@@ -171 +171 @@
 
     if (m_isSuspended) {
-        enqueueTask([this, subprotocol] {
-            didConnect(subprotocol);
-        });
-        return;
-    }
-
-    m_subprotocol = subprotocol;
+        enqueueTask([this, subprotocol = WTFMove(subprotocol)] () mutable {
+            didConnect(WTFMove(subprotocol));
+        });
+        return;
+    }
+
+    m_subprotocol = WTFMove(subprotocol);
     m_client->didConnect();
 }
 
-void WebSocketChannel::didReceiveText(const String& message)
+void WebSocketChannel::didReceiveText(String&& message)
 {
     if (m_isClosing)
@@ -190 +190 @@
 
     if (m_isSuspended) {
-        enqueueTask([this, message] {
-            didReceiveText(message);
+        enqueueTask([this, message = WTFMove(message)] () mutable {
+            didReceiveText(WTFMove(message));
         });
         return;
@@ -199 +199 @@
 }
 
-void WebSocketChannel::didReceiveBinaryData(const IPC::DataReference& data)
+void WebSocketChannel::didReceiveBinaryData(IPC::DataReference&& data)
 {
     if (m_isClosing)
@@ -208 +208 @@
 
     if (m_isSuspended) {
-        enqueueTask([this, data = data.vector()]() mutable {
+        enqueueTask([this, data = data.vector()] () mutable {
             if (!m_isClosing && m_client)
                 m_client->didReceiveBinaryData(WTFMove(data));
@@ -217 +217 @@
 }
 
-void WebSocketChannel::didClose(unsigned short code, const String& reason)
-{
-    if (!m_client)
-        return;
-
-    if (m_isSuspended) {
-        enqueueTask([this, code, reason] {
-            didClose(code, reason);
+void WebSocketChannel::didClose(unsigned short code, String&& reason)
+{
+    if (!m_client)
+        return;
+
+    if (m_isSuspended) {
+        enqueueTask([this, code, reason = WTFMove(reason)] () mutable {
+            didClose(code, WTFMove(reason));
         });
         return;
@@ -235 +235 @@
 }
 
-void WebSocketChannel::didReceiveMessageError(const String& errorMessage)
-{
-    if (!m_client)
-        return;
-
-    if (m_isSuspended) {
-        enqueueTask([this, errorMessage] {
-            didReceiveMessageError(errorMessage);
+void WebSocketChannel::didReceiveMessageError(String&& errorMessage)
+{
+    if (!m_client)
+        return;
+
+    if (m_isSuspended) {
+        enqueueTask([this, errorMessage = WTFMove(errorMessage)] () mutable {
+            didReceiveMessageError(WTFMove(errorMessage));
         });
         return;

trunk/Source/WebKit/WebProcess/Network/WebSocketChannel.h

@@ -74 +74 @@
 
     // Message receivers
-    void didConnect(const String&);
-    void didReceiveText(const String&);
-    void didReceiveBinaryData(const IPC::DataReference&);
-    void didClose(unsigned short code, const String&);
-    void didReceiveMessageError(const String&);
+    void didConnect(String&&);
+    void didReceiveText(String&&);
+    void didReceiveBinaryData(IPC::DataReference&&);
+    void didClose(unsigned short code, String&&);
+    void didReceiveMessageError(String&&);
 
     // MessageSender