Changeset 279576 in webkit

Timestamp:

Jul 6, 2021, 12:48:10 AM (4 years ago)

Author:

Fujii Hironori

Message:

[curl][Win] very high CPU load on page with WebSocket
​https://bugs.webkit.org/show_bug.cgi?id=227428
<rdar://problem/80150503>

Reviewed by Don Olmstead.

curl_socket_t is UINT_PTR on Windows while it is int on other
platforms. CurlStream::appendMonitoringFd was failing to update
maxfd because the following condition can't be true on Windows.

if (maxfd < *socket)

maxfd = *socket;

As the result, ::select was not called, and CurlStreamScheduler's
thread ran busy.

• platform/network/curl/CurlStream.cpp:

(WebCore::CurlStream::appendMonitoringFd): Added static_cast.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CurlStream.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-07-06  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [curl][Win] very high CPU load on page with WebSocket
+        https://bugs.webkit.org/show_bug.cgi?id=227428
+        <rdar://problem/80150503>
+
+        Reviewed by Don Olmstead.
+
+        curl_socket_t is UINT_PTR on Windows while it is int on other
+        platforms. CurlStream::appendMonitoringFd was failing to update
+        `maxfd` because the following condition can't be true on Windows.
+
+        > if (maxfd < *socket)
+        >     maxfd = *socket;
+
+        As the result, ::select was not called, and CurlStreamScheduler's
+        thread ran busy.
+
+        * platform/network/curl/CurlStream.cpp:
+        (WebCore::CurlStream::appendMonitoringFd): Added static_cast.
+
 2021-07-06  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/platform/network/curl/CurlStream.cpp

@@ -101 +101 @@
         FD_SET(*socket, &writefds);
 
-    if (maxfd < *socket)
+    if (maxfd < static_cast<int>(*socket))
         maxfd = *socket;
 }