Changeset 276136 in webkit

Timestamp:

Apr 16, 2021, 7:41:11 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

[SOUP] Show resource priority and remote IP in the inspector
​https://bugs.webkit.org/show_bug.cgi?id=224660

Reviewed by Adrian Perez de Castro.

• NetworkProcess/soup/NetworkDataTaskSoup.cpp:

(WebKit::toNetworkLoadPriority):
(WebKit::NetworkDataTaskSoup::didGetHeaders):
(WebKit::NetworkDataTaskSoup::networkEvent):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/soup/NetworkDataTaskSoup.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-16  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Show resource priority and remote IP in the inspector
+        https://bugs.webkit.org/show_bug.cgi?id=224660
+
+        Reviewed by Adrian Perez de Castro.
+
+        * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+        (WebKit::toNetworkLoadPriority):
+        (WebKit::NetworkDataTaskSoup::didGetHeaders):
+        (WebKit::NetworkDataTaskSoup::networkEvent):
+
 2021-04-16  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp

@@ -969 +969 @@
 }
 
+static WebCore::NetworkLoadPriority toNetworkLoadPriority(SoupMessagePriority priority)
+{
+    switch (priority) {
+    case SOUP_MESSAGE_PRIORITY_VERY_LOW:
+    case SOUP_MESSAGE_PRIORITY_LOW:
+        return WebCore::NetworkLoadPriority::Low;
+    case SOUP_MESSAGE_PRIORITY_NORMAL:
+        return WebCore::NetworkLoadPriority::Medium;
+    case SOUP_MESSAGE_PRIORITY_HIGH:
+    case SOUP_MESSAGE_PRIORITY_VERY_HIGH:
+        return WebCore::NetworkLoadPriority::High;
+    }
+
+    return WebCore::NetworkLoadPriority::Unknown;
+}
+
 void NetworkDataTaskSoup::didGetHeaders()
 {
@@ -994 +1010 @@
             requestHeaders.set(String(headerName), String(headerValue));
         m_networkLoadMetrics.requestHeaders = WTFMove(requestHeaders);
+
+        m_networkLoadMetrics.priority = toNetworkLoadPriority(soup_message_get_priority(m_soupMessage.get()));
     }
 
@@ -1192 +1210 @@
         break;
     case G_SOCKET_CLIENT_CONNECTED:
+        if (shouldCaptureExtraNetworkLoadMetrics() && G_IS_SOCKET_CONNECTION(stream)) {
+            GRefPtr<GSocketAddress> address = adoptGRef(g_socket_connection_get_remote_address(G_SOCKET_CONNECTION(stream), nullptr));
+            if (G_IS_INET_SOCKET_ADDRESS(address.get())) {
+                GUniquePtr<char> ipAddress(g_inet_address_to_string(g_inet_socket_address_get_address(G_INET_SOCKET_ADDRESS(address.get()))));
+                m_networkLoadMetrics.remoteAddress = makeString(ipAddress.get(), ':', g_inet_socket_address_get_port(G_INET_SOCKET_ADDRESS(address.get())));
+            }
+        }
         // Web Timing considers that connection time involves dns, proxy & TLS negotiation...
-        // so we better pick G_SOCKET_CLIENT_COMPLETE for connectEnd
+        // so we better pick G_SOCKET_CLIENT_COMPLETE for connectEnd.
         break;
     case G_SOCKET_CLIENT_PROXY_NEGOTIATING: