vbox的更動 24204 路徑 trunk/src/VBox/Runtime/r3/tcp.cpp

時間撮記:

2009-10-30 下午04:00:40 (15 年 以前)

作者:

vboxsync

訊息:

IPRT/r3/tcp.cpp: correct shutdown sequence.

檔案:

• trunk/src/VBox/Runtime/r3/tcp.cpp (修改) (15 筆差異)

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

@@ -56 +56 @@
 #include <iprt/string.h>
 #include <iprt/thread.h>
+#include <iprt/time.h>
 
 #include "internal/magics.h"
@@ -72 +73 @@
 # else
 #  define SHUT_RDWR             2
+# endif
+#endif
+#ifndef SHUT_WR
+# ifdef SD_SEND
+#  define SHUT_WR               SD_SEND
+# else
+#  define SHUT_WR               1
 # endif
 #endif
@@ -140 +148 @@
 static int  rcTcpServerListenCleanup(PRTTCPSERVER pServer);
 static int  rtTcpServerDestroySocket(RTSOCKET volatile *pSockClient, const char *pszMsg);
-static int  rtTcpClose(RTSOCKET Sock, const char *pszMsg);
+static int  rtTcpClose(RTSOCKET Sock, const char *pszMsg, bool fTryGracefulShutdown);
 
 
@@ -243 +251 @@
  * @returns IPRT status code.
  */
-static int rtTcpServerDestroySocket(RTSOCKET volatile *pSock, const char *pszMsg)
+static int rtTcpServerDestroySocket(RTSOCKET volatile *pSock, const char *pszMsg, bool fTryGracefulShutdown)
 {
     RTSOCKET Sock = rtTcpAtomicXchgSock(pSock, NIL_RTSOCKET);
     if (Sock != NIL_RTSOCKET)
     {
-        shutdown(Sock, SHUT_RDWR);
-        return rtTcpClose(Sock, pszMsg);
+        if (!fTryGracefulShutdown)
+            shutdown(Sock, SHUT_RDWR);
+        return rtTcpClose(Sock, pszMsg, fTryGracefulShutdown);
     }
     return VINF_TCP_SERVER_NO_CLIENT;
@@ -467 +476 @@
             AssertMsgFailed(("setsockopt() %Rrc\n", rc));
         }
-        rtTcpClose(WaitSock, "RTServerCreateEx");
+        rtTcpClose(WaitSock, "RTServerCreateEx", false /*fTryGracefulShutdown*/);
     }
     else
@@ -575 +584 @@
         if (!rtTcpServerTrySetState(pServer, RTTCPSERVERSTATE_SERVING, RTTCPSERVERSTATE_ACCEPTING))
         {
-            rtTcpClose(Socket, "rtTcpServerListen");
+            rtTcpClose(Socket, "rtTcpServerListen", true /*fTryGracefulShutdown*/);
             return rcTcpServerListenCleanup(pServer);
         }
         rtTcpAtomicXchgSock(&pServer->SockClient, Socket);
         int rc = pServer->pfnServe(Socket, pServer->pvUser);
-        rtTcpServerDestroySocket(&pServer->SockClient, "Listener: client");
+        rtTcpServerDestroySocket(&pServer->SockClient, "Listener: client", true /*fTryGracefulShutdown*/);
 
         /*
@@ -595 +604 @@
                 RTSOCKET SockServer = rtTcpAtomicXchgSock(&pServer->SockServer, NIL_RTSOCKET);
                 rtTcpServerSetState(pServer, RTTCPSERVERSTATE_STOPPED, RTTCPSERVERSTATE_STOPPING);
-                rtTcpClose(SockServer, "Listener: server stopped");
+                rtTcpClose(SockServer, "Listener: server stopped", false /*fTryGracefulShutdown*/);
             }
             else
@@ -613 +622 @@
      * Close the server socket, the client one shouldn't be set.
      */
-    rtTcpServerDestroySocket(&pServer->SockServer, "ListenCleanup");
+    rtTcpServerDestroySocket(&pServer->SockServer, "ListenCleanup", false /*fTryGracefulShutdown*/);
     Assert(pServer->SockClient == NIL_RTSOCKET);
 
@@ -656 +665 @@
     AssertReturn(RTMemPoolRetain(pServer) != UINT32_MAX, VERR_INVALID_HANDLE);
 
-    int rc = rtTcpServerDestroySocket(&pServer->SockClient, "DisconnectClient: client");
+    int rc = rtTcpServerDestroySocket(&pServer->SockClient, "DisconnectClient: client", true /*fTryGracefulShutdown*/);
 
     RTMemPoolRelease(RTMEMPOOL_DEFAULT, pServer);
@@ -706 +715 @@
         if (rtTcpServerTrySetState(pServer, RTTCPSERVERSTATE_STOPPING, enmState))
         {
-            rtTcpServerDestroySocket(&pServer->SockServer, "RTTcpServerShutdown");
+            rtTcpServerDestroySocket(&pServer->SockServer, "RTTcpServerShutdown", false /*fTryGracefulShutdown*/);
             rtTcpServerSetState(pServer, RTTCPSERVERSTATE_STOPPED, RTTCPSERVERSTATE_STOPPING);
 
@@ -770 +779 @@
      */
     ASMAtomicWriteU32(&pServer->u32Magic, ~RTTCPSERVER_MAGIC);
-    rtTcpServerDestroySocket(&pServer->SockServer, "Destroyer: server");
-    rtTcpServerDestroySocket(&pServer->SockClient, "Destroyer: client");
+    rtTcpServerDestroySocket(&pServer->SockServer, "Destroyer: server", false /*fTryGracefulShutdown*/);
+    rtTcpServerDestroySocket(&pServer->SockClient, "Destroyer: client", true  /*fTryGracefulShutdown*/);
 
     /*
@@ -945 +954 @@
         }
         rc = rtTcpError();
-        rtTcpClose(Sock, "RTTcpClientConnect");
+        rtTcpClose(Sock, "RTTcpClientConnect", false /*fTryGracefulShutdown*/);
     }
     else
@@ -955 +964 @@
 RTR3DECL(int) RTTcpClientClose(RTSOCKET Sock)
 {
-    return rtTcpClose(Sock, "RTTcpClientClose");
+    return rtTcpClose(Sock, "RTTcpClientClose", true /*fTryGracefulShutdown*/);
 }
 
@@ -962 +971 @@
  * Internal close function which does all the proper bitching.
  */
-static int rtTcpClose(RTSOCKET Sock, const char *pszMsg)
-{
+static int rtTcpClose(RTSOCKET Sock, const char *pszMsg, bool fTryGracefulShutdown)
+{
+    int rc;
+
     /* ignore nil handles. */
     if (Sock == NIL_RTSOCKET)
@@ -969 +980 @@
 
     /*
+     * Try to gracefully shut it down.
+     */
+    if (fTryGracefulShutdown)
+    {
+        rc = shutdown(Sock, SHUT_WR);
+        if (!rc)
+        {
+            uint64_t u64Start = RTTimeMilliTS();
+            for (;;)
+            {
+                rc = RTTcpSelectOne(Sock, 1000);
+                if (rc == VERR_TIMEOUT)
+                {
+                    if (RTTimeMilliTS() - u64Start > 30000)
+                        break;
+                }
+                else if (rc != VINF_SUCCESS)
+                    break;
+                {
+                    uint8_t abBitBucket[16*_1KB];
+                    ssize_t cbBytesRead = recv(Sock, abBitBucket, sizeof(abBitBucket), MSG_NOSIGNAL);
+                    if (cbBytesRead == 0)
+                        break; /* orderly shutdown in progress */
+                    if (cbBytesRead < 0)
+                        break; /* some kind of error, never mind which... */
+                }
+            }  /* forever */
+        }
+    }
+
+    /*
      * Attempt to close it.
      */
 #ifdef RT_OS_WINDOWS
-    int rc = closesocket(Sock);
+    rc = closesocket(Sock);
 #else
-    int rc = close(Sock);
+    rc = close(Sock);
 #endif
     if (!rc)