Changeset 34217 in vbox for trunk/src/VBox/Storage

Timestamp:

Nov 21, 2010 2:45:14 PM (14 years ago)

Author:

vboxsync

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

67961

Message:

VD: Use S/G buffers instead of S/G arrays for VDAsyncWrite and VDAsyncRead (Preparation for moving the I/O cache in front of VD, see #5295)

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (16 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -903 +903 @@
 DECLINLINE(PVDIOCTX) vdIoCtxAlloc(PVBOXHDD pDisk, VDIOCTXTXDIR enmTxDir,
                                   uint64_t uOffset, size_t cbTransfer,
-                                  PCRTSGSEG pcaSeg, unsigned cSeg,
-                                  void *pvAllocation,
+                                  PCRTSGBUF pcSgBuf, void *pvAllocation,
                                   PFNVDIOCTXTRANSFER pfnIoCtxTransfer)
 {
@@ -928 +927 @@
         /* There is no S/G list for a flush request. */
         if (enmTxDir != VDIOCTXTXDIR_FLUSH)
-            RTSgBufInit(&pIoCtx->SgBuf, pcaSeg, cSeg);
+            RTSgBufClone(&pIoCtx->SgBuf, pcSgBuf);
         else
             memset(&pIoCtx->SgBuf, 0, sizeof(RTSGBUF));
@@ -938 +937 @@
 DECLINLINE(PVDIOCTX) vdIoCtxRootAlloc(PVBOXHDD pDisk, VDIOCTXTXDIR enmTxDir,
                                       uint64_t uOffset, size_t cbTransfer,
-                                      PCRTSGSEG paSeg, unsigned cSeg,
+                                      PCRTSGBUF pcSgBuf,
                                       PFNVDASYNCTRANSFERCOMPLETE pfnComplete,
                                       void *pvUser1, void *pvUser2,
@@ -945 +944 @@
 {
     PVDIOCTX pIoCtx = vdIoCtxAlloc(pDisk, enmTxDir, uOffset, cbTransfer,
-                                   paSeg, cSeg, pvAllocation, pfnIoCtxTransfer);
+                                   pcSgBuf, pvAllocation, pfnIoCtxTransfer);
 
     if (RT_LIKELY(pIoCtx))
@@ -961 +960 @@
 DECLINLINE(PVDIOCTX) vdIoCtxChildAlloc(PVBOXHDD pDisk, VDIOCTXTXDIR enmTxDir,
                                        uint64_t uOffset, size_t cbTransfer,
-                                       PCRTSGSEG paSeg, unsigned cSeg,
+                                       PCRTSGBUF pcSgBuf,
                                        PVDIOCTX pIoCtxParent, size_t cbTransferParent,
                                        size_t cbWriteParent, void *pvAllocation,
@@ -967 +966 @@
 {
     PVDIOCTX pIoCtx = vdIoCtxAlloc(pDisk, enmTxDir, uOffset, cbTransfer,
-                                   paSeg, cSeg, pvAllocation, pfnIoCtxTransfer);
+                                   pcSgBuf, pvAllocation, pfnIoCtxTransfer);
 
     AssertPtr(pIoCtxParent);
@@ -1934 +1933 @@
                  * A bit hackish but avoids the need to allocate memory twice.
                  */
-                PRTSGSEG pTmp = (PRTSGSEG)RTMemAlloc(cbPreRead + cbThisWrite + cbPostRead + sizeof(RTSGSEG));
+                PRTSGBUF pTmp = (PRTSGBUF)RTMemAlloc(cbPreRead + cbThisWrite + cbPostRead + sizeof(RTSGSEG) + sizeof(RTSGBUF));
                 AssertBreakStmt(VALID_PTR(pTmp), rc = VERR_NO_MEMORY);
-
-                pTmp->pvSeg = pTmp + 1;
-                pTmp->cbSeg = cbPreRead + cbThisWrite + cbPostRead;
+                PRTSGSEG pSeg = (PRTSGSEG)(pTmp + 1);
+
+                pSeg->pvSeg = pSeg + 1;
+                pSeg->cbSeg = cbPreRead + cbThisWrite + cbPostRead;
+                RTSgBufInit(pTmp, pSeg, 1);
 
                 PVDIOCTX pIoCtxWrite = vdIoCtxChildAlloc(pDisk, VDIOCTXTXDIR_WRITE,
-                                                         uOffset, pTmp->cbSeg,
-                                                         pTmp, 1,
+                                                         uOffset, pSeg->cbSeg,
+                                                         pTmp,
                                                          pIoCtx, cbThisWrite,
                                                          cbWrite,
@@ -7918 +7919 @@
 
 VBOXDDU_DECL(int) VDAsyncRead(PVBOXHDD pDisk, uint64_t uOffset, size_t cbRead,
-                              PCRTSGSEG paSeg, unsigned cSeg,
+                              PCRTSGBUF pcSgBuf,
                               PFNVDASYNCTRANSFERCOMPLETE pfnComplete,
                               void *pvUser1, void *pvUser2)
@@ -7927 +7928 @@
     PVDIOCTX pIoCtx = NULL;
 
-    LogFlowFunc(("pDisk=%#p uOffset=%llu paSeg=%p cSeg=%u cbRead=%zu pvUser1=%#p pvUser2=%#p\n",
-                 pDisk, uOffset, paSeg, cSeg, cbRead, pvUser1, pvUser2));
+    LogFlowFunc(("pDisk=%#p uOffset=%llu pcSgBuf=%#p cbRead=%zu pvUser1=%#p pvUser2=%#p\n",
+                 pDisk, uOffset, pcSgBuf, cbRead, pvUser1, pvUser2));
 
     do
@@ -7940 +7941 @@
                            ("cbRead=%zu\n", cbRead),
                            rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreakStmt(VALID_PTR(paSeg),
-                           ("paSeg=%#p\n", paSeg),
-                           rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreakStmt(cSeg,
-                           ("cSeg=%zu\n", cSeg),
+        AssertMsgBreakStmt(VALID_PTR(pcSgBuf),
+                           ("pcSgBuf=%#p\n", pcSgBuf),
                            rc = VERR_INVALID_PARAMETER);
 
@@ -7957 +7955 @@
 
         pIoCtx = vdIoCtxRootAlloc(pDisk, VDIOCTXTXDIR_READ, uOffset,
-                                  cbRead, paSeg, cSeg,
+                                  cbRead, pcSgBuf,
                                   pfnComplete, pvUser1, pvUser2,
                                   NULL, vdReadHelperAsync);
@@ -7995 +7993 @@
 
 VBOXDDU_DECL(int) VDAsyncWrite(PVBOXHDD pDisk, uint64_t uOffset, size_t cbWrite,
-                               PCRTSGSEG paSeg, unsigned cSeg,
+                               PCRTSGBUF pcSgBuf,
                                PFNVDASYNCTRANSFERCOMPLETE pfnComplete,
                                void *pvUser1, void *pvUser2)
@@ -8004 +8002 @@
     PVDIOCTX pIoCtx = NULL;
 
-    LogFlowFunc(("pDisk=%#p uOffset=%llu paSeg=%p cSeg=%u cbWrite=%zu pvUser1=%#p pvUser2=%#p\n",
-                 pDisk, uOffset, paSeg, cSeg, cbWrite, pvUser1, pvUser2));
+    LogFlowFunc(("pDisk=%#p uOffset=%llu cSgBuf=%#p cbWrite=%zu pvUser1=%#p pvUser2=%#p\n",
+                 pDisk, uOffset, pcSgBuf, cbWrite, pvUser1, pvUser2));
     do
     {
@@ -8016 +8014 @@
                            ("cbWrite=%zu\n", cbWrite),
                            rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreakStmt(VALID_PTR(paSeg),
-                           ("paSeg=%#p\n", paSeg),
-                           rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreakStmt(cSeg,
-                           ("cSeg=%zu\n", cSeg),
+        AssertMsgBreakStmt(VALID_PTR(pcSgBuf),
+                           ("pcSgBuf=%#p\n", pcSgBuf),
                            rc = VERR_INVALID_PARAMETER);
 
@@ -8033 +8028 @@
 
         pIoCtx = vdIoCtxRootAlloc(pDisk, VDIOCTXTXDIR_WRITE, uOffset,
-                                  cbWrite, paSeg, cSeg,
+                                  cbWrite, pcSgBuf,
                                   pfnComplete, pvUser1, pvUser2,
                                   NULL, vdWriteHelperAsync);
@@ -8091 +8086 @@
 
         pIoCtx = vdIoCtxRootAlloc(pDisk, VDIOCTXTXDIR_FLUSH, 0,
-                                  0, NULL, 0,
+                                  0, NULL,
                                   pfnComplete, pvUser1, pvUser2,
                                   NULL, vdFlushHelperAsync);