Changeset 269150 in webkit

Timestamp:

Oct 29, 2020, 9:20:31 AM (6 years ago)

Author:

youenn@apple.com

Message:

Improve LibWebRTCSocketClient logging
​https://bugs.webkit.org/show_bug.cgi?id=218336

Reviewed by Eric Carlson.

Output webrtc socket identifier in case of error.
Fix the case of LibWebRTCSocketClient::sendTo that can log too much.

No observable change of behavior.

• NetworkProcess/webrtc/LibWebRTCSocketClient.cpp:

(WebKit::LibWebRTCSocketClient::sendTo):
(WebKit::LibWebRTCSocketClient::close):
(WebKit::LibWebRTCSocketClient::setOption):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/webrtc/LibWebRTCSocketClient.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-29  Youenn Fablet  <youenn@apple.com>
+
+        Improve LibWebRTCSocketClient logging
+        https://bugs.webkit.org/show_bug.cgi?id=218336
+
+        Reviewed by Eric Carlson.
+
+        Output webrtc socket identifier in case of error.
+        Fix the case of LibWebRTCSocketClient::sendTo that can log too much.
+
+        No observable change of behavior.
+
+        * NetworkProcess/webrtc/LibWebRTCSocketClient.cpp:
+        (WebKit::LibWebRTCSocketClient::sendTo):
+        (WebKit::LibWebRTCSocketClient::close):
+        (WebKit::LibWebRTCSocketClient::setOption):
+
 2020-10-29  Chris Lord  <clord@igalia.com>
 

trunk/Source/WebKit/NetworkProcess/webrtc/LibWebRTCSocketClient.cpp

@@ -73 +73 @@
 void LibWebRTCSocketClient::sendTo(const uint8_t* data, size_t size, const rtc::SocketAddress& socketAddress, const rtc::PacketOptions& options)
 {
-    auto result = m_socket->SendTo(data, size, socketAddress, options);
-    RELEASE_LOG_ERROR_IF(result && m_sendError != result, Network, "LibWebRTCSocketClient::sendTo failed with error %d", m_socket->GetError());
-    m_sendError = result;
+    m_socket->SendTo(data, size, socketAddress, options);
+    auto error = m_socket->GetError();
+    RELEASE_LOG_ERROR_IF(error && m_sendError != error, Network, "LibWebRTCSocketClient::sendTo (ID=%" PRIu64 ") failed with error %d", m_identifier.toUInt64(), error);
+    m_sendError = error;
 }
 
@@ -83 +84 @@
     auto result = m_socket->Close();
     UNUSED_PARAM(result);
-    RELEASE_LOG_ERROR_IF(result, Network, "LibWebRTCSocketClient::close failed with error %d", m_socket->GetError());
+    RELEASE_LOG_ERROR_IF(result, Network, "LibWebRTCSocketClient::close (ID=%" PRIu64 ") failed with error %d", m_identifier.toUInt64(), m_socket->GetError());
 
     m_rtcProvider.takeSocket(m_identifier);
@@ -93 +94 @@
     auto result = m_socket->SetOption(static_cast<rtc::Socket::Option>(option), value);
     UNUSED_PARAM(result);
-    RELEASE_LOG_ERROR_IF(result, Network, "LibWebRTCSocketClient::setOption(%d, %d) failed with error %d", option, value, m_socket->GetError());
+    RELEASE_LOG_ERROR_IF(result, Network, "LibWebRTCSocketClient::setOption(%d, %d) (ID=%" PRIu64 ") failed with error %d", option, value, m_identifier.toUInt64(), m_socket->GetError());
 }