Changeset 21894 in vbox for trunk/src/VBox/VMM

Timestamp:

Jul 30, 2009 2:58:16 PM (16 years ago)

Author:

vboxsync

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

50543

Message:

SSM: addressed some more TODOs.

File:

• trunk/src/VBox/VMM/SSM-new.cpp (modified) (12 diffs)

trunk/src/VBox/VMM/SSM-new.cpp

@@ -1704 +1704 @@
 
 /**
- * Flush any buffered data.
+ * Flush buffered data.
  *
  * @returns VBox status code.
@@ -1711 +1711 @@
  * @thread  The producer thread.
  */
-static int ssmR3StrmFlush(PSSMSTRM pStrm)
-{
-    /*
-     * Read streams have nothing that needs to be flushed.
-     */
-    if (!pStrm->fWrite)
-        return VINF_SUCCESS;
+static int ssmR3StrmWriteBuffers(PSSMSTRM pStrm)
+{
+    Assert(!pStrm->pCur);
+    Assert(pStrm->fWrite);
+
+    /*
+     * Just return if the stream has a pending error condition.
+     */
     int rc = pStrm->rc;
     if (RT_FAILURE(rc))
         return rc;
-
-    /*
-     * Complete the current buffer and queue it.
-     */
-    ssmR3StrmFlushCurBuf(pStrm);
-
-/** @todo This is what the I/O thread will be doing when we finally get one. */
 
     /*
@@ -1747 +1741 @@
         if (    RT_FAILURE(rc)
             &&  ssmR3StrmSetError(pStrm, rc))
-            LogRel(("ssmR3StrmFlush: RTFileWriteAt failed with rc=%Rrc at offStream=%#llx\n", rc, pCur->offStream));
+            LogRel(("ssmR3StrmWriteBuffers: RTFileWriteAt failed with rc=%Rrc at offStream=%#llx\n", rc, pCur->offStream));
 
         /* free it */
@@ -1768 +1762 @@
      * Flush and close the stream.
      */
-    ssmR3StrmFlush(pStrm);
+    if (pStrm->fWrite)
+    {
+        ssmR3StrmFlushCurBuf(pStrm);
+        ssmR3StrmWriteBuffers(pStrm);
+    }
     int rc = RTFileClose(pStrm->hFile);
     if (RT_FAILURE(rc))
@@ -1827 +1825 @@
         /*
          * Flush the current buffer and replace it with a new one.
+         * Write the bits to the disk if we haven't got any helper yet.
          */
-        int rc = ssmR3StrmFlush(pStrm);
-        if (RT_FAILURE(rc))
-            return rc;
+        ssmR3StrmFlushCurBuf(pStrm);
+        if (pStrm->hIoThread == NIL_RTTHREAD)
+        {
+            int rc = ssmR3StrmWriteBuffers(pStrm);
+            if (RT_FAILURE(rc))
+                return rc;
+        }
         pBuf = ssmR3StrmGetFreeBuf(pStrm);
         if (!pBuf)
@@ -1972 +1975 @@
          */
         ssmR3StrmFlushCurBuf(pStrm);
-        rc = ssmR3StrmReadMore(pStrm); /** @todo Remove this when adding the I/O thread! */
-        if (RT_FAILURE(rc))
-            break;
+        if (pStrm->hIoThread == NIL_RTTHREAD)
+        {
+            rc = ssmR3StrmReadMore(pStrm);
+            if (RT_FAILURE(rc))
+                break;
+        }
         PSSMSTRMBUF pBuf = ssmR3StrmGetBuf(pStrm);
         if (!pBuf)
@@ -3785 +3791 @@
  * @returns VBox status code.
  * @param   pSSM                The SSM handle.
+ * @param   pDir                The directory buffer.
+ * @param   cbDir               The size of the directory.
+ * @param   cDirEntries         The number of directory entries.
+ * @param   offDir              The directory offset in the file.
  * @param   pszUnit             The unit to seek to.
  * @param   iInstance           The particulart insance we seek.
  * @param   piVersion           Where to store the unit version number.
  */
-static int ssmR3FileSeekSubV2(PSSMHANDLE pSSM, PSSMFILEDIR pDir, size_t cbDir, uint32_t cDirEntries,
+static int ssmR3FileSeekSubV2(PSSMHANDLE pSSM, PSSMFILEDIR pDir, size_t cbDir, uint32_t cDirEntries, uint64_t offDir,
                               const char *pszUnit, uint32_t iInstance, uint32_t *piVersion)
 {
@@ -3795 +3805 @@
      * Read it.
      */
-    uint64_t const offDir = pSSM->u.Read.cbLoadFile - sizeof(SSMFILEFTR) - cbDir;
     int rc = ssmR3StrmPeekAt(&pSSM->Strm, offDir, pDir, cbDir, NULL);
     AssertLogRelRCReturn(rc, rc);
@@ -3887 +3896 @@
      * pass it down to a worker to simplify cleanup.
      */
+    uint64_t        offFooter;
     SSMFILEFTR      Footer;
-/** @todo this doesn't work when we get an I/O thread... */
-    int rc = RTFileReadAt(pSSM->Strm.hFile, pSSM->u.Read.cbLoadFile - sizeof(Footer), &Footer, sizeof(Footer), NULL);
+    int rc = ssmR3StrmPeekAt(&pSSM->Strm, -(RTFOFF)sizeof(Footer), &Footer, sizeof(Footer), &offFooter);
     AssertLogRelRCReturn(rc, rc);
     AssertLogRelReturn(!memcmp(Footer.szMagic, SSMFILEFTR_MAGIC, sizeof(Footer.szMagic)), VERR_SSM_INTEGRITY);
@@ -3898 +3907 @@
     if (RT_UNLIKELY(!pDir))
         return VERR_NO_TMP_MEMORY;
-    rc = ssmR3FileSeekSubV2(pSSM, pDir, cbDir, Footer.cDirEntries, pszUnit, iInstance, piVersion);
+    rc = ssmR3FileSeekSubV2(pSSM, pDir, cbDir, Footer.cDirEntries, offFooter - cbDir,
+                            pszUnit, iInstance, piVersion);
     RTMemTmpFree(pDir);
 
@@ -3967 +3977 @@
 static int ssmR3DataWriteFinish(PSSMHANDLE pSSM)
 {
-    //Log2(("ssmR3DataWriteFinish: %#010llx start\n", RTFileTell(pSSM->File)));
+    //Log2(("ssmR3DataWriteFinish: %#010llx start\n", ssmR3StrmTell(&pSSM->Strm)));
     int rc = ssmR3DataFlushBuffer(pSSM);
     if (RT_SUCCESS(rc))
@@ -4790 +4800 @@
     if (cbRead)
     {
-        //Log2(("ssmR3ReadInV1: %#010llx cbBug=%#x cbRead=%#x\n", RTFileTell(pSSM->File), cbBuf, cbRead));
+        //Log2(("ssmR3ReadInV1: %#010llx cbBug=%#x cbRead=%#x\n", ssmR3StrmTell(&pSSM->Strm), cbBuf, cbRead));
         int rc = ssmR3StrmRead(&pSSM->Strm, pvBuf, cbRead);
         if (RT_SUCCESS(rc))