Changeset 24895 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 24, 2009 12:30:13 PM (15 years ago)

Author:

vboxsync

Message:

SSM: Flush buffers when they are 0.5 sec old and check that the stream is ok (hasn't been cancelled). Check for out of disk space before each write.

File:

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

trunk/src/VBox/Main/ConsoleImplTeleporter.cpp

@@ -285 +285 @@
     AssertReturn(pState->mfIsSource, VERR_INVALID_HANDLE);
 
-    /* Poll for incoming NACKs and errors from the other side */
-    int rc = RTTcpSelectOne(pState->mhSocket, 0);
-    if (rc != VERR_TIMEOUT)
-    {
-        if (RT_SUCCESS(rc))
-        {
-            LogRel(("Teleporter/TCP: Incoming data found before write, assuming it's a cancel.\n"));
-            rc = VERR_SSM_CANCELLED;
-        }
-        else
-            LogRel(("Teleporter/TCP: RTTcpSelectOne -> %Rrc before write.\n", rc));
-        return rc;
-    }
-
     for (;;)
     {
@@ -305 +291 @@
         Hdr.u32Magic = TELEPORTERTCPHDR_MAGIC;
         Hdr.cb       = RT_MIN((uint32_t)cbToWrite, TELEPORTERTCPHDR_MAX_SIZE);
-        rc = RTTcpWrite(pState->mhSocket, &Hdr, sizeof(Hdr));
+        int rc = RTTcpWrite(pState->mhSocket, &Hdr, sizeof(Hdr));
         if (RT_FAILURE(rc))
         {
@@ -483 +469 @@
 
 /**
+ * @copydoc SSMSTRMOPS::pfnIsOk
+ */
+static DECLCALLBACK(int) teleporterTcpOpIsOk(void *pvUser)
+{
+    TeleporterState *pState = (TeleporterState *)pvUser;
+
+    if (pState->mfIsSource)
+    {
+        /* Poll for incoming NACKs and errors from the other side */
+        int rc = RTTcpSelectOne(pState->mhSocket, 0);
+        if (rc != VERR_TIMEOUT)
+        {
+            if (RT_SUCCESS(rc))
+            {
+                LogRel(("Teleporter/TCP: Incoming data detect by IsOk, assuming it's a cancel.\n"));
+                rc = VERR_SSM_CANCELLED;
+            }
+            else
+                LogRel(("Teleporter/TCP: RTTcpSelectOne -> %Rrc (IsOk).\n", rc));
+            return rc;
+        }
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+/**
  * @copydoc SSMSTRMOPS::pfnClose
  */
@@ -522 +536 @@
     teleporterTcpOpTell,
     teleporterTcpOpSize,
+    teleporterTcpOpIsOk,
     teleporterTcpOpClose,
     SSMSTRMOPS_VERSION