Changeset 146965 in webkit

Timestamp:

Mar 26, 2013 10:03:11 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Make SocketStreamHandle (Chromium port) fully use IPC window in send()
​https://bugs.webkit.org/show_bug.cgi?id=113304

Patch by Takeshi Yoshino <​tyoshino@chromium.org> on 2013-03-26
Reviewed by Kent Tamura.

socket_stream of Chromium buffers send data up to 32KiB (exact) bytes.

However, SocketStreamHandleInternal::send() method now keeps in-flight
send data not greater than m_maxPendingSendAllowed - 1 that is
32KiB - 1. This means that SocketStreamHandleInternal consumes the
buffered data in SocketStreamHandleBase by 32KiB - 1. It makes memory
copy operations unaligned unnecessarily. It should just use the
allowed size fully.

• platform/network/chromium/SocketStreamHandle.cpp:

(WebCore::SocketStreamHandleInternal::send):
(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/chromium/SocketStreamHandle.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-26  Takeshi Yoshino  <tyoshino@chromium.org>
+
+        Make SocketStreamHandle (Chromium port) fully use IPC window in send()
+        https://bugs.webkit.org/show_bug.cgi?id=113304
+
+        Reviewed by Kent Tamura.
+
+        socket_stream of Chromium buffers send data up to 32KiB (exact) bytes.
+
+        However, SocketStreamHandleInternal::send() method now keeps in-flight
+        send data not greater than m_maxPendingSendAllowed - 1 that is
+        32KiB - 1. This means that SocketStreamHandleInternal consumes the
+        buffered data in SocketStreamHandleBase by 32KiB - 1. It makes memory
+        copy operations unaligned unnecessarily. It should just use the
+        allowed size fully.
+
+        * platform/network/chromium/SocketStreamHandle.cpp:
+        (WebCore::SocketStreamHandleInternal::send):
+        (WebCore):
+
 2013-03-26  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp

@@ -78 +78 @@
         return 0;
     }
-    if (m_pendingAmountSent + len >= m_maxPendingSendAllowed)
-        len = m_maxPendingSendAllowed - m_pendingAmountSent - 1;
+    if (m_pendingAmountSent + len > m_maxPendingSendAllowed)
+        len = m_maxPendingSendAllowed - m_pendingAmountSent;
 
     if (len <= 0)
@@ -99 +99 @@
         m_socket->close();
 }
-    
+
 void SocketStreamHandleInternal::didOpenStream(WebKit::WebSocketStreamHandle* socketHandle, int maxPendingSendAllowed)
 {