Changeset 31584 in vbox for trunk/src/VBox

Timestamp:

Aug 11, 2010 9:51:16 PM (14 years ago)

Author:

vboxsync

Message:

Try to fix burning builds

File:

• trunk/src/VBox/Runtime/r3/socket.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/socket.cpp

@@ -760 +760 @@
     rtSocketErrorReset();
 #ifdef RT_OS_WINDOWS
-    int    cbNow = cbBuffer >= INT_MAX/2 ? INT_MAX/2 : (int)cbBuffer;
-#else
-    size_t cbNow = cbBuffer;
-#endif
-    ssize_t cbRead = recv(pThis->hNative, pvBuffer, cbNow, MSG_NOSIGNAL);
+    int cbNow = cbBuffer >= INT_MAX/2 ? INT_MAX/2 : (int)cbBuffer;
+
+    int cbRead = recv(pThis->hNative, pvBuffer, cbNow, MSG_NOSIGNAL);
+    if (cbRead >= 0)
+    {
+        *pcbRead = cbRead;
+        rc = VINF_SUCCESS;
+    }
+    else
+        rc = rtSocketError();
+
+    if (rc == VERR_TRY_AGAIN)
+        rc = VINF_TRY_AGAIN;
+#else
+    ssize_t cbRead = recv(pThis->hNative, pvBuffer, cbBuffer, MSG_NOSIGNAL);
     if (cbRead >= 0)
         *pcbRead = cbRead;
@@ -773 +783 @@
     }
     else
-        rc = RTErrConvertFromErrno(errno);
+        rc = rtSocketError();
+#endif
 
     rtSocketUnlock(pThis);
@@ -797 +808 @@
     rtSocketErrorReset();
 #ifdef RT_OS_WINDOWS
-    int    cbNow = RT_MIN((int)cbBuffer, INT_MAX/2);
-#else
-    size_t cbNow = cbBuffer;
-#endif
-    ssize_t cbWritten = send(pThis->hNative, pvBuffer, cbNow, MSG_NOSIGNAL);
+    int cbNow = RT_MIN((int)cbBuffer, INT_MAX/2);
+
+    int cbWritten = send(pThis->hNative, pvBuffer, cbNow, MSG_NOSIGNAL);
+
+    if (cbWritten >= 0)
+    {
+        *pcbWritten = cbWritten;
+        rc = VINF_SUCCESS;
+    }
+    else
+        rc = rtSocketError();
+
+    if (rc == VERR_TRY_AGAIN)
+        rc = VINF_TRY_AGAIN;
+#else
+    ssize_t cbWritten = send(pThis->hNative, pvBuffer, cbBuffer, MSG_NOSIGNAL);
     if (cbWritten >= 0)
         *pcbWritten = cbWritten;
@@ -810 +832 @@
     }
     else
-        rc = RTErrConvertFromErrno(errno);
+        rc = rtSocketError();
+#endif
 
     rtSocketUnlock(pThis);