Changeset 48872 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 4, 2013 2:53:40 AM (12 years ago)

Author:

vboxsync

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

89541

Message:

DrvVD.cpp: nits and some logging.

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Storage/DrvVD.cpp

@@ -313 +313 @@
         Assert(!pvUser);
         pStorageBackend->rcReqLast      = rcReq;
-        pStorageBackend->fSyncIoPending = false;
+        ASMAtomicWriteBool(&pStorageBackend->fSyncIoPending, false);
         RTSemEventSignal(pStorageBackend->EventSem);
     }
@@ -350 +350 @@
             if (RT_SUCCESS(rc))
             {
-                uint32_t fFlags =    (fOpen & RTFILE_O_ACCESS_MASK) == RTFILE_O_READ
-                                   ? PDMACEP_FILE_FLAGS_READ_ONLY
-                                   : 0;
+                uint32_t fFlags = (fOpen & RTFILE_O_ACCESS_MASK) == RTFILE_O_READ
+                                ? PDMACEP_FILE_FLAGS_READ_ONLY
+                                : 0;
                 if (pThis->fShareable)
                 {
@@ -373 +373 @@
                     if (RT_SUCCESS(rc))
                     {
+                        LogFlow(("drvvdAsyncIOOpen: Successfully opened '%s'; fOpen=%#x pStorage=%p\n",
+                                 pszLocation, fOpen, pStorageBackend));
                         *ppStorage = pStorageBackend;
                         return VINF_SUCCESS;
@@ -413 +415 @@
     PPDMASYNCCOMPLETIONTASK pTask;
 
-    Assert(!pStorageBackend->fSyncIoPending);
-    ASMAtomicXchgBool(&pStorageBackend->fSyncIoPending, true);
+    bool fOld = ASMAtomicXchgBool(&pStorageBackend->fSyncIoPending, true);
+    Assert(!fOld);
     DataSeg.cbSeg = cbRead;
     DataSeg.pvSeg = pvBuf;
@@ -445 +447 @@
     PPDMASYNCCOMPLETIONTASK pTask;
 
-    Assert(!pStorageBackend->fSyncIoPending);
-    ASMAtomicXchgBool(&pStorageBackend->fSyncIoPending, true);
+    bool fOld = ASMAtomicXchgBool(&pStorageBackend->fSyncIoPending, true);
+    Assert(!fOld);
     DataSeg.cbSeg = cbWrite;
     DataSeg.pvSeg = (void *)pvBuf;
@@ -477 +479 @@
     LogFlowFunc(("pvUser=%#p pStorage=%#p\n", pvUser, pStorage));
 
-    Assert(!pStorageBackend->fSyncIoPending);
-    ASMAtomicXchgBool(&pStorageBackend->fSyncIoPending, true);
+    bool fOld = ASMAtomicXchgBool(&pStorageBackend->fSyncIoPending, true);
+    Assert(!fOld);
 
     int rc = PDMR3AsyncCompletionEpFlush(pStorageBackend->pEndpoint, NULL, &pTask);
@@ -505 +507 @@
     PDRVVDSTORAGEBACKEND pStorageBackend = (PDRVVDSTORAGEBACKEND)pStorage;
 
-    int rc = PDMR3AsyncCompletionEpRead(pStorageBackend->pEndpoint, uOffset, paSegments, cSegments, cbRead,
+    int rc = PDMR3AsyncCompletionEpRead(pStorageBackend->pEndpoint, uOffset, paSegments, (unsigned)cSegments, cbRead,
                                         pvCompletion, (PPPDMASYNCCOMPLETIONTASK)ppTask);
     if (rc == VINF_AIO_TASK_PENDING)
@@ -521 +523 @@
     PDRVVDSTORAGEBACKEND pStorageBackend = (PDRVVDSTORAGEBACKEND)pStorage;
 
-    int rc = PDMR3AsyncCompletionEpWrite(pStorageBackend->pEndpoint, uOffset, paSegments, cSegments, cbWrite,
+    int rc = PDMR3AsyncCompletionEpWrite(pStorageBackend->pEndpoint, uOffset, paSegments, (unsigned)cSegments, cbWrite,
                                          pvCompletion, (PPPDMASYNCCOMPLETIONTASK)ppTask);
     if (rc == VINF_AIO_TASK_PENDING)
@@ -1533 +1535 @@
 
     if (RT_SUCCESS(rc))
-        Log2(("%s: off=%#llx pvBuf=%p cbRead=%d %.*Rhxd\n", __FUNCTION__,
+        Log2(("%s: off=%#llx pvBuf=%p cbRead=%d\n%.*Rhxd\n", __FUNCTION__,
               off, pvBuf, cbRead, cbRead, pvBuf));
     LogFlowFunc(("returns %Rrc\n", rc));
@@ -1546 +1548 @@
     LogFlowFunc(("off=%#llx pvBuf=%p cbWrite=%d\n", off, pvBuf, cbWrite));
     PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
-    Log2(("%s: off=%#llx pvBuf=%p cbWrite=%d %.*Rhxd\n", __FUNCTION__,
+    Log2(("%s: off=%#llx pvBuf=%p cbWrite=%d\n%.*Rhxd\n", __FUNCTION__,
           off, pvBuf, cbWrite, cbWrite, pvBuf));