Changeset 58435 in vbox

Timestamp:

Oct 27, 2015 4:15:30 PM (9 years ago)

Author:

vboxsync

Message:

GIMDev: Fix for localhost sockets on linux hosts terminating the debug receive thread prematurely.

Location:

trunk/src/VBox/Devices/GIMDev

Files:

• DrvUDP.cpp (modified) (2 diffs)
• GIMDev.cpp (modified) (1 diff)

trunk/src/VBox/Devices/GIMDev/DrvUDP.cpp

@@ -104 +104 @@
     {
         size_t cbBuf = *pcbWrite;
-        rc = RTSocketWriteToNB(pThis->hSocket, pvBuf, cbBuf, NULL /*pDstAddr*/);
+        rc = RTSocketWriteTo(pThis->hSocket, pvBuf, cbBuf, NULL /*pDstAddr*/);
         if (RT_SUCCESS(rc))
             *pcbWrite = cbBuf;
@@ -147 +147 @@
     if (pThis->hSocket != NIL_RTSOCKET)
     {
+        /*
+         * We shutdown the socket here to poke out any blocking socket reads. The caller
+         * on the other thread/s need to ensure that they do -not- invoke drvUDPRead()
+         * or drvUDPWrite() after this.
+         */
         RTSocketRetain(pThis->hSocket);
         RTSocketShutdown(pThis->hSocket, true, true);

trunk/src/VBox/Devices/GIMDev/GIMDev.cpp

@@ -140 +140 @@
             }
         }
+#ifdef RT_OS_LINUX
+        else if (rc == VERR_NET_CONNECTION_REFUSED)
+        {
+            /*
+             * With the current, simplistic PDMISTREAM interface, this is the best we can do.
+             * Even using RTSocketSelectOne[Ex] on Linux returns immediately with 'ready-to-read'
+             * on localhost UDP sockets that are not connected on the other end.
+             */
+            /** @todo Fix socket waiting semantics on localhost Linux unconnected UDP sockets. */
+            RTThreadSleep(400);
+        }
+#endif
         else if (   rc != VINF_TRY_AGAIN
                  && rc != VERR_TRY_AGAIN)