Changeset 24895 in vbox for trunk

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.

Location:

trunk

Files:

• include/VBox/ssm.h (modified) (1 diff)
• src/VBox/Main/ConsoleImplTeleporter.cpp (modified) (4 diffs)
• src/VBox/VMM/SSM.cpp (modified) (7 diffs)

trunk/include/VBox/ssm.h

@@ -965 +965 @@
 
     /**
+     * Check if the stream is OK or not (cancelled).
+     *
+     * @returns VBox status code.
+     * @param   pvUser              The user argument.
+     *
+     * @remarks The method is expected to do a LogRel on failure.
+     */
+    DECLCALLBACKMEMBER(int, pfnIsOk)(void *pvUser);
+
+    /**
      * Close the stream.
      *

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

trunk/src/VBox/VMM/SSM.cpp

@@ -381 +381 @@
     /** End of stream indicator (for read streams only). */
     bool                    fEndOfStream;
+    /** The nano timestamp set by ssmR3StrmGetFreeBuf. */
+    uint64_t                NanoTS;
     /** Pointer to the next buffer in the chain. */
     PSSMSTRMBUF volatile    pNext;
@@ -1780 +1782 @@
 
 /**
+ * @copydoc SSMSTRMOPS::pfnIsOk
+ */
+static DECLCALLBACK(int) ssmR3FileIsOk(void *pvUser)
+{
+    /*
+     * Check that there is still some space left on the disk.
+     */
+    RTFOFF cbFree;
+    int rc = RTFileQueryFsSizes((RTFILE)(uintptr_t)pvUser, NULL, &cbFree, NULL, NULL);
+#define SSM_MIN_DISK_FREE    ((RTFOFF)( 10 * _1M ))
+    if (RT_SUCCESS(rc))
+    {
+        if (cbFree < SSM_MIN_DISK_FREE)
+        {
+            LogRel(("SSM: Giving up: Low on disk space. (cbFree=%RTfoff, SSM_MIN_DISK_FREE=%RTfoff).\n",
+                    cbFree, SSM_MIN_DISK_FREE));
+            rc = VERR_SSM_LOW_ON_DISK_SPACE;
+        }
+    }
+    else if (rc == VERR_NOT_SUPPORTED)
+        rc = VINF_SUCCESS;
+    else
+        AssertLogRelRC(rc);
+    return rc;
+}
+
+
+/**
  * @copydoc SSMSTRMOPS::pfnClose
  */
@@ -1799 +1829 @@
     ssmR3FileTell,
     ssmR3FileSize,
+    ssmR3FileIsOk,
     ssmR3FileClose,
     SSMSTRMOPS_VERSION
@@ -1921 +1952 @@
             pMine->pNext        = NULL;
             pMine->fEndOfStream = false;
+            pMine->NanoTS       = RTTimeNanoTS();
             return pMine;
         }
@@ -2099 +2131 @@
 
         /* flush */
-        int rc = pStrm->pOps->pfnWrite(pStrm->pvUser, pCur->offStream, &pCur->abData[0], pCur->cb);
+        int rc = pStrm->pOps->pfnIsOk(pStrm->pvUser);
+        if (RT_SUCCESS(rc))
+            rc = pStrm->pOps->pfnWrite(pStrm->pvUser, pCur->offStream, &pCur->abData[0], pCur->cb);
         if (    RT_FAILURE(rc)
             &&  ssmR3StrmSetError(pStrm, rc))
-            LogRel(("ssmR3StrmWriteBuffers: RTFileWriteAt failed with rc=%Rrc at offStream=%#llx\n", rc, pCur->offStream));
+            LogRel(("ssmR3StrmWriteBuffers: Write failed with rc=%Rrc at offStream=%#llx\n", rc, pCur->offStream));
 
         /* free */
@@ -2535 +2569 @@
     }
     return NULL;
+}
+
+
+/**
+ * Check that the stream is OK and flush data that is getting old
+ *
+ * The checking is mainly for testing for cancellation and out of space
+ * conditions.
+ *
+ * @returns VBox status code.
+ * @param   pStrm       The stream handle.
+ */
+static int ssmR3StrmCheckAndFlush(PSSMSTRM pStrm)
+{
+    int rc = pStrm->pOps->pfnIsOk(pStrm->pvUser);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    if (    pStrm->fWrite
+        &&  pStrm->hIoThread != NIL_RTTHREAD
+        &&  !pStrm->pHead /* the worker is probably idle */
+        &&  pStrm->pCur
+        &&  RTTimeNanoTS() - pStrm->pCur->NanoTS > 500*1000*1000 /* 0.5s */
+       )
+        ssmR3StrmFlushCurBuf(pStrm);
+    return VINF_SUCCESS;
 }
 
@@ -4964 +5024 @@
 
         /*
-         * Check that there is still some space left on the disk.
+         * Check that the stream is still OK.
          */
-        /** @todo move this to the stream flushing code? It's not perfect when done
-         *        here, it could be way better if we did it there. */
-        if (pSSM->pszFilename)
-        {
-            RTFOFF cbFree;
-            rc = RTFsQuerySizes(pSSM->pszFilename, NULL, &cbFree, NULL, NULL);
-            AssertRC(rc);
-#define SSM_MIN_DISK_FREE    ((RTFOFF)( 10 * _1M ))
-            if (   RT_SUCCESS(rc)
-                && cbFree < SSM_MIN_DISK_FREE)
-            {
-                LogRel(("SSM: Giving up: Low on disk space. (cbFree=%RTfoff, SSM_MIN_DISK_FREE=%RTfoff).\n",
-                        cbFree, SSM_MIN_DISK_FREE));
-                return pSSM->rc = VERR_SSM_LOW_ON_DISK_SPACE;
-            }
-        }
+        rc = ssmR3StrmCheckAndFlush(&pSSM->Strm);
+        if (RT_FAILURE(rc))
+            return pSSM->rc = rc;
     }