Changeset 1652 in vbox

Timestamp:

Mar 23, 2007 9:59:03 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

19785

Message:

Try it with overlapped writes then.

File:

• trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp (modified) (7 diffs)

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

@@ -79 +79 @@
     /* File handle of the named pipe. */
     RTFILE              NamedPipe;
+    /* Dummy overlapped structure. */
+    OVERLAPPED          Overlapped;
 #else /* !__WIN__ */
     /** Socket handle of the local socket for server. */
@@ -113 +115 @@
         if (VBOX_FAILURE(rc))
         {
+            Log(("drvNamedPipeRead: RTFileRead returned Vrc\n", rc));
             if (rc == VERR_EOF)
             {
                 RTFILE tmp = pData->NamedPipe;
-                pData->NamedPipe = NIL_RTFILE;
-#if 0
                 FlushFileBuffers((HANDLE)tmp);
-#endif
-                DisconnectNamedPipe((HANDLE)tmp);
-                RTFileClose(tmp);
+                if (!pData->fIsServer)
+                {
+                    pData->NamedPipe = NIL_RTFILE;
+                    DisconnectNamedPipe((HANDLE)tmp);
+                    RTFileClose(tmp);
+                }
             }
             cbReallyRead = 0;
@@ -170 +174 @@
     {
         unsigned cbWritten;
-#if 0
-        rc = RTFileWrite(pData->NamedPipe, pvBuf, *cbWrite, &cbWritten);
-#else
-        cbWritten = *cbWrite;
-#endif
+        pData->Overlapped.Offset     = 0;
+        pData->Overlapped.OffsetHigh = 0;
+        if (!WriteFile((HANDLE)pData->NamedPipe, pvBuf, *cbWrite, NULL, &pData->Overlapped))
+        {
+            DWORD uError = GetLastError();
+
+            if (uError != ERROR_IO_PENDING)
+                rc = RTErrConvertFromWin32(uError);
+
+            Log(("drvNamedPipeWrite: WriteFile returned %d (%Vrc)\n", uError, rc));
+        }
+
         if (VBOX_FAILURE(rc))
         {
@@ -180 +191 @@
             {
                 RTFILE tmp = pData->NamedPipe;
-                pData->NamedPipe = NIL_RTFILE;
-#if 0
                 FlushFileBuffers((HANDLE)tmp);
-#endif
-                DisconnectNamedPipe((HANDLE)tmp);
-                RTFileClose(tmp);
+                if (!pData->fIsServer)
+                {
+                    pData->NamedPipe = NIL_RTFILE;
+                    DisconnectNamedPipe((HANDLE)tmp);
+                    RTFileClose(tmp);
+                }
             }
             cbWritten = 0;
@@ -362 +374 @@
     if (fIsServer)
     {
-        HANDLE hPipe = CreateNamedPipe(pData->pszLocation, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, 1, 32, 32, 10000, NULL);
+        HANDLE hPipe = CreateNamedPipe(pData->pszLocation, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, 1, 32, 32, 10000, NULL);
         if (hPipe == INVALID_HANDLE_VALUE)
         {
@@ -382 +394 @@
             return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NamedPipe#%d failed to connect to named pipe %s"), pDrvIns->iInstance, pszLocation);
     }
+
+    memset(&pData->Overlapped, 0, sizeof(pData->Overlapped));
+    pData->Overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+
 #else /* !__WIN__ */
     int s;
@@ -444 +460 @@
     if (pData->NamedPipe != NIL_RTFILE)
     {
-#if 0
         FlushFileBuffers((HANDLE)pData->NamedPipe);
-        DisconnectNamedPipe((HANDLE)pData->NamedPipe);
-#endif
+        if (!pData->fIsServer)
+            DisconnectNamedPipe((HANDLE)pData->NamedPipe);
+
         RTFileClose(pData->NamedPipe);
+        CloseHandle(pData->Overlapped.hEvent);
     }
 #else /* !__WIN__ */