[Lldb-commits] [lldb] [lldb] Assorted improvements to the Pipe class (PR #128719)

David Spickett via lldb-commits lldb-commits at lists.llvm.org
Tue Feb 25 07:35:41 PST 2025


================
@@ -93,15 +93,13 @@ Status SharedSocket::CompleteSending(lldb::pid_t child_pid) {
         "WSADuplicateSocket() failed, error: %d", last_error);
   }
 
-  size_t num_bytes;
-  Status error =
-      m_socket_pipe.WriteWithTimeout(&protocol_info, sizeof(protocol_info),
-                                     std::chrono::seconds(10), num_bytes);
-  if (error.Fail())
-    return error;
-  if (num_bytes != sizeof(protocol_info))
+  llvm::Expected<size_t> num_bytes = m_socket_pipe.Write(
+      &protocol_info, sizeof(protocol_info), std::chrono::seconds(10));
+  if (!num_bytes)
+    return Status::FromError(num_bytes.takeError());
+  if (*num_bytes != sizeof(protocol_info))
     return Status::FromErrorStringWithFormatv(
-        "WriteWithTimeout(WSAPROTOCOL_INFO) failed: {0} bytes", num_bytes);
+        "Write(WSAPROTOCOL_INFO) failed: {0} bytes", *num_bytes);
----------------
DavidSpickett wrote:

This and the read error below are a bit lacking. How about:
Write(WSAPROTOCOL_INFO) failed: expcted to write {} bytes, wrote {} bytes

https://github.com/llvm/llvm-project/pull/128719


More information about the lldb-commits mailing list