Changeset 49231 in vbox for trunk/src/VBox

Timestamp:

Oct 22, 2013 2:38:45 PM (12 years ago)

Author:

vboxsync

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

90133

Message:

VMDK: Sketched the code for using RTZipBlockDecompress in vmdkFileInflateSync.

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (5 diffs)

trunk/src/VBox/Storage/VMDK.cpp

@@ -639 +639 @@
 }
 
+/*#define VMDK_USE_BLOCK_DECOMP_API - test and enable */
+#ifndef VMDK_USE_BLOCK_DECOMP_API
 static DECLCALLBACK(int) vmdkFileInflateHelper(void *pvUser, void *pvBuf, size_t cbBuf, size_t *pcbBuf)
 {
@@ -668 +670 @@
     return VINF_SUCCESS;
 }
+#endif
 
 /**
@@ -679 +682 @@
 {
     int rc;
+#ifndef VMDK_USE_BLOCK_DECOMP_API
     PRTZIPDECOMP pZip = NULL;
+#endif
     VMDKMARKER *pMarker = (VMDKMARKER *)pExtent->pvCompGrain;
     size_t cbCompSize, cbActuallyRead;
@@ -727 +732 @@
                                   512);
 
+#ifdef VMDK_USE_BLOCK_DECOMP_API
+    rc = RTZipBlockDecompress(RTZIPTYPE_ZLIB, 0 /*fFlags*/,
+                              pExtent->pvCompGrain, cbCompSize + RT_OFFSETOF(VMDKMARKER, uType), NULL,
+                              pvBuf, cbToRead, &cbActuallyRead);
+#else
     VMDKCOMPRESSIO InflateState;
     InflateState.pImage = pImage;
@@ -738 +748 @@
     rc = RTZipDecompress(pZip, pvBuf, cbToRead, &cbActuallyRead);
     RTZipDecompDestroy(pZip);
+#endif /* !VMDK_USE_BLOCK_DECOMP_API */
     if (RT_FAILURE(rc))
     {