Changeset 67272 in vbox for trunk/src/VBox/Runtime/common/vfs

Timestamp:

Jun 6, 2017 1:42:16 PM (8 years ago)

Author:

vboxsync

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

115968

Message:

RTVfsIoStrmZeroFill: Fixed wrong method test (pfnSkip instead of pfnZeroFill); use g_abRTZero64K instead of the heap.

File:

• trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -42 +42 @@
 #include <iprt/semaphore.h>
 #include <iprt/thread.h>
+#include <iprt/zero.h>
 
 #include "internal/file.h"
@@ -3039 +3040 @@
 
     int rc;
-    if (pThis->pOps->pfnSkip)
+    if (pThis->pOps->pfnZeroFill)
     {
         RTVfsLockAcquireWrite(pThis->Base.hLock);
@@ -3047 +3048 @@
     else
     {
-        void *pvBuf = RTMemTmpAllocZ(_64K);
-        if (pvBuf)
+        rc = VINF_SUCCESS;
+        while (cb > 0)
         {
-            rc = VINF_SUCCESS;
-            while (cb > 0)
-            {
-                size_t cbToWrite = (size_t)RT_MIN(cb, _64K);
-                RTVfsLockAcquireWrite(pThis->Base.hLock);
-                rc = RTVfsIoStrmWrite(hVfsIos, pvBuf, cbToWrite, true /*fBlocking*/, NULL);
-                RTVfsLockReleaseWrite(pThis->Base.hLock);
-                if (RT_FAILURE(rc))
-                    break;
-                cb -= cbToWrite;
-            }
-
-            RTMemTmpFree(pvBuf);
+            size_t cbToWrite = (size_t)RT_MIN(cb, sizeof(g_abRTZero64K));
+            RTVfsLockAcquireWrite(pThis->Base.hLock);
+            rc = RTVfsIoStrmWrite(hVfsIos, g_abRTZero64K, cbToWrite, true /*fBlocking*/, NULL);
+            RTVfsLockReleaseWrite(pThis->Base.hLock);
+            if (RT_FAILURE(rc))
+                break;
+            cb -= cbToWrite;
         }
-        else
-            rc = VERR_NO_TMP_MEMORY;
     }
     return rc;