儲存庫 vbox 的更動 12381

時間撮記:

2008-9-10 下午11:37:41 (16 年 以前)

作者:

vboxsync

訊息:

DrvHostSerial: Open a new descriptor for reading the device to get around issue that the read select seems to block writing (fd lock?). Increase the buffer (darwin only) to make it possible to handle medium sized transfers (DevSerial *is* sending us data at the wrong rate).

檔案:

• trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp (修改) (10 筆差異)

trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

@@ -74 +74 @@
 
 /** Size of the send fifo queue (in bytes) */
-#define CHAR_MAX_SEND_QUEUE             0x80
-#define CHAR_MAX_SEND_QUEUE_MASK        0x7f
+#ifdef RT_OS_DARWIN
+# define CHAR_MAX_SEND_QUEUE             0x400
+# define CHAR_MAX_SEND_QUEUE_MASK        0x3ff
+#else
+# define CHAR_MAX_SEND_QUEUE             0x80
+# define CHAR_MAX_SEND_QUEUE_MASK        0x7f
+#endif
 
 /*******************************************************************************
@@ -107 +112 @@
     /** the device handle */
     RTFILE                      DeviceFile;
+# ifdef RT_OS_DARWIN
+    /** The device handle used for reading. */
+    RTFILE                      DeviceFileR;
+# endif
     /** The read end of the control pipe */
     RTFILE                      WakeupPipeR;
@@ -524 +533 @@
                     FD_ZERO(&WrSet);
                     FD_SET(pThis->DeviceFile, &WrSet);
-                    //FD_SET(pThis->WakeupPipeR, &WrSet);
                     fd_set XcptSet;
                     FD_ZERO(&XcptSet);
                     FD_SET(pThis->DeviceFile, &XcptSet);
-                    //FD_SET(pThis->WakeupPipeR, &XcptSet);
-                    rc = select(RT_MAX(pThis->WakeupPipeR, pThis->DeviceFile) + 1, NULL, &WrSet, &XcptSet, NULL);
+                    rc = select(pThis->DeviceFile + 1, NULL, &WrSet, &XcptSet, NULL);
                     /** @todo check rc? */
 
@@ -700 +707 @@
             fd_set RdSet;
             FD_ZERO(&RdSet);
-            FD_SET(pThis->DeviceFile, &RdSet);
+            FD_SET(pThis->DeviceFileR, &RdSet);
             FD_SET(pThis->WakeupPipeR, &RdSet);
             fd_set XcptSet;
             FD_ZERO(&XcptSet);
-            FD_SET(pThis->DeviceFile, &XcptSet);
+            FD_SET(pThis->DeviceFileR, &XcptSet);
             FD_SET(pThis->WakeupPipeR, &XcptSet);
 # if 1 /* it seems like this select is blocking the write... */
-            rc = select(RT_MAX(pThis->WakeupPipeR, pThis->DeviceFile) + 1, &RdSet, NULL, &XcptSet, NULL);
+            rc = select(RT_MAX(pThis->WakeupPipeR, pThis->DeviceFileR) + 1, &RdSet, NULL, &XcptSet, NULL);
 # else
             struct timeval tv = { 0, 1000 };
-            rc = select(RT_MAX(pThis->WakeupPipeR, pThis->DeviceFile) + 1, &RdSet, NULL, &XcptSet, &tv);
+            rc = select(RT_MAX(pThis->WakeupPipeR, pThis->DeviceFileR) + 1, &RdSet, NULL, &XcptSet, &tv);
 # endif
             if (rc == -1)
@@ -742 +749 @@
 
             /* read data from the serial port. */
-            rc = RTFileRead(pThis->DeviceFile, abBuffer, sizeof(abBuffer), &cbRead);
+            rc = RTFileRead(pThis->DeviceFileR, abBuffer, sizeof(abBuffer), &cbRead);
             if (RT_FAILURE(rc))
             {
@@ -980 +987 @@
         if (!((statusLines ^ pThis->fStatusLines) & uStatusLinesToCheck))
         {
-            PDMR3ThreadSleep(pThread, 1000); /* 1 sec */
+            PDMR3ThreadSleep(pThread, 500); /* 0.5 sec */
             continue;
         }
@@ -1209 +1216 @@
 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
     pThis->DeviceFile  = NIL_RTFILE;
+# ifdef RT_OS_DARWIN
+    pThis->DeviceFileR = NIL_RTFILE;
+# endif
     pThis->WakeupPipeR = NIL_RTFILE;
     pThis->WakeupPipeW = NIL_RTFILE;
@@ -1270 +1280 @@
 
     rc = RTFileOpen(&pThis->DeviceFile, pThis->pszDevicePath, RTFILE_O_OPEN | RTFILE_O_READWRITE);
+# ifdef RT_OS_DARWIN
+    if (RT_SUCCESS(rc))
+        rc = RTFileOpen(&pThis->DeviceFileR, pThis->pszDevicePath, RTFILE_O_OPEN | RTFILE_O_READ);
+# endif
+
 
 #endif
@@ -1301 +1316 @@
 
     fcntl(pThis->DeviceFile, F_SETFL, O_NONBLOCK);
+# ifdef RT_OS_DARWIN
+    fcntl(pThis->DeviceFileR, F_SETFL, O_NONBLOCK);
+# endif
     int aFDs[2];
     if (pipe(aFDs) != 0)
@@ -1404 +1422 @@
         pThis->WakeupPipeR = NIL_RTFILE;
     }
+# if defined(RT_OS_DARWIN)
+    if (pThis->DeviceFileR != NIL_RTFILE)
+    {
+        if (pThis->DeviceFile != pThis->DeviceFileR)
+        {
+            int rc = RTFileClose(pThis->DeviceFileR);
+            AssertRC(rc);
+        }
+        pThis->DeviceFileR = NIL_RTFILE;
+    }
+# endif
     if (pThis->DeviceFile != NIL_RTFILE)
     {