Changeset 32801 in vbox

Timestamp:

Sep 28, 2010 4:17:46 PM (14 years ago)

Author:

vboxsync

Message:

rtTcpClose: The trunk fix for the graceful shutdown hang.

Location:

trunk/src/VBox/Runtime

Files:

• r3/tcp.cpp (modified) (1 diff)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstRTTcp-1.cpp (added)

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

@@ -935 +935 @@
         if (RT_SUCCESS(rc))
         {
-            uint64_t u64Start = RTTimeMilliTS();
-            for (;;)
+            size_t      cbReceived = 0;
+            uint64_t    u64Start   = RTTimeMilliTS();
+            while (   cbReceived < _1G
+                   && RTTimeMilliTS() - u64Start < 30000)
             {
-                rc = RTSocketSelectOne(Sock, 1000);
+                uint32_t fEvents;
+                rc = RTSocketSelectOneEx(Sock, RTSOCKET_EVT_READ | RTSOCKET_EVT_ERROR, &fEvents, 1000);
                 if (rc == VERR_TIMEOUT)
-                {
-                    if (RTTimeMilliTS() - u64Start > 30000)
-                        break;
-                }
-                else if (rc != VINF_SUCCESS)
+                    continue;
+                if (RT_FAILURE(rc))
                     break;
-                {
-                    char abBitBucket[16*_1K];
-                    ssize_t cbBytesRead = recv(RTSocketToNative(Sock), &abBitBucket[0], sizeof(abBitBucket), MSG_NOSIGNAL);
-                    if (cbBytesRead == 0)
-                        break; /* orderly shutdown in progress */
-                    if (cbBytesRead < 0)
-                        break; /* some kind of error, never mind which... */
-                }
-            }  /* forever */
+                if (fEvents & RTSOCKET_EVT_ERROR)
+                    break;
+
+                char abBitBucket[16*_1K];
+                size_t cbRead;
+                rc = RTSocketReadNB(Sock, &abBitBucket[0], sizeof(abBitBucket), &cbRead);
+                if (RT_FAILURE(rc))
+                    break; /* some kind of error, never mind which... */
+                if (rc != VINF_TRY_AGAIN && !cbRead)
+                    break; /* orderly shutdown in progress */
+
+                cbReceived += cbRead;
+            }
         }
     }

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -102 +102 @@
         tstRTSystemQueryDmi \
         tstRTSystemQueryOsInfo \
+        tstRTTcp-1 \
         tstRTTemp \
         tstTermCallbacks \
@@ -430 +431 @@
 tstRTSystemQueryOsInfo_SOURCES = tstRTSystemQueryOsInfo.cpp
 
+tstRTTcp-1_TEMPLATE = VBOXR3TSTEXE
+tstRTTcp-1_SOURCES = tstRTTcp-1.cpp
+
 tstRTTemp_TEMPLATE = VBOXR3TSTEXE
 tstRTTemp_SOURCES = tstRTTemp.cpp