Changeset 31254 in vbox

Timestamp:

Jul 30, 2010 3:42:19 PM (15 years ago)

Author:

vboxsync

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

64269

Message:

ConsoleImplTeleporter.cpp: Disable Nagel's algorithm and completely drop the flush calls.

File:

• trunk/src/VBox/Main/ConsoleImplTeleporter.cpp (modified) (8 diffs)

trunk/src/VBox/Main/ConsoleImplTeleporter.cpp

@@ -40 +40 @@
 #include <VBox/com/string.h>
 #include "VBox/com/ErrorInfo.h"
+
 
 /*******************************************************************************
@@ -288 +289 @@
 {
     int vrc = RTTcpSgWriteL(pState->mhSocket, 2, pszCommand, strlen(pszCommand), "\n", sizeof("\n") - 1);
-    if (RT_SUCCESS(vrc))
-        vrc = RTTcpFlush(pState->mhSocket);
     if (RT_FAILURE(vrc))
         return setError(E_FAIL, tr("Failed writing command '%s': %Rrc"), pszCommand, vrc);
@@ -529 +528 @@
         EofHdr.cb       = fCanceled ? UINT32_MAX : 0;
         int rc = RTTcpWrite(pState->mhSocket, &EofHdr, sizeof(EofHdr));
-        if (RT_SUCCESS(rc))
-            rc = RTTcpFlush(pState->mhSocket);
         if (RT_FAILURE(rc))
         {
@@ -540 +537 @@
     {
         ASMAtomicWriteBool(&pState->mfStopReading, true);
-        RTTcpFlush(pState->mhSocket);
     }
 
@@ -639 +635 @@
 
     /*
-     * Try connect to the destination machine.
+     * Try connect to the destination machine, disable Nagel.
      * (Note. The caller cleans up mhSocket, so we can return without worries.)
      */
@@ -646 +642 @@
         return setError(E_FAIL, tr("Failed to connect to port %u on '%s': %Rrc"),
                         pState->muPort, pState->mstrHostname.c_str(), vrc);
+    vrc = RTTcpSetSendCoalescing(pState->mhSocket, false /*fEnable*/);
+    AssertRC(vrc);
 
     /* Read and check the welcome message. */
@@ -1197 +1195 @@
             teleporterTrgUnlockMedia(pState);
     }
-    RTTcpFlush(pState->mhSocket);
     return rc;
 }
@@ -1224 +1221 @@
     if (RT_FAILURE(rc))
         LogRel(("Teleporter: RTTcpWrite(,%s,%zu) -> %Rrc\n", szMsg, cch, rc));
-    RTTcpFlush(pState->mhSocket);
     return rc;
 }